From af94eed0427d38b658620c842e1ef30ba619c078 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Wed, 17 Apr 2024 23:21:39 -0700 Subject: [PATCH] Basic toggling of fields --- src-ui/src/app/app.module.ts | 2 + .../admin/settings/settings.component.html | 28 +-- .../admin/settings/settings.component.ts | 22 +- .../saved-view-widget.component.html | 15 +- .../saved-view-widget.component.spec.ts | 28 +-- .../saved-view-widget.component.ts | 6 +- .../document-card-large.component.html | 47 +++-- .../document-card-large.component.ts | 6 + .../document-card-small.component.html | 67 ++++--- .../document-card-small.component.ts | 6 + .../document-list.component.html | 188 ++++++++++++------ .../document-list/document-list.component.ts | 44 +++- src-ui/src/app/data/saved-view.ts | 20 ++ src-ui/src/app/services/settings.service.ts | 38 +++- 14 files changed, 346 insertions(+), 171 deletions(-) diff --git a/src-ui/src/app/app.module.ts b/src-ui/src/app/app.module.ts index 8e8ace690..f78340021 100644 --- a/src-ui/src/app/app.module.ts +++ b/src-ui/src/app/app.module.ts @@ -140,6 +140,7 @@ import { calendar, calendarEvent, cardChecklist, + cardHeading, caretDown, caretUp, chatLeftText, @@ -234,6 +235,7 @@ const icons = { calendar, calendarEvent, cardChecklist, + cardHeading, caretDown, caretUp, chatLeftText, diff --git a/src-ui/src/app/components/admin/settings/settings.component.html b/src-ui/src/app/components/admin/settings/settings.component.html index d54b02de1..d43a6239f 100644 --- a/src-ui/src/app/components/admin/settings/settings.component.html +++ b/src-ui/src/app/components/admin/settings/settings.component.html @@ -351,23 +351,23 @@ - @if (savedViewGroup.get(view.id.toString()).get('show_on_dashboard').value) { -
-
- -
-
- - -
- @if (savedViewGroup.get(view.id.toString()).get('display_mode').value === DashboardViewMode.TABLE && documentDisplayFields) { +
+ @if (savedViewGroup.get(view.id.toString()).get('show_on_dashboard').value) { +
+ +
+
+ + +
+ } + @if (documentDisplayFields) { }
- }
} diff --git a/src-ui/src/app/components/admin/settings/settings.component.ts b/src-ui/src/app/components/admin/settings/settings.component.ts index 7112c03c5..c3ffa62b6 100644 --- a/src-ui/src/app/components/admin/settings/settings.component.ts +++ b/src-ui/src/app/components/admin/settings/settings.component.ts @@ -117,7 +117,9 @@ export class SettingsComponent savedViews: SavedView[] SettingsNavIDs = SettingsNavIDs - documentDisplayFields: any[] + get documentDisplayFields() { + return this.settings.allDocumentDisplayFields + } store: BehaviorSubject storeSub: Subscription @@ -225,24 +227,6 @@ export class SettingsComponent }) } - if ( - this.permissionsService.currentUserCan( - PermissionAction.View, - PermissionType.CustomField - ) - ) { - this.customFieldsService.listAll().subscribe((r) => { - this.documentDisplayFields = DOCUMENT_DISPLAY_FIELDS.concat( - r.results.map((field) => { - return { - id: `${DocumentDisplayField.CUSTOM_FIELD}${field.id}` as any, - name: field.name, - } - }) - ) - }) - } - this.activatedRoute.paramMap.subscribe((paramMap) => { const section = paramMap.get('section') if (section) { diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html index eb6ac003e..3aafe55b8 100644 --- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html +++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html @@ -14,7 +14,7 @@ @for (column of savedView.document_display_fields; track column; let i = $index) { - @if (visibleColumns.includes(column)) { + @if (activeDisplayFields.has(column)) { @switch (column) { @case (DashboardViewTableColumn.ADDED) { @@ -114,7 +114,16 @@ } @else if (documents.length && savedView.display_mode === DashboardViewMode.SMALL_CARDS) {
@for (d of documents; track d.id) { - + + }
} @else { diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.spec.ts b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.spec.ts index 63562b36a..a739b2701 100644 --- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.spec.ts +++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.spec.ts @@ -344,51 +344,51 @@ describe('SavedViewWidgetComponent', () => { it('should check if column is visible including permissions', () => { expect( - component.visibleColumns.includes(DocumentDisplayField.TITLE) + component.activeDisplayFields.includes(DocumentDisplayField.TITLE) ).toBeTruthy() expect( - component.visibleColumns.includes(DocumentDisplayField.CREATED) + component.activeDisplayFields.includes(DocumentDisplayField.CREATED) ).toBeTruthy() expect( - component.visibleColumns.includes(DocumentDisplayField.ADDED) + component.activeDisplayFields.includes(DocumentDisplayField.ADDED) ).toBeTruthy() expect( - component.visibleColumns.includes(DocumentDisplayField.TAGS) + component.activeDisplayFields.includes(DocumentDisplayField.TAGS) ).toBeTruthy() expect( - component.visibleColumns.includes(DocumentDisplayField.CORRESPONDENT) + component.activeDisplayFields.includes(DocumentDisplayField.CORRESPONDENT) ).toBeTruthy() expect( - component.visibleColumns.includes(DocumentDisplayField.DOCUMENT_TYPE) + component.activeDisplayFields.includes(DocumentDisplayField.DOCUMENT_TYPE) ).toBeTruthy() expect( - component.visibleColumns.includes(DocumentDisplayField.STORAGE_PATH) + component.activeDisplayFields.includes(DocumentDisplayField.STORAGE_PATH) ).toBeTruthy() expect( - component.visibleColumns.includes( + component.activeDisplayFields.includes( `${DocumentDisplayField.CUSTOM_FIELD}11` as any ) ).toBeTruthy() - component.visibleColumns = [] + component.activeDisplayFields = [] jest .spyOn(component.permissionsService, 'currentUserCan') .mockReturnValue(false) component.ngOnInit() expect( - component.visibleColumns.includes(DocumentDisplayField.TAGS) + component.activeDisplayFields.includes(DocumentDisplayField.TAGS) ).toBeFalsy() expect( - component.visibleColumns.includes(DocumentDisplayField.CORRESPONDENT) + component.activeDisplayFields.includes(DocumentDisplayField.CORRESPONDENT) ).toBeFalsy() expect( - component.visibleColumns.includes(DocumentDisplayField.DOCUMENT_TYPE) + component.activeDisplayFields.includes(DocumentDisplayField.DOCUMENT_TYPE) ).toBeFalsy() expect( - component.visibleColumns.includes(DocumentDisplayField.STORAGE_PATH) + component.activeDisplayFields.includes(DocumentDisplayField.STORAGE_PATH) ).toBeFalsy() expect( - component.visibleColumns.includes( + component.activeDisplayFields.includes( `${DocumentDisplayField.CUSTOM_FIELD}11` as any ) ).toBeFalsy() diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts index 5d2f68978..bf18d8c6a 100644 --- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts +++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts @@ -79,11 +79,11 @@ export class SavedViewWidgetComponent mouseOnPreview = false popoverHidden = true - visibleColumns: DocumentDisplayField[] = [ + activeDisplayFields: Set = new Set([ DocumentDisplayField.TITLE, DocumentDisplayField.CREATED, DocumentDisplayField.ADDED, - ] + ]) docLinkDocuments: Document[] = [] @@ -122,7 +122,7 @@ export class SavedViewWidgetComponent type && this.permissionsService.currentUserCan(PermissionAction.View, type) ) - this.visibleColumns.push(column) + this.activeDisplayFields.add(column) }) } diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html index 81489a40a..0f7e580de 100644 --- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html +++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html @@ -15,7 +15,7 @@
- @if (document.correspondent) { + @if (displayFields.has(DocumentDisplayField.CORRESPONDENT) && document.correspondent) { @if (clickCorrespondent.observers.length ) { {{(document.correspondent$ | async)?.name}} } @else { @@ -23,9 +23,13 @@ } : } - {{document.title | documentTitle}} - @for (t of document.tags$ | async; track t) { - + @if (displayFields.has(DocumentDisplayField.TITLE)) { + {{document.title | documentTitle}} + } + @if (displayFields.has(DocumentDisplayField.TAGS)) { + @for (t of document.tags$ | async; track t) { + + } }
@@ -66,44 +70,49 @@
- @if (notesEnabled && document.notes.length) { + @if (displayFields.has(DocumentDisplayField.NOTES) && notesEnabled && document.notes.length) { } - @if (document.document_type) { + @if (displayFields.has(DocumentDisplayField.DOCUMENT_TYPE) && document.document_type) { } - @if (document.storage_path) { + @if (displayFields.has(DocumentDisplayField.STORAGE_PATH) && document.storage_path) { } - @if (document.archive_serial_number | isNumber) { + @if (displayFields.has(DocumentDisplayField.ASN) && document.archive_serial_number | isNumber) {
#{{document.archive_serial_number}}
} - -
- Created: {{ document.created | customDate }} - Added: {{ document.added | customDate }} - Modified: {{ document.modified | customDate }} + @if (displayFields.has(DocumentDisplayField.CREATED) || displayFields.has(DocumentDisplayField.ADDED)) { + +
+ Created: {{ document.created | customDate }} + Added: {{ document.added | customDate }} + Modified: {{ document.modified | customDate }} +
+ +
+ + @if (displayFields.has(DocumentDisplayField.CREATED)) { {{document.created_date | customDate:'mediumDate'}} } + @else { {{document.added | customDate:'mediumDate'}} } +
- -
- {{document.created_date | customDate:'mediumDate'}} -
- @if (document.owner && document.owner !== settingsService.currentUser.id) { + } + @if (displayFields.has(DocumentDisplayField.OWNER) && document.owner && document.owner !== settingsService.currentUser.id) {
{{document.owner | username}}
} - @if (document.is_shared_by_requester) { + @if (displayFields.has(DocumentDisplayField.SHARED) && document.is_shared_by_requester) {
Shared
diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts index 442114767..02da43ea3 100644 --- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts +++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts @@ -11,6 +11,7 @@ import { SettingsService } from 'src/app/services/settings.service' import { NgbPopover } from '@ng-bootstrap/ng-bootstrap' import { SETTINGS_KEYS } from 'src/app/data/ui-settings' import { ComponentWithPermissions } from '../../with-permissions/with-permissions.component' +import { DocumentDisplayField } from 'src/app/data/saved-view' @Component({ selector: 'pngx-document-card-large', @@ -18,6 +19,8 @@ import { ComponentWithPermissions } from '../../with-permissions/with-permission styleUrls: ['./document-card-large.component.scss'], }) export class DocumentCardLargeComponent extends ComponentWithPermissions { + DocumentDisplayField = DocumentDisplayField + constructor( private documentService: DocumentService, public settingsService: SettingsService @@ -28,6 +31,9 @@ export class DocumentCardLargeComponent extends ComponentWithPermissions { @Input() selected = false + @Input() + displayFields: Set + @Output() toggleSelected = new EventEmitter() 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 ea9ba9914..8333e3f30 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 @@ -10,19 +10,21 @@
-
- @for (t of getTagsLimited$() | async; track t) { - - } - @if (moreTags) { -
- + {{moreTags}} -
- } -
+ @if (displayFields?.has(DocumentDisplayField.TAGS)) { +
+ @for (t of getTagsLimited$() | async; track t) { + + } + @if (moreTags) { +
+ + {{moreTags}} +
+ } +
+ } - @if (notesEnabled && document.notes.length) { + @if (displayFields.has(DocumentDisplayField.NOTES) && notesEnabled && document.notes.length) { @@ -32,54 +34,61 @@

- @if (document.correspondent) { + @if (displayFields.has(DocumentDisplayField.CORRESPONDENT) && document.correspondent) { {{(document.correspondent$ | async)?.name ?? privateName}}: } - {{document.title | documentTitle}} + @if (displayFields.has(DocumentDisplayField.TITLE)) { + {{document.title | documentTitle}} + }

- @if (document.document_type) { + @if (displayFields.has(DocumentDisplayField.DOCUMENT_TYPE) && document.document_type) { } - @if (document.storage_path) { + @if (displayFields.has(DocumentDisplayField.STORAGE_PATH) && document.storage_path) { } -
- -
- Created: {{ document.created | customDate }} - Added: {{ document.added | customDate }} - Modified: {{ document.modified | customDate }} + @if (displayFields.has(DocumentDisplayField.CREATED) || displayFields.has(DocumentDisplayField.ADDED)) { +
+ +
+ Created: {{ document.created | customDate }} + Added: {{ document.added | customDate }} + Modified: {{ document.modified | customDate }} +
+ +
+ + + @if (displayFields.has(DocumentDisplayField.CREATED)) { {{document.created | customDate:'mediumDate'}} } + @else { {{document.added | customDate:'mediumDate'}} } +
- -
- - {{document.created_date | customDate:'mediumDate'}}
-
- @if (document.archive_serial_number | isNumber) { + } + @if (displayFields.has(DocumentDisplayField.ASN) && document.archive_serial_number | isNumber) {
#{{document.archive_serial_number}}
} - @if (document.owner && document.owner !== settingsService.currentUser.id) { + @if (displayFields.has(DocumentDisplayField.OWNER) && document.owner && document.owner !== settingsService.currentUser.id) {
{{document.owner | username}}
} - @if (document.is_shared_by_requester) { + @if (displayFields.has(DocumentDisplayField.SHARED) && document.is_shared_by_requester) {
Shared diff --git a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts index 2ca1a3408..3d9c3b610 100644 --- a/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts +++ b/src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts @@ -12,6 +12,7 @@ import { SettingsService } from 'src/app/services/settings.service' import { NgbPopover } from '@ng-bootstrap/ng-bootstrap' import { SETTINGS_KEYS } from 'src/app/data/ui-settings' import { ComponentWithPermissions } from '../../with-permissions/with-permissions.component' +import { DocumentDisplayField } from 'src/app/data/saved-view' @Component({ selector: 'pngx-document-card-small', @@ -19,6 +20,8 @@ import { ComponentWithPermissions } from '../../with-permissions/with-permission styleUrls: ['./document-card-small.component.scss'], }) export class DocumentCardSmallComponent extends ComponentWithPermissions { + DocumentDisplayField = DocumentDisplayField + constructor( private documentService: DocumentService, public settingsService: SettingsService @@ -35,6 +38,9 @@ export class DocumentCardSmallComponent extends ComponentWithPermissions { @Input() document: Document + @Input() + displayFields: Set + @Output() dblClickDocument = new EventEmitter() diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html index 3cce1496b..f9ec9cd53 100644 --- a/src-ui/src/app/components/document-list/document-list.component.html +++ b/src-ui/src/app/components/document-list/document-list.component.html @@ -11,8 +11,24 @@
+
+ +
+
+ @for (field of settingsService.allDocumentDisplayFields; track field.id) { +
+ + +
+ } +
+
+
- + @@ -125,23 +141,35 @@ @if (displayMode === 'largeCards') {
@for (d of list.documents; track trackByDocumentId($index, d)) { - + }
} - @if (displayMode === 'details') { + @if (displayMode === 'details' || displayMode === 'table') { - - @if (permissionService.currentUserCan(PermissionAction.View, PermissionType.Correspondent)) { + @if (activeDisplayFields.has(DocumentDisplayField.ASN)) { + + } + @if (activeDisplayFields.has(DocumentDisplayField.CORRESPONDENT) && permissionService.currentUserCan(PermissionAction.View, PermissionType.Correspondent)) { } - - - @if (notesEnabled) { + @if (activeDisplayFields.has(DocumentDisplayField.TITLE)) { + + } + @if (activeDisplayFields.has(DocumentDisplayField.OWNER)) { + + } + @if (activeDisplayFields.has(DocumentDisplayField.NOTES) && notesEnabled) { } - @if (permissionService.currentUserCan(PermissionAction.View, PermissionType.DocumentType)) { + @if (activeDisplayFields.has(DocumentDisplayField.DOCUMENT_TYPE) && permissionService.currentUserCan(PermissionAction.View, PermissionType.DocumentType)) { } - @if (permissionService.currentUserCan(PermissionAction.View, PermissionType.StoragePath)) { + @if (activeDisplayFields.has(DocumentDisplayField.STORAGE_PATH) && permissionService.currentUserCan(PermissionAction.View, PermissionType.StoragePath)) { } - - + @if (activeDisplayFields.has(DocumentDisplayField.CREATED)) { + + } + @if (activeDisplayFields.has(DocumentDisplayField.ADDED)) { + + } @for (d of list.documents; track trackByDocumentId($index, d)) { @@ -216,10 +252,12 @@ - - @if (permissionService.currentUserCan(PermissionAction.View, PermissionType.Correspondent)) { + @if (activeDisplayFields.has(DocumentDisplayField.ASN)) { + + } + @if (activeDisplayFields.has(DocumentDisplayField.CORRESPONDENT) && permissionService.currentUserCan(PermissionAction.View, PermissionType.Correspondent)) { } - - @if (notesEnabled) { + @if (activeDisplayFields.has(DocumentDisplayField.TITLE)) { + {{d.title | documentTitle}} + } + @if (activeDisplayFields.has(DocumentDisplayField.TAGS)) { + @for (t of d.tags$ | async; track t) { + + } + } + + @if (activeDisplayFields.has(DocumentDisplayField.OWNER)) { + + } + @if (activeDisplayFields.has(DocumentDisplayField.NOTES) && notesEnabled) { } - @if (permissionService.currentUserCan(PermissionAction.View, PermissionType.DocumentType)) { + @if (activeDisplayFields.has(DocumentDisplayField.DOCUMENT_TYPE) && permissionService.currentUserCan(PermissionAction.View, PermissionType.DocumentType)) { } - @if (permissionService.currentUserCan(PermissionAction.View, PermissionType.StoragePath)) { + @if (activeDisplayFields.has(DocumentDisplayField.STORAGE_PATH) && permissionService.currentUserCan(PermissionAction.View, PermissionType.StoragePath)) { } - - + @if (activeDisplayFields.has(DocumentDisplayField.CREATED)) { + + } + @if (activeDisplayFields.has(DocumentDisplayField.ADDED)) { + + } } @@ -274,7 +322,17 @@ @if (displayMode === 'smallCards') {
@for (d of list.documents; track trackByDocumentId($index, d)) { - + + }
} diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts index e2bd73862..2ccfa4e5e 100644 --- a/src-ui/src/app/components/document-list/document-list.component.ts +++ b/src-ui/src/app/components/document-list/document-list.component.ts @@ -16,7 +16,11 @@ import { } from 'src/app/utils/filter-rules' import { FILTER_FULLTEXT_MORELIKE } from 'src/app/data/filter-rule-type' import { Document } from 'src/app/data/document' -import { DisplayMode, SavedView } from 'src/app/data/saved-view' +import { + DisplayMode, + DocumentDisplayField, + SavedView, +} from 'src/app/data/saved-view' import { SETTINGS_KEYS } from 'src/app/data/ui-settings' import { SortableDirective, @@ -46,6 +50,8 @@ export class DocumentListComponent extends ComponentWithPermissions implements OnInit, OnDestroy { + DocumentDisplayField = DocumentDisplayField + constructor( public list: DocumentListViewService, public savedViewService: SavedViewService, @@ -55,7 +61,7 @@ export class DocumentListComponent private modalService: NgbModal, private consumerStatusService: ConsumerStatusService, public openDocumentsService: OpenDocumentsService, - private settingsService: SettingsService, + public settingsService: SettingsService, public permissionService: PermissionsService ) { super() @@ -67,6 +73,18 @@ export class DocumentListComponent @ViewChildren(SortableDirective) headers: QueryList displayMode: string = DisplayMode.SMALL_CARDS // largeCards, smallCards, details + activeDisplayFields: Set = new Set([ + DocumentDisplayField.TITLE, + DocumentDisplayField.CORRESPONDENT, + DocumentDisplayField.CREATED, + DocumentDisplayField.TAGS, + DocumentDisplayField.DOCUMENT_TYPE, + DocumentDisplayField.STORAGE_PATH, + DocumentDisplayField.NOTES, + DocumentDisplayField.OWNER, + DocumentDisplayField.ASN, + DocumentDisplayField.SHARED, + ]) unmodifiedFilterRules: FilterRule[] = [] private unmodifiedSavedView: SavedView @@ -131,11 +149,33 @@ export class DocumentListComponent localStorage.setItem('document-list:displayMode', this.displayMode) } + saveDisplayFields() { + localStorage.setItem( + 'document-list:displayFields', + JSON.stringify(Array.from(this.activeDisplayFields)) + ) + } + + toggleDisplayField(field: string) { + if (this.activeDisplayFields.has(field)) { + this.activeDisplayFields.delete(field) + } else { + this.activeDisplayFields.add(field) + } + this.saveDisplayFields() + } + ngOnInit(): void { if (localStorage.getItem('document-list:displayMode') != null) { this.displayMode = localStorage.getItem('document-list:displayMode') } + if (localStorage.getItem('document-list:displayFields') != null) { + this.activeDisplayFields = new Set( + JSON.parse(localStorage.getItem('document-list:displayFields')) + ) + } + this.consumerStatusService .onDocumentConsumptionFinished() .pipe(takeUntil(this.unsubscribeNotifier)) diff --git a/src-ui/src/app/data/saved-view.ts b/src-ui/src/app/data/saved-view.ts index 3c4d90930..477e07650 100644 --- a/src-ui/src/app/data/saved-view.ts +++ b/src-ui/src/app/data/saved-view.ts @@ -15,6 +15,10 @@ export enum DocumentDisplayField { DOCUMENT_TYPE = 'documenttype', STORAGE_PATH = 'storagepath', CUSTOM_FIELD = 'custom_field_', + NOTES = 'note', + OWNER = 'owner', + SHARED = 'shared', + ASN = 'asn', } export const DOCUMENT_DISPLAY_FIELDS = [ @@ -46,6 +50,22 @@ export const DOCUMENT_DISPLAY_FIELDS = [ id: DocumentDisplayField.STORAGE_PATH, name: $localize`Storage path`, }, + { + id: DocumentDisplayField.NOTES, + name: $localize`Notes`, + }, + { + id: DocumentDisplayField.OWNER, + name: $localize`Owner`, + }, + { + id: DocumentDisplayField.SHARED, + name: $localize`Shared`, + }, + { + id: DocumentDisplayField.ASN, + name: $localize`ASN`, + }, ] export interface SavedView extends ObjectWithPermissions { diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts index 67804fa12..2045f7a8c 100644 --- a/src-ui/src/app/services/settings.service.ts +++ b/src-ui/src/app/services/settings.service.ts @@ -19,9 +19,18 @@ import { import { environment } from 'src/environments/environment' import { UiSettings, SETTINGS, SETTINGS_KEYS } from '../data/ui-settings' import { User } from '../data/user' -import { PermissionsService } from './permissions.service' +import { + PermissionAction, + PermissionType, + PermissionsService, +} from './permissions.service' import { ToastService } from './toast.service' -import { SavedView } from '../data/saved-view' +import { + DOCUMENT_DISPLAY_FIELDS, + DocumentDisplayField, + SavedView, +} from '../data/saved-view' +import { CustomFieldsService } from './rest/custom-fields.service' export interface LanguageOption { code: string @@ -257,6 +266,8 @@ export class SettingsService { public globalDropzoneActive: boolean = false public organizingSidebarSavedViews: boolean = false + public allDocumentDisplayFields: any + constructor( rendererFactory: RendererFactory2, @Inject(DOCUMENT) private document, @@ -265,7 +276,8 @@ export class SettingsService { @Inject(LOCALE_ID) private localeId: string, protected http: HttpClient, private toastService: ToastService, - private permissionsService: PermissionsService + private permissionsService: PermissionsService, + private customFieldsService: CustomFieldsService ) { this._renderer = rendererFactory.createRenderer(null, null) } @@ -288,6 +300,26 @@ export class SettingsService { uisettings.permissions, this.currentUser ) + + this.allDocumentDisplayFields = DOCUMENT_DISPLAY_FIELDS + + if ( + this.permissionsService.currentUserCan( + PermissionAction.View, + PermissionType.CustomField + ) + ) { + this.customFieldsService.listAll().subscribe((r) => { + this.allDocumentDisplayFields = DOCUMENT_DISPLAY_FIELDS.concat( + r.results.map((field) => { + return { + id: `${DocumentDisplayField.CUSTOM_FIELD}${field.id}` as any, + name: field.name, + } + }) + ) + }) + } }) ) }
ASNASNCorrespondentTitleOwnerTitleOwnerNotesDocument typeStorage pathCreatedAddedCreatedAdded
- {{d.archive_serial_number}} - + {{d.archive_serial_number}} + @if (d.correspondent) { {{(d.correspondent$ | async)?.name}} @@ -227,15 +265,21 @@ - {{d.title | documentTitle}} - @for (t of d.tags$ | async; track t) { - - } - - {{d.owner | username}} - + {{d.owner | username}} + @if (d.notes.length) { @@ -246,26 +290,30 @@ } @if (d.document_type) { {{(d.document_type$ | async)?.name}} } @if (d.storage_path) { {{(d.storage_path$ | async)?.name}} } - {{d.created_date | customDate}} - - {{d.added | customDate}} - + {{d.created_date | customDate}} + + {{d.added | customDate}} +