Fixes based on PR comments

City-of-Helsinki · Dec 14, 2022 · 93aa06a · 93aa06a
1 parent 9aefcab
commit 93aa06a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/admin-ui/src/common/util.ts b/admin-ui/src/common/util.ts
@@ -390,3 +390,6 @@ export const combineResults = (
 
   return combined;
 };
+
+export const sortByName = (a?: string, b?: string): number =>
+  a && b ? a.toLowerCase().localeCompare(b.toLowerCase()) : !a ? 1 : -1;
diff --git a/admin-ui/src/component/ReservationUnits/ReservationUnitEditor/SortedSelect.tsx b/admin-ui/src/component/ReservationUnits/ReservationUnitEditor/SortedSelect.tsx
@@ -2,6 +2,7 @@ import React from "react";
 import { useTranslation } from "react-i18next";
 import memoize from "lodash/memoize";
 import { Select, SelectProps } from "hds-react";
+import { sortByName } from "../../../common/util";
 
 function SortedSelect<T>(
   props: Partial<SelectProps<T>> & { sort?: boolean; label: string }
@@ -11,13 +12,7 @@ function SortedSelect<T>(
   const sortedOpts = memoize((originalOptions) => {
     const opts = [...originalOptions];
     if (props.sort) {
-      opts.sort((a, b) =>
-        a.label && b.label
-          ? a.label.toLowerCase().localeCompare(b.label.toLowerCase())
-          : !a.label
-          ? 1
-          : -1
-      );
+      opts.sort((a, b) => sortByName(a.label, b.label));
     }
     return opts;
   })(props.options);

diff --git a/admin-ui/src/component/my-units/UnitCalendar.tsx b/admin-ui/src/component/my-units/UnitCalendar.tsx
@@ -19,6 +19,7 @@ import resourceEventStyleGetter, {
   PRE_PAUSE,
 } from "./resourceEventStyleGetter";
 import { getReserveeName } from "../reservations/requested/util";
+import { sortByName } from "../../common/util";
 
 export type Resource = {
   title: string;
@@ -295,9 +296,8 @@ const Events = ({
 
 const sortByDraftStatusAndTitle = (resources: Resource[]) => {
   return resources.sort((a, b) => {
-    const draftComparison = Number(a.isDraft) - Number(b.isDraft);
-    const titleComparison =
-      a.title && b.title ? a.title.localeCompare(b.title) : !a.title ? 1 : -1;
+    const draftComparison: number = Number(a.isDraft) - Number(b.isDraft);
+    const titleComparison = sortByName(a.title, b.title);
 
     return draftComparison || titleComparison;
   });