Optimization: Provide signals for the http client to break redundant …

…requests
folio-org · Dec 3, 2024 · 459d630 · 459d630
1 parent 359c293
commit 459d630
Show file tree

Hide file tree

Showing 24 changed files with 47 additions and 42 deletions.
diff --git a/src/OrderLinesList/hooks/useOrderLines/useOrderLines.js b/src/OrderLinesList/hooks/useOrderLines/useOrderLines.js
@@ -29,7 +29,7 @@ export const useOrderLines = ({ pagination, fetchReferences, customFields }) =>
 
   const { isFetching, data = {} } = useQuery(
     [namespace, pagination.timestamp, pagination.limit, pagination.offset],
-    async () => {
+    async ({ signal }) => {
       moment.tz.setDefault(timezone);
 
       const query = await buildQuery();
@@ -46,7 +46,7 @@ export const useOrderLines = ({ pagination, fetchReferences, customFields }) =>
         query,
       };
 
-      const { poLines, totalRecords } = await ky.get(LINES_API, { searchParams }).json();
+      const { poLines, totalRecords } = await ky.get(LINES_API, { searchParams, signal }).json();
       const { ordersMap = {}, acqUnitsMap = {} } = await fetchReferences(poLines);
       const orderLines = poLines.map(orderLine => ({
         ...orderLine,

diff --git a/src/OrdersList/hooks/useOrders/useOrders.js b/src/OrdersList/hooks/useOrders/useOrders.js
@@ -41,12 +41,12 @@ export const useOrders = ({ pagination, fetchReferences, customFields }) => {
 
   const { isFetching, data = {} } = useQuery(
     [namespace, pagination.timestamp, pagination.limit, pagination.offset],
-    async () => {
+    async ({ signal }) => {
       if (!filtersCount) {
         return { orders: [], ordersCount: 0 };
       }
 
-      const { purchaseOrders, totalRecords } = await ky.get(ORDERS_API, { searchParams }).json();
+      const { purchaseOrders, totalRecords } = await ky.get(ORDERS_API, { searchParams, signal }).json();
       const { usersMap = {}, vendorsMap = {}, acqUnitsMap = {} } = await fetchReferences(purchaseOrders);
       const orders = purchaseOrders.map(order => ({
         ...order,

diff --git a/src/common/hooks/useAcqMethod/useAcqMethod.js b/src/common/hooks/useAcqMethod/useAcqMethod.js
@@ -12,7 +12,7 @@ export const useAcqMethod = (methodId, options = {}) => {
 
   const { isLoading, data } = useQuery(
     [namespace, methodId],
-    () => ky.get(`${ACQUISITION_METHODS_API}/${methodId}`).json(),
+    ({ signal }) => ky.get(`${ACQUISITION_METHODS_API}/${methodId}`, { signal }).json(),
     {
       enabled: Boolean(methodId),
       ...options,

diff --git a/src/common/hooks/useAcqMethods/useAcqMethods.js b/src/common/hooks/useAcqMethods/useAcqMethods.js
@@ -25,7 +25,7 @@ export const useAcqMethods = (options = {}) => {
     data = DEFAULT_DATA,
   } = useQuery(
     [namespace, 'acq-methods'],
-    () => ky.get(ACQUISITION_METHODS_API, { searchParams }).json(),
+    ({ signal }) => ky.get(ACQUISITION_METHODS_API, { searchParams, signal }).json(),
     options,
   );
 

diff --git a/src/common/hooks/useInstance/useInstance.js b/src/common/hooks/useInstance/useInstance.js
@@ -18,7 +18,7 @@ export const useInstance = (instanceId, options = DEFAULT_OPTIONS) => {
     data: instance = DEFAULT_DATA,
   } = useQuery(
     [namespace, instanceId, tenantId],
-    () => ky.get(`inventory/instances/${instanceId}`).json(),
+    ({ signal }) => ky.get(`inventory/instances/${instanceId}`, { signal }).json(),
     { enabled: Boolean(instanceId) },
   );
 

diff --git a/src/common/hooks/useLinesLimit/useLinesLimit.js b/src/common/hooks/useLinesLimit/useLinesLimit.js
@@ -22,7 +22,7 @@ export const useLinesLimit = (enabled = true) => {
 
   const { isLoading, data = {} } = useQuery(
     [namespace],
-    () => ky.get(CONFIG_API, { searchParams }).json(),
+    ({ signal }) => ky.get(CONFIG_API, { searchParams, signal }).json(),
     { enabled },
   );
 

diff --git a/src/common/hooks/useOpenOrderSettings/useOpenOrderSettings.js b/src/common/hooks/useOpenOrderSettings/useOpenOrderSettings.js
@@ -29,7 +29,7 @@ export const useOpenOrderSettings = (options = {}) => {
 
   const { isFetching, data = {} } = useQuery(
     [namespace],
-    () => ky.get(CONFIG_API, { searchParams }).json(),
+    ({ signal }) => ky.get(CONFIG_API, { searchParams, signal }).json(),
     options,
   );
 

diff --git a/src/common/hooks/useOrder/useOrder.js b/src/common/hooks/useOrder/useOrder.js
@@ -14,11 +14,11 @@ export const useOrder = (orderId) => {
 
   const { isLoading, data } = useQuery(
     ['ui-orders', 'order', orderId],
-    async () => {
+    async ({ signal }) => {
       try {
-        return ky.get(`${ORDERS_API}/${orderId}`).json();
+        return ky.get(`${ORDERS_API}/${orderId}`, { signal }).json();
       } catch {
-        const { purchaseOrders } = await ky.get(`${ORDERS_API}`, { searchParams }).json();
+        const { purchaseOrders } = await ky.get(`${ORDERS_API}`, { searchParams, signal }).json();
 
         return purchaseOrders[0] || {};
       }

diff --git a/src/common/hooks/useOrderLine/useOrderLine.js b/src/common/hooks/useOrderLine/useOrderLine.js
@@ -13,7 +13,7 @@ export const useOrderLine = (lineId) => {
 
   const { isLoading, data } = useQuery(
     [namespace, lineId],
-    async () => ky.get(`${LINES_API}/${lineId}`).json(),
+    async ({ signal }) => ky.get(`${LINES_API}/${lineId}`, { signal }).json(),
     {
       enabled: Boolean(lineId),
     },

diff --git a/src/common/hooks/useOrderTemplate/useOrderTemplate.js b/src/common/hooks/useOrderTemplate/useOrderTemplate.js
@@ -14,7 +14,7 @@ export const useOrderTemplate = (orderTemplateId) => {
     data = {},
   } = useQuery(
     [namespace, orderTemplateId],
-    () => ky.get(`${ORDER_TEMPLATES_API}/${orderTemplateId}`).json(),
+    ({ signal }) => ky.get(`${ORDER_TEMPLATES_API}/${orderTemplateId}`, { signal }).json(),
     { enabled: Boolean(orderTemplateId) },
   );
 

diff --git a/src/common/hooks/usePOLineRelatedItems/usePOLineRelatedItems.js b/src/common/hooks/usePOLineRelatedItems/usePOLineRelatedItems.js
@@ -19,7 +19,7 @@ export const usePOLineRelatedItems = (poLine, { offset, limit } = {}) => {
   };
 
   const queryKey = [namespace, limit, offset, poLine.id];
-  const queryFn = () => ky.get(ITEMS_API, { searchParams }).json();
+  const queryFn = ({ signal }) => ky.get(ITEMS_API, { searchParams, signal }).json();
 
   const {
     data,

diff --git a/src/common/hooks/useVendor/useVendor.js b/src/common/hooks/useVendor/useVendor.js
@@ -9,7 +9,7 @@ export const useVendor = (vendorId) => {
 
   const { isLoading, data } = useQuery(
     ['ui-orders', 'vendor', vendorId],
-    () => ky.get(`${VENDORS_API}/${vendorId}`).json(),
+    ({ signal }) => ky.get(`${VENDORS_API}/${vendorId}`, { signal }).json(),
     { enabled: Boolean(vendorId) },
   );
 

diff --git a/...geInstanceConnection/hooks/useChangeInstanceModalConfigs/useChangeInstanceModalConfigs.js b/...geInstanceConnection/hooks/useChangeInstanceModalConfigs/useChangeInstanceModalConfigs.js
@@ -18,7 +18,7 @@ export const useChangeInstanceModalConfigs = (poLine) => {
     isLoading,
   } = useQuery({
     queryKey: [namespace, poLine.id],
-    queryFn: () => checkRelatedHoldings(ky)(poLine),
+    queryFn: ({ signal }) => checkRelatedHoldings(ky.extend({ signal }))(poLine),
     queryOptions: {
       enabled: isDetailed,
     },

diff --git a/src/components/POLine/LineLinkedInstances/hooks/useLinkedInstances/useLinkedInstances.js b/src/components/POLine/LineLinkedInstances/hooks/useLinkedInstances/useLinkedInstances.js
@@ -31,13 +31,13 @@ export const useInstanceRelationTypes = () => {
 
   const { refetch } = useQuery(
     ['ui-orders', 'linked-lines'],
-    () => {
+    ({ signal }) => {
       const searchParams = {
         limit: LIMIT_MAX,
         query: 'cql.allRecords=1',
       };
 
-      return ky.get('instance-relationship-types', { searchParams }).json();
+      return ky.get('instance-relationship-types', { searchParams, signal }).json();
     },
     { enabled: false },
   );

diff --git a/src/components/POLine/RelatedInvoiceLines/useConnectedInvoiceLines.js b/src/components/POLine/RelatedInvoiceLines/useConnectedInvoiceLines.js
@@ -28,18 +28,19 @@ export const useConnectedInvoiceLines = (orderLineId) => {
 
   const { isLoading, data = [] } = useQuery(
     [namespace],
-    async () => {
+    async ({ signal }) => {
       const { invoiceLines = [], totalRecords } = await ky.get(INVOICE_LINES_API, {
         searchParams: {
           query: `poLineId==${orderLineId}`,
           limit: LIMIT_MAX,
         },
+        signal,
       }).json();
 
       const invoicesIds = invoiceLines.map(({ invoiceId }) => invoiceId);
       const invoices = await batchRequest(
         async ({ params: searchParams }) => {
-          const invoicesData = await ky.get(INVOICES_API, { searchParams }).json();
+          const invoicesData = await ky.get(INVOICES_API, { searchParams, signal }).json();
 
           return invoicesData.invoices;
         },
@@ -50,7 +51,7 @@ export const useConnectedInvoiceLines = (orderLineId) => {
       const vendorIds = invoices.map(({ vendorId }) => vendorId);
       const vendors = await batchRequest(
         async ({ params: searchParams }) => {
-          const vendorsData = await ky.get(VENDORS_API, { searchParams }).json();
+          const vendorsData = await ky.get(VENDORS_API, { searchParams, signal }).json();
 
           return vendorsData.organizations;
         },
@@ -61,7 +62,7 @@ export const useConnectedInvoiceLines = (orderLineId) => {
       const fiscalYearIds = [...new Set(invoices.map(({ fiscalYearId }) => fiscalYearId))];
       const fiscalYears = await batchRequest(
         async ({ params: searchParams }) => {
-          const fiscalYearData = await ky.get(FISCAL_YEARS_API, { searchParams }).json();
+          const fiscalYearData = await ky.get(FISCAL_YEARS_API, { searchParams, signal }).json();
 
           return fiscalYearData.fiscalYears;
         },

diff --git a/src/components/POLine/hooks/usePOLineVersions/usePOLineVersions.js b/src/components/POLine/hooks/usePOLineVersions/usePOLineVersions.js
@@ -13,7 +13,7 @@ export const usePOLineVersions = (poLineId, options = {}) => {
 
   const { isLoading, data } = useQuery(
     [namespace, poLineId],
-    () => ky.get(`${AUDIT_ACQ_EVENTS_API}/order-line/${poLineId}`).json(),
+    ({ signal }) => ky.get(`${AUDIT_ACQ_EVENTS_API}/order-line/${poLineId}`, { signal }).json(),
     {
       enabled: Boolean(poLineId),
       ...options,

diff --git a/src/components/POLine/hooks/useSelectedPOLineVersion/useSelectedPOLineVersion.js b/src/components/POLine/hooks/useSelectedPOLineVersion/useSelectedPOLineVersion.js
@@ -69,7 +69,9 @@ export const useSelectedPOLineVersion = ({ versionId, versions, snapshotPath, ce
     data: selectedVersion = {},
   } = useQuery(
     [namespace, versionId, versionSnapshot?.id],
-    async () => {
+    async ({ signal }) => {
+      const kyExtended = ky.extend({ signal });
+
       const accessProviderId = versionSnapshot?.accessProvider;
       const eresource = versionSnapshot?.eresource || {};
       const physical = versionSnapshot?.physical || {};
@@ -96,8 +98,8 @@ export const useSelectedPOLineVersion = ({ versionId, versions, snapshotPath, ce
         organizationsMap,
         materialTypesMap,
       ] = await Promise.all([
-        getOrganizationsByIds(ky)(organizationIds).then(keyBy('id')),
-        getMaterialTypes(ky)()
+        getOrganizationsByIds(kyExtended)(organizationIds).then(keyBy('id')),
+        getMaterialTypes(kyExtended)()
           .then(({ mtypes }) => mtypes)
           .then(keyBy('id')),
       ]);

diff --git a/src/components/PurchaseOrder/POInvoices/useRelatedInvoices.js b/src/components/PurchaseOrder/POInvoices/useRelatedInvoices.js
@@ -18,10 +18,10 @@ export const useRelatedInvoices = (invoiceIds = []) => {
 
   const { isLoading, data = [] } = useQuery(
     [namespace, ...invoiceIds],
-    async () => {
+    async ({ signal }) => {
       const invoices = await batchRequest(
         async ({ params: searchParams }) => {
-          const invoicesData = await ky.get(INVOICES_API, { searchParams }).json();
+          const invoicesData = await ky.get(INVOICES_API, { searchParams, signal }).json();
 
           return invoicesData.invoices;
         },
@@ -31,7 +31,7 @@ export const useRelatedInvoices = (invoiceIds = []) => {
       const vendorIds = invoices.map(({ vendorId }) => vendorId);
       const vendors = await batchRequest(
         async ({ params: searchParams }) => {
-          const vendorsData = await ky.get(VENDORS_API, { searchParams }).json();
+          const vendorsData = await ky.get(VENDORS_API, { searchParams, signal }).json();
 
           return vendorsData.organizations;
         },
@@ -42,7 +42,7 @@ export const useRelatedInvoices = (invoiceIds = []) => {
       const fiscalYearIds = invoices.map(({ fiscalYearId }) => fiscalYearId);
       const fiscalYears = await batchRequest(
         async ({ params: searchParams }) => {
-          const fiscalYearData = await ky.get(FISCAL_YEARS_API, { searchParams }).json();
+          const fiscalYearData = await ky.get(FISCAL_YEARS_API, { searchParams, signal }).json();
 
           return fiscalYearData.fiscalYears;
         },

diff --git a/src/components/PurchaseOrder/hooks/usePOVersions/usePOVersions.js b/src/components/PurchaseOrder/hooks/usePOVersions/usePOVersions.js
@@ -13,7 +13,7 @@ export const usePOVersions = (orderId, options = {}) => {
 
   const { isLoading, data } = useQuery(
     [namespace, orderId],
-    () => ky.get(`${AUDIT_ACQ_EVENTS_API}/order/${orderId}`).json(),
+    ({ signal }) => ky.get(`${AUDIT_ACQ_EVENTS_API}/order/${orderId}`, { signal }).json(),
     {
       enabled: Boolean(orderId),
       ...options,

diff --git a/src/components/PurchaseOrder/hooks/useSelectedPOVersion/useSelectedPOVersion.js b/src/components/PurchaseOrder/hooks/useSelectedPOVersion/useSelectedPOVersion.js
@@ -71,7 +71,9 @@ export const useSelectedPOVersion = ({ versionId, versions, snapshotPath }, opti
     data: selectedVersion = {},
   } = useQuery(
     [namespace, versionId, versionSnapshot?.id],
-    async () => {
+    async ({ signal }) => {
+      const kyExtended = ky.extend({ signal });
+
       const organizationIds = [vendorId];
       const acqUnitsIds = versionSnapshot?.acqUnitIds || [];
 
@@ -80,9 +82,9 @@ export const useSelectedPOVersion = ({ versionId, versions, snapshotPath }, opti
         acqUnitsMap,
         addressesMap,
       ] = await Promise.all([
-        getOrganizationsByIds(ky)(organizationIds).then(keyBy('id')),
-        getAcqUnitsByIds(ky)(acqUnitsIds).then(keyBy('id')),
-        getTenantAddresses(ky)()
+        getOrganizationsByIds(kyExtended)(organizationIds).then(keyBy('id')),
+        getAcqUnitsByIds(kyExtended)(acqUnitsIds).then(keyBy('id')),
+        getTenantAddresses(kyExtended)()
           .then(({ configs }) => getAddresses(configs))
           .then(keyBy('id')),
       ]);

diff --git a/src/settings/RoutingAddress/hooks/useRoutingAddressSettings/useRoutingAddressSettings.js b/src/settings/RoutingAddress/hooks/useRoutingAddressSettings/useRoutingAddressSettings.js
@@ -24,8 +24,8 @@ export const useRoutingAddressSettings = (options = {}) => {
     error,
   } = useQuery({
     queryKey: [namespace],
-    queryFn: async () => {
-      const response = await ky.get(ORDERS_STORAGE_SETTINGS_API, { searchParams }).json();
+    queryFn: async ({ signal }) => {
+      const response = await ky.get(ORDERS_STORAGE_SETTINGS_API, { searchParams, signal }).json();
 
       return response?.settings?.[0];
     },

diff --git a/src/settings/RoutingAddress/hooks/useUserAddressTypes/useUserAddressTypes.js b/src/settings/RoutingAddress/hooks/useUserAddressTypes/useUserAddressTypes.js
@@ -21,7 +21,7 @@ export const useUserAddressTypes = (options = {}) => {
     data = {},
   } = useQuery(
     [namespace, 'user-address-types'],
-    () => ky.get(USER_ADDRESS_TYPES_API, { searchParams }).json(),
+    ({ signal }) => ky.get(USER_ADDRESS_TYPES_API, { searchParams, signal }).json(),
     options,
   );
 

diff --git a/src/settings/RoutingListConfiguration/hooks/useListConfiguration/useListConfiguration.js b/src/settings/RoutingListConfiguration/hooks/useListConfiguration/useListConfiguration.js
@@ -14,7 +14,7 @@ export const useListConfiguration = () => {
 
   const { isFetching, data, refetch } = useQuery(
     [namespace, LIST_CONFIGURATION_TEMPLATE_ID],
-    () => ky.get(`${TEMPLATES_API}/${LIST_CONFIGURATION_TEMPLATE_ID}`).json(),
+    ({ signal }) => ky.get(`${TEMPLATES_API}/${LIST_CONFIGURATION_TEMPLATE_ID}`, { signal }).json(),
   );
 
   return ({

diff --git a/src/settings/hooks/useDefaultReceivingSearchSettings/useDefaultReceivingSearchSettings.js b/src/settings/hooks/useDefaultReceivingSearchSettings/useDefaultReceivingSearchSettings.js
@@ -24,8 +24,8 @@ export const useDefaultReceivingSearchSettings = (options = {}) => {
     refetch,
   } = useQuery({
     queryKey: [namespace],
-    queryFn: async () => {
-      const response = await ky.get(ORDERS_STORAGE_SETTINGS_API, { searchParams }).json();
+    queryFn: async ({ signal }) => {
+      const response = await ky.get(ORDERS_STORAGE_SETTINGS_API, { searchParams, signal }).json();
 
       return response?.settings?.[0];
     },
-Original file line number
+Diff line change
@@ Expand Up @@
       };
       const queryKey = [namespace, limit, offset, poLine.id];
-      const queryFn = () => ky.get(ITEMS_API, { searchParams }).json();
+      const queryFn = ({ signal }) => ky.get(ITEMS_API, { searchParams, signal }).json();
       const {
         data,
@@ Expand Down @@