Some visual adjustments to the badges
This commit is contained in:
@@ -1,20 +1,22 @@
|
||||
function createProductActivities({ productsContentState, opportunitiesQueryState,
|
||||
loadCrm, loadActions, blockActions, render }) {
|
||||
let cycle = null;
|
||||
function begin(requestId, token) {
|
||||
cycle = { requestId, token, version: opportunitiesQueryState.periodRequestVersion, completed: false };
|
||||
function begin(requestId, token, opportunityNumbers = null) {
|
||||
cycle = { requestId, token, numbers: opportunityNumbers && new Set(opportunityNumbers.map(String)), 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);
|
||||
const entries = [...productsContentState.opptyProductsByNumber].filter(([number]) => !current.numbers || current.numbers.has(String(number)));
|
||||
const products = entries.map(([, result]) => result).filter(result => !result.error);
|
||||
if (!products.length) return;
|
||||
const cachedAt = Math.max(...products.map(result => Number(result.cachedAt) || 0));
|
||||
const isActive = () => cycle === current && productsContentState.currentProductsRequestId === requestId
|
||||
&& opportunitiesQueryState.periodRequestVersion === current.version;
|
||||
return Promise.resolve(loadCrm(current.token, current.version, { cachedAt, cacheOnly: products.every(result => result.fromCache) })).then(async success => {
|
||||
// Product cache hits do not guarantee that the corresponding activity cache exists.
|
||||
return Promise.resolve(loadCrm(current.token, current.version, { cachedAt, cacheOnly: false })).then(async success => {
|
||||
if (!isActive()) return;
|
||||
if (success === false) {
|
||||
products.forEach(blockActions);
|
||||
@@ -30,7 +32,7 @@ function createProductActivities({ productsContentState, opportunitiesQueryState
|
||||
seen.add(id);
|
||||
return true;
|
||||
});
|
||||
pending.push(loadActions({ ...result, items }, true, { cachedAt: result.cachedAt, cacheOnly: result.fromCache === true }));
|
||||
pending.push(loadActions({ ...result, items }, true, { cachedAt: result.cachedAt, cacheOnly: false }));
|
||||
}
|
||||
await Promise.allSettled(pending);
|
||||
if (!isActive()) return;
|
||||
|
||||
Reference in New Issue
Block a user