Merge pull request #768 from navikt/feature/hydration-fix

Fiks konsekvent sortering på både server og klient
navikt · Aug 21, 2024 · b8fdc93 · b8fdc93
2 parents 5036dcd + 5e8096f
commit b8fdc93
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/src/app/(sok)/_components/filters/FiltersMobile.jsx b/src/app/(sok)/_components/filters/FiltersMobile.jsx
@@ -176,15 +176,6 @@ function FiltersMobile({ onCloseClick, searchResult, query, dispatchQuery, aggre
                                 initialValues={aggregations.engagementTypes}
                                 updatedValues={searchResult && searchResult.aggregations.engagementTypes}
                             />
-
-                            {/* TODO: COMMENT IN WHEN FILTER IS READY BACKEND
-                            <Education
-                                query={query}
-                                dispatch={dispatchQuery}
-                                initialValues={aggregations.education}
-                                updatedValues={searchResult && searchResult.aggregations.education}
-                            />
-                       */}
                         </>
                     )}
                 </div>

diff --git a/src/app/(sok)/_components/filters/Locations.jsx b/src/app/(sok)/_components/filters/Locations.jsx
@@ -98,7 +98,7 @@ function Locations({ locations, query, dispatch, updatedValues }) {
                                             <div>
                                                 {location.subLocations &&
                                                     location.subLocations
-                                                        .sort((a, b) => a.key.localeCompare(b.key))
+                                                        .sort((a, b) => a.key.localeCompare(b.key, "no"))
                                                         .map((subLocation) => (
                                                             <Checkbox
                                                                 name={