Refactor logic for 'Pickup' and 'No Interest' modals

Move the logic into PhysicalListDetails and use the result of getReadyForPickup().length > 0 as a boolean to determine whether the buttons and modals should be rendered.
danskernesdigitalebibliotek · Nov 10, 2023 · 67257ce · 67257ce
1 parent 12e12ee
commit 67257ce
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 30 deletions.
diff --git a/src/apps/dashboard/dashboard-notification-list/dashboard-notification-list.tsx b/src/apps/dashboard/dashboard-notification-list/dashboard-notification-list.tsx
@@ -233,12 +233,6 @@ const DashboardNotificationList: FC<DashboardNotificationListProps> = ({
     setAccepted(false);
   };
 
-  const isReservationNotReadyForLoan =
-    reservationForModal &&
-    readyToLoanReservations.some(
-      ({ faust }) => faust !== reservationForModal.faust
-    );
-
   return (
     <>
       <div className="status-userprofile">
@@ -331,7 +325,6 @@ const DashboardNotificationList: FC<DashboardNotificationListProps> = ({
           modalId={`${reservationDetails}${String(modalReservationDetailsId)}`}
         >
           <ReservationDetails
-            isPossibleToChangeReservationDetails={isReservationNotReadyForLoan}
             openReservationDeleteModal={openReservationDeleteModal}
             faust={reservationForModal.faust}
             identifier={reservationForModal.identifier}

diff --git a/src/apps/reservation-list/modal/reservation-details/physical-list-details.tsx b/src/apps/reservation-list/modal/reservation-details/physical-list-details.tsx
@@ -30,13 +30,14 @@ import ReservationFormListItem from "../../../../components/reservation/Reservat
 import NoInterestAfterModal from "../../../../components/reservation/forms/NoInterestAfterModal";
 import { RequestStatus } from "../../../../core/utils/types/request";
 import { formatDate } from "../../../../core/utils/helpers/date";
+import { getReadyForPickup } from "../../utils/helpers";
 
 interface PhysicalListDetailsProps {
   reservation: ReservationType;
-  isPossibleToChangeReservationDetails?: boolean | null;
 }
 
 const PhysicalListDetails: FC<PhysicalListDetailsProps & MaterialProps> = ({
+  reservation,
   reservation: {
     numberInQueue,
     pickupBranch,
@@ -45,8 +46,7 @@ const PhysicalListDetails: FC<PhysicalListDetailsProps & MaterialProps> = ({
     dateOfReservation,
     pickupNumber,
     reservationId
-  },
-  isPossibleToChangeReservationDetails = true
+  }
 }) => {
   const config = useConfig();
   const t = useText();
@@ -78,6 +78,8 @@ const PhysicalListDetails: FC<PhysicalListDetailsProps & MaterialProps> = ({
     blacklistBranches
   );
 
+  const isReadyForPickup = getReadyForPickup([reservation]).length > 0;
+
   const saveChanges = () => {
     setReservationStatus("pending");
     if (!reservationId || !selectedBranch) {
@@ -141,11 +143,9 @@ const PhysicalListDetails: FC<PhysicalListDetailsProps & MaterialProps> = ({
             changeHandler={openModal("pickup")}
             buttonAriaLabel={t("changePickupLocationText")}
             subText={pickupNumber ?? ""}
-            isPossibleToChangeReservationDetails={
-              isPossibleToChangeReservationDetails
-            }
+            isPossibleToChangeReservationDetails={!isReadyForPickup}
           />
-          {isPossibleToChangeReservationDetails && (
+          {!isReadyForPickup && (
             <PickupModal
               branches={whitelistBranches}
               defaultBranch={pickupBranch}
@@ -169,11 +169,9 @@ const PhysicalListDetails: FC<PhysicalListDetailsProps & MaterialProps> = ({
             }
             changeHandler={openModal("interestPeriod")}
             buttonAriaLabel={t("changeInterestPeriodText")}
-            isPossibleToChangeReservationDetails={
-              isPossibleToChangeReservationDetails
-            }
+            isPossibleToChangeReservationDetails={!isReadyForPickup}
           />
-          {isPossibleToChangeReservationDetails && (
+          {!isReadyForPickup && (
             <NoInterestAfterModal
               selectedInterest={selectedInterest ?? 90}
               setSelectedInterest={setSelectedInterest}

diff --git a/src/apps/reservation-list/modal/reservation-details/reservation-details.tsx b/src/apps/reservation-list/modal/reservation-details/reservation-details.tsx
@@ -15,14 +15,12 @@ import { useConfig } from "../../../../core/utils/config";
 export interface ReservationDetailsProps {
   reservation: ReservationType;
   openReservationDeleteModal: (deleteReservation: ReservationType) => void;
-  isPossibleToChangeReservationDetails?: boolean | null;
 }
 
 const ReservationDetails: FC<ReservationDetailsProps & MaterialProps> = ({
   reservation,
   material,
-  openReservationDeleteModal,
-  isPossibleToChangeReservationDetails
+  openReservationDeleteModal
 }) => {
   const t = useText();
   const config = useConfig();
@@ -79,14 +77,7 @@ const ReservationDetails: FC<ReservationDetailsProps & MaterialProps> = ({
           )}
           <div className="modal-details__list">
             {isDigital && <DigitalListDetails reservation={reservation} />}
-            {!isDigital && (
-              <PhysicalListDetails
-                reservation={reservation}
-                isPossibleToChangeReservationDetails={
-                  isPossibleToChangeReservationDetails
-                }
-              />
-            )}
+            {!isDigital && <PhysicalListDetails reservation={reservation} />}
           </div>
           {reservation.reservationId && allowUserRemoveReadyReservations && (
             <ReservationDetailsButton

diff --git a/src/components/reservation/ReservationFormListItem.tsx b/src/components/reservation/ReservationFormListItem.tsx
@@ -8,7 +8,7 @@ interface ReservationFormListItemProps {
   subText?: string;
   changeHandler?: () => void;
   buttonAriaLabel?: string;
-  isPossibleToChangeReservationDetails?: boolean | null;
+  isPossibleToChangeReservationDetails?: boolean;
 }
 
 const ReservationFormListItem: React.FC<ReservationFormListItemProps> = ({