fix: rejected occurrences tab sorting and pagination

City-of-Helsinki · Jan 14, 2025 · 4a29d38 · 4a29d38
1 parent 09d11e0
commit 4a29d38
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/apps/admin-ui/gql/gql-types.ts b/apps/admin-ui/gql/gql-types.ts
@@ -6799,6 +6799,7 @@ export type RejectedOccurrencesQueryVariables = Exact<{
 
 export type RejectedOccurrencesQuery = {
   rejectedOccurrences?: {
+    totalCount?: number | null;
     pageInfo: { hasNextPage: boolean; endCursor?: string | null };
     edges: Array<{
       node?: {
@@ -12252,6 +12253,7 @@ export const RejectedOccurrencesDocument = gql`
         hasNextPage
         endCursor
       }
+      totalCount
       edges {
         node {
           id

diff --git a/apps/admin-ui/src/common/apolloClient.ts b/apps/admin-ui/src/common/apolloClient.ts
@@ -73,6 +73,7 @@ function createClient(apiBaseUrl: string) {
             applicationSections: relayStylePagination(),
             allocatedTimeSlots: relayStylePagination(),
             bannerNotifications: relayStylePagination(),
+            rejectedOccurrences: relayStylePagination(),
           },
         },
       },

diff --git a/apps/admin-ui/src/spa/application-rounds/[id]/review/RejectedOccurrencesDataLoader.tsx b/apps/admin-ui/src/spa/application-rounds/[id]/review/RejectedOccurrencesDataLoader.tsx
@@ -16,6 +16,7 @@ import { filterNonNullable } from "common/src/helpers";
 import { getPermissionErrors } from "common/src/apolloUtils";
 import { useTranslation } from "next-i18next";
 import { getFilteredUnits } from "./utils";
+import { LIST_PAGE_SIZE } from "@/common/const";
 import { CenterSpinner } from "common/styles/util";
 
 type Props = {
@@ -38,6 +39,7 @@ function RejectedOccurrencesDataLoader({
   const { data, previousData, loading, fetchMore } =
     useRejectedOccurrencesQuery({
       variables: {
+        first: LIST_PAGE_SIZE,
         applicationRound: applicationRoundPk,
         unit: getFilteredUnits(unitFilter, unitOptions),
         reservationUnit: reservationUnitFilter
@@ -115,10 +117,14 @@ function transformOrderBy(
       return desc
         ? [RejectedOccurrenceOrderingChoices.ApplicationSectionNameDesc]
         : [RejectedOccurrenceOrderingChoices.ApplicationSectionNameAsc];
+    case "rejected_unit_name_fi":
+      return desc
+        ? [RejectedOccurrenceOrderingChoices.UnitNameDesc]
+        : [RejectedOccurrenceOrderingChoices.UnitNameAsc];
     case "rejected_reservation_unit_name_fi":
       return desc
-        ? [RejectedOccurrenceOrderingChoices.ReservationUnitPkDesc]
-        : [RejectedOccurrenceOrderingChoices.ReservationUnitPkAsc];
+        ? [RejectedOccurrenceOrderingChoices.ReservationUnitNameDesc]
+        : [RejectedOccurrenceOrderingChoices.ReservationUnitNameAsc];
     case "time_of_occurrence":
       return desc
         ? [RejectedOccurrenceOrderingChoices.BeginDatetimeDesc]

diff --git a/apps/admin-ui/src/spa/application-rounds/[id]/review/RejectedOccurrencesTable.tsx b/apps/admin-ui/src/spa/application-rounds/[id]/review/RejectedOccurrencesTable.tsx
@@ -161,7 +161,7 @@ export function RejectedOccurrencesTable({
   isLoading,
   sort,
   sortChanged: onSortChanged,
-}: Props) {
+}: Readonly<Props>) {
   const { t } = useTranslation();
 
   const rows = rejectedOccurrences.map((ro) => timeSlotMapper(t, ro));