Set more precise types on requestsAndReservations

`requests`was not inferred correctly.
danskernesdigitalebibliotek · Nov 28, 2023 · 2e8005b · 2e8005b
1 parent 54db1a9
commit 2e8005b
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 25 deletions.
diff --git a/src/apps/reservation-list/modal/delete-reservation/delete-reservation-modal.tsx b/src/apps/reservation-list/modal/delete-reservation/delete-reservation-modal.tsx
@@ -1,5 +1,5 @@
 import React, { FC, useMemo, useState } from "react";
-import { UseMutateFunction, useQueryClient } from "react-query";
+import { useQueryClient } from "react-query";
 import Modal from "../../../../core/utils/modal";
 import { useText } from "../../../../core/utils/text";
 import DeleteReservationContent from "./delete-reservation-content";
@@ -9,34 +9,21 @@ import {
   useDeleteV1UserReservationsIdentifier
 } from "../../../../core/publizon/publizon";
 import { useMultipleRequestsWithStatus } from "../../../../core/utils/useRequestsWithStatus";
-import { requestsAndReservations } from "./helper";
+import {
+  OperationDigital,
+  OperationPhysical,
+  ParamsDigital,
+  ParamsPhysical,
+  requestsAndReservations
+} from "./helper";
 import ModalMessage from "../../../../components/message/modal-message/ModalMessage";
-import { DeleteReservationsParams } from "../../../../core/fbs/model";
 import { ApiResult } from "../../../../core/publizon/model";
 import {
   reservationId,
   ReservationType
 } from "../../../../core/utils/types/reservation-type";
 import { getModalIds } from "../../../../core/utils/helpers/modal-helpers";
 
-type ParamsDigital = {
-  identifier: string;
-};
-type ParamsPhysical = {
-  params?: DeleteReservationsParams;
-};
-type OperationDigital = UseMutateFunction<
-  ApiResult | null,
-  unknown,
-  ParamsDigital,
-  unknown
->;
-type OperationPhysical = UseMutateFunction<
-  void | null,
-  unknown,
-  ParamsPhysical,
-  unknown
->;
 interface DeleteReservationModalProps {
   modalId: string;
   reservations: ReservationType[];
@@ -64,7 +51,7 @@ const DeleteReservationModal: FC<DeleteReservationModalProps> = ({
 
   const { requests, reservationsPhysical, reservationsDigital } = useMemo(
     () =>
-      requestsAndReservations<OperationPhysical, OperationDigital>({
+      requestsAndReservations({
         operations: {
           digital: deleteDigitalReservation,
           physical: deletePhysicalReservation

diff --git a/src/apps/reservation-list/modal/delete-reservation/helper.ts b/src/apps/reservation-list/modal/delete-reservation/helper.ts
@@ -1,10 +1,36 @@
+import { UseMutateFunction } from "react-query";
+import { DeleteReservationsParams } from "../../../../core/fbs/model";
 import { UseTextFunction } from "../../../../core/utils/text";
 import { RequestStatus } from "../../../../core/utils/types/request";
 import {
   ReservationType,
   isDigitalReservation,
   isPhysicalReservation
 } from "../../../../core/utils/types/reservation-type";
+import { ApiResult } from "../../../../core/publizon/model";
+
+export type ParamsDigital = {
+  identifier: string;
+};
+export type ParamsPhysical = {
+  params?: DeleteReservationsParams;
+};
+export type OperationDigital = UseMutateFunction<
+  ApiResult | null,
+  unknown,
+  ParamsDigital,
+  unknown
+>;
+export type OperationPhysical = UseMutateFunction<
+  void | null,
+  unknown,
+  ParamsPhysical,
+  unknown
+>;
+type Request = {
+  params: { params: { reservationid: number[] } } | { identifier: string };
+  operation: OperationPhysical | OperationDigital;
+};
 
 export const getReservationsToDelete = (reservations: ReservationType[]) => {
   if (!reservations.length) {
@@ -62,13 +88,17 @@ export const getDeleteButtonLabel = ({
   });
 };
 
-export const requestsAndReservations = <TOperationPhysical, TOperationDigital>({
+export const requestsAndReservations = ({
   reservations,
   operations
 }: {
   reservations: ReservationType[];
-  operations: { physical: TOperationPhysical; digital: TOperationDigital };
-}) => {
+  operations: { physical: OperationPhysical; digital: OperationDigital };
+}): {
+  requests: Request[];
+  reservationsPhysical: number[];
+  reservationsDigital: string[];
+} => {
   const { physical: reservationsPhysical, digital: reservationsDigital } =
     getReservationsToDelete(reservations);