diff --git a/libs/blocks/bulk-publish-v2/components/job-process.css b/libs/blocks/bulk-publish-v2/components/job-process.css
index ab7e4e3a26..1f5b703e83 100644
--- a/libs/blocks/bulk-publish-v2/components/job-process.css
+++ b/libs/blocks/bulk-publish-v2/components/job-process.css
@@ -42,6 +42,10 @@
color: black;
}
+.status[has-update] {
+ display: none;
+}
+
.result.success.link .url {
color: var(--link-color);
}
diff --git a/libs/blocks/bulk-publish-v2/components/job-process.js b/libs/blocks/bulk-publish-v2/components/job-process.js
index e686650fc7..fde3f72551 100644
--- a/libs/blocks/bulk-publish-v2/components/job-process.js
+++ b/libs/blocks/bulk-publish-v2/components/job-process.js
@@ -1,6 +1,6 @@
import { LitElement, html } from '../../../deps/lit-all.min.js';
import { getSheet } from '../../../../tools/utils/utils.js';
-import { displayDate, getStatusText, delay } from '../utils.js';
+import { displayDate, getStatusText, delay, updateItemProgress } from '../utils.js';
import { pollJobStatus, updateRetry } from '../services.js';
import { getConfig } from '../../../utils/utils.js';
@@ -30,7 +30,12 @@ class JobProcess extends LitElement {
this.renderRoot.adoptedStyleSheets = [styleSheet];
if (this.job?.useBulk) {
await pollJobStatus(this.job, (detail) => {
- this.jobStatus = detail;
+ if (detail.state === 'stopped') {
+ this.jobStatus = detail;
+ /* c8 ignore next 3 */
+ } else {
+ updateItemProgress(detail, this);
+ }
this.dispatchEvent(new CustomEvent('progress', { detail }));
});
} else {
@@ -39,10 +44,11 @@ class JobProcess extends LitElement {
}
async updated() {
- if (this.jobStatus?.state === 'stopped') {
+ const stopped = this.jobStatus?.state === 'stopped';
+ if (stopped) {
this.dispatchEvent(new CustomEvent('stopped', { detail: this.jobStatus }));
}
- if (this.jobStatus?.progress?.failed !== 0) {
+ if (stopped && this.jobStatus?.progress?.failed !== 0) {
const timeouts = this.jobStatus?.data?.resources?.filter((job) => job.status === 503) ?? [];
this.retry(timeouts);
}
@@ -118,30 +124,33 @@ class JobProcess extends LitElement {
};
}
+ renderJobItem(path, pathIndex) {
+ const jobPath = typeof path === 'object' ? path.path : path;
+ const { style, status, topic, url, time } = this.getJob(jobPath);
+ return html`
+
this.onClick({ url, code: status.code, topic }, pathIndex)}>
+
+ ${topic} ${url}
+
+
+ ${status.text}
+ { this.expandDate = url; }}
+ @mouseleave=${() => { this.expandDate = false; }}>
+ ${this.expandDate === url ? time.label : ''} ${displayDate(time.stamp)}
+
+
+
+ `;
+ }
+
render() {
const { job } = this.job.result;
- return job.data.paths.map((path, pathIndex) => {
- const jobPath = typeof path === 'object' ? path.path : path;
- const { style, status, topic, url, time } = this.getJob(jobPath);
- return html`
-
this.onClick({ url, code: status.code, topic }, pathIndex)}>
-
- ${topic} ${url}
-
-
- ${status.text}
- { this.expandDate = url; }}
- @mouseleave=${() => { this.expandDate = false; }}>
- ${this.expandDate === url ? time.label : ''} ${displayDate(time.stamp)}
-
-
-
- `;
- });
+ return job.data.paths.map((path, pathIndex) => this.renderJobItem(path, pathIndex));
}
}
diff --git a/libs/blocks/bulk-publish-v2/services.js b/libs/blocks/bulk-publish-v2/services.js
index e239bbb687..24210b4b27 100644
--- a/libs/blocks/bulk-publish-v2/services.js
+++ b/libs/blocks/bulk-publish-v2/services.js
@@ -159,12 +159,22 @@ const startJob = async (details) => {
};
}
});
- const results = await Promise.all(requests);
+ // batch to limit concurrency
+ const results = [];
+ while (requests.length) {
+ if (requests.length > 5) await delay(5000);
+ const result = await Promise.all(requests.splice(0, 4));
+ results.push(...result);
+ }
return results;
};
+// fetch one job status at a time
+const statusQueue = [];
const getJobStatus = async (link) => {
- await delay();
+ await delay(5000);
+ if (!statusQueue.includes(link)) statusQueue.push(link);
+ if (statusQueue.indexOf(link) !== 0) return null;
try {
const status = await fetch(link, { headers });
const result = await status.json();
@@ -181,11 +191,12 @@ const pollJobStatus = async (job, setProgress) => {
let stopped = false;
while (!stopped) {
const status = await getJobStatus(`${result.links.self}/details`);
- if (status.stopTime) {
+ if (status?.stopTime) {
jobStatus = status;
stopped = true;
+ statusQueue.shift();
}
- setProgress(status);
+ if (status) setProgress(status);
}
return jobStatus;
};
diff --git a/libs/blocks/bulk-publish-v2/utils.js b/libs/blocks/bulk-publish-v2/utils.js
index b839644609..225153c483 100644
--- a/libs/blocks/bulk-publish-v2/utils.js
+++ b/libs/blocks/bulk-publish-v2/utils.js
@@ -1,3 +1,5 @@
+import { createTag } from '../../utils/utils.js';
+
const PREFS = 'bulk-pub-prefs';
const FORM_MODES = ['full', 'half'];
const DEFAULT_PREFS = { mode: FORM_MODES[0], resume: [] };
@@ -97,6 +99,24 @@ const getStatusText = (status, state, count) => {
return { code, text, color };
};
+/* c8 ignore next 16 */
+const updateItemProgress = (detail, tool) => {
+ const resources = detail.data?.resources?.filter((res) => res.status !== 0);
+ if (resources) {
+ resources.forEach(({ path, status }) => {
+ const item = tool.renderRoot.querySelector(`[job-item='${path}']`);
+ if (item && !item?.hasAttribute('updated')) {
+ const { text, color } = getStatusText(status, null);
+ const newStatus = createTag('span', { class: `status ${color}` }, text);
+ const display = item.querySelector('.status');
+ display.insertAdjacentElement('afterend', newStatus);
+ display.setAttribute('has-update', '');
+ item.setAttribute('updated', '');
+ }
+ });
+ }
+};
+
const displayDate = (newDate) => {
const date = new Date(newDate);
const today = new Date();
@@ -109,6 +129,11 @@ const processJobResult = (jobs) => jobs.reduce((result, job) => {
return result;
}, { complete: [], error: [] });
+const getProcessedCount = (jobs) => jobs.reduce((count, { progress }) => {
+ const processed = progress?.processed ?? 0;
+ return count + processed;
+}, 0);
+
export {
frisk,
displayDate,
@@ -117,10 +142,12 @@ export {
getErrorText,
getJobErrorText,
getAemUrl,
+ getProcessedCount,
isDelete,
PROCESS_TYPES,
processJobResult,
getStatusText,
+ updateItemProgress,
sticky,
isValidUrl,
delay,
diff --git a/libs/features/personalization/personalization.js b/libs/features/personalization/personalization.js
index 2c651274ce..57ed96bb92 100644
--- a/libs/features/personalization/personalization.js
+++ b/libs/features/personalization/personalization.js
@@ -64,7 +64,7 @@ export const normalizePath = (p) => {
if (path.startsWith(config.codeRoot)
|| path.includes('.hlx.')
- || path.startsWith(`https://${config.productionDomain}`)) {
+ || path.includes('.adobe.')) {
try {
const url = new URL(path);
const firstFolder = url.pathname.split('/')[1];
@@ -86,14 +86,13 @@ export const preloadManifests = ({ targetManifests = [], persManifests = [] }) =
manifests = manifests.concat(
persManifests.map((manifest) => ({
...manifest,
- manifestPath: appendJsonExt(manifest.manifestPath),
+ manifestPath: normalizePath(appendJsonExt(manifest.manifestPath)),
manifestUrl: manifest.manifestPath,
})),
);
for (const manifest of manifests) {
if (!manifest.manifestData && manifest.manifestPath && !manifest.disabled) {
- manifest.manifestPath = normalizePath(manifest.manifestPath);
loadLink(
manifest.manifestPath,
{ as: 'fetch', crossorigin: 'anonymous', rel: 'preload' },