feat: Use static endpoints for /resources and /entitlementOptions in Poppy Compatible release

Includes change to use "page" param instead of offset for useInfiniteFetch (loadmore works differently than prev-next)

ERM-3248

Author: EthanFreestone

src/constants/endpoints.js

@@ -7,6 +7,7 @@ export const AGREEMENTS_ENDPOINT = 'erm/sas';
 export const AGREEMENT_ENDPOINT = (agreementId) => `${AGREEMENTS_ENDPOINT}/${agreementId}`;
 
 export const AGREEMENT_ERESOURCES_ENDPOINT = (agreementId, filterPath) => `${AGREEMENT_ENDPOINT(agreementId)}/resources/${filterPath}`;
+export const AGREEMENT_ERESOURCES_ENDPOINT_STATIC = (agreementId, filterPath) => `${AGREEMENT_ENDPOINT(agreementId)}/resources/static/${filterPath}`;
 
 export const AGREEMENT_LINES_ENDPOINT = 'erm/entitlements';
 export const AGREEMENT_LINES_EXTERNAL_ENDPOINT = 'erm/entitlements/external';

src/routes/AgreementViewRoute/AgreementViewRoute.js

@@ -25,7 +25,7 @@ import { joinRelatedAgreements } from '../utilities/processRelatedAgreements';
 
 import {
   AGREEMENT_ENDPOINT,
-  AGREEMENT_ERESOURCES_ENDPOINT,
+  AGREEMENT_ERESOURCES_ENDPOINT_STATIC,
   AGREEMENT_LINES_ENDPOINT,
   httpStatuses
 } from '../../constants';
@@ -58,7 +58,7 @@ const AgreementViewRoute = ({
   } = useAgreementsHelperApp();
 
   const agreementPath = AGREEMENT_ENDPOINT(agreementId);
-  const agreementEresourcesPath = AGREEMENT_ERESOURCES_ENDPOINT(agreementId, eresourcesFilterPath);
+  const agreementEresourcesPath = AGREEMENT_ERESOURCES_ENDPOINT_STATIC(agreementId, eresourcesFilterPath);
 
   const { agreement, isAgreementLoading } = useAgreement({ agreementId });
 
@@ -114,14 +114,15 @@ const AgreementViewRoute = ({
   );
 
   // AGREEMENT ERESOURCES INFINITE FETCH
+  const agreementEresourcesPerPage = useMemo(() => parseMclPageSize(settings, 'agreementEresources'), [settings]);
   const agreementEresourcesQueryParams = useMemo(() => (
     generateKiwtQueryParams({
       sort: [
         { path: 'pti.titleInstance.name' }
       ],
-      perPage: parseMclPageSize(settings, 'agreementEresources')
+      perPage: agreementEresourcesPerPage
     }, {})
-  ), [settings]);
+  ), [agreementEresourcesPerPage]);
 
   const {
     infiniteQueryObject: {
@@ -133,7 +134,7 @@ const AgreementViewRoute = ({
   } = useInfiniteFetch(
     [agreementEresourcesPath, agreementEresourcesQueryParams, 'ui-agreements', 'AgreementViewRoute', 'getEresources'],
     ({ pageParam = 0 }) => {
-      const params = [...agreementEresourcesQueryParams, `offset=${pageParam}`];
+      const params = [...agreementEresourcesQueryParams, `page=${(pageParam / agreementEresourcesPerPage) + 1}`];
       return ky.get(`${agreementEresourcesPath}?${params?.join('&')}`).json();
     }
   );

src/routes/EResourceViewRoute/EResourceViewRoute.js

@@ -49,14 +49,15 @@ const EResourceViewRoute = ({
   const entitlementOptionsPath = ERESOURCE_ENTITLEMENT_OPTIONS_ENDPOINT(eresourceId);
 
   // AGREEMENTS FOR ERESOURCE INFINITE FETCH
+  const eresourceAgreementPerPage = useMemo(() => parseMclPageSize(settings, 'entitlements'), [settings]);
   const eresourceAgreementParams = useMemo(() => (
     generateKiwtQueryParams(
       {
-        perPage: parseMclPageSize(settings, 'entitlements')
+        perPage: eresourceAgreementPerPage
       },
       {}
     )
-  ), [settings]);
+  ), [eresourceAgreementPerPage]);
 
   const {
     infiniteQueryObject: {
@@ -68,7 +69,7 @@ const EResourceViewRoute = ({
   } = useInfiniteFetch(
     [entitlementsPath, eresourceAgreementParams, 'ui-agreements', 'EresourceViewRoute', 'getEntitlements'],
     ({ pageParam = 0 }) => {
-      const params = [...eresourceAgreementParams, `offset=${pageParam}`];
+      const params = [...eresourceAgreementParams, `page=${(pageParam / eresourceAgreementPerPage) + 1}`];
       return ky.get(`${entitlementsPath}?${params?.join('&')}`).json();
     }
   );