lgcosta/paperless-ngx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Exclude added for small cards default list, make show just like other fields

Browse Source
This commit is contained in:
shamoon 2024-04-21 08:16:26 -07:00
parent 218488eba6
commit 72df553289
3 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html
View File

@ -58,7 +58,7 @@
<small>{{(document.storage_path$ | async)?.name ?? privateName}}</small> <small>{{(document.storage_path$ | async)?.name ?? privateName}}</small>
</button> </button>
} }
@if (displayFields.includes(DisplayField.CREATED) || displayFields.includes(DisplayField.ADDED)) { @if (displayFields.includes(DisplayField.CREATED)) {
<div class="list-group-item bg-transparent p-0 border-0 d-flex flex-wrap-reverse justify-content-between"> <div class="list-group-item bg-transparent p-0 border-0 d-flex flex-wrap-reverse justify-content-between">
<ng-template #dateTooltip> <ng-template #dateTooltip>
<div class="d-flex flex-column text-light"> <div class="d-flex flex-column text-light">
@ -70,8 +70,24 @@
<div class="ps-0 p-1" placement="top" [ngbTooltip]="dateTooltip"> <div class="ps-0 p-1" placement="top" [ngbTooltip]="dateTooltip">
<i-bs width="1em" height="1em" class="me-2 text-muted" name="calendar-event"></i-bs> <i-bs width="1em" height="1em" class="me-2 text-muted" name="calendar-event"></i-bs>
<small> <small>
@if (displayFields.includes(DisplayField.CREATED)) { {{document.created | customDate:'mediumDate'}} } {{document.created | customDate:'mediumDate'}}
@else { {{document.added | customDate:'mediumDate'}} } </small>
</div>
</div>
}
@if (displayFields.includes(DisplayField.ADDED)) {
<div class="list-group-item bg-transparent p-0 border-0 d-flex flex-wrap-reverse justify-content-between">
<ng-template #dateTooltip>
<div class="d-flex flex-column text-light">
<span i18n>Created: {{ document.created | customDate }}</span>
<span i18n>Added: {{ document.added | customDate }}</span>
<span i18n>Modified: {{ document.modified | customDate }}</span>
</div>
</ng-template>
<div class="ps-0 p-1" placement="top" [ngbTooltip]="dateTooltip">
<i-bs width="1em" height="1em" class="me-2 text-muted" name="calendar-event"></i-bs>
<small>
{{document.added | customDate:'mediumDate'}}
</small> </small>
</div> </div>
</div> </div>

4
src-ui/src/app/services/document-list-view.service.spec.ts
View File

@ -586,7 +586,9 @@ describe('DocumentListViewService', () => {
`${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true` `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true`
) )
expect(documentListViewService.displayFields).toEqual( expect(documentListViewService.displayFields).toEqual(
DEFAULT_DISPLAY_FIELDS.map((f) => f.id) DEFAULT_DISPLAY_FIELDS.filter((f) => f.id !== DisplayField.ADDED).map(
(f) => f.id
)
) )
}) })
}) })

7
src-ui/src/app/services/document-list-view.service.ts
View File

@ -414,10 +414,13 @@ export class DocumentListViewService {
} }
get displayFields(): DisplayField[] { get displayFields(): DisplayField[] {
return ( let fields =
this.activeListViewState.displayFields ?? this.activeListViewState.displayFields ??
DEFAULT_DISPLAY_FIELDS.map((f) => f.id) DEFAULT_DISPLAY_FIELDS.map((f) => f.id)
) if (!this.activeListViewState.displayFields) {
fields = fields.filter((f) => f !== DisplayField.ADDED)
}
return fields
} }
set displayFields(fields: DisplayField[]) { set displayFields(fields: DisplayField[]) {