@@ -984,25 +1477,125 @@ export class WorkflowDetail extends BtrixElement {
name=${WorkflowTab.LatestCrawl}
class="mt-3 block"
>
- ${when(this.workflow?.isCrawlRunning, this.renderWatchCrawl, () =>
- this.renderInactiveWatchCrawl(),
+
+ ${when(this.workflowTab === WorkflowTab.LatestCrawl, () =>
+ when(
+ showReplay,
+ this.renderInactiveWatchCrawl,
+ this.renderWatchCrawl,
+ ),
)}
`;
};
+ private readonly renderPausedNotice = (
+ { truncate } = { truncate: false },
+ ) => {
+ if (
+ !this.workflow ||
+ !this.isPaused ||
+ this.isResuming ||
+ !this.workflow.lastCrawlPausedExpiry
+ )
+ return;
+
+ const diff =
+ new Date(this.workflow.lastCrawlPausedExpiry).valueOf() -
+ new Date().valueOf();
+
+ if (diff < 0) return;
+
+ const formattedDate = this.localize.date(
+ this.workflow.lastCrawlPausedExpiry,
+ );
+
+ const infoIcon = html`
+ `;
+ };
+
private renderLatestCrawlAction() {
- if (this.isCrawler && this.workflow?.isCrawlRunning) {
+ if (!this.workflow || !this.lastCrawlId) return;
+
+ if (this.isRunning) {
+ if (!this.isCrawler) return;
+
const enableEditBrowserWindows = !this.workflow.lastCrawlStopping;
const windowCount =
this.workflow.scale * (this.appState.settings?.numBrowsers || 1);
return html`
-
+
${msg("Running in")} ${this.localize.number(windowCount)}
${pluralOf("browserWindows", windowCount)}
@@ -1024,93 +1617,118 @@ export class WorkflowDetail extends BtrixElement {
`;
}
-
- const authToken = this.authState?.headers.Authorization.split(" ")[1];
-
- if (
- this.workflowTab === WorkflowTab.LatestCrawl &&
- this.lastCrawlId &&
- this.workflow?.lastCrawlSize
- ) {
- return html`
-
-
- `;
- }
-
- if (
- this.workflowTab === WorkflowTab.Logs &&
- (this.logTotals?.errors || this.logTotals?.behaviors)
- ) {
- return html`
-
-
- `;
- }
}
private readonly renderCrawlDetails = () => {
+ const latestCrawl = this.latestCrawlTask.value;
const skeleton = html`
`;
+ const duration = (workflow: Workflow) => {
+ if (!workflow.lastCrawlStartTime) return skeleton;
+
+ return this.localize.humanizeDuration(
+ (workflow.lastCrawlTime && !workflow.isCrawlRunning
+ ? new Date(workflow.lastCrawlTime)
+ : new Date()
+ ).valueOf() - new Date(workflow.lastCrawlStartTime).valueOf(),
+ );
+ };
+
+ const execTime = () => {
+ if (!latestCrawl) return skeleton;
+
+ if (this.isRunning) {
+ return html`
+ ${noData}
+
+
+
+ `;
+ }
+
+ if (latestCrawl.crawlExecSeconds < 60) {
+ return this.localize.humanizeDuration(
+ latestCrawl.crawlExecSeconds * 1000,
+ );
+ }
+
+ return humanizeExecutionSeconds(latestCrawl.crawlExecSeconds, {
+ style: "short",
+ });
+ };
+
const pages = (workflow: Workflow) => {
- if (!this.lastCrawl) return skeleton;
+ if (!latestCrawl) return skeleton;
if (workflow.isCrawlRunning) {
return [
- this.localize.number(+(this.lastCrawl.stats?.done || 0)),
- this.localize.number(+(this.lastCrawl.stats?.found || 0)),
- ].join(" / ");
+ this.localize.number(+(latestCrawl.stats?.done || 0)),
+ this.localize.number(+(latestCrawl.stats?.found || 0)),
+ ].join(` ${msg("of")} `);
}
- return this.localize.number(this.lastCrawl.pageCount || 0);
+ return this.localize.number(latestCrawl.pageCount || 0);
};
const qa = (workflow: Workflow) => {
- if (!this.lastCrawl)
- return html`
`;
+ if (!latestCrawl) return html`
`;
if (workflow.isCrawlRunning) {
return html`
${noData}
-
-
+
`;
}
- return html`
`;
+ return html`
+ ${latestCrawl.reviewStatus || !this.isCrawler
+ ? html``
+ : html`
+
+ ${msg("Add Review")}
+ `}
+
`;
};
return html`
${this.renderDetailItem(msg("Run Duration"), (workflow) =>
- this.lastCrawlStartTime
- ? this.localize.humanizeDuration(
- (workflow.lastCrawlTime && !workflow.isCrawlRunning
- ? new Date(workflow.lastCrawlTime)
- : new Date()
- ).valueOf() - new Date(this.lastCrawlStartTime).valueOf(),
- )
- : skeleton,
+ isLoading(this.runNowTask)
+ ? html`${until(
+ this.runNowTask.taskComplete.then((workflow) =>
+ workflow ? duration(workflow) : noData,
+ ),
+ html``,
+ )}`
+ : duration(workflow),
+ )}
+ ${this.renderDetailItem(msg("Execution Time"), () =>
+ isLoading(this.runNowTask)
+ ? html`${until(
+ this.runNowTask.taskComplete.then((workflow) =>
+ workflow ? execTime() : noData,
+ ),
+ html``,
+ )}`
+ : execTime(),
)}
${this.renderDetailItem(msg("Pages Crawled"), pages)}
${this.renderDetailItem(msg("Size"), (workflow) =>
@@ -1129,7 +1747,7 @@ export class WorkflowDetail extends BtrixElement {
// Show custom message if crawl is active but not explicitly running
let waitingMsg: string | null = null;
- if (!this.isExplicitRunning) {
+ if (!this.isCrawling) {
switch (this.workflow.lastCrawlState) {
case "starting":
waitingMsg = msg("Crawl starting...");
@@ -1165,7 +1783,7 @@ export class WorkflowDetail extends BtrixElement {
return html`
${when(
- this.isExplicitRunning && this.workflow,
+ this.isCrawling && this.workflow,
(workflow) => html`
{
if (!this.workflow) return;
if (!this.lastCrawlId || !this.workflow.lastCrawlSize) {
@@ -1198,10 +1816,10 @@ export class WorkflowDetail extends BtrixElement {
return html`
- ${this.renderReplay()}
+ ${guard([this.lastCrawlId], this.renderReplay)}
`;
- }
+ };
private renderInactiveCrawlMessage() {
if (!this.workflow) return;
@@ -1228,11 +1846,11 @@ export class WorkflowDetail extends BtrixElement {
)}
${when(
this.lastCrawlId,
- () =>
+ (id) =>
html`
${msg("View Crawl Details")}
@@ -1244,7 +1862,7 @@ export class WorkflowDetail extends BtrixElement {
`;
}
- private renderReplay() {
+ private readonly renderReplay = () => {
if (!this.workflow || !this.lastCrawlId) return;
const replaySource = `/api/orgs/${this.workflow.oid}/crawls/${this.lastCrawlId}/replay.json`;
@@ -1262,27 +1880,27 @@ export class WorkflowDetail extends BtrixElement {
noCache="true"
>
`;
- }
+ };
- private renderLogs() {
+ private readonly renderLogs = () => {
return html`
-
+
${when(
this.lastCrawlId,
(crawlId) => html`
`,
() => this.renderNoCrawlLogs(),
)}
`;
- }
+ };
private readonly renderRunNowButton = () => {
return html`
@@ -1295,10 +1913,12 @@ export class WorkflowDetail extends BtrixElement {
size="small"
variant="primary"
?disabled=${this.org?.storageQuotaReached ||
- this.org?.execMinutesQuotaReached}
- @click=${() => void this.runNow()}
+ this.org?.execMinutesQuotaReached ||
+ isLoading(this.runNowTask)}
+ ?loading=${isLoading(this.runNowTask)}
+ @click=${() => void this.runNowTask.run()}
>
-
+
${msg("Run Crawl")}
@@ -1404,10 +2024,10 @@ export class WorkflowDetail extends BtrixElement {
value=${value}
size="small"
@click=${async () => {
- await this.scale(value);
+ await this.scaleTask.run([value]);
this.openDialogName = undefined;
}}
- ?disabled=${this.isSubmittingUpdate}
+ ?disabled=${isLoading(this.scaleTask)}
>${label}
`,
@@ -1418,7 +2038,10 @@ export class WorkflowDetail extends BtrixElement {
(this.openDialogName = undefined)}
+ @click=${() => {
+ this.scaleTask.abort();
+ this.openDialogName = undefined;
+ }}
>${msg("Cancel")}