From 72df553289d17a85bb078450c5725af192875d62 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Sun, 21 Apr 2024 08:16:26 -0700 Subject: [PATCH] Exclude added for small cards default list, make show just like other fields --- .../document-card-small.component.html | 22 ++++++++++++++++--- .../document-list-view.service.spec.ts | 4 +++- .../services/document-list-view.service.ts | 7 ++++-- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html index 363d79184..0974639de 100644 --- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html +++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html @@ -58,7 +58,7 @@ {{(document.storage_path$ | async)?.name ?? privateName}} } - @if (displayFields.includes(DisplayField.CREATED) || displayFields.includes(DisplayField.ADDED)) { + @if (displayFields.includes(DisplayField.CREATED)) {
@@ -70,8 +70,24 @@
- @if (displayFields.includes(DisplayField.CREATED)) { {{document.created | customDate:'mediumDate'}} } - @else { {{document.added | customDate:'mediumDate'}} } + {{document.created | customDate:'mediumDate'}} + +
+
+ } + @if (displayFields.includes(DisplayField.ADDED)) { +
+ +
+ Created: {{ document.created | customDate }} + Added: {{ document.added | customDate }} + Modified: {{ document.modified | customDate }} +
+
+
+ + + {{document.added | customDate:'mediumDate'}}
diff --git a/src-ui/src/app/services/document-list-view.service.spec.ts b/src-ui/src/app/services/document-list-view.service.spec.ts index e8779024e..2319d91aa 100644 --- a/src-ui/src/app/services/document-list-view.service.spec.ts +++ b/src-ui/src/app/services/document-list-view.service.spec.ts @@ -586,7 +586,9 @@ describe('DocumentListViewService', () => { `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true` ) expect(documentListViewService.displayFields).toEqual( - DEFAULT_DISPLAY_FIELDS.map((f) => f.id) + DEFAULT_DISPLAY_FIELDS.filter((f) => f.id !== DisplayField.ADDED).map( + (f) => f.id + ) ) }) }) diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts index 2ed0d610a..1073e9b70 100644 --- a/src-ui/src/app/services/document-list-view.service.ts +++ b/src-ui/src/app/services/document-list-view.service.ts @@ -414,10 +414,13 @@ export class DocumentListViewService { } get displayFields(): DisplayField[] { - return ( + let fields = this.activeListViewState.displayFields ?? DEFAULT_DISPLAY_FIELDS.map((f) => f.id) - ) + if (!this.activeListViewState.displayFields) { + fields = fields.filter((f) => f !== DisplayField.ADDED) + } + return fields } set displayFields(fields: DisplayField[]) {