diff --git a/src/components/_modal/pages/order/localizationinformation/LocalizationInformation.js b/src/components/_modal/pages/order/localizationinformation/LocalizationInformation.js index e803122f6..222ae6516 100644 --- a/src/components/_modal/pages/order/localizationinformation/LocalizationInformation.js +++ b/src/components/_modal/pages/order/localizationinformation/LocalizationInformation.js @@ -88,6 +88,7 @@ export function LocalizationInformation({ >{`${pickupBranch?.postalCode} ${pickupBranch?.city}`} )} + {/* maybe move warning together with warning in order-modal. see bibdk2021-1927 */} {!isLoadingBranches && pickupBranch && diff --git a/src/components/hooks/useOrderPageInformations.js b/src/components/hooks/useOrderPageInformations.js index d7d01b6eb..5bc678f5b 100644 --- a/src/components/hooks/useOrderPageInformations.js +++ b/src/components/hooks/useOrderPageInformations.js @@ -40,7 +40,7 @@ export default function useOrderPageInformation({ return inferAccessTypes( periodicaForm, pickupBranch, - workData?.work?.manifestations?.mostRelevant, + workData?.work?.manifestations?.all, loanerInfo ); }, [workData?.work, periodicaForm, pickupBranch]); diff --git a/src/components/hooks/useWorkAndSelectedPids.js b/src/components/hooks/useWorkAndSelectedPids.js index 802f06850..983ac81ab 100644 --- a/src/components/hooks/useWorkAndSelectedPids.js +++ b/src/components/hooks/useWorkAndSelectedPids.js @@ -13,14 +13,10 @@ export function useGetManifestationsForOrderButton(workId, selectedPids) { const workResponse = useData(workId && workFragments.buttonTxt({ workId })); const allPids = useMemo(() => { - return workResponse?.data?.work?.manifestations?.mostRelevant?.flatMap( + return workResponse?.data?.work?.manifestations?.all?.flatMap( (manifestation) => manifestation.pid ); - }, [ - workId, - selectedPids, - workResponse?.data?.work?.manifestations?.mostRelevant, - ]); + }, [workId, selectedPids, workResponse?.data?.work?.manifestations?.all]); const manifestationsResponse = useData( allPids && diff --git a/src/components/work/overview/Overview.js b/src/components/work/overview/Overview.js index c97d3a497..1aedbe340 100644 --- a/src/components/work/overview/Overview.js +++ b/src/components/work/overview/Overview.js @@ -63,7 +63,7 @@ export function Overview({ className = "", skeleton = false, }) { - const manifestations = work?.manifestations?.mostRelevant; + const manifestations = work?.manifestations?.all; const router = useRouter(); const { uniqueMaterialTypes, inUniqueMaterialTypes, flatPidsByType } = diff --git a/src/components/work/reservationbutton/ReservationButton.js b/src/components/work/reservationbutton/ReservationButton.js index 1eb5b0068..008ef6813 100644 --- a/src/components/work/reservationbutton/ReservationButton.js +++ b/src/components/work/reservationbutton/ReservationButton.js @@ -158,7 +158,7 @@ export const ReservationButton = ({ modal, handleOrderFinished = undefined, }) => { - const physicalCopy = checkPhysicalCopy([access?.[0]])?.[0]; //TODO why do we check all accesses if only one is used in the end? + const physicalCopy = checkPhysicalCopy(access)?.[0]; //TODO why do we check all accesses if only one is used in the end? const digitalCopy = checkDigitalCopy([access?.[0]])?.[0]; //TODO why do we check all accesses if only one is used in the end? const noSelectedManifestations = Boolean(isEmpty(access)); diff --git a/src/components/work/reservationbutton/orderbuttontextbelow/OrderButtonTextBelow.js b/src/components/work/reservationbutton/orderbuttontextbelow/OrderButtonTextBelow.js index 82678bb7c..1d392af9f 100644 --- a/src/components/work/reservationbutton/orderbuttontextbelow/OrderButtonTextBelow.js +++ b/src/components/work/reservationbutton/orderbuttontextbelow/OrderButtonTextBelow.js @@ -24,7 +24,7 @@ import useUser from "@/components/hooks/useUser"; * @returns {React.ReactElement|null} */ function OrderButtonTextBelow({ access, skeleton }) { - const physicalCopy = checkPhysicalCopy([access?.[0]])?.[0]; + const physicalCopy = checkPhysicalCopy(access)?.[0]; const digitalCopy = checkDigitalCopy([access?.[0]])?.[0]; const isPeriodicaLike = getAreAccessesPeriodicaLike([access?.[0]])?.[0]; diff --git a/src/lib/api/work.fragments.js b/src/lib/api/work.fragments.js index 9c1a9a365..056132ec7 100644 --- a/src/lib/api/work.fragments.js +++ b/src/lib/api/work.fragments.js @@ -438,6 +438,9 @@ export function buttonTxt({ workId }) { manifestations { all { pid + materialTypes { + ...materialTypesFragment + } } mostRelevant { pid @@ -766,7 +769,7 @@ export function orderPageWorkWithManifestations({ workId }) { } workTypes manifestations { - mostRelevant { + all { ...manifestationAccess ...manifestationDetailsForAccessFactory } @@ -807,7 +810,7 @@ export function overviewWork({ workId }) { } workTypes manifestations { - mostRelevant { + all { ownerWork { workTypes }