Merge branch 'release/2024-1-0' into fix/fee-list

danskernesdigitalebibliotek · Jan 4, 2024 · 195e900 · 195e900
2 parents 3febf25 + acc8e26
commit 195e900
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 25 deletions.
diff --git a/package.json b/package.json
@@ -143,7 +143,7 @@
     "prop-types": "Since we use former ddb-react components that depend on prop-types we keep this. Should be removed when usage of prop-types is deprecated."
   },
   "dependencies": {
-    "@danskernesdigitalebibliotek/dpl-design-system": "2023.51.0-cd7e0937a067366392e60d85a9831b7d1cdf363e",
+    "@danskernesdigitalebibliotek/dpl-design-system": "0.0.0-53111dc1d5d35ee254a8e231f1e3721088240a4a",
     "@reach/alert": "^0.17.0",
     "@reach/dialog": "^0.18.0",
     "@reduxjs/toolkit": "^1.9.7",

diff --git a/src/apps/loan-list/materials/selectable-material/selectable-material.tsx b/src/apps/loan-list/materials/selectable-material/selectable-material.tsx
@@ -66,7 +66,7 @@ const SelectableMaterial: FC<SelectableMaterialProps & MaterialProps> = ({
   };
 
   return (
-    <li className="arrow arrow__hover--right-small">
+    <li className="arrow__hover--right-small">
       <div
         className={clsx("list-materials", {
           "list-materials--disabled": disabled

diff --git a/src/apps/loan-list/materials/stackable-material/stackable-material.tsx b/src/apps/loan-list/materials/stackable-material/stackable-material.tsx
@@ -39,9 +39,12 @@ const StackableMaterial: FC<StackableMaterialProps & MaterialProps> = ({
 
   return (
     <div
-      className={clsx("list-reservation my-32 cursor-pointer", {
-        "list-reservation--stacked": additionalMaterials > 0
-      })}
+      className={clsx(
+        "list-reservation my-32 cursor-pointer arrow__hover--right-small",
+        {
+          "list-reservation--stacked": additionalMaterials > 0
+        }
+      )}
       role="button"
       onClick={handleOpenDueDateModal}
       onKeyUp={(e) => {

diff --git a/src/apps/reservation-list/reservation-material/reservation-material.tsx b/src/apps/reservation-list/reservation-material/reservation-material.tsx
@@ -30,7 +30,7 @@ const ReservationMaterial: FC<ReservationMaterialProps & MaterialProps> = ({
   return (
     <li>
       <div
-        className="list-reservation my-32 cursor-pointer"
+        className="list-reservation my-32 cursor-pointer arrow__hover--right-small"
         role="button"
         onClick={() => openDetailsModal()}
         onKeyUp={(e) => {

diff --git a/src/apps/search-header/search-header.test.ts b/src/apps/search-header/search-header.test.ts
@@ -37,7 +37,7 @@ describe("Search header app", () => {
     cy.getBySel("search-header-input").focus().type("ha");
     cy.getBySel("autosuggest").should("not.be.visible");
     cy.getBySel("search-header-input").focus().type("r");
-    cy.getBySel("autosuggest").should("be.visible");
+    cy.getBySel("autosuggest-text-item").should("be.visible");
   });
 
   it("Allows use of arrow keys to navigate autosuggest", () => {

diff --git a/src/components/Buttons/ArrowButton.tsx b/src/components/Buttons/ArrowButton.tsx
@@ -18,6 +18,7 @@ const ArrowButton: React.FC<ArrowButtonProps> = ({
   return (
     <button
       aria-labelledby={arrowLabelledBy}
+      className="arrow-button"
       style={pointer}
       type="button"
       onClick={(e) => {

diff --git a/src/components/Dropdown/Dropdown.tsx b/src/components/Dropdown/Dropdown.tsx
@@ -71,7 +71,7 @@ const Dropdown: React.FunctionComponent<DropdownProps> = ({
               value={value}
               className={classes.option}
               disabled={disabled}
-              selected={value === defaultValue}
+              selected={value.toString() === defaultValue?.toString()}
             >
               {optionsLabel}
             </option>

diff --git a/src/components/card-item-list/card-list-item/card-list-item.tsx b/src/components/card-item-list/card-list-item/card-list-item.tsx
@@ -122,7 +122,7 @@ const CardListItem: React.FC<CardListItemProps> = ({
     <article
       ref={itemRef}
       data-cy={dataCy}
-      className="card-list-item arrow arrow__hover--right-small"
+      className="card-list-item arrow__hover--right-small"
       onClick={() => {
         handleClick();
       }}

diff --git a/src/components/reservation/UserListItems.tsx b/src/components/reservation/UserListItems.tsx
@@ -36,12 +36,7 @@ export interface UserListItemsProps {
 
 const UserListItems: FC<UserListItemsProps> = ({
   patron,
-  patron: {
-    defaultInterestPeriod,
-    preferredPickupBranch,
-    phoneNumber,
-    emailAddress
-  },
+  patron: { preferredPickupBranch, phoneNumber, emailAddress },
   branches,
   selectedBranch,
   selectBranchHandler,
@@ -74,7 +69,7 @@ const UserListItems: FC<UserListItemsProps> = ({
 
   return (
     <>
-      {defaultInterestPeriod && (
+      {interestPeriods && (
         <>
           <ReservationFormListItem
             icon={LoanHistoryIcon}
@@ -84,7 +79,9 @@ const UserListItems: FC<UserListItemsProps> = ({
             buttonAriaLabel={t("changeInterestPeriodText")}
           />
           <NoInterestAfterModal
-            selectedInterest={selectedInterest ?? defaultInterestPeriod}
+            selectedInterest={
+              selectedInterest ?? interestPeriods.defaultInterestPeriod.value
+            }
             setSelectedInterest={setSelectedInterest}
           />
         </>

diff --git a/src/components/reservation/forms/NoInterestAfterModal.tsx b/src/components/reservation/forms/NoInterestAfterModal.tsx
@@ -6,7 +6,7 @@ import { RequestStatus } from "../../../core/utils/types/request";
 import { Periods } from "../types";
 
 export interface PickupModalProps {
-  selectedInterest: number;
+  selectedInterest: number | string;
   setSelectedInterest: (value: number) => void;
   saveCallback?: () => void;
   reservationStatus?: RequestStatus;

diff --git a/src/components/reservation/helper.ts b/src/components/reservation/helper.ts
@@ -34,9 +34,9 @@ export const getNoInterestAfter = (
   interestPeriod: Periods,
   t: UseTextFunction
 ) => {
-  const interestPeriodFound = interestPeriod.interestPeriods.find(
-    ({ value }) => value === String(days)
-  );
+  const interestPeriodFound = interestPeriod.interestPeriods.find((period) => {
+    return period.value.toString() === days.toString();
+  });
 
   if (interestPeriodFound) {
     return interestPeriodFound.label;

diff --git a/yarn.lock b/yarn.lock
@@ -1477,10 +1477,10 @@
     debug "^3.1.0"
     lodash.once "^4.1.1"
 
-"@danskernesdigitalebibliotek/dpl-design-system@2023.51.0-cd7e0937a067366392e60d85a9831b7d1cdf363e":
-  version "2023.51.0-cd7e0937a067366392e60d85a9831b7d1cdf363e"
-  resolved "https://npm.pkg.github.com/download/@danskernesdigitalebibliotek/dpl-design-system/2023.51.0-cd7e0937a067366392e60d85a9831b7d1cdf363e/eaa8bd13af004074cd2447655a4bb20fccd8dc2c#eaa8bd13af004074cd2447655a4bb20fccd8dc2c"
-  integrity sha512-Zimpf9G00kcS7QA27wuOtN4zmrRbs+4UAADXkAq0lFE+VhaQZ7EbcueVw2tZ47UXzQUgcPbF5a9X5P1Jk/kkZQ==
+"@danskernesdigitalebibliotek/dpl-design-system@0.0.0-53111dc1d5d35ee254a8e231f1e3721088240a4a":
+  version "0.0.0-53111dc1d5d35ee254a8e231f1e3721088240a4a"
+  resolved "https://npm.pkg.github.com/download/@danskernesdigitalebibliotek/dpl-design-system/0.0.0-53111dc1d5d35ee254a8e231f1e3721088240a4a/b7efe97875a0bae09fc27425250b8de333dd0476#b7efe97875a0bae09fc27425250b8de333dd0476"
+  integrity sha512-U1orycYBJoaLt42wVXTc0+XNpuatby/JD2gV1YH8ewd0lOo6yNhik2U/iSbcKIsUpwrGx64itxEPt9e+dbRXNw==
 
 "@discoveryjs/json-ext@^0.5.0", "@discoveryjs/json-ext@^0.5.3":
   version "0.5.7"