From 6e0c2fdc598de4645c5d3fc2b34db0466c3ec586 Mon Sep 17 00:00:00 2001
From: Eric Sizer <esizer@users.noreply.github.com>
Date: Thu, 26 Sep 2024 14:17:31 -0400
Subject: [PATCH] conver ee filter to multi combobox (#11649)

---
 .../AssessmentResultsFilterDialog.tsx         | 51 +++++++++----------
 1 file changed, 24 insertions(+), 27 deletions(-)

diff --git a/apps/web/src/components/AssessmentStepTracker/AssessmentResultsFilterDialog.tsx b/apps/web/src/components/AssessmentStepTracker/AssessmentResultsFilterDialog.tsx
index 468a489f1d7..54e1840a529 100644
--- a/apps/web/src/components/AssessmentStepTracker/AssessmentResultsFilterDialog.tsx
+++ b/apps/web/src/components/AssessmentStepTracker/AssessmentResultsFilterDialog.tsx
@@ -9,7 +9,6 @@ import {
 } from "@gc-digital-talent/forms";
 import {
   commonMessages,
-  formMessages,
   getEmploymentEquityGroup,
   getLocalizedName,
   navigationMessages,
@@ -146,32 +145,30 @@ const AssessmentResultsFilterDialog = ({
           label={intl.formatMessage(commonMessages.workingLanguageAbility)}
           options={localizedEnumToOptions(data?.languageAbilities, intl)}
         />
-        <Select
-          id="equity"
-          name="equity"
-          enableNull
-          nullSelection={intl.formatMessage(formMessages.defaultPlaceholder)}
-          label={intl.formatMessage(commonMessages.employmentEquity)}
-          options={[
-            equityOption("isWoman", getEmploymentEquityGroup("woman")),
-            equityOption(
-              "hasDisability",
-              getEmploymentEquityGroup("disability"),
-            ),
-            equityOption(
-              "isIndigenous",
-              getEmploymentEquityGroup("indigenous"),
-            ),
-            equityOption(
-              "isVisibleMinority",
-              getEmploymentEquityGroup("minority"),
-            ),
-          ]}
-        />
-        <div
-          data-h2-grid-column="l-tablet(span 2)"
-          data-h2-align-self="base(center)"
-        >
+        <div data-h2-grid-column="l-tablet(span 2)">
+          <Combobox
+            id="equity"
+            name="equity"
+            label={intl.formatMessage(commonMessages.employmentEquity)}
+            isMulti
+            options={[
+              equityOption("isWoman", getEmploymentEquityGroup("woman")),
+              equityOption(
+                "hasDisability",
+                getEmploymentEquityGroup("disability"),
+              ),
+              equityOption(
+                "isIndigenous",
+                getEmploymentEquityGroup("indigenous"),
+              ),
+              equityOption(
+                "isVisibleMinority",
+                getEmploymentEquityGroup("minority"),
+              ),
+            ]}
+          />
+        </div>
+        <div data-h2-align-self="base(center)">
           <Checkbox
             id="govEmployee"
             name="govEmployee"