react_ui: workspace_defined_leave への移行

Changes

5 changed files (+23/-34)

• packages/react_ui/src/components/WorkRecordBadges.stories.tsx
  • @@ -83,11 +83,11 @@ }),
    }, }; - export const SpecialLeave: Story = { + export const WorkspaceDefinedLeave: Story = { args: { workRecord: proto.create(WorkRecordSchema, { record: { - case: "specialLeave", + case: "workspaceDefinedLeave", value: { displayName: "リフレッシュ休暇", },
  • @@ -96,11 +96,11 @@ }),
    }, }; - export const LegalLeave: Story = { + export const LeaveDeemedToBeWorked: Story = { args: { workRecord: proto.create(WorkRecordSchema, { record: { - case: "legalLeave", + case: "workspaceDefinedLeave", value: { displayName: "産前産後休業", currentRevision: {
• packages/react_ui/src/components/WorkRecordBadges.tsx
  • @@ -75,8 +75,7 @@ <ResponsiveBadge {...rest} color="green">
    有給休暇 </ResponsiveBadge> ); - case "specialLeave": - case "legalLeave": + case "workspaceDefinedLeave": return ( <ResponsiveBadge {...rest}
  • @@ -86,8 +85,7 @@ ? "green"
    : "amber" } > - {workRecord.record.value.displayName || - (workRecord.record.case === "specialLeave" ? "特別休暇" : "法定休暇")} + {workRecord.record.value.displayName || "休暇"} </ResponsiveBadge> ); default:
• packages/react_ui/src/mocks/yamori/worker/v1/worker_service.ts
  • @@ -286,7 +286,7 @@ },
    { date: toProtoDate(subDays(Date.now(), 5)), record: { - case: "legalLeave", + case: "workspaceDefinedLeave", value: { displayName: "産前産後休業", currentRevision: {
  • @@ -300,7 +300,7 @@ },
    { date: toProtoDate(subDays(Date.now(), 4)), record: { - case: "specialLeave", + case: "workspaceDefinedLeave", value: { displayName: "冠婚葬祭", },
• packages/react_ui/src/pages/:workspace/calendar/page.tsx
  • @@ -23,7 +23,6 @@ import { ListRequestSchema } from "@yamori/proto/yamori/worker/v1/list_request_pb.js";
    import { ListResponseSchema } from "@yamori/proto/yamori/worker/v1/list_response_pb.js"; import { WorkerSchema } from "@yamori/proto/yamori/worker/v1/worker_pb.js"; import { LeaveSchema } from "@yamori/proto/yamori/work_record/v1/leave_pb.js"; - import { LeaveReadMaskSchema } from "@yamori/proto/yamori/work_record/v1/leave_read_mask_pb.js"; import { addMonths, subMonths,
  • @@ -78,14 +77,6 @@ }
    export const pattern = new URLPattern({ pathname: "/:workspace/calendar", - }); - - const leaveMask = proto.create(LeaveReadMaskSchema, { - fields: [ - LeaveSchema.field.id.number, - LeaveSchema.field.displayName.number, - LeaveSchema.field.currentRevision.number, - ], }); // TODO: どこか共通のファイルで定義する
  • @@ -137,8 +128,13 @@ WorkerSchema.field.providePaidLeaveKey.number,
    WorkerSchema.field.workRecords.number, ], workRecordsMask: { - legalLeaveReadMask: leaveMask, - specialLeaveReadMask: leaveMask, + workspaceDefinedLeaveMask: { + fields: [ + LeaveSchema.field.id.number, + LeaveSchema.field.displayName.number, + LeaveSchema.field.currentRevision.number, + ], + }, }, }, },
• packages/react_ui/src/pages/:workspace/workers/:id/Dashboard.tsx
  • @@ -6,7 +6,6 @@
    import * as proto from "@bufbuild/protobuf"; import { Box, Container, Flex, Heading, Separator } from "@radix-ui/themes"; import { LeaveSchema } from "@yamori/proto/yamori/work_record/v1/leave_pb.js"; - import { LeaveReadMaskSchema } from "@yamori/proto/yamori/work_record/v1/leave_read_mask_pb.js"; import { WorkRecordSchema } from "@yamori/proto/yamori/work_record/v1/work_record_pb.js"; import { PaidLeaveProvisionSchema } from "@yamori/proto/yamori/worker/v1/paid_leave_provision_pb.js"; import { type Worker, WorkerSchema } from "@yamori/proto/yamori/worker/v1/worker_pb.js";
  • @@ -29,14 +28,6 @@ import { useDateCells } from "./Dashboard/useDateCells.ts";
    export const Title: FC = () => "ダッシュボード"; - const leaveReadMask = proto.create(LeaveReadMaskSchema, { - fields: [ - LeaveSchema.field.id.number, - LeaveSchema.field.displayName.number, - LeaveSchema.field.currentRevision.number, - ], - }); - const readMask = proto.create(WorkerReadMaskSchema, { fields: [ WorkerSchema.field.writeWorkRecordKey.number,
  • @@ -60,12 +51,16 @@ WorkRecordSchema.field.date.number,
    WorkRecordSchema.field.workingDay.number, WorkRecordSchema.field.dayOff.number, WorkRecordSchema.field.paidLeave.number, - WorkRecordSchema.field.legalLeave.number, - WorkRecordSchema.field.specialLeave.number, + WorkRecordSchema.field.workspaceDefinedLeave.number, WorkRecordSchema.field.note.number, ], - specialLeaveReadMask: leaveReadMask, - legalLeaveReadMask: leaveReadMask, + workspaceDefinedLeaveMask: { + fields: [ + LeaveSchema.field.id.number, + LeaveSchema.field.displayName.number, + LeaveSchema.field.currentRevision.number, + ], + }, }, });