From e180775952337bae7df0e2e90256dd7b4879b146 Mon Sep 17 00:00:00 2001 From: sua yoo Date: Wed, 5 Feb 2025 11:31:19 -0800 Subject: [PATCH 1/6] separate --- .../archived-item-detail.ts | 43 +++++++------------ 1 file changed, 15 insertions(+), 28 deletions(-) diff --git a/frontend/src/pages/org/archived-item-detail/archived-item-detail.ts b/frontend/src/pages/org/archived-item-detail/archived-item-detail.ts index 49a201af3f..6917817245 100644 --- a/frontend/src/pages/org/archived-item-detail/archived-item-detail.ts +++ b/frontend/src/pages/org/archived-item-detail/archived-item-detail.ts @@ -853,38 +853,17 @@ export class ArchivedItemDetail extends BtrixElement { `, )} - + + ${this.item + ? this.renderPageCount(this.item) + : html``} + ${this.item ? html`${this.item.fileSize - ? html`${this.localize.bytes(this.item.fileSize || 0, { + ? this.localize.bytes(this.item.fileSize || 0, { unitDisplay: "narrow", - })}${this.item.stats?.done - ? html`, - ${this.localize.number(+this.item.stats.done)} - / - ${this.localize.number(+this.item.stats.found)} - - ${pluralOf("pages", +this.item.stats.found)}` - : html`, - ${this.localize.number( - this.item.pageCount ? +this.item.pageCount : 0, - )} - - ${pluralOf( - "pages", - this.item.pageCount ? +this.item.pageCount : 0, - )}`}` + }) : html`${msg("Unknown")}`}` : html``} @@ -900,6 +879,14 @@ export class ArchivedItemDetail extends BtrixElement { `; } + private renderPageCount(item: ArchivedItem) { + const pageCount = item.pageCount ? +item.pageCount : 0; + + return html` + ${this.localize.number(pageCount)} ${pluralOf("pages", pageCount)} + `; + } + private renderCrawlChannelVersion() { if (!this.item) { return html``; From 4a7c2aedc4ec06eeb3208810f2741667419271b1 Mon Sep 17 00:00:00 2001 From: sua yoo Date: Wed, 5 Feb 2025 11:35:47 -0800 Subject: [PATCH 2/6] update format --- .../archived-item-detail/archived-item-detail.ts | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/frontend/src/pages/org/archived-item-detail/archived-item-detail.ts b/frontend/src/pages/org/archived-item-detail/archived-item-detail.ts index 6917817245..653caf308f 100644 --- a/frontend/src/pages/org/archived-item-detail/archived-item-detail.ts +++ b/frontend/src/pages/org/archived-item-detail/archived-item-detail.ts @@ -855,15 +855,14 @@ export class ArchivedItemDetail extends BtrixElement { )} ${this.item - ? this.renderPageCount(this.item) + ? html`${this.localize.number(this.item.pageCount || 0)} + ${pluralOf("pages", this.item.pageCount || 0)}` : html``} ${this.item ? html`${this.item.fileSize - ? this.localize.bytes(this.item.fileSize || 0, { - unitDisplay: "narrow", - }) + ? this.localize.bytes(this.item.fileSize || 0) : html`${msg("Unknown")}`}` : html``} @@ -879,14 +878,6 @@ export class ArchivedItemDetail extends BtrixElement { `; } - private renderPageCount(item: ArchivedItem) { - const pageCount = item.pageCount ? +item.pageCount : 0; - - return html` - ${this.localize.number(pageCount)} ${pluralOf("pages", pageCount)} - `; - } - private renderCrawlChannelVersion() { if (!this.item) { return html``; From 81022f5df1449da7b17ff8786a2c077b16557081 Mon Sep 17 00:00:00 2001 From: sua yoo Date: Wed, 5 Feb 2025 12:26:27 -0800 Subject: [PATCH 3/6] update label --- frontend/src/features/archived-items/archived-item-list.ts | 2 +- .../src/pages/org/archived-item-detail/archived-item-detail.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/features/archived-items/archived-item-list.ts b/frontend/src/features/archived-items/archived-item-list.ts index eab15f1bb2..403e13b796 100644 --- a/frontend/src/features/archived-items/archived-item-list.ts +++ b/frontend/src/features/archived-items/archived-item-list.ts @@ -415,7 +415,7 @@ export class ArchivedItemList extends TailwindElement { { cssCol: "1fr", cell: html` - ${msg("Pages Crawled")} + ${msg("Pages")} `, }, { diff --git a/frontend/src/pages/org/archived-item-detail/archived-item-detail.ts b/frontend/src/pages/org/archived-item-detail/archived-item-detail.ts index 653caf308f..7a3ce04454 100644 --- a/frontend/src/pages/org/archived-item-detail/archived-item-detail.ts +++ b/frontend/src/pages/org/archived-item-detail/archived-item-detail.ts @@ -853,7 +853,7 @@ export class ArchivedItemDetail extends BtrixElement { `, )} - + ${this.item ? html`${this.localize.number(this.item.pageCount || 0)} ${pluralOf("pages", this.item.pageCount || 0)}` From 1d000288a39aa6302ab092702913a292a9d2b469 Mon Sep 17 00:00:00 2001 From: sua yoo Date: Wed, 5 Feb 2025 12:31:07 -0800 Subject: [PATCH 4/6] fix crawl id label --- .../src/pages/org/archived-item-detail/archived-item-detail.ts | 2 +- frontend/src/pages/org/archived-items.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/pages/org/archived-item-detail/archived-item-detail.ts b/frontend/src/pages/org/archived-item-detail/archived-item-detail.ts index 7a3ce04454..c87cad917e 100644 --- a/frontend/src/pages/org/archived-item-detail/archived-item-detail.ts +++ b/frontend/src/pages/org/archived-item-detail/archived-item-detail.ts @@ -867,7 +867,7 @@ export class ArchivedItemDetail extends BtrixElement { : html``} ${this.renderCrawlChannelVersion()} - + ${this.item ? html` ClipboardController.copyToClipboard(item.id)} > - ${msg("Copy Crawl ID")} + ${msg("Copy Archived Item ID")} ` : nothing} From 068447f3094098bc127f18894e785b8e98b7292b Mon Sep 17 00:00:00 2001 From: Henry Wilkinson Date: Wed, 5 Feb 2025 16:08:21 -0500 Subject: [PATCH 5/6] =?UTF-8?q?Crawl=20ID=20=E2=86=92=20Archived=20item=20?= =?UTF-8?q?ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/index.ts | 2 +- frontend/src/pages/admin.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/index.ts b/frontend/src/index.ts index de489f9cab..1de6ac2bf7 100644 --- a/frontend/src/index.ts +++ b/frontend/src/index.ts @@ -938,7 +938,7 @@ export class App extends BtrixElement { diff --git a/frontend/src/pages/admin.ts b/frontend/src/pages/admin.ts index 9d289e0ee0..a28bdeea13 100644 --- a/frontend/src/pages/admin.ts +++ b/frontend/src/pages/admin.ts @@ -149,7 +149,7 @@ export class Admin extends BtrixElement {
From 3b79a44af6246659a841f39b771be8e2a5005705 Mon Sep 17 00:00:00 2001 From: sua yoo Date: Mon, 10 Feb 2025 16:14:19 -0800 Subject: [PATCH 6/6] =?UTF-8?q?Revert=20"Crawl=20ID=20=E2=86=92=20Archived?= =?UTF-8?q?=20item=20ID"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 068447f3094098bc127f18894e785b8e98b7292b. --- frontend/src/index.ts | 2 +- frontend/src/pages/admin.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/index.ts b/frontend/src/index.ts index 1de6ac2bf7..de489f9cab 100644 --- a/frontend/src/index.ts +++ b/frontend/src/index.ts @@ -938,7 +938,7 @@ export class App extends BtrixElement { diff --git a/frontend/src/pages/admin.ts b/frontend/src/pages/admin.ts index a28bdeea13..9d289e0ee0 100644 --- a/frontend/src/pages/admin.ts +++ b/frontend/src/pages/admin.ts @@ -149,7 +149,7 @@ export class Admin extends BtrixElement {