From deb8189fcfdf5b651bb9e02d6c9d7af076f7546a Mon Sep 17 00:00:00 2001
From: Kasper Birch <kasperbirch1@gmail.com>
Date: Mon, 15 Jan 2024 08:33:01 +0100
Subject: [PATCH 1/5] Change the 'Reserve' button text to the standard and move
 the notice about material ordered from other libraries to the
 `MaterialAvailabilityTextParagraph`.

This will give the user a more streamlined experience while still notifying the user that the material is ordered from another library.
---
 src/apps/material/material.dev.tsx                  |  2 +-
 .../MaterialAvailabilityText.tsx                    | 13 +++++++++++++
 .../MaterialButtonReservableFromAnotherLibrary.tsx  |  6 ++----
 src/components/reservation/ReservationModalBody.tsx | 12 ++++++++----
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/apps/material/material.dev.tsx b/src/apps/material/material.dev.tsx
index 7fed849b7d..33f6c8e234 100644
--- a/src/apps/material/material.dev.tsx
+++ b/src/apps/material/material.dev.tsx
@@ -86,7 +86,7 @@ export default {
     },
     reservableFromAnotherLibraryText: {
       name: "Reservable on another library",
-      defaultValue: "Reservable on another library",
+      defaultValue: "Ordered from another library.",
       control: { type: "text" }
     },
     findOnBookshelfText: {
diff --git a/src/components/material/MaterialAvailabilityText/MaterialAvailabilityText.tsx b/src/components/material/MaterialAvailabilityText/MaterialAvailabilityText.tsx
index aae18fb572..6858690857 100644
--- a/src/components/material/MaterialAvailabilityText/MaterialAvailabilityText.tsx
+++ b/src/components/material/MaterialAvailabilityText/MaterialAvailabilityText.tsx
@@ -10,17 +10,30 @@ import { Manifestation } from "../../../core/utils/types/entities";
 import { hasCorrectAccessType } from "../material-buttons/helper";
 import MaterialAvailabilityTextOnline from "./online/MaterialAvailabilityTextOnline";
 import MaterialAvailabilityTextPhysical from "./physical/MaterialAvailabilityTextPhysical";
+import useReservableFromAnotherLibrary from "../../../core/utils/useReservableFromAnotherLibrary";
+import MaterialAvailabilityTextParagraph from "./generic/MaterialAvailabilityTextParagraph";
+import { useText } from "../../../core/utils/text";
 
 interface Props {
   manifestations: Manifestation[];
 }
 
 const MaterialAvailabilityText: React.FC<Props> = ({ manifestations }) => {
+  const t = useText();
   const materialType = head(getMaterialTypes(manifestations));
   const isbns = getAllIdentifiers(manifestations);
+  const reservablePidsFromAnotherLibrary =
+    useReservableFromAnotherLibrary(manifestations);
 
   if (hasCorrectAccessType(AccessTypeCode.Physical, manifestations)) {
     const pids = getAllPids(manifestations);
+    if (reservablePidsFromAnotherLibrary.length) {
+      return (
+        <MaterialAvailabilityTextParagraph>
+          {t("reservableFromAnotherLibraryText")}
+        </MaterialAvailabilityTextParagraph>
+      );
+    }
     return <MaterialAvailabilityTextPhysical pids={pids} />;
   }
 
diff --git a/src/components/material/material-buttons/physical/MaterialButtonReservableFromAnotherLibrary.tsx b/src/components/material/material-buttons/physical/MaterialButtonReservableFromAnotherLibrary.tsx
index 97241373b6..7d6174474f 100644
--- a/src/components/material/material-buttons/physical/MaterialButtonReservableFromAnotherLibrary.tsx
+++ b/src/components/material/material-buttons/physical/MaterialButtonReservableFromAnotherLibrary.tsx
@@ -40,10 +40,8 @@ const MaterialButtonReservableFromAnotherLibrary: FC<
       dataCy={dataCy}
       label={
         size === "small"
-          ? t("reservableFromAnotherLibraryText")
-          : `${t(
-              "reservableFromAnotherLibraryText"
-            )} ${manifestationMaterialType}`
+          ? t("reserveText")
+          : `${t("reserveText")} ${manifestationMaterialType}`
       }
       buttonType="none"
       variant="filled"
diff --git a/src/components/reservation/ReservationModalBody.tsx b/src/components/reservation/ReservationModalBody.tsx
index e725869010..8296cb563d 100644
--- a/src/components/reservation/ReservationModalBody.tsx
+++ b/src/components/reservation/ReservationModalBody.tsx
@@ -251,10 +251,14 @@ export const ReservationModalBody = ({
           <div>
             <div className="reservation-modal-submit">
               <MaterialAvailabilityTextParagraph>
-                <StockAndReservationInfo
-                  stockCount={holdings}
-                  reservationCount={reservations}
-                />
+                {reservablePidsFromAnotherLibrary?.length ? (
+                  t("reservableFromAnotherLibraryText")
+                ) : (
+                  <StockAndReservationInfo
+                    stockCount={holdings}
+                    reservationCount={reservations}
+                  />
+                )}
               </MaterialAvailabilityTextParagraph>
               <Button
                 dataCy="reservation-modal-submit-button"

From 4a7739b944ee358222b61b480517c30cb9a9442c Mon Sep 17 00:00:00 2001
From: Kasper Birch <kasperbirch1@gmail.com>
Date: Tue, 16 Jan 2024 08:38:25 +0100
Subject: [PATCH 2/5] Refactor `openOrder` test to align with recent updates

---
 .../fixtures/material/open-order/open-order-accepted.json   | 6 +++---
 src/apps/material/material.dev.tsx                          | 2 +-
 src/apps/material/open-order.test.ts                        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cypress/fixtures/material/open-order/open-order-accepted.json b/cypress/fixtures/material/open-order/open-order-accepted.json
index d0d756a202..cc07b8c71c 100644
--- a/cypress/fixtures/material/open-order/open-order-accepted.json
+++ b/cypress/fixtures/material/open-order/open-order-accepted.json
@@ -1,9 +1,9 @@
 {
   "data": {
     "submitOrder": {
-      "status": "OWNED_ACCEPTED",
-      "message": "Item available at pickupAgency, order accepted",
-      "orderId": "1234"
+      "status": "NOT_OWNED_ILL_LOC",
+      "message": "Item not available at pickupAgency, item localised for ILL",
+      "orderId": "1048265231"
     }
   }
 }
diff --git a/src/apps/material/material.dev.tsx b/src/apps/material/material.dev.tsx
index 33f6c8e234..6064947617 100644
--- a/src/apps/material/material.dev.tsx
+++ b/src/apps/material/material.dev.tsx
@@ -767,7 +767,7 @@ export default {
     },
     openOrderNotOwnedIllLocText: {
       name: "Open order item localized for ILL text",
-      defaultValue: "Item not available at pickup agency but localized for ILL",
+      defaultValue: "Your material has been ordered from another library",
       control: { type: "text" }
     },
     openOrderNotOwnedNoIllLocText: {
diff --git a/src/apps/material/open-order.test.ts b/src/apps/material/open-order.test.ts
index 9feaa9b456..e73fb888ad 100644
--- a/src/apps/material/open-order.test.ts
+++ b/src/apps/material/open-order.test.ts
@@ -9,7 +9,7 @@ const navigateToMaterial = () => {
   cy.getBySel("material-button-reservable-on-another-library")
     .first()
     .should("be.visible")
-    .and("contain", "Reservable on another library")
+    .and("contain", "Reserve bog")
     .click();
   cy.getBySel("material-description").scrollIntoView();
   cy.getBySel("reservation-modal-submit-button", true)
@@ -45,7 +45,7 @@ describe("Open Order Functionality", () => {
 
     cy.getBySel("open-oprder-response-status-text")
       .should("be.visible")
-      .and("contain", "Your order is accepted");
+      .and("contain", "Your material has been ordered from another library");
 
     closeModal();
   });

From 5d38f24d5ec373ba1e9dfc3b6cd4a53283789d59 Mon Sep 17 00:00:00 2001
From: Kasper Birch <kasperbirch1@gmail.com>
Date: Sun, 11 Feb 2024 11:54:04 +0100
Subject: [PATCH 3/5] Add `getFutureDateStringISO` to set the date for
 mutateOpenOrder expires

---
 .../reservation/ReservationModalBody.tsx      | 21 ++++++++++++-------
 src/components/reservation/helper.ts          |  6 ++++++
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/components/reservation/ReservationModalBody.tsx b/src/components/reservation/ReservationModalBody.tsx
index 8296cb563d..a7bd9a2765 100644
--- a/src/components/reservation/ReservationModalBody.tsx
+++ b/src/components/reservation/ReservationModalBody.tsx
@@ -41,7 +41,8 @@ import {
   getInstantLoanBranchHoldings,
   getInstantLoanBranchHoldingsAboveThreshold,
   removePrefixFromBranchId,
-  translateOpenOrderStatus
+  translateOpenOrderStatus,
+  getFutureDateStringISO
 } from "./helper";
 import UseReservableManifestations from "../../core/utils/UseReservableManifestations";
 import { PeriodicalEdition } from "../material/periodical/helper";
@@ -177,8 +178,9 @@ export const ReservationModalBody = ({
       );
     }
 
-    if (reservablePidsFromAnotherLibrary?.length && patron) {
+    if (reservablePidsFromAnotherLibrary?.length > 0 && patron) {
       const { patronId, name, emailAddress, preferredPickupBranch } = patron;
+
       // Save reservation to open order.
       mutateOpenOrder(
         {
@@ -187,9 +189,9 @@ export const ReservationModalBody = ({
             pickUpBranch: selectedBranch
               ? removePrefixFromBranchId(selectedBranch)
               : removePrefixFromBranchId(preferredPickupBranch),
-            expires:
-              selectedInterest?.toString() ||
-              defaultInterestDaysForOpenOrder.toString(),
+            expires: getFutureDateStringISO(
+              Number(selectedInterest ?? defaultInterestDaysForOpenOrder)
+            ),
             userParameters: {
               userId: patronId.toString(),
               userName: name,
@@ -251,7 +253,7 @@ export const ReservationModalBody = ({
           <div>
             <div className="reservation-modal-submit">
               <MaterialAvailabilityTextParagraph>
-                {reservablePidsFromAnotherLibrary?.length ? (
+                {reservablePidsFromAnotherLibrary?.length > 0 ? (
                   t("reservableFromAnotherLibraryText")
                 ) : (
                   <StockAndReservationInfo
@@ -299,7 +301,12 @@ export const ReservationModalBody = ({
                   branches={branches}
                   selectedBranch={selectedBranch}
                   selectBranchHandler={setSelectedBranch}
-                  selectedInterest={selectedInterest}
+                  selectedInterest={
+                    reservablePidsFromAnotherLibrary?.length > 0 &&
+                    selectedInterest === null
+                      ? Number(defaultInterestDaysForOpenOrder)
+                      : selectedInterest
+                  }
                   setSelectedInterest={setSelectedInterest}
                 />
               )}
diff --git a/src/components/reservation/helper.ts b/src/components/reservation/helper.ts
index c4ba5de80d..fee1627314 100644
--- a/src/components/reservation/helper.ts
+++ b/src/components/reservation/helper.ts
@@ -48,6 +48,12 @@ export const getFutureDateString = (num: number) => {
   const futureDate = dayjs().add(num, "day").format("YYYY-MM-DD");
   return futureDate;
 };
+
+export const getFutureDateStringISO = (num: number) => {
+  const futureDate = dayjs().add(num, "day").format("YYYY-MM-DDTHH:mm:ssZ");
+  return futureDate;
+};
+
 type Periodical = Pick<PeriodicalEdition, "volumeNumber" | "volumeYear">;
 
 const constructReservation = ({

From 5658543dab791508042764add3d940621d8fee7b Mon Sep 17 00:00:00 2001
From: Kasper Birch <kasperbirch1@gmail.com>
Date: Mon, 8 Apr 2024 15:57:04 +0200
Subject: [PATCH 4/5] Add `materialIsReservableFromAnotherLibrary` to
 `useReservableFromAnotherLibrary`

 For better code readability
---
 .../MaterialAvailabilityText.tsx              |  4 ++--
 .../material-buttons/MaterialButtons.tsx      |  4 ++--
 .../reservation/ReservationModalBody.tsx      | 15 ++++++-------
 .../utils/useReservableFromAnotherLibrary.tsx | 21 ++++++++++++++++---
 .../useReservableFromAnotherLibrary.test.tsx  |  8 +++++--
 5 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/src/components/material/MaterialAvailabilityText/MaterialAvailabilityText.tsx b/src/components/material/MaterialAvailabilityText/MaterialAvailabilityText.tsx
index 6858690857..63460975cf 100644
--- a/src/components/material/MaterialAvailabilityText/MaterialAvailabilityText.tsx
+++ b/src/components/material/MaterialAvailabilityText/MaterialAvailabilityText.tsx
@@ -22,12 +22,12 @@ const MaterialAvailabilityText: React.FC<Props> = ({ manifestations }) => {
   const t = useText();
   const materialType = head(getMaterialTypes(manifestations));
   const isbns = getAllIdentifiers(manifestations);
-  const reservablePidsFromAnotherLibrary =
+  const { materialIsReservableFromAnotherLibrary } =
     useReservableFromAnotherLibrary(manifestations);
 
   if (hasCorrectAccessType(AccessTypeCode.Physical, manifestations)) {
     const pids = getAllPids(manifestations);
-    if (reservablePidsFromAnotherLibrary.length) {
+    if (materialIsReservableFromAnotherLibrary) {
       return (
         <MaterialAvailabilityTextParagraph>
           {t("reservableFromAnotherLibraryText")}
diff --git a/src/components/material/material-buttons/MaterialButtons.tsx b/src/components/material/material-buttons/MaterialButtons.tsx
index 1773040a14..73146bc03b 100644
--- a/src/components/material/material-buttons/MaterialButtons.tsx
+++ b/src/components/material/material-buttons/MaterialButtons.tsx
@@ -35,10 +35,10 @@ const MaterialButtons: FC<MaterialButtonsProps> = ({
   // articles appear as a part of journal/periodical publications and can't be
   // physically loaned for themseleves.
 
-  const reservablePidsFromAnotherLibrary =
+  const { materialIsReservableFromAnotherLibrary } =
     useReservableFromAnotherLibrary(manifestations);
 
-  if (reservablePidsFromAnotherLibrary.length > 0) {
+  if (materialIsReservableFromAnotherLibrary) {
     return (
       <MaterialButtonReservableFromAnotherLibrary
         size={size}
diff --git a/src/components/reservation/ReservationModalBody.tsx b/src/components/reservation/ReservationModalBody.tsx
index a7bd9a2765..ce9783d9e2 100644
--- a/src/components/reservation/ReservationModalBody.tsx
+++ b/src/components/reservation/ReservationModalBody.tsx
@@ -129,9 +129,10 @@ export const ReservationModalBody = ({
     !!selectedPeriodical
   );
 
-  const reservablePidsFromAnotherLibrary = useReservableFromAnotherLibrary(
-    selectedManifestations
-  );
+  const {
+    reservablePidsFromAnotherLibrary,
+    materialIsReservableFromAnotherLibrary
+  } = useReservableFromAnotherLibrary(selectedManifestations);
 
   // If we don't have all data for displaying the view render nothing.
   if (!userResponse.data || !holdingsResponse.data) {
@@ -178,14 +179,14 @@ export const ReservationModalBody = ({
       );
     }
 
-    if (reservablePidsFromAnotherLibrary?.length > 0 && patron) {
+    if (materialIsReservableFromAnotherLibrary && patron) {
       const { patronId, name, emailAddress, preferredPickupBranch } = patron;
 
       // Save reservation to open order.
       mutateOpenOrder(
         {
           input: {
-            pids: [...reservablePidsFromAnotherLibrary],
+            pids: reservablePidsFromAnotherLibrary,
             pickUpBranch: selectedBranch
               ? removePrefixFromBranchId(selectedBranch)
               : removePrefixFromBranchId(preferredPickupBranch),
@@ -253,7 +254,7 @@ export const ReservationModalBody = ({
           <div>
             <div className="reservation-modal-submit">
               <MaterialAvailabilityTextParagraph>
-                {reservablePidsFromAnotherLibrary?.length > 0 ? (
+                {materialIsReservableFromAnotherLibrary ? (
                   t("reservableFromAnotherLibraryText")
                 ) : (
                   <StockAndReservationInfo
@@ -302,7 +303,7 @@ export const ReservationModalBody = ({
                   selectedBranch={selectedBranch}
                   selectBranchHandler={setSelectedBranch}
                   selectedInterest={
-                    reservablePidsFromAnotherLibrary?.length > 0 &&
+                    materialIsReservableFromAnotherLibrary &&
                     selectedInterest === null
                       ? Number(defaultInterestDaysForOpenOrder)
                       : selectedInterest
diff --git a/src/core/utils/useReservableFromAnotherLibrary.tsx b/src/core/utils/useReservableFromAnotherLibrary.tsx
index a418eadbb3..f10cf4ded1 100644
--- a/src/core/utils/useReservableFromAnotherLibrary.tsx
+++ b/src/core/utils/useReservableFromAnotherLibrary.tsx
@@ -6,7 +6,10 @@ import { Pid } from "./types/ids";
 
 const useReservableFromAnotherLibrary = (
   manifestations: Manifestation[]
-): Pid[] => {
+): {
+  reservablePidsFromAnotherLibrary: Pid[];
+  materialIsReservableFromAnotherLibrary: boolean;
+} => {
   const config = useConfig();
   const { data: holdingsData } = useGetHoldings({
     faustIds: getAllFaustIds(manifestations),
@@ -16,14 +19,26 @@ const useReservableFromAnotherLibrary = (
   // If there is no holdings data or if there are holdings that are reservable, we return an empty array.
   // Because we use the array length to determine if we should show the button or not.
   if (holdingsData?.some(({ reservable }) => reservable === true)) {
-    return [];
+    return {
+      reservablePidsFromAnotherLibrary: [],
+      materialIsReservableFromAnotherLibrary: false
+    };
   }
 
-  return manifestations
+  const reservablePidsFromAnotherLibrary = manifestations
     .filter(({ catalogueCodes }) =>
       catalogueCodes?.otherCatalogues.some((code) => code.startsWith("OVE"))
     )
     .map(({ pid }) => pid);
+
+  const materialIsReservableFromAnotherLibrary = Boolean(
+    reservablePidsFromAnotherLibrary.length
+  );
+
+  return {
+    reservablePidsFromAnotherLibrary,
+    materialIsReservableFromAnotherLibrary
+  };
 };
 
 export default useReservableFromAnotherLibrary;
diff --git a/src/tests/unit/useReservableFromAnotherLibrary.test.tsx b/src/tests/unit/useReservableFromAnotherLibrary.test.tsx
index d3bbe9036f..b52798559f 100644
--- a/src/tests/unit/useReservableFromAnotherLibrary.test.tsx
+++ b/src/tests/unit/useReservableFromAnotherLibrary.test.tsx
@@ -73,7 +73,10 @@ describe("useReservableFromAnotherLibrary", () => {
     );
 
     act(() => {
-      expect(result.current).toEqual(["870970-basis:27721257"]);
+      expect(result.current.reservablePidsFromAnotherLibrary).toEqual([
+        "870970-basis:27721257"
+      ]);
+      expect(result.current.materialIsReservableFromAnotherLibrary).toBe(true);
     });
   });
 
@@ -103,7 +106,8 @@ describe("useReservableFromAnotherLibrary", () => {
     );
 
     act(() => {
-      expect(result.current).toEqual([]);
+      expect(result.current.reservablePidsFromAnotherLibrary).toEqual([]);
+      expect(result.current.materialIsReservableFromAnotherLibrary).toBe(false);
     });
   });
 });

From f854c63398d31d23bbadce33bf8922e40f2f3de1 Mon Sep 17 00:00:00 2001
From: Kasper Birch <kasperbirch1@gmail.com>
Date: Mon, 15 Apr 2024 11:02:22 +0200
Subject: [PATCH 5/5] Add `reserveWithMaterialType`

---
 src/apps/material/material.dev.tsx                           | 5 +++++
 src/apps/material/material.entry.tsx                         | 1 +
 .../material-buttons/physical/MaterialButtonPhysical.tsx     | 4 +++-
 .../physical/MaterialButtonReservableFromAnotherLibrary.tsx  | 4 +++-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/apps/material/material.dev.tsx b/src/apps/material/material.dev.tsx
index 6064947617..c5c3afec8a 100644
--- a/src/apps/material/material.dev.tsx
+++ b/src/apps/material/material.dev.tsx
@@ -84,6 +84,11 @@ export default {
       defaultValue: "Reserve",
       control: { type: "text" }
     },
+    reserveWithMaterialTypeText: {
+      name: "Reserve",
+      defaultValue: "Reserve @materialType",
+      control: { type: "text" }
+    },
     reservableFromAnotherLibraryText: {
       name: "Reservable on another library",
       defaultValue: "Ordered from another library.",
diff --git a/src/apps/material/material.entry.tsx b/src/apps/material/material.entry.tsx
index 91a5817f70..0d9c9c136a 100644
--- a/src/apps/material/material.entry.tsx
+++ b/src/apps/material/material.entry.tsx
@@ -153,6 +153,7 @@ interface MaterialEntryTextProps {
   reservationSuccesTitleText: string;
   reserveBookText: string;
   reserveText: string;
+  reserveWithMaterialTypeText: string;
   reviewsText: string;
   saveButtonText: string;
   seeOnlineText: string;
diff --git a/src/components/material/material-buttons/physical/MaterialButtonPhysical.tsx b/src/components/material/material-buttons/physical/MaterialButtonPhysical.tsx
index d655f673cc..985d5ec739 100644
--- a/src/components/material/material-buttons/physical/MaterialButtonPhysical.tsx
+++ b/src/components/material/material-buttons/physical/MaterialButtonPhysical.tsx
@@ -39,7 +39,9 @@ const MaterialButtonPhysical: FC<MaterialButtonPhysicalProps> = ({
       label={
         size === "small"
           ? t("reserveText")
-          : `${t("reserveText")} ${manifestationMaterialType}`
+          : `${t("reserveWithMaterialTypeText", {
+              placeholders: { "@materialType": manifestationMaterialType }
+            })}`
       }
       buttonType="none"
       variant="filled"
diff --git a/src/components/material/material-buttons/physical/MaterialButtonReservableFromAnotherLibrary.tsx b/src/components/material/material-buttons/physical/MaterialButtonReservableFromAnotherLibrary.tsx
index 7d6174474f..6c978fba86 100644
--- a/src/components/material/material-buttons/physical/MaterialButtonReservableFromAnotherLibrary.tsx
+++ b/src/components/material/material-buttons/physical/MaterialButtonReservableFromAnotherLibrary.tsx
@@ -41,7 +41,9 @@ const MaterialButtonReservableFromAnotherLibrary: FC<
       label={
         size === "small"
           ? t("reserveText")
-          : `${t("reserveText")} ${manifestationMaterialType}`
+          : `${t("reserveWithMaterialTypeText", {
+              placeholders: { "@materialType": manifestationMaterialType }
+            })}`
       }
       buttonType="none"
       variant="filled"