diff --git a/src/apps/material/material.entry.tsx b/src/apps/material/material.entry.tsx index a62530ca7..f3ec24332 100644 --- a/src/apps/material/material.entry.tsx +++ b/src/apps/material/material.entry.tsx @@ -189,7 +189,6 @@ interface MaterialEntryConfigProps { blacklistedInstantLoanBranchesConfig: string; blacklistedPickupBranchesConfig?: string; branchesConfig: string; - expirationWarningDaysBeforeConfig: string; instantLoanConfig: string; smsNotificationsForReservationsEnabledConfig: string; } diff --git a/src/apps/material/material.stories.tsx b/src/apps/material/material.stories.tsx index c5354c2b5..66189b852 100644 --- a/src/apps/material/material.stories.tsx +++ b/src/apps/material/material.stories.tsx @@ -664,10 +664,6 @@ const meta: Meta = { description: "Instant loan underline description", control: { type: "text" } }, - expirationWarningDaysBeforeConfig: { - description: "Expiration warning days before", - control: { type: "text" } - }, instantLoanConfig: { description: "Instant loan config", control: { type: "text" } @@ -954,7 +950,6 @@ const meta: Meta = { instantLoanSubTitleText: "Spring køen over og hent bogen nu på", instantLoanUnderlineDescriptionText: "Bogen er tilgængelig på disse biblioteker nær dig", - expirationWarningDaysBeforeConfig: "1", instantLoanConfig: '{ "threshold": "1", "matchStrings": ["Standard"], "enabled": "true" }', interestPeriodsConfig: diff --git a/src/core/utils/useReaderPlayer.tsx b/src/core/utils/useReaderPlayer.tsx index 75ab3996d..4e077c7a3 100644 --- a/src/core/utils/useReaderPlayer.tsx +++ b/src/core/utils/useReaderPlayer.tsx @@ -1,5 +1,3 @@ -import useLoans from "./useLoans"; -import useReservations from "./useReservations"; import { Manifestation } from "./types/entities"; import { getManifestationIsbn } from "../../apps/material/helper"; import { @@ -10,6 +8,14 @@ import { import { isAnonymous } from "./helpers/user"; import useOnlineAvailabilityData from "../../components/availability-label/useOnlineAvailabilityData"; import { hasCorrectAccess } from "../../components/material/material-buttons/helper"; +import { + useGetV1UserLoans, + useGetV1UserReservations +} from "../publizon/publizon"; +import { + mapPublizonLoanToLoanType, + mapPublizonReservationToReservationType +} from "./helpers/list-mapper"; const useReaderPlayer = (manifestations: Manifestation[] | null) => { const isUserAnonymous = isAnonymous(); @@ -23,13 +29,19 @@ const useReaderPlayer = (manifestations: Manifestation[] | null) => { ? getManifestationIsbn(manifestations[0]) : null; - const { - publizon: { loans } - } = useLoans(); - - const { - publizon: { reservations } - } = useReservations(); + const { data: loansPublizon } = useGetV1UserLoans( + {}, + { query: { enabled: !isUserAnonymous } } + ); + const loans = loansPublizon?.loans + ? mapPublizonLoanToLoanType(loansPublizon.loans) + : null; + const { data: reservationsPublizon } = useGetV1UserReservations({ + query: { enabled: !isUserAnonymous } + }); + const reservations = reservationsPublizon?.reservations + ? mapPublizonReservationToReservationType(reservationsPublizon.reservations) + : null; const availabilityData = useOnlineAvailabilityData({ enabled: !!identifier, @@ -46,7 +58,9 @@ const useReaderPlayer = (manifestations: Manifestation[] | null) => { loans && identifier ? getOrderIdByIdentifier({ loans, identifier }) : null; const isAllReadyReservedButtonVisible = - identifier && isIdentifierReserved(identifier, reservations); + identifier && reservations + ? isIdentifierReserved(identifier, reservations) + : false; const isMaterialLoanedButtonVisible = !!orderId; const isLoanButtonVisible = isUserAnonymous || isAvailable; const isReserveButtonVisible = !isAvailable;