update

src/app/api/reports/index.ts

@@ -18,11 +18,14 @@ export interface ProjectPandLReportRequest {
 }
 
 //  - Project Cash Flow Report
+interface AutocompleteOptions {
+    value: number | string;
+    label: string;
+    group?: string;
+}
+
 export interface ProjectCashFlowReportFilter {
-    project: {
-        value: number;
-        label: string;
-    }[];
+    project: AutocompleteOptions[];
     dateType: string[];
 }
 
@@ -33,8 +36,8 @@ export interface ProjectCashFlowReportRequest {
 
 //  - Project Potential Delay Report
 export interface ProjectPotentialDelayReportFilter {
-    team: string;
-    client: string;
+    team: AutocompleteOptions[];
+    client: AutocompleteOptions[];
     numberOfDays: number;
     projectCompletion: number;
 }

src/components/GenerateProjectPotentialDelayReport/GenerateProjectPotentialDelayReport.tsx

@@ -58,7 +58,6 @@ const GenerateProjectPotentialDelayReport: React.FC<Props> = ({ teams, clients,
                 criteria={searchCriteria}
                 onSearch={async (query) => {
 
-                    console.log(query)
                     let hasError = false
                     if (query.numberOfDays.length === 0 || !Number.isInteger(parseFloat(query.numberOfDays)) || parseInt(query.numberOfDays) < 0) {
                         setErrors((prev) => ({...prev, numberOfDays: true}))
@@ -76,9 +75,12 @@ const GenerateProjectPotentialDelayReport: React.FC<Props> = ({ teams, clients,
 
                     if (hasError) return false
 
+                    const clientIndex = clientCombo.findIndex(client => client.value === query.client)
+                    const subsidiaryIndex = subsidiaryCombo.findIndex(subsidiary => subsidiary.value === query.client)
+
                     const response = await fetchProjectPotentialDelayReport({ 
                         teamId: typeof query.team === "number" ? query.team : "All", 
-                        clientId: typeof query.client === "number" ? query.client : "All",
+                        clientId: typeof query.client === "number" ? clientIndex >= 0 ? clients[clientIndex].id : subsidiaries[subsidiaryIndex].id : "All",
                         numberOfDays: parseInt(query.numberOfDays),
                         projectCompletion: parseInt(query.projectCompletion)
                     })