Merge pull request #1288 from danskernesdigitalebibliotek/fix/dashboa…

…rd-loans-reservations Fix dashboard loans not showing
danskernesdigitalebibliotek · Jun 25, 2024 · 6398e76 · 6398e76
2 parents 263e2f5 + 37458e8
commit 6398e76
Showing 1 changed file with 26 additions and 6 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
@@ -55,6 +55,11 @@ const DashboardNotificationList: FC<DashboardNotificationListProps> = ({
       soonOverdue: loansSoonOverduePhysical,
       farFromOverdue: loansFarFromOverduePhysical,
       isLoading: isLoadingLoansPhysical
+    },
+    publizon: {
+      soonOverdue: loansSoonOverdueDigital,
+      farFromOverdue: loansFarFromOverdueDigital,
+      isLoading: isLoadingLoansDigital
     }
   } = useLoans();
 
@@ -120,12 +125,16 @@ const DashboardNotificationList: FC<DashboardNotificationListProps> = ({
           break;
 
         case soon:
-          setLoansToDisplay(loansSoonOverduePhysical);
+          setLoansToDisplay(
+            loansSoonOverduePhysical.concat(loansSoonOverdueDigital)
+          );
           setModalHeader(t("loansSoonOverdueText"));
           break;
 
         case longer:
-          setLoansToDisplay(loansFarFromOverduePhysical);
+          setLoansToDisplay(
+            loansFarFromOverduePhysical.concat(loansFarFromOverdueDigital)
+          );
           setModalHeader(t("loansNotOverdueText"));
           break;
 
@@ -140,6 +149,8 @@ const DashboardNotificationList: FC<DashboardNotificationListProps> = ({
       loansFarFromOverduePhysical,
       loansOverduePhysical,
       loansSoonOverduePhysical,
+      loansSoonOverdueDigital,
+      loansFarFromOverdueDigital,
       t
     ]
   );
@@ -158,7 +169,8 @@ const DashboardNotificationList: FC<DashboardNotificationListProps> = ({
           : openDueDateModal(yesterday)
     },
     {
-      listLength: loansSoonOverduePhysical.length,
+      listLength:
+        loansSoonOverduePhysical.length + loansSoonOverdueDigital.length,
       badge: t("statusBadgeWarningText"),
       header: t("loansSoonOverdueText"),
       color: "warning",
@@ -170,7 +182,8 @@ const DashboardNotificationList: FC<DashboardNotificationListProps> = ({
           : openDueDateModal(soon)
     },
     {
-      listLength: loansFarFromOverduePhysical.length,
+      listLength:
+        loansFarFromOverduePhysical.length + loansFarFromOverdueDigital.length,
       header: t("loansNotOverdueText"),
       dataCy: "loans-not-overdue",
       color: "neutral",
@@ -218,7 +231,11 @@ const DashboardNotificationList: FC<DashboardNotificationListProps> = ({
               materialsCount={loans.length}
               header={t("physicalLoansText")}
               emptyListText={t("noPhysicalLoansText")}
-              isLoading={isLoadingLoans || isLoadingLoansPhysical}
+              isLoading={
+                isLoadingLoans ||
+                isLoadingLoansPhysical ||
+                isLoadingLoansDigital
+              }
               linkText={t("dashboardLoansLinkText")}
               linkUrl={physicalLoansUrl}
             />
@@ -242,7 +259,10 @@ const DashboardNotificationList: FC<DashboardNotificationListProps> = ({
             ...dashboardNotificationsReservations
           ]}
           isLoading={
-            isLoadingLoans || isLoadingLoansPhysical || isLoadingReservations
+            isLoadingLoans ||
+            isLoadingLoansPhysical ||
+            isLoadingLoansDigital ||
+            isLoadingReservations
           }
         />
       )}