Skip to content

Commit 0468099

Browse files
committed
update latest crawl
1 parent 55b7727 commit 0468099

File tree

2 files changed

+32
-21
lines changed

2 files changed

+32
-21
lines changed

frontend/src/features/crawl-workflows/workflow-action-menu/workflow-action-menu.ts

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,12 +210,22 @@ export class WorkflowActionMenu extends BtrixElement {
210210
const authToken = this.authState?.headers.Authorization.split(" ")[1];
211211
const logTotals = this.logTotals;
212212

213+
let path = `/api/orgs/${this.orgId}/all-crawls/${latestCrawl.id}/download?auth_bearer=${authToken}`;
214+
let name = `${latestCrawl.id}.wacz`;
215+
216+
if (latestCrawl.resources?.length === 1) {
217+
const file = latestCrawl.resources[0];
218+
219+
path = file.path;
220+
name = file.name;
221+
}
222+
213223
return html`
214224
<sl-menu slot="submenu">
215225
<btrix-menu-item-link
216-
href=${`/api/orgs/${this.orgId}/all-crawls/${latestCrawl.id}/download?auth_bearer=${authToken}`}
226+
href=${path}
217227
?disabled=${!latestCrawl.fileSize}
218-
download
228+
download=${name}
219229
>
220230
<sl-icon name="cloud-download" slot="prefix"></sl-icon>
221231
${msg("Download Item")}

frontend/src/pages/org/workflow-detail.ts

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -718,8 +718,16 @@ export class WorkflowDetail extends BtrixElement {
718718
const authToken = this.authState?.headers.Authorization.split(" ")[1];
719719
const disableDownload = this.isRunning;
720720
const disableReplay = !latestCrawl.fileSize;
721-
const replayHref = `/api/orgs/${this.orgId}/all-crawls/${latestCrawlId}/download?auth_bearer=${authToken}`;
722-
const replayFilename = `browsertrix-${latestCrawlId}.wacz`;
721+
722+
let path = `/api/orgs/${this.orgId}/all-crawls/${latestCrawlId}/download?auth_bearer=${authToken}`;
723+
let name = `${latestCrawlId}.wacz`;
724+
725+
if (latestCrawl.resources?.length === 1) {
726+
const file = latestCrawl.resources[0];
727+
728+
path = file.path;
729+
name = file.name;
730+
}
723731

724732
return html`
725733
<btrix-copy-button
@@ -736,22 +744,15 @@ export class WorkflowDetail extends BtrixElement {
736744
?disabled=${!disableDownload}
737745
>
738746
<sl-button-group>
739-
<sl-tooltip
740-
content="${msg("Download Item as WACZ")} (${this.localize.bytes(
741-
latestCrawl.fileSize || 0,
742-
)})"
743-
?disabled=${disableReplay}
747+
<sl-button
748+
size="small"
749+
href=${path}
750+
download=${name}
751+
?disabled=${disableDownload || disableReplay}
744752
>
745-
<sl-button
746-
size="small"
747-
href=${replayHref}
748-
download=${replayFilename}
749-
?disabled=${disableDownload || disableReplay}
750-
>
751-
<sl-icon name="cloud-download" slot="prefix"></sl-icon>
752-
${msg("Download")}
753-
</sl-button>
754-
</sl-tooltip>
753+
<sl-icon name="cloud-download" slot="prefix"></sl-icon>
754+
${msg("Download")}
755+
</sl-button>
755756
<sl-dropdown distance="4" placement="bottom-end" hoist>
756757
<sl-button
757758
slot="trigger"
@@ -765,9 +766,9 @@ export class WorkflowDetail extends BtrixElement {
765766
</sl-button>
766767
<sl-menu>
767768
<btrix-menu-item-link
768-
href=${replayHref}
769+
href=${path}
769770
?disabled=${disableDownload || disableReplay}
770-
download=${replayFilename}
771+
download=${name}
771772
>
772773
<sl-icon name="cloud-download" slot="prefix"></sl-icon>
773774
${msg("Item")}

0 commit comments

Comments
 (0)