Merge pull request #1037 from City-of-Helsinki/fix/embedder-alphabeti…

…c-order Fix/embedder alphabetic order
City-of-Helsinki · Oct 6, 2023 · b60b743 · b60b743
2 parents d0d5ce6 + 11cbea6
commit b60b743
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 6 deletions.
diff --git a/src/components/ListItems/ResultItem/ResultItem.js b/src/components/ListItems/ResultItem/ResultItem.js
@@ -102,7 +102,7 @@ const ResultItem = ({
           </StyledListItemIcon>
           )
         }
-        <StyledItemTextContainer simpleitem={simpleItem || undefined}>
+        <StyledItemTextContainer simpleitem={+simpleItem}>
           <StyledTopRow data-sm="ResultItemTopRow">
             {
               // SROnly element with full readable text
@@ -119,7 +119,7 @@ const ResultItem = ({
               // Title
             }
             <StyledTitle
-              simpleitem={simpleItem || undefined}
+              simpleitem={+simpleItem}
               data-sm="ResultItemTitle"
               className={`${typographyClasses.title || ''} ResultItem-title`}
               component="p"
@@ -191,7 +191,7 @@ const ResultItem = ({
       {divider && (
         <li aria-hidden>
           <StyledDivider
-            simpleitem={simpleItem || undefined}
+            simpleitem={+simpleItem}
             variant={icon ? 'inset' : 'fullWidth'}
           />
         </li>

diff --git a/src/components/ListItems/ResultItem/__tests__/__snapshots__/ResultItem.test.js.snap b/src/components/ListItems/ResultItem/__tests__/__snapshots__/ResultItem.test.js.snap
@@ -32,6 +32,7 @@ exports[`<ResultItem /> should work 1`] = `
           class="MuiTypography-root MuiTypography-body2  ResultItem-title css-1eygwv7-MuiTypography-root"
           data-sm="ResultItemTitle"
           role="textbox"
+          simpleitem="0"
         >
           Title text
         </p>
@@ -77,6 +78,7 @@ exports[`<ResultItem /> should work 1`] = `
   >
     <hr
       class="MuiDivider-root MuiDivider-fullWidth css-3ab9ag-MuiDivider-root"
+      simpleitem="0"
     />
   </li>
 </div>

diff --git a/src/components/ListItems/UnitItem/__tests__/__snapshots__/UnitItem.test.js.snap b/src/components/ListItems/UnitItem/__tests__/__snapshots__/UnitItem.test.js.snap
@@ -42,6 +42,7 @@ exports[`<UnitItem /> should work 1`] = `
           class="MuiTypography-root MuiTypography-body2 css-in3yi3 ResultItem-title css-1eygwv7-MuiTypography-root"
           data-sm="ResultItemTitle"
           role="textbox"
+          simpleitem="0"
         >
           Lippulaivan kirjasto
         </p>
@@ -64,6 +65,7 @@ exports[`<UnitItem /> should work 1`] = `
   >
     <hr
       class="MuiDivider-root MuiDivider-inset css-1tvkns7-MuiDivider-root"
+      simpleitem="0"
     />
   </li>
 </div>

diff --git a/src/components/Lists/ResultList/__tests__/__snapshots__/ResultList.test.js.snap b/src/components/Lists/ResultList/__tests__/__snapshots__/ResultList.test.js.snap
@@ -80,6 +80,7 @@ exports[`<ResultList /> should work 1`] = `
               class="MuiTypography-root MuiTypography-body2 css-in3yi3 ResultItem-title css-1eygwv7-MuiTypography-root"
               data-sm="ResultItemTitle"
               role="textbox"
+              simpleitem="0"
             >
               Lippulaivan kirjasto
             </p>
@@ -102,6 +103,7 @@ exports[`<ResultList /> should work 1`] = `
       >
         <hr
           class="MuiDivider-root MuiDivider-inset css-1tvkns7-MuiDivider-root"
+          simpleitem="0"
         />
       </li>
       <li
@@ -144,6 +146,7 @@ exports[`<ResultList /> should work 1`] = `
               class="MuiTypography-root MuiTypography-body2 css-in3yi3 ResultItem-title css-1eygwv7-MuiTypography-root"
               data-sm="ResultItemTitle"
               role="textbox"
+              simpleitem="0"
             >
               Kivistön kirjasto
             </p>
@@ -166,6 +169,7 @@ exports[`<ResultList /> should work 1`] = `
       >
         <hr
           class="MuiDivider-root MuiDivider-inset css-1tvkns7-MuiDivider-root"
+          simpleitem="0"
         />
       </li>
     </ul>

diff --git a/src/views/MapView/utils/useMapUnits.js b/src/views/MapView/utils/useMapUnits.js
@@ -6,6 +6,7 @@ import { getDistrictPrimaryUnits, getFilteredSubdistrictUnits, getParkingUnits }
 import { getOrderedData } from '../../../redux/selectors/results';
 import { getSelectedUnit } from '../../../redux/selectors/selectedUnit';
 import { getServiceUnits } from '../../../redux/selectors/service';
+import orderUnits from '../../../utils/orderUnits';
 import { useEmbedStatus } from '../../../utils/path';
 import { getServiceFilteredStatisticalDistrictUnits } from '../../../redux/selectors/statisticalDistrict';
 
@@ -96,6 +97,7 @@ const useMapUnits = () => {
   const statisticalDistrictUnits = useSelector(getServiceFilteredStatisticalDistrictUnits);
   const parkingAreaUnits = useSelector(state => getParkingUnits(state));
   const highlightedUnit = useSelector(state => getSelectedUnit(state));
+  const locale = useSelector(state => state.user.locale);
 
   const searchUnitsLoading = useSelector(state => state.searchResults.isFetching);
   const serviceUnitsLoading = useSelector(state => state.service.isFetching);
@@ -135,17 +137,19 @@ const useMapUnits = () => {
         if (serviceUnits && !unitsLoading) return serviceUnits;
         return [];
 
-      case 'area':
-        return [
+      case 'area': {
+        const results = [
           ...(districtPrimaryUnits.length ? districtPrimaryUnits : []),
           ...(districtServiceUnits.length ? districtServiceUnits : []),
           ...(parkingAreaUnits.length ? parkingAreaUnits : []),
-          ...(statisticalDistrictUnits.length && statisticalTabOpen
+          ...((statisticalDistrictUnits.length && statisticalTabOpen)
             ? statisticalDistrictUnits
             : []
           ),
         ];
 
+        return orderUnits(results, { locale, direction: 'desc', order: 'alphabetical' });
+      }
       default:
         return [];
     }

diff --git a/src/views/UnitView/components/UnitDataList/__tests__/__snapshots__/UnitDataList.test.js.snap b/src/views/UnitView/components/UnitDataList/__tests__/__snapshots__/UnitDataList.test.js.snap
@@ -66,6 +66,7 @@ exports[`<UnitDataList /> should work 1`] = `
               class="MuiTypography-root MuiTypography-body2  ResultItem-title css-1eygwv7-MuiTypography-root"
               data-sm="ResultItemTitle"
               role="textbox"
+              simpleitem="0"
             >
               Suomen kielen kielikahvila
             </p>
@@ -77,6 +78,7 @@ exports[`<UnitDataList /> should work 1`] = `
       >
         <hr
           class="MuiDivider-root MuiDivider-inset css-1tvkns7-MuiDivider-root"
+          simpleitem="0"
         />
       </li>
       <li
@@ -125,6 +127,7 @@ exports[`<UnitDataList /> should work 1`] = `
               class="MuiTypography-root MuiTypography-body2  ResultItem-title css-1eygwv7-MuiTypography-root"
               data-sm="ResultItemTitle"
               role="textbox"
+              simpleitem="0"
             >
               R&A x Armas: Vanhenemisen estetiikka
             </p>
@@ -136,6 +139,7 @@ exports[`<UnitDataList /> should work 1`] = `
       >
         <hr
           class="MuiDivider-root MuiDivider-inset css-1tvkns7-MuiDivider-root"
+          simpleitem="0"
         />
       </li>
       <li
@@ -184,6 +188,7 @@ exports[`<UnitDataList /> should work 1`] = `
               class="MuiTypography-root MuiTypography-body2  ResultItem-title css-1eygwv7-MuiTypography-root"
               data-sm="ResultItemTitle"
               role="textbox"
+              simpleitem="0"
             >
               Digital guidance for seniors
             </p>