-
-
+
@@ -374,4 +393,5 @@
+
diff --git a/src-ui/src/app/components/admin/settings/settings.component.spec.ts b/src-ui/src/app/components/admin/settings/settings.component.spec.ts
index d53f57b69..7b23edc21 100644
--- a/src-ui/src/app/components/admin/settings/settings.component.spec.ts
+++ b/src-ui/src/app/components/admin/settings/settings.component.spec.ts
@@ -48,6 +48,8 @@ import {
InstallType,
SystemStatusItemStatus,
} from 'src/app/data/system-status'
+import { DragDropSelectComponent } from '../../common/input/drag-drop-select/drag-drop-select.component'
+import { DragDropModule } from '@angular/cdk/drag-drop'
const savedViews = [
{ id: 1, name: 'view1', show_in_sidebar: true, show_on_dashboard: true },
@@ -96,6 +98,7 @@ describe('SettingsComponent', () => {
PermissionsGroupComponent,
IfOwnerDirective,
ConfirmButtonComponent,
+ DragDropSelectComponent,
],
providers: [CustomDatePipe, DatePipe, PermissionsGuard],
imports: [
@@ -108,6 +111,7 @@ describe('SettingsComponent', () => {
NgSelectModule,
NgxBootstrapIconsModule.pick(allIcons),
NgbModalModule,
+ DragDropModule,
],
}).compileComponents()
@@ -437,4 +441,11 @@ describe('SettingsComponent', () => {
size: 'xl',
})
})
+
+ it('should support reset', () => {
+ completeSetup()
+ component.settingsForm.get('themeColor').setValue('#ff0000')
+ component.reset()
+ expect(component.settingsForm.get('themeColor').value).toEqual('')
+ })
})
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 33f6949a1..7df90e3de 100644
--- a/src-ui/src/app/components/admin/settings/settings.component.ts
+++ b/src-ui/src/app/components/admin/settings/settings.component.ts
@@ -50,6 +50,7 @@ import {
SystemStatusItemStatus,
SystemStatus,
} from 'src/app/data/system-status'
+import { DisplayMode } from 'src/app/data/document'
enum SettingsNavIDs {
General = 1,
@@ -73,8 +74,8 @@ export class SettingsComponent
extends ComponentWithPermissions
implements OnInit, AfterViewInit, OnDestroy, DirtyComponent
{
- SettingsNavIDs = SettingsNavIDs
activeNavID: number
+ DisplayMode = DisplayMode
savedViewGroup = new FormGroup({})
@@ -110,6 +111,10 @@ export class SettingsComponent
})
savedViews: SavedView[]
+ SettingsNavIDs = SettingsNavIDs
+ get displayFields() {
+ return this.settings.allDisplayFields
+ }
store: BehaviorSubject
storeSub: Subscription
@@ -340,6 +345,9 @@ export class SettingsComponent
name: view.name,
show_on_dashboard: view.show_on_dashboard,
show_in_sidebar: view.show_in_sidebar,
+ page_size: view.page_size,
+ display_mode: view.display_mode,
+ display_fields: view.display_fields,
}
this.savedViewGroup.addControl(
view.id.toString(),
@@ -348,6 +356,9 @@ export class SettingsComponent
name: new FormControl(null),
show_on_dashboard: new FormControl(null),
show_in_sidebar: new FormControl(null),
+ page_size: new FormControl(null),
+ display_mode: new FormControl(null),
+ display_fields: new FormControl([]),
})
)
}
@@ -530,8 +541,8 @@ export class SettingsComponent
.subscribe({
next: () => {
this.store.next(this.settingsForm.value)
- this.documentListViewService.updatePageSize()
this.settings.updateAppearanceSettings()
+ this.settings.initializeDisplayFields()
let savedToast: Toast = {
content: $localize`Settings were saved successfully.`,
delay: 5000,
@@ -592,6 +603,10 @@ export class SettingsComponent
}
}
+ reset() {
+ this.settingsForm.patchValue(this.store.getValue())
+ }
+
clearThemeColor() {
this.settingsForm.get('themeColor').patchValue('')
}
diff --git a/src-ui/src/app/components/app-frame/app-frame.component.html b/src-ui/src/app/components/app-frame/app-frame.component.html
index bdc8d08f2..1e4080c48 100644
--- a/src-ui/src/app/components/app-frame/app-frame.component.html
+++ b/src-ui/src/app/components/app-frame/app-frame.component.html
@@ -111,7 +111,7 @@
}
- @for (view of savedViewService.sidebarViews; track view) {
+ @for (view of savedViewService.sidebarViews; track view.id) {
-
diff --git a/src-ui/src/app/components/common/custom-field-display/custom-field-display.component.html b/src-ui/src/app/components/common/custom-field-display/custom-field-display.component.html
new file mode 100644
index 000000000..61946db02
--- /dev/null
+++ b/src-ui/src/app/components/common/custom-field-display/custom-field-display.component.html
@@ -0,0 +1,25 @@
+@if (field) {
+ @switch (field.data_type) {
+ @case (CustomFieldDataType.Monetary) {
+ {{value | currency: currency}}
+ }
+ @case (CustomFieldDataType.Date) {
+ {{value | customDate}}
+ }
+ @case (CustomFieldDataType.Url) {
+ {{value}}
+ }
+ @case (CustomFieldDataType.DocumentLink) {
+
+ }
+ @default {
+ {{value}}
+ }
+ }
+}
diff --git a/src-ui/src/app/components/common/custom-field-display/custom-field-display.component.scss b/src-ui/src/app/components/common/custom-field-display/custom-field-display.component.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src-ui/src/app/components/common/custom-field-display/custom-field-display.component.spec.ts b/src-ui/src/app/components/common/custom-field-display/custom-field-display.component.spec.ts
new file mode 100644
index 000000000..d2b8d9f40
--- /dev/null
+++ b/src-ui/src/app/components/common/custom-field-display/custom-field-display.component.spec.ts
@@ -0,0 +1,89 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing'
+import { of } from 'rxjs'
+import { CustomField, CustomFieldDataType } from 'src/app/data/custom-field'
+import { DocumentService } from 'src/app/services/rest/document.service'
+import { CustomFieldDisplayComponent } from './custom-field-display.component'
+import { DisplayField, Document } from 'src/app/data/document'
+import { HttpClientTestingModule } from '@angular/common/http/testing'
+import { CustomFieldsService } from 'src/app/services/rest/custom-fields.service'
+
+const customFields: CustomField[] = [
+ { id: 1, name: 'Field 1', data_type: CustomFieldDataType.String },
+ { id: 2, name: 'Field 2', data_type: CustomFieldDataType.Monetary },
+ { id: 3, name: 'Field 3', data_type: CustomFieldDataType.DocumentLink },
+]
+const document: Document = {
+ id: 1,
+ title: 'Doc 1',
+ custom_fields: [
+ { field: 1, document: 1, created: null, value: 'Text value' },
+ { field: 2, document: 1, created: null, value: '100 USD' },
+ { field: 3, document: 1, created: null, value: '1,2,3' },
+ ],
+}
+
+describe('CustomFieldDisplayComponent', () => {
+ let component: CustomFieldDisplayComponent
+ let fixture: ComponentFixture
+ let documentService: DocumentService
+ let customFieldService: CustomFieldsService
+
+ beforeEach(async () => {
+ await TestBed.configureTestingModule({
+ declarations: [CustomFieldDisplayComponent],
+ providers: [DocumentService],
+ imports: [HttpClientTestingModule],
+ }).compileComponents()
+ })
+
+ beforeEach(() => {
+ documentService = TestBed.inject(DocumentService)
+ customFieldService = TestBed.inject(CustomFieldsService)
+ jest
+ .spyOn(customFieldService, 'listAll')
+ .mockReturnValue(of({ results: customFields } as any))
+ fixture = TestBed.createComponent(CustomFieldDisplayComponent)
+ component = fixture.componentInstance
+ fixture.detectChanges()
+ })
+
+ it('should create', () => {
+ expect(component).toBeTruthy()
+ })
+
+ it('should initialize component', () => {
+ jest
+ .spyOn(documentService, 'getFew')
+ .mockReturnValue(of({ results: [] } as any))
+
+ component.fieldDisplayKey = DisplayField.CUSTOM_FIELD + '2'
+ expect(component.fieldId).toEqual(2)
+ component.document = document
+ expect(component.document.title).toEqual('Doc 1')
+
+ expect(component.field).toEqual(customFields[1])
+ expect(component.value).toEqual(100)
+ expect(component.currency).toEqual('USD')
+ })
+
+ it('should get document titles', () => {
+ const docLinkDocuments: Document[] = [
+ { id: 1, title: 'Document 1' } as any,
+ { id: 2, title: 'Document 2' } as any,
+ { id: 3, title: 'Document 3' } as any,
+ ]
+ jest
+ .spyOn(documentService, 'getFew')
+ .mockReturnValue(of({ results: docLinkDocuments } as any))
+ component.fieldId = 3
+ component.document = document
+
+ const title1 = component.getDocumentTitle(1)
+ const title2 = component.getDocumentTitle(2)
+ const title3 = component.getDocumentTitle(3)
+
+ expect(title1).toEqual('Document 1')
+ expect(title2).toEqual('Document 2')
+ expect(title3).toEqual('Document 3')
+ })
+})
diff --git a/src-ui/src/app/components/common/custom-field-display/custom-field-display.component.ts b/src-ui/src/app/components/common/custom-field-display/custom-field-display.component.ts
new file mode 100644
index 000000000..f53c7c8fd
--- /dev/null
+++ b/src-ui/src/app/components/common/custom-field-display/custom-field-display.component.ts
@@ -0,0 +1,105 @@
+import { Component, Input, OnDestroy, OnInit } from '@angular/core'
+import { Subject, takeUntil } from 'rxjs'
+import { CustomField, CustomFieldDataType } from 'src/app/data/custom-field'
+import { DisplayField, Document } from 'src/app/data/document'
+import { Results } from 'src/app/data/results'
+import { CustomFieldsService } from 'src/app/services/rest/custom-fields.service'
+import { DocumentService } from 'src/app/services/rest/document.service'
+
+@Component({
+ selector: 'pngx-custom-field-display',
+ templateUrl: './custom-field-display.component.html',
+ styleUrl: './custom-field-display.component.scss',
+})
+export class CustomFieldDisplayComponent implements OnInit, OnDestroy {
+ CustomFieldDataType = CustomFieldDataType
+
+ private _document: Document
+ @Input()
+ set document(document: Document) {
+ this._document = document
+ this.init()
+ }
+
+ get document(): Document {
+ return this._document
+ }
+
+ private _fieldId: number
+ @Input()
+ set fieldId(id: number) {
+ this._fieldId = id
+ this.init()
+ }
+
+ get fieldId(): number {
+ return this._fieldId
+ }
+
+ @Input()
+ set fieldDisplayKey(key: string) {
+ this.fieldId = parseInt(key.replace(DisplayField.CUSTOM_FIELD, ''), 10)
+ }
+
+ value: any
+ currency: string
+
+ private customFields: CustomField[] = []
+
+ public field: CustomField
+
+ private docLinkDocuments: Document[] = []
+
+ private unsubscribeNotifier: Subject = new Subject()
+
+ constructor(
+ private customFieldService: CustomFieldsService,
+ private documentService: DocumentService
+ ) {
+ this.customFieldService.listAll().subscribe((r) => {
+ this.customFields = r.results
+ this.init()
+ })
+ }
+
+ ngOnInit(): void {
+ this.init()
+ }
+
+ private init() {
+ if (this.value || !this._fieldId || !this._document || !this.customFields) {
+ return
+ }
+ this.field = this.customFields.find((f) => f.id === this._fieldId)
+ this.value = this._document.custom_fields.find(
+ (f) => f.field === this._fieldId
+ )?.value
+ if (this.value && this.field.data_type === CustomFieldDataType.Monetary) {
+ this.currency = this.value.match(/([A-Z]{3})/)?.[0]
+ this.value = parseFloat(this.value.replace(this.currency, ''))
+ } else if (
+ this.value?.length &&
+ this.field.data_type === CustomFieldDataType.DocumentLink
+ ) {
+ this.getDocuments()
+ }
+ }
+
+ private getDocuments() {
+ this.documentService
+ .getFew(this.value, { fields: 'id,title' })
+ .pipe(takeUntil(this.unsubscribeNotifier))
+ .subscribe((result: Results) => {
+ this.docLinkDocuments = result.results
+ })
+ }
+
+ public getDocumentTitle(docId: number): string {
+ return this.docLinkDocuments?.find((d) => d.id === docId)?.title
+ }
+
+ ngOnDestroy(): void {
+ this.unsubscribeNotifier.next(true)
+ this.unsubscribeNotifier.complete()
+ }
+}
diff --git a/src-ui/src/app/components/common/input/drag-drop-select/drag-drop-select.component.html b/src-ui/src/app/components/common/input/drag-drop-select/drag-drop-select.component.html
new file mode 100644
index 000000000..dd7d7b3a3
--- /dev/null
+++ b/src-ui/src/app/components/common/input/drag-drop-select/drag-drop-select.component.html
@@ -0,0 +1,26 @@
+
+
{{title}}:
+
+ @for (item of selectedItems; track item.id) {
+
{{item.name}}
+ }
+ @if (selectedItems.length === 0) {
+
{{emptyText}}
+ }
+
+
+
+ @for (item of unselectedItems; track item.id) {
+
{{item.name}}
+ }
+
+
Show all
}
- @if (documents.length) {
-
+ @if (documents.length && displayMode === DisplayMode.TABLE) {
+
- | Created |
- Title |
- @if (permissionsService.currentUserCan(PermissionAction.View, PermissionType.Tag)) {
- Tags |
- }
- @if (permissionsService.currentUserCan(PermissionAction.View, PermissionType.Correspondent)) {
- Correspondent |
- } @else {
- |
+ @for (field of displayFields; track field; let i = $index) {
+ @if (displayFields.includes(field)) {
+
+ {{ getColumnTitle(field) }}
+ |
+ }
}
- @for (doc of documents; track doc) {
-
- | {{doc.created_date | customDate}} |
-
- {{doc.title | documentTitle}}
- |
- @if (permissionsService.currentUserCan(PermissionAction.View, PermissionType.Tag)) {
-
- @for (t of doc.tags$ | async; track t) {
-
+ @for (doc of documents; track doc.id) {
+ |
+ @for (field of displayFields; track field; let i = $index) {
+ |
+ @switch (field) {
+ @case (DisplayField.ADDED) {
+ {{doc.added | customDate}}
+ }
+ @case (DisplayField.CREATED) {
+ {{doc.created_date | customDate}}
+ }
+ @case (DisplayField.TITLE) {
+ {{doc.title | documentTitle}}
+ }
+ @case (DisplayField.CORRESPONDENT) {
+ @if (doc.correspondent) {
+ {{(doc.correspondent$ | async)?.name}}
+ }
+ }
+ @case (DisplayField.TAGS) {
+ @for (t of doc.tags$ | async; track t) {
+
+ }
+ }
+ @case (DisplayField.DOCUMENT_TYPE) {
+ @if (doc.document_type) {
+ {{(doc.document_type$ | async)?.name}}
+ }
+ }
+ @case (DisplayField.STORAGE_PATH) {
+ @if (doc.storage_path) {
+ {{(doc.storage_path$ | async)?.name}}
+ }
+ }
+ }
+ @if (field.startsWith(DisplayField.CUSTOM_FIELD)) {
+
+ }
+ @if (i === displayFields.length - 1) {
+
}
|
}
-
- @if (permissionsService.currentUserCan(PermissionAction.View, PermissionType.Correspondent) && doc.correspondent !== null) {
- {{(doc.correspondent$ | async)?.name}}
- }
-
- |
}
+ } @else if (documents.length && displayMode === DisplayMode.SMALL_CARDS) {
+
+ @for (d of documents; track d.id) {
+
+
+ }
+
+ @for (d of documents; track d.id) {
+
+
+ }
+
No documents
}
diff --git a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.scss b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.scss
index bf1894b48..8c445f18e 100644
--- a/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.scss
+++ b/src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.scss
@@ -3,10 +3,9 @@ table {
table-layout: fixed;
}
-th:first-child {
- width: 25%;
- @media (min-width: 768px) {
- width: 15%;
+@media (min-width: 768px) {
+ th.w-25 {
+ width: 15% !important;
}
}
@@ -30,3 +29,45 @@ td.py-3 {
padding-top: 0.75em !important;
padding-bottom: 0.75em !important;
}
+
+$paperless-card-breakpoints: (
+ // 0: 2, // xs is manual for slim-sidebar
+ 768px: 2, //md
+ 992px: 2, //lg
+ 1200px: 3, //xl
+ 1600px: 4,
+ 1800px: 5,
+ 2000px: 6
+);
+
+.row-cols-paperless-cards {
+ // xs, we dont want in .col-slim block
+ > * {
+ flex: 0 0 auto;
+ width: calc(100% / 2);
+ }
+
+ @each $width, $n_cols in $paperless-card-breakpoints {
+ @media(min-width: $width) {
+ > * {
+ flex: 0 0 auto;
+ width: calc(100% / $n-cols);
+ }
+ }
+ }
+}
+
+::ng-deep .col-slim .row-cols-paperless-cards {
+ @each $width, $n_cols in $paperless-card-breakpoints {
+ @media(min-width: $width) {
+ > * {
+ flex: 0 0 auto;
+ width: calc(100% / ($n-cols + 1)) !important;
+ }
+ }
+ }
+}
+
+::ng-deep .document-card-check {
+ display: none !important; // override for dashboard
+}
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 545f5696b..432c686c3 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
@@ -11,7 +11,13 @@ import { RouterTestingModule } from '@angular/router/testing'
import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
import { of, Subject } from 'rxjs'
import { routes } from 'src/app/app-routing.module'
-import { FILTER_HAS_TAGS_ALL } from 'src/app/data/filter-rule-type'
+import {
+ FILTER_CORRESPONDENT,
+ FILTER_DOCUMENT_TYPE,
+ FILTER_FULLTEXT_MORELIKE,
+ FILTER_HAS_TAGS_ALL,
+ FILTER_STORAGE_PATH,
+} from 'src/app/data/filter-rule-type'
import { SavedView } from 'src/app/data/saved-view'
import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
import { PermissionsGuard } from 'src/app/guards/permissions.guard'
@@ -31,6 +37,10 @@ import { SafeUrlPipe } from 'src/app/pipes/safeurl.pipe'
import { DragDropModule } from '@angular/cdk/drag-drop'
import { PreviewPopupComponent } from 'src/app/components/common/preview-popup/preview-popup.component'
import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
+import { CustomFieldsService } from 'src/app/services/rest/custom-fields.service'
+import { CustomFieldDataType } from 'src/app/data/custom-field'
+import { CustomFieldDisplayComponent } from 'src/app/components/common/custom-field-display/custom-field-display.component'
+import { DisplayMode, DisplayField } from 'src/app/data/document'
const savedView: SavedView = {
id: 1,
@@ -45,17 +55,53 @@ const savedView: SavedView = {
value: '1,2',
},
],
+ page_size: 20,
+ display_mode: DisplayMode.TABLE,
+ display_fields: [
+ DisplayField.CREATED,
+ DisplayField.TITLE,
+ DisplayField.TAGS,
+ DisplayField.CORRESPONDENT,
+ DisplayField.DOCUMENT_TYPE,
+ DisplayField.STORAGE_PATH,
+ `${DisplayField.CUSTOM_FIELD}11` as any,
+ `${DisplayField.CUSTOM_FIELD}15` as any,
+ ],
}
const documentResults = [
{
id: 2,
title: 'doc2',
+ custom_fields: [
+ { id: 1, field: 11, created: new Date(), value: 'custom', document: 2 },
+ ],
},
{
id: 3,
title: 'doc3',
correspondent: 0,
+ custom_fields: [],
+ },
+ {
+ id: 4,
+ title: 'doc4',
+ custom_fields: [
+ { id: 32, field: 3, created: new Date(), value: 'EUR123', document: 4 },
+ ],
+ },
+ {
+ id: 5,
+ title: 'doc5',
+ custom_fields: [
+ {
+ id: 22,
+ field: 15,
+ created: new Date(),
+ value: [123, 456, 789],
+ document: 5,
+ },
+ ],
},
]
@@ -77,6 +123,7 @@ describe('SavedViewWidgetComponent', () => {
DocumentTitlePipe,
SafeUrlPipe,
PreviewPopupComponent,
+ CustomFieldDisplayComponent,
],
providers: [
PermissionsGuard,
@@ -89,6 +136,33 @@ describe('SavedViewWidgetComponent', () => {
},
CustomDatePipe,
DatePipe,
+ {
+ provide: CustomFieldsService,
+ useValue: {
+ listAll: () =>
+ of({
+ all: [3, 11, 15],
+ count: 3,
+ results: [
+ {
+ id: 3,
+ name: 'Custom field 3',
+ data_type: CustomFieldDataType.Monetary,
+ },
+ {
+ id: 11,
+ name: 'Custom Field 11',
+ data_type: CustomFieldDataType.String,
+ },
+ {
+ id: 15,
+ name: 'Custom Field 15',
+ data_type: CustomFieldDataType.DocumentLink,
+ },
+ ],
+ }),
+ },
+ },
],
imports: [
HttpClientTestingModule,
@@ -170,7 +244,7 @@ describe('SavedViewWidgetComponent', () => {
component.ngOnInit()
expect(listAllSpy).toHaveBeenCalledWith(
1,
- 10,
+ 20,
savedView.sort_field,
savedView.sort_reverse,
savedView.filter_rules,
@@ -204,11 +278,78 @@ describe('SavedViewWidgetComponent', () => {
})
})
+ it('should navigate to document', () => {
+ const routerSpy = jest.spyOn(router, 'navigate')
+ component.openDocumentDetail(documentResults[0])
+ expect(routerSpy).toHaveBeenCalledWith(['documents', documentResults[0].id])
+ })
+
it('should navigate via quickfilter on click tag', () => {
const qfSpy = jest.spyOn(documentListViewService, 'quickFilter')
- component.clickTag({ id: 11, name: 'Tag11' }, new MouseEvent('click'))
+ component.clickTag(11, new MouseEvent('click'))
expect(qfSpy).toHaveBeenCalledWith([
{ rule_type: FILTER_HAS_TAGS_ALL, value: '11' },
])
+ component.clickTag(11) // coverage
+ })
+
+ it('should navigate via quickfilter on click correspondent', () => {
+ const qfSpy = jest.spyOn(documentListViewService, 'quickFilter')
+ component.clickCorrespondent(11, new MouseEvent('click'))
+ expect(qfSpy).toHaveBeenCalledWith([
+ { rule_type: FILTER_CORRESPONDENT, value: '11' },
+ ])
+ component.clickCorrespondent(11) // coverage
+ })
+
+ it('should navigate via quickfilter on click doc type', () => {
+ const qfSpy = jest.spyOn(documentListViewService, 'quickFilter')
+ component.clickDocType(11, new MouseEvent('click'))
+ expect(qfSpy).toHaveBeenCalledWith([
+ { rule_type: FILTER_DOCUMENT_TYPE, value: '11' },
+ ])
+ component.clickDocType(11) // coverage
+ })
+
+ it('should navigate via quickfilter on click storage path', () => {
+ const qfSpy = jest.spyOn(documentListViewService, 'quickFilter')
+ component.clickStoragePath(11, new MouseEvent('click'))
+ expect(qfSpy).toHaveBeenCalledWith([
+ { rule_type: FILTER_STORAGE_PATH, value: '11' },
+ ])
+ component.clickStoragePath(11) // coverage
+ })
+
+ it('should navigate via quickfilter on click more like', () => {
+ const qfSpy = jest.spyOn(documentListViewService, 'quickFilter')
+ component.clickMoreLike(11)
+ expect(qfSpy).toHaveBeenCalledWith([
+ { rule_type: FILTER_FULLTEXT_MORELIKE, value: '11' },
+ ])
+ })
+
+ it('should get correct column title', () => {
+ expect(component.getColumnTitle(DisplayField.TITLE)).toEqual('Title')
+ expect(component.getColumnTitle(DisplayField.CREATED)).toEqual('Created')
+ expect(component.getColumnTitle(DisplayField.ADDED)).toEqual('Added')
+ expect(component.getColumnTitle(DisplayField.TAGS)).toEqual('Tags')
+ expect(component.getColumnTitle(DisplayField.CORRESPONDENT)).toEqual(
+ 'Correspondent'
+ )
+ expect(component.getColumnTitle(DisplayField.DOCUMENT_TYPE)).toEqual(
+ 'Document type'
+ )
+ expect(component.getColumnTitle(DisplayField.STORAGE_PATH)).toEqual(
+ 'Storage path'
+ )
+ })
+
+ it('should get correct column title for custom field', () => {
+ expect(
+ component.getColumnTitle((DisplayField.CUSTOM_FIELD + 11) as any)
+ ).toEqual('Custom Field 11')
+ expect(
+ component.getColumnTitle((DisplayField.CUSTOM_FIELD + 15) as any)
+ ).toEqual('Custom Field 15')
})
})
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 c81ea5484..476531947 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
@@ -6,23 +6,38 @@ import {
QueryList,
ViewChildren,
} from '@angular/core'
-import { Params, Router } from '@angular/router'
+import { Router } from '@angular/router'
import { Subject, takeUntil } from 'rxjs'
-import { Document } from 'src/app/data/document'
+import {
+ DEFAULT_DASHBOARD_DISPLAY_FIELDS,
+ DEFAULT_DASHBOARD_VIEW_PAGE_SIZE,
+ DEFAULT_DISPLAY_FIELDS,
+ DisplayField,
+ DisplayMode,
+ Document,
+} from 'src/app/data/document'
import { SavedView } from 'src/app/data/saved-view'
import { ConsumerStatusService } from 'src/app/services/consumer-status.service'
import { DocumentService } from 'src/app/services/rest/document.service'
-import { Tag } from 'src/app/data/tag'
import {
FILTER_CORRESPONDENT,
+ FILTER_DOCUMENT_TYPE,
+ FILTER_FULLTEXT_MORELIKE,
FILTER_HAS_TAGS_ALL,
+ FILTER_STORAGE_PATH,
} from 'src/app/data/filter-rule-type'
import { OpenDocumentsService } from 'src/app/services/open-documents.service'
import { DocumentListViewService } from 'src/app/services/document-list-view.service'
import { ComponentWithPermissions } from 'src/app/components/with-permissions/with-permissions.component'
import { NgbPopover } from '@ng-bootstrap/ng-bootstrap'
-import { queryParamsFromFilterRules } from 'src/app/utils/query-params'
-import { PermissionsService } from 'src/app/services/permissions.service'
+import {
+ PermissionAction,
+ PermissionType,
+ PermissionsService,
+} from 'src/app/services/permissions.service'
+import { CustomFieldsService } from 'src/app/services/rest/custom-fields.service'
+import { CustomField, CustomFieldDataType } from 'src/app/data/custom-field'
+import { SettingsService } from 'src/app/services/settings.service'
@Component({
selector: 'pngx-saved-view-widget',
@@ -33,8 +48,14 @@ export class SavedViewWidgetComponent
extends ComponentWithPermissions
implements OnInit, OnDestroy
{
+ public DisplayMode = DisplayMode
+ public DisplayField = DisplayField
+ public CustomFieldDataType = CustomFieldDataType
+
loading: boolean = true
+ private customFields: CustomField[] = []
+
constructor(
private documentService: DocumentService,
private router: Router,
@@ -42,7 +63,9 @@ export class SavedViewWidgetComponent
private consumerStatusService: ConsumerStatusService,
public openDocumentsService: OpenDocumentsService,
public documentListViewService: DocumentListViewService,
- public permissionsService: PermissionsService
+ public permissionsService: PermissionsService,
+ private settingsService: SettingsService,
+ private customFieldService: CustomFieldsService
) {
super()
}
@@ -60,14 +83,44 @@ export class SavedViewWidgetComponent
mouseOnPreview = false
popoverHidden = true
+ displayMode: DisplayMode
+
+ displayFields: DisplayField[] = DEFAULT_DASHBOARD_DISPLAY_FIELDS
+
ngOnInit(): void {
this.reload()
+ this.displayMode = this.savedView.display_mode ?? DisplayMode.TABLE
this.consumerStatusService
.onDocumentConsumptionFinished()
.pipe(takeUntil(this.unsubscribeNotifier))
.subscribe(() => {
this.reload()
})
+
+ if (
+ this.permissionsService.currentUserCan(
+ PermissionAction.View,
+ PermissionType.CustomField
+ )
+ ) {
+ this.customFieldService
+ .listAll()
+ .pipe(takeUntil(this.unsubscribeNotifier))
+ .subscribe((customFields) => {
+ this.customFields = customFields.results
+ })
+ }
+
+ if (this.savedView.display_fields) {
+ this.displayFields = this.savedView.display_fields
+ }
+
+ // filter by perms etc
+ this.displayFields = this.displayFields.filter(
+ (field) =>
+ this.settingsService.allDisplayFields.find((f) => f.id === field) !==
+ undefined
+ )
}
ngOnDestroy(): void {
@@ -80,7 +133,7 @@ export class SavedViewWidgetComponent
this.documentService
.listFiltered(
1,
- 10,
+ this.savedView.page_size ?? DEFAULT_DASHBOARD_VIEW_PAGE_SIZE,
this.savedView.sort_field,
this.savedView.sort_reverse,
this.savedView.filter_rules,
@@ -103,15 +156,52 @@ export class SavedViewWidgetComponent
}
}
- clickTag(tag: Tag, event: MouseEvent) {
- event.preventDefault()
- event.stopImmediatePropagation()
+ clickTag(tagID: number, event: MouseEvent = null) {
+ event?.preventDefault()
+ event?.stopImmediatePropagation()
this.list.quickFilter([
- { rule_type: FILTER_HAS_TAGS_ALL, value: tag.id.toString() },
+ { rule_type: FILTER_HAS_TAGS_ALL, value: tagID.toString() },
])
}
+ clickCorrespondent(correspondentId: number, event: MouseEvent = null) {
+ event?.preventDefault()
+ event?.stopImmediatePropagation()
+
+ this.list.quickFilter([
+ { rule_type: FILTER_CORRESPONDENT, value: correspondentId.toString() },
+ ])
+ }
+
+ clickDocType(docTypeId: number, event: MouseEvent = null) {
+ event?.preventDefault()
+ event?.stopImmediatePropagation()
+
+ this.list.quickFilter([
+ { rule_type: FILTER_DOCUMENT_TYPE, value: docTypeId.toString() },
+ ])
+ }
+
+ clickStoragePath(storagePathId: number, event: MouseEvent = null) {
+ event?.preventDefault()
+ event?.stopImmediatePropagation()
+
+ this.list.quickFilter([
+ { rule_type: FILTER_STORAGE_PATH, value: storagePathId.toString() },
+ ])
+ }
+
+ clickMoreLike(documentID: number) {
+ this.list.quickFilter([
+ { rule_type: FILTER_FULLTEXT_MORELIKE, value: documentID.toString() },
+ ])
+ }
+
+ openDocumentDetail(document: Document) {
+ this.router.navigate(['documents', document.id])
+ }
+
getPreviewUrl(document: Document): string {
return this.documentService.getPreviewUrl(document.id)
}
@@ -161,14 +251,11 @@ export class SavedViewWidgetComponent
}, 300)
}
- getCorrespondentQueryParams(correspondentId: number): Params {
- return correspondentId !== undefined
- ? queryParamsFromFilterRules([
- {
- rule_type: FILTER_CORRESPONDENT,
- value: correspondentId.toString(),
- },
- ])
- : null
+ public getColumnTitle(field: DisplayField): string {
+ if (field.startsWith(DisplayField.CUSTOM_FIELD)) {
+ const id = field.split('_')[2]
+ return this.customFields.find((f) => f.id === parseInt(id))?.name
+ }
+ return DEFAULT_DISPLAY_FIELDS.find((f) => f.id === field)?.name
}
}
diff --git a/src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html b/src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html
index 49af71b08..b64d5e567 100644
--- a/src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html
+++ b/src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html
@@ -13,11 +13,11 @@
Loading...
}
-
+
-
+
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..3981ea7e5 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.includes(DisplayField.CORRESPONDENT) && document.correspondent) {
@if (clickCorrespondent.observers.length ) {
{{(document.correspondent$ | async)?.name}}
} @else {
@@ -23,14 +23,18 @@
}
:
}
- {{document.title | documentTitle}}
- @for (t of document.tags$ | async; track t) {
-
+ @if (displayFields.includes(DisplayField.TITLE)) {
+ {{document.title | documentTitle}}
+ }
+ @if (displayFields.includes(DisplayField.TAGS)) {
+ @for (t of document.tags$ | async; track t) {
+
+ }
}
- @if (document.__search_hit__ && document.__search_hit__.highlights) {
+ @if (document.__search_hit__?.score && document.__search_hit__.highlights) {
}
@for (highlight of searchNoteHighlights; track highlight) {
@@ -39,7 +43,7 @@
}
- @if (!document.__search_hit__) {
+ @if (!document.__search_hit__?.score) {
{{contentTrimmed}}
}
@@ -66,44 +70,53 @@
- @if (notesEnabled && document.notes.length) {
+ @if (displayFields.includes(DisplayField.NOTES) && notesEnabled && document.notes.length) {
}
- @if (document.document_type) {
+ @if (displayFields.includes(DisplayField.DOCUMENT_TYPE) && document.document_type) {
}
- @if (document.storage_path) {
+ @if (displayFields.includes(DisplayField.STORAGE_PATH) && document.storage_path) {
}
- @if (document.archive_serial_number | isNumber) {
+ @if (displayFields.includes(DisplayField.ASN) && document.archive_serial_number | isNumber) {
#{{document.archive_serial_number}}
}
-
-
- Created: {{ document.created | customDate }}
- Added: {{ document.added | customDate }}
- Modified: {{ document.modified | customDate }}
-
-
-
- {{document.created_date | customDate:'mediumDate'}}
-
- @if (document.owner && document.owner !== settingsService.currentUser.id) {
+ @if (displayFields.includes(DisplayField.CREATED) || displayFields.includes(DisplayField.ADDED)) {
+
+
+ Created: {{ document.created | customDate }}
+ Added: {{ document.added | customDate }}
+ Modified: {{ document.modified | customDate }}
+
+
+ @if (displayFields.includes(DisplayField.CREATED)) {
+
+ {{document.created_date | customDate:'mediumDate'}}
+
+ }
+ @if (displayFields.includes(DisplayField.ADDED)) {
+
+ {{document.added | customDate:'mediumDate'}}
+
+ }
+ }
+ @if (displayFields.includes(DisplayField.OWNER) && document.owner && document.owner !== settingsService.currentUser.id) {
{{document.owner | username}}
}
- @if (document.is_shared_by_requester) {
+ @if (displayFields.includes(DisplayField.SHARED) && document.is_shared_by_requester) {
Shared
@@ -114,6 +127,16 @@
- @for (t of getTagsLimited$() | async; track t) {
-
- }
- @if (moreTags) {
-
- + {{moreTags}}
-
- }
-
+ @for (t of getTagsLimited$() | async; track t) {
+
+ }
+ @if (moreTags) {
+
+ + {{moreTags}}
+
+ }
+
- @if (document.correspondent) {
+ @if (displayFields.includes(DisplayField.CORRESPONDENT) && document.correspondent) {
{{(document.correspondent$ | async)?.name ?? privateName}}:
}
- {{document.title | documentTitle}}
+ @if (displayFields.includes(DisplayField.TITLE)) {
+ {{document.title | documentTitle}}
+ }