From 703591adc430d6076e1a275a91eb5354039a5240 Mon Sep 17 00:00:00 2001
From: Wayne <wayne.lee@2fi-solutions.com.hk>
Date: Wed, 2 Oct 2024 23:28:25 +0900
Subject: [PATCH] Do not show project pass actual end date in timesheet project
 selection

---
 src/app/api/projects/index.ts                       |  1 +
 .../TimeLeaveModal/TimeLeaveInputTable.tsx          |  3 +++
 .../TimeLeaveModal/TimeLeaveMobileEntry.tsx         |  3 +++
 .../TimesheetTable/FastTimeEntryModal.tsx           |  2 ++
 src/components/TimesheetTable/ProjectSelect.tsx     | 13 +++++++------
 .../TimesheetTable/TimesheetEditModal.tsx           |  2 ++
 6 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/app/api/projects/index.ts b/src/app/api/projects/index.ts
index d208d0e..c8e77e4 100644
--- a/src/app/api/projects/index.ts
+++ b/src/app/api/projects/index.ts
@@ -79,6 +79,7 @@ export interface ProjectWithTasks {
   id: number;
   code: string;
   status?: string;
+  actualEnd?: string;
   description?: string;
   name: string;
   tasks: Task[];
diff --git a/src/components/TimeLeaveModal/TimeLeaveInputTable.tsx b/src/components/TimeLeaveModal/TimeLeaveInputTable.tsx
index c7e0734..57e1be3 100644
--- a/src/components/TimeLeaveModal/TimeLeaveInputTable.tsx
+++ b/src/components/TimeLeaveModal/TimeLeaveInputTable.tsx
@@ -345,6 +345,7 @@ const TimeLeaveInputTable: React.FC<Props> = ({
         renderEditCell(params: GridRenderEditCellParams<TimeLeaveRow, number>) {
           return (
             <ProjectSelect
+              referenceDay={dayjs(day)}
               includeLeaves
               leaveTypes={leaveTypes}
               multiple={false}
@@ -618,6 +619,7 @@ const TimeLeaveInputTable: React.FC<Props> = ({
       taskGroupsByProject,
       taskGroupsWithoutProject,
       miscTasks,
+      day,
     ],
   );
 
@@ -747,6 +749,7 @@ const TimeLeaveInputTable: React.FC<Props> = ({
       />
       {fastEntryEnabled && (
         <FastTimeEntryModal
+          recordDate={day}
           allProjects={allProjects}
           assignedProjects={assignedProjects}
           open={fastEntryModalOpen}
diff --git a/src/components/TimeLeaveModal/TimeLeaveMobileEntry.tsx b/src/components/TimeLeaveModal/TimeLeaveMobileEntry.tsx
index f4e551d..e2f3840 100644
--- a/src/components/TimeLeaveModal/TimeLeaveMobileEntry.tsx
+++ b/src/components/TimeLeaveModal/TimeLeaveMobileEntry.tsx
@@ -268,6 +268,7 @@ const TimeLeaveMobileEntry: React.FC<Props> = ({
           )}
         </Stack>
         <TimesheetEditModal
+          recordDate={date}
           allProjects={allProjects}
           assignedProjects={assignedProjects}
           open={editTimeModalOpen}
@@ -278,6 +279,7 @@ const TimeLeaveMobileEntry: React.FC<Props> = ({
           {...editTimeModalProps}
         />
         <LeaveEditModal
+          recordDate={date}
           leaveTypes={leaveTypes}
           open={editLeaveModalOpen}
           onClose={closeEditLeaveModal}
@@ -287,6 +289,7 @@ const TimeLeaveMobileEntry: React.FC<Props> = ({
         />
         {fastEntryEnabled && (
           <FastTimeEntryModal
+            recordDate={date}
             allProjects={allProjects}
             assignedProjects={assignedProjects}
             open={fastEntryModalOpen}
diff --git a/src/components/TimesheetTable/FastTimeEntryModal.tsx b/src/components/TimesheetTable/FastTimeEntryModal.tsx
index 739524a..fbc46de 100644
--- a/src/components/TimesheetTable/FastTimeEntryModal.tsx
+++ b/src/components/TimesheetTable/FastTimeEntryModal.tsx
@@ -30,6 +30,7 @@ import { manhourFormatter, shortDateFormatter } from "@/app/utils/formatUtil";
 import { DAILY_NORMAL_MAX_HOURS } from "@/app/api/timesheets/utils";
 import zip from "lodash/zip";
 import intersectionBy from "lodash/intersectionBy";
+import dayjs from "dayjs";
 
 export interface FastTimeEntryForm {
   projectIds: TimeEntry["projectId"][];
@@ -174,6 +175,7 @@ const FastTimeEntryModal: React.FC<Props> = ({
             name="projectIds"
             render={({ field }) => (
               <ProjectSelect
+                referenceDay={dayjs(recordDate)}
                 includeLeaves={false}
                 error={Boolean(formState.errors.projectIds)}
                 multiple
diff --git a/src/components/TimesheetTable/ProjectSelect.tsx b/src/components/TimesheetTable/ProjectSelect.tsx
index 8a318a0..a7a2b14 100644
--- a/src/components/TimesheetTable/ProjectSelect.tsx
+++ b/src/components/TimesheetTable/ProjectSelect.tsx
@@ -15,13 +15,14 @@ import differenceBy from "lodash/differenceBy";
 import intersectionWith from "lodash/intersectionWith";
 import { TFunction } from "i18next";
 import { LeaveType } from "@/app/api/timesheets";
+import dayjs, { Dayjs } from "dayjs";
 
 interface CommonProps {
   allProjects: ProjectWithTasks[];
   assignedProjects: AssignedProject[];
   error?: boolean;
   multiple?: boolean;
-  showOnlyOngoing?: boolean;
+  referenceDay: Dayjs;
   includeLeaves?: boolean;
   leaveTypes?: LeaveType[];
 }
@@ -64,7 +65,7 @@ const getGroupName = (t: TFunction, groupName: string): string => {
 
 const AutocompleteProjectSelect: React.FC<Props> = ({
   allProjects,
-  showOnlyOngoing = true,
+  referenceDay,
   assignedProjects,
   value,
   onProjectSelect,
@@ -75,10 +76,10 @@ const AutocompleteProjectSelect: React.FC<Props> = ({
 }) => {
   const { t } = useTranslation("home");
   const allFilteredProjects = useMemo(() => {
-    return showOnlyOngoing
-      ? allProjects.filter((p) => p.status === "On-going")
-      : allProjects;
-  }, [showOnlyOngoing, allProjects]);
+    return allProjects.filter((p) =>
+      p.actualEnd ? !referenceDay.isAfter(p.actualEnd) : true,
+    );
+  }, [allProjects, referenceDay]);
 
   const nonAssignedProjects = useMemo(() => {
     return differenceBy(allFilteredProjects, assignedProjects, "id");
diff --git a/src/components/TimesheetTable/TimesheetEditModal.tsx b/src/components/TimesheetTable/TimesheetEditModal.tsx
index dcd3e33..cdda1fa 100644
--- a/src/components/TimesheetTable/TimesheetEditModal.tsx
+++ b/src/components/TimesheetTable/TimesheetEditModal.tsx
@@ -29,6 +29,7 @@ import {
   DAILY_NORMAL_MAX_HOURS,
   TIMESHEET_DAILY_MAX_HOURS,
 } from "@/app/api/timesheets/utils";
+import dayjs from "dayjs";
 
 export interface Props extends Omit<ModalProps, "children"> {
   onSave: (timeEntry: TimeEntry, recordDate?: string) => Promise<void>;
@@ -162,6 +163,7 @@ const TimesheetEditModal: React.FC<Props> = ({
             name="projectId"
             render={({ field }) => (
               <ProjectSelect
+                referenceDay={dayjs(recordDate)}
                 multiple={false}
                 allProjects={allProjects}
                 assignedProjects={assignedProjects}