fix: use equipmentsAll query for reservation unit edit filter options

City-of-Helsinki · Feb 6, 2025 · 9597ad0 · 9597ad0
1 parent bca7764
commit 9597ad0
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 31 deletions.
diff --git a/apps/admin-ui/gql/gql-types.ts b/apps/admin-ui/gql/gql-types.ts
@@ -6477,15 +6477,16 @@ export type UpdateImageMutation = {
 };
 
 export type ReservationUnitEditorParametersQueryVariables = Exact<{
-  [key: string]: never;
+  equipmentsOrderBy?: InputMaybe<EquipmentOrderingChoices>;
 }>;
 
 export type ReservationUnitEditorParametersQuery = {
-  equipments?: {
-    edges: Array<{
-      node?: { id: string; nameFi?: string | null; pk?: number | null } | null;
-    } | null>;
-  } | null;
+  equipmentsAll?: Array<{
+    id: string;
+    name: string;
+    nameFi?: string | null;
+    pk?: number | null;
+  }> | null;
   taxPercentages?: {
     edges: Array<{
       node?: { id: string; pk?: number | null; value: string } | null;
@@ -11534,15 +11535,14 @@ export type UpdateImageMutationOptions = Apollo.BaseMutationOptions<
   UpdateImageMutationVariables
 >;
 export const ReservationUnitEditorParametersDocument = gql`
-  query ReservationUnitEditorParameters {
-    equipments {
-      edges {
-        node {
-          id
-          nameFi
-          pk
-        }
-      }
+  query ReservationUnitEditorParameters(
+    $equipmentsOrderBy: EquipmentOrderingChoices
+  ) {
+    equipmentsAll(orderBy: [$equipmentsOrderBy]) {
+      id
+      name
+      nameFi
+      pk
     }
     taxPercentages {
       edges {
@@ -11623,6 +11623,7 @@ export const ReservationUnitEditorParametersDocument = gql`
  * @example
  * const { data, loading, error } = useReservationUnitEditorParametersQuery({
  *   variables: {
+ *      equipmentsOrderBy: // value for 'equipmentsOrderBy'
  *   },
  * });
  */

diff --git a/apps/admin-ui/src/spa/ReservationUnit/edit/index.tsx b/apps/admin-ui/src/spa/ReservationUnit/edit/index.tsx
@@ -39,6 +39,7 @@ import {
   useCreateReservationUnitMutation,
   useUpdateReservationUnitMutation,
   useReservationUnitEditQuery,
+  EquipmentOrderingChoices,
 } from "@gql/gql-types";
 import { ControlledSelect } from "common/src/components/form/ControlledSelect";
 import { DateTimeInput } from "common/src/components/form/DateTimeInput";
@@ -1418,20 +1419,18 @@ function DescriptionSection({
   purposes,
   qualifiers,
   reservationUnitTypes,
-}: {
+}: Readonly<{
   form: UseFormReturn<ReservationUnitEditFormValues>;
-  equipments: ReservationUnitEditorParametersQuery["equipments"];
+  equipments: ReservationUnitEditorParametersQuery["equipmentsAll"];
   purposes: ReservationUnitEditorParametersQuery["purposes"];
   qualifiers: ReservationUnitEditorParametersQuery["qualifiers"];
   reservationUnitTypes: ReservationUnitEditorParametersQuery["reservationUnitTypes"];
-}) {
+}>) {
   const { t } = useTranslation();
   const { control, formState } = form;
   const { errors } = formState;
 
-  const equipmentOptions = filterNonNullable(
-    equipments?.edges.map((n) => n?.node)
-  ).map((n) => ({
+  const equipmentOptions = filterNonNullable(equipments).map((n) => ({
     value: n.pk ?? -1,
     label: n.nameFi ?? "no-name",
   }));
@@ -1636,6 +1635,9 @@ function ReservationUnitEditor({
       console.error(e);
       errorToast({ text: t("errors.errorFetchingData") });
     },
+    variables: {
+      equipmentsOrderBy: EquipmentOrderingChoices.CategoryRankAsc,
+    },
   });
 
   // ----------------------------- Constants ---------------------------------
@@ -1849,7 +1851,7 @@ function ReservationUnitEditor({
         <BasicSection form={form} unit={unit} />
         <DescriptionSection
           form={form}
-          equipments={parametersData?.equipments}
+          equipments={parametersData?.equipmentsAll}
           purposes={parametersData?.purposes}
           qualifiers={parametersData?.qualifiers}
           reservationUnitTypes={parametersData?.reservationUnitTypes}

diff --git a/apps/admin-ui/src/spa/ReservationUnit/edit/queries.tsx b/apps/admin-ui/src/spa/ReservationUnit/edit/queries.tsx
@@ -192,15 +192,14 @@ export const UPDATE_IMAGE_TYPE = gql`
 `;
 
 export const RESERVATION_UNIT_EDITOR_PARAMETERS = gql`
-  query ReservationUnitEditorParameters {
-    equipments {
-      edges {
-        node {
-          id
-          nameFi
-          pk
-        }
-      }
+  query ReservationUnitEditorParameters(
+    $equipmentsOrderBy: EquipmentOrderingChoices
+  ) {
+    equipmentsAll(orderBy: [$equipmentsOrderBy]) {
+      id
+      name
+      nameFi
+      pk
     }
     taxPercentages {
       edges {