1170 - Wrong district name displayed on the dropdown

bcgov · Nov 4, 2024 · 4a0c07e · 4a0c07e
1 parent b8d5ba2
commit 4a0c07e
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/components/selectRangeUsePlanPage/ZoneSelect.js b/src/components/selectRangeUsePlanPage/ZoneSelect.js
@@ -133,7 +133,10 @@ export function ZoneSelectAll({ zones, users, zoneInfo, setZoneInfo }) {
           onClick={handleChange}
           value={zoneInfo?.selectedZones}
           multiple
-          renderValue={(zoneIds) => zoneIds.map((id) => zones[id]?.description).join(',  ')}
+          renderValue={(zoneIds) => {
+            if (zoneInfo.selectAllZones) return '';
+            return zoneIds.map((id) => zones.find((zone) => zone.id === id)?.description).join(',  ');
+          }}
           MenuProps={{
             getContentAnchorEl: () => null,
             ...MenuProps,
@@ -249,7 +252,10 @@ export function ZoneSelect({ zones, unassignedZones, userZones, users, setZoneIn
           onClick={handleChange}
           value={zoneInfo.selectedZones}
           multiple
-          renderValue={(zoneIds) => zoneIds.map((id) => zones[id]?.description).join(',  ')}
+          renderValue={(zoneIds) => {
+            if (zoneInfo.selectAllZones) return '';
+            return zoneIds.map((id) => zones.find((zone) => zone.id === id).description).join(',  ');
+          }}
           MenuProps={{
             getContentAnchorEl: () => null,
             ...MenuProps,
@@ -262,7 +268,6 @@ export function ZoneSelect({ zones, unassignedZones, userZones, users, setZoneIn
           {userZones &&
             userZones.map((zone) => {
               const user = users.find((user) => user.id === zone.userId);
-
               return (
                 <MenuItem
                   alignItems="flex-start"