Handle selectedFilters

uktrade · Jan 3, 2024 · 7912796 · 7912796
1 parent 0b616f5
commit 7912796
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/src/client/components/Dashboard/my-tasks/MyTasks.jsx b/src/client/components/Dashboard/my-tasks/MyTasks.jsx
@@ -32,6 +32,21 @@ const FiltersContainer = styled.div`
   }
 `
 
+function mapSelectedCompanyFilters(selectedFilters, companies) {
+  const selectedCompanyIds = selectedFilters?.companies || []
+
+  const selectedCompanies = companies.filter((company) =>
+    selectedCompanyIds.includes(company.id)
+  )
+
+  const options = selectedCompanies.map((company) => ({
+    label: company.name,
+    value: company.id,
+  }))
+
+  return options
+}
+
 export const MyTasksContent = ({ myTasks, filters, selectedFilters }) => (
   <>
     <TaskCompaniesAndProjectsResource>
@@ -68,7 +83,10 @@ export const MyTasksContent = ({ myTasks, filters, selectedFilters }) => (
               label: company.name,
               value: company.id,
             }))}
-            selectedOptions={selectedFilters?.companies}
+            selectedOptions={mapSelectedCompanyFilters(
+              selectedFilters,
+              companies
+            )}
             data-test="company-filter"
           />
         </FiltersContainer>

diff --git a/src/client/components/Dashboard/my-tasks/state.js b/src/client/components/Dashboard/my-tasks/state.js
@@ -90,7 +90,7 @@ export const state2props = ({ router, ...state }) => {
       },
     },
     selectedFilters: {
-      companies: [],
+      companies: queryParams.company,
     },
   }
 }