Merge pull request #1072 from danskernesdigitalebibliotek/fix/availab…

…ility-blacklisting

Fix/availability blacklisting

src/apps/material/helper.ts

@@ -411,19 +411,29 @@ export const isParallelReservation = (manifestations: Manifestation[]) =>
   hasCorrectAccessType(AccessTypeCode.Physical, manifestations) &&
   !isArticle(manifestations);
 
-// Because we  need to exclude the branches that are blacklisted, we need to use a custom hook to prevent duplicate code
+// Because we need to exclude the branches that are blacklisted, we need to
+// use a custom hook to prevent duplicate code
 export const getBlacklistedQueryArgs = (
   faustIds: FaustId[],
   config: UseConfigFunction,
-  blacklist: "availability" | "pickup"
+  blacklist: "availability" | "pickup" | "both"
 ) => {
-  const configKey =
-    blacklist === "availability"
-      ? "blacklistedAvailabilityBranchesConfig"
-      : "blacklistedPickupBranchesConfig";
-  const blacklistBranches = config(configKey, {
+  const configKey = {
+    availability: "blacklistedAvailabilityBranchesConfig",
+    pickup: "blacklistedPickupBranchesConfig",
+    both: "blacklistedAvailabilityBranchesConfig"
+  };
+  let blacklistBranches = config(configKey[blacklist], {
     transformer: "stringToArray"
   });
+  // If we want to blacklist both availability and pickup branches we now add the
+  // complimentary blacklist
+  if (blacklist === "both") {
+    const additionalBlacklistBranches = config(configKey.pickup, {
+      transformer: "stringToArray"
+    });
+    blacklistBranches = blacklistBranches.concat(additionalBlacklistBranches);
+  }
   return {
     recordid: faustIds,
     ...(blacklistBranches ? { exclude: blacklistBranches } : {})
@@ -442,16 +452,19 @@ export const getAvailability = async ({
 export const useGetHoldings = ({
   faustIds,
   config,
+  useAvailabilityBlacklist = false,
   options
 }: {
   faustIds: FaustId[];
   config: UseConfigFunction;
+  useAvailabilityBlacklist?: boolean;
   options?: {
     query?: UseQueryOptions<Awaited<ReturnType<typeof getHoldingsV3>>>;
   };
 }) => {
+  const blacklistedBranches = useAvailabilityBlacklist ? "both" : "pickup";
   const { data, isLoading, isError } = useGetHoldingsV3(
-    getBlacklistedQueryArgs(faustIds, config, "pickup"),
+    getBlacklistedQueryArgs(faustIds, config, blacklistedBranches),
     options
   );
   return { data, isLoading, isError };

src/components/find-on-shelf/FindOnShelfModalBody.tsx

@@ -51,6 +51,7 @@ const FindOnShelfModalBody: FC<FindOnShelfModalBodyProps> = ({
   );
   const { data, isLoading } = useGetHoldings({
     faustIds: faustIdArray,
+    useAvailabilityBlacklist: true,
     config
   });
   const author = creatorsToString(flattenCreators(authors), t);
@@ -145,7 +146,7 @@ const FindOnShelfModalBody: FC<FindOnShelfModalBodyProps> = ({
         }
       )
     );
-  // "00" is the ending of beanchIds for branches that are considered main & should
+  // "00" is the ending of branchIds for branches that are considered main & should
   // be shown first independent of whether they're available.
   const finalDataMainBranchFirst = finalDataAlphabetical.sort(
     (manifestationHolding: ManifestationHoldings) => {
@@ -154,7 +155,24 @@ const FindOnShelfModalBody: FC<FindOnShelfModalBodyProps> = ({
         : 1;
     }
   );
-  const finalDataToShow: ManifestationHoldings[] = finalDataMainBranchFirst;
+  // Due to the way the data is structured and that we need to assemble it from
+  // two different sources, we need to filter out branches that are blacklisted
+  // even though this already happened once when fetching one half of the data.
+  const finalDataFilterOutBlacklistedBranches = finalDataMainBranchFirst.filter(
+    (libraryBranch: ManifestationHoldings) => {
+      const blacklistedBranches = config(
+        "blacklistedAvailabilityBranchesConfig",
+        {
+          transformer: "stringToArray"
+        }
+      );
+      return !blacklistedBranches.includes(
+        libraryBranch[0].holding.branch.branchId
+      );
+    }
+  );
+  const finalDataToShow: ManifestationHoldings[] =
+    finalDataFilterOutBlacklistedBranches;
 
   return (
     <>

src/components/material/MaterialHeader.tsx

@@ -142,7 +142,7 @@ const MaterialHeader: React.FC<MaterialHeaderProps> = ({
             />
           )}
         </div>
-        {/* The CTA nuttons apperently only makes sense on a global work */}
+        {/* The CTA buttons apparently only make sense on a global work */}
         {!isGlobalMaterial && showItem && (
           <>
             {isPeriodical && (

src/core/utils/useReservableFromAnotherLibrary.tsx

@@ -10,6 +10,7 @@ const useReservableFromAnotherLibrary = (
   const config = useConfig();
   const { data: holdingsData } = useGetHoldings({
     faustIds: getAllFaustIds(manifestations),
+    useAvailabilityBlacklist: true,
     config
   });