Optimized requests to retrieve SRs and Actions

src/features/opportunities/controller.js

@@ -13,7 +13,6 @@ function createOpportunitiesController({
   productsContentState,
   renderProductsProgress,
   requestOpportunitiesPage,
-  loadCrmServiceRequests,
   resetCrmServiceRequests,
   resetWorkloadActions,
   requestOpptyProductsInBackground,
@@ -84,7 +83,6 @@ function createOpportunitiesController({
     }
 
     try {
-      await loadCrmServiceRequests(token, requestVersion);
       if (!isCurrentPeriodRequest(requestVersion)) return;
       const allItems = await requestOpportunitiesPage(token, period, dateRange, 0, [], requestVersion, 1);
 

src/features/opportunities/product-activities.js

@@ -0,0 +1,30 @@
+function createProductActivities({ productsContentState, opportunitiesQueryState, resetCrm,
+  loadCrm, loadActions, render }) {
+  let cycle = null;
+  function begin(requestId, token) {
+    cycle = { requestId, token, version: opportunitiesQueryState.periodRequestVersion, completed: false };
+  }
+  function complete(requestId) {
+    const current = cycle;
+    if (!current || current.completed || current.requestId !== requestId
+      || productsContentState.currentProductsRequestId !== requestId) return;
+    current.completed = true;
+    const products = [...productsContentState.opptyProductsByNumber.values()].filter(result => !result.error && !result.fromCache);
+    if (!products.length) return;
+    resetCrm();
+    const seen = new Set();
+    for (const result of products) {
+      const items = result.items.filter(item => {
+        const id = String(item?.RevnId ?? "");
+        if (seen.has(id)) return false;
+        seen.add(id);
+        return true;
+      });
+      loadActions({ ...result, items }, true);
+    }
+    Promise.resolve(loadCrm(current.token, current.version)).finally(() => {
+      if (cycle === current && productsContentState.currentProductsRequestId === requestId) render();
+    }).catch(() => {});
+  }
+  return { begin, complete };
+}

src/features/opportunities/workload-actions.js

@@ -11,10 +11,10 @@ function createOpportunityWorkloadActions({ authSessionState, allowsCrmActivitie
   function idsFor(products) {
     return [...new Set((products?.items || []).map(item => String(item?.RevnId ?? "").trim()).filter(Boolean))];
   }
-  function loadProducts(products) {
+  function loadProducts(products, refresh = false) {
     if (!session.enabled || !allowsCrmActivities()) return;
     for (const revnId of idsFor(products)) {
-      if (session.records.has(revnId)) continue;
+      if (!refresh && session.records.has(revnId)) continue;
       const record = { status: "loading", actions: [], hasNext: false };
       session.records.set(revnId, record);
       session.queue.push({ revnId, record });
@@ -36,7 +36,7 @@ function createOpportunityWorkloadActions({ authSessionState, allowsCrmActivitie
   async function run(current, { revnId, record }) {
     try {
       const authorizations = await requestConsumerTokenServiceOnce();
-      if (!current.enabled || current !== session || !allowsCrmActivities()) return;
+      if (!current.enabled || current !== session || current.records.get(revnId) !== record || !allowsCrmActivities()) return;
       const result = await sendRuntimeMessage({ type: messageTypes.requestWlActions, revnId, authorization: authorizations?.workloadActions });
       if (!current.enabled || current !== session || !allowsCrmActivities()) return;
       appendBackgroundRequestLog(result?.debugRequests);