Optimized requests to retrieve SRs and Actions

src/content/application.js

@@ -54,6 +54,7 @@ function createContentApplication(overrides = {}) {
     environment
   });
   const contentModal = createContentModal({
+    closeCrmSrPopover: () => crmSrPopover.close(),
     ensureCurrentUser: () => currentUser.ensure(),
     ACCOUNT_PLANS_MODAL_ID: contracts.ACCOUNT_PLANS_MODAL_ID,
     AUTH_STATUS: contracts.AUTH_STATUS,
@@ -110,10 +111,6 @@ function createContentApplication(overrides = {}) {
     requestTokenRelayOnce: (...args) => authContentSession.requestTokenRelayOnce(...args),
     resetCustomerAndOwnerFiltersForPeriod: (...args) => opportunitiesFilters.resetCustomerAndOwnerFiltersForPeriod(...args),
     resetOpportunitiesTable: (...args) => opportunitiesController.resetOpportunitiesTable(...args),
-    resetWorkloadActions: (...args) => opportunityWorkloadActions.reset(...args),
-    reopenWorkloadActions: () => opportunityWorkloadActions.reopen(),
-    loadCrmServiceRequests: (...args) => opportunityCrmServiceRequests.load(...args),
-    resetCrmServiceRequests: () => opportunityCrmServiceRequests.reset(),
     restoreFilterPreferences: (...args) => preferencesStorage.restoreFilterPreferences(...args),
     saveFilterPreferences: (...args) => preferencesStorage.saveFilterPreferences(...args),
     toggleCustomerFilterPanel: (...args) => opportunitiesFilters.toggleCustomerFilterPanel(...args),
@@ -189,7 +186,6 @@ function createContentApplication(overrides = {}) {
     productsContentState,
     renderProductsProgress: (...args) => productsContentJobs.renderProductsProgress(...args),
     requestOpportunitiesPage: (...args) => fusionOpportunities.requestOpportunitiesPage(...args),
-    loadCrmServiceRequests: (...args) => opportunityCrmServiceRequests.load(...args),
     resetCrmServiceRequests: () => opportunityCrmServiceRequests.reset(),
     requestOpptyProductsInBackground: (...args) => productsContentJobs.requestOpptyProductsInBackground(...args),
     requestTokenRelayOnce: (...args) => authContentSession.requestTokenRelayOnce(...args),
@@ -329,8 +325,16 @@ function createContentApplication(overrides = {}) {
     requestOpportunitiesForPeriod: (...args) => opportunitiesController.requestOpportunitiesForPeriod(...args),
     environment
   });
+  const productActivities = createProductActivities({
+    productsContentState, opportunitiesQueryState,
+    resetCrm: () => opportunityCrmServiceRequests.reset(),
+    loadCrm: (...args) => opportunityCrmServiceRequests.load(...args),
+    loadActions: (...args) => opportunityWorkloadActions.loadProducts(...args),
+    render: () => productsContentJobs.queueProductsTableRender()
+  });
   const productsContentJobs = createProductsContentJobs({
-    loadWorkloadActions: (...args) => opportunityWorkloadActions.loadProducts(...args),
+    beginProductActivities: (...args) => productActivities.begin(...args),
+    completeProductActivities: (...args) => productActivities.complete(...args),
     appendBackgroundRequestLog: (...args) => debugContentLog.appendBackgroundRequestLog(...args),
     messageTypes,
     PRODUCTS_CACHE_TIMESTAMP_ID: contracts.PRODUCTS_CACHE_TIMESTAMP_ID,
@@ -552,6 +556,7 @@ function createContentApplication(overrides = {}) {
     preferencesStorage,
     preferencesView,
     productsContentJobs,
+    productActivities,
     productsDetails,
     aiSummaryContent,
     consumptionPlansAction,

src/content/modal.js

@@ -51,10 +51,7 @@ function createContentModal({
   renderStageFilterButtons,
   renderStatusFilterButtons,
   requestOpportunitiesForPeriod,
-  loadCrmServiceRequests,
-  resetCrmServiceRequests,
-  resetWorkloadActions,
-  reopenWorkloadActions,
+  closeCrmSrPopover,
   requestTokenRelayOnce,
   ensureCurrentUser,
   resetCustomerAndOwnerFiltersForPeriod,
@@ -88,10 +85,7 @@ function createContentModal({
       ensureEscapeKeyHandler();
       ensureCurrentUser().then(() => {
         if (existingModal.hidden) return;
-        reopenWorkloadActions();
-        return requestTokenRelayOnce().then(token => {
-          if (!existingModal.hidden) return loadCrmServiceRequests(token, opportunitiesQueryState.periodRequestVersion);
-        });
+        return requestTokenRelayOnce();
       })
         .then(() => renderOpportunitiesTable()).catch(() => {});
       return;
@@ -469,8 +463,7 @@ function createContentModal({
 
   function closeOpportunitiesModal() {
     resetAuthCompletion();
-    resetWorkloadActions(false);
-    resetCrmServiceRequests();
+    closeCrmSrPopover();
     const modal = document.getElementById(MODAL_ID);
 
     if (modal) {

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);

src/features/products/content-jobs.js

@@ -7,7 +7,8 @@ function createProductsContentJobs({
   preferencesState,
   productsContentState,
   renderOpportunitiesTable,
-  loadWorkloadActions,
+  beginProductActivities,
+  completeProductActivities,
   sendRuntimeMessage,
   environment
 }) {
@@ -52,6 +53,7 @@ function createProductsContentJobs({
 
     const requestId = `${Date.now()}-${Math.random().toString(36).slice(2)}`;
     productsContentState.currentProductsRequestId = requestId;
+    beginProductActivities(requestId, token);
     productsContentState.opptyProductsByNumber = new Map();
     productsContentState.expandedProductOptyNumbers = new Set();
     productsContentState.productsProgress = {
@@ -119,7 +121,6 @@ function createProductsContentJobs({
           cachedAt: Number(message.cachedAt) || 0,
           error: message.error || ""
         });
-        loadWorkloadActions(productsContentState.opptyProductsByNumber.get(String(message.optyNumber)));
       }
 
       if (Number(message.cachedAt) > productsContentState.productsLastCachedAt) {
@@ -134,6 +135,7 @@ function createProductsContentJobs({
         cacheHits: Number(message.cacheHits) || 0
       };
       renderProductsProgress();
+      if (message.state === "complete" || message.state === "complete-with-errors") completeProductActivities(message.requestId);
       queueProductsTableRender();
       return false;
     });