diff --git a/src-ui/e2e/dashboard/requests/api-dashboard1.har b/src-ui/e2e/dashboard/requests/api-dashboard1.har index a0e6ea088..9758236d1 100644 --- a/src-ui/e2e/dashboard/requests/api-dashboard1.har +++ b/src-ui/e2e/dashboard/requests/api-dashboard1.har @@ -124,7 +124,7 @@ "content": { "size": -1, "mimeType": "application/json", - "text": "{\"count\":6,\"next\":null,\"previous\":null,\"all\":[8,17,7,4,11,15],\"results\":[{\"id\":8,\"name\":\"Correspondent 2\",\"show_on_dashboard\":false,\"show_in_sidebar\":false,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":3,\"value\":\"2\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"document_display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":17,\"name\":\"In the Last Month\",\"show_on_dashboard\":false,\"show_in_sidebar\":false,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":20,\"value\":\"created:[-1 month to now]\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"document_display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":7,\"name\":\"Inbox\",\"show_on_dashboard\":true,\"show_in_sidebar\":true,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":6,\"value\":\"9\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"document_display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":4,\"name\":\"Recently Added\",\"show_on_dashboard\":true,\"show_in_sidebar\":true,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"document_display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":11,\"name\":\"Tag: Another Sample Tag\",\"show_on_dashboard\":false,\"show_in_sidebar\":true,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":6,\"value\":\"4\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"document_display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":15,\"name\":\"View ASN not empty\",\"show_on_dashboard\":false,\"show_in_sidebar\":false,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":18,\"value\":\"false\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"document_display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]}]}" + "text": "{\"count\":6,\"next\":null,\"previous\":null,\"all\":[8,17,7,4,11,15],\"results\":[{\"id\":8,\"name\":\"Correspondent 2\",\"show_on_dashboard\":false,\"show_in_sidebar\":false,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":3,\"value\":\"2\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":17,\"name\":\"In the Last Month\",\"show_on_dashboard\":false,\"show_in_sidebar\":false,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":20,\"value\":\"created:[-1 month to now]\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":7,\"name\":\"Inbox\",\"show_on_dashboard\":true,\"show_in_sidebar\":true,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":6,\"value\":\"9\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":4,\"name\":\"Recently Added\",\"show_on_dashboard\":true,\"show_in_sidebar\":true,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":11,\"name\":\"Tag: Another Sample Tag\",\"show_on_dashboard\":false,\"show_in_sidebar\":true,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":6,\"value\":\"4\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":15,\"name\":\"View ASN not empty\",\"show_on_dashboard\":false,\"show_in_sidebar\":false,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":18,\"value\":\"false\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]}]}" }, "headersSize": -1, "bodySize": -1, diff --git a/src-ui/e2e/dashboard/requests/api-dashboard2.har b/src-ui/e2e/dashboard/requests/api-dashboard2.har index 9b228ef74..952387f56 100644 --- a/src-ui/e2e/dashboard/requests/api-dashboard2.har +++ b/src-ui/e2e/dashboard/requests/api-dashboard2.har @@ -124,7 +124,7 @@ "content": { "size": -1, "mimeType": "application/json", - "text": "{\"count\":6,\"next\":null,\"previous\":null,\"all\":[8,17,7,4,11,15],\"results\":[{\"id\":8,\"name\":\"Correspondent 2\",\"show_on_dashboard\":false,\"show_in_sidebar\":false,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":3,\"value\":\"2\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"document_display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":17,\"name\":\"In the Last Month\",\"show_on_dashboard\":false,\"show_in_sidebar\":false,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":20,\"value\":\"created:[-1 month to now]\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"document_display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":7,\"name\":\"Inbox\",\"show_on_dashboard\":true,\"show_in_sidebar\":true,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":6,\"value\":\"9\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"document_display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":4,\"name\":\"Recently Added\",\"show_on_dashboard\":true,\"show_in_sidebar\":true,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"document_display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":11,\"name\":\"Tag: Another Sample Tag\",\"show_on_dashboard\":false,\"show_in_sidebar\":true,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":6,\"value\":\"4\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"document_display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":15,\"name\":\"View ASN not empty\",\"show_on_dashboard\":false,\"show_in_sidebar\":false,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":18,\"value\":\"false\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"document_display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]}]}" + "text": "{\"count\":6,\"next\":null,\"previous\":null,\"all\":[8,17,7,4,11,15],\"results\":[{\"id\":8,\"name\":\"Correspondent 2\",\"show_on_dashboard\":false,\"show_in_sidebar\":false,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":3,\"value\":\"2\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":17,\"name\":\"In the Last Month\",\"show_on_dashboard\":false,\"show_in_sidebar\":false,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":20,\"value\":\"created:[-1 month to now]\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":7,\"name\":\"Inbox\",\"show_on_dashboard\":true,\"show_in_sidebar\":true,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":6,\"value\":\"9\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":4,\"name\":\"Recently Added\",\"show_on_dashboard\":true,\"show_in_sidebar\":true,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":11,\"name\":\"Tag: Another Sample Tag\",\"show_on_dashboard\":false,\"show_in_sidebar\":true,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":6,\"value\":\"4\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":15,\"name\":\"View ASN not empty\",\"show_on_dashboard\":false,\"show_in_sidebar\":false,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":18,\"value\":\"false\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]}]}" }, "headersSize": -1, "bodySize": -1, diff --git a/src-ui/e2e/dashboard/requests/api-dashboard3.har b/src-ui/e2e/dashboard/requests/api-dashboard3.har index 01a590c4e..4fc9d62d6 100644 --- a/src-ui/e2e/dashboard/requests/api-dashboard3.har +++ b/src-ui/e2e/dashboard/requests/api-dashboard3.har @@ -124,7 +124,7 @@ "content": { "size": -1, "mimeType": "application/json", - "text": "{\"count\":6,\"next\":null,\"previous\":null,\"all\":[8,17,7,4,11,15],\"results\":[{\"id\":8,\"name\":\"Correspondent 2\",\"show_on_dashboard\":false,\"show_in_sidebar\":false,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":3,\"value\":\"2\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"document_display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":17,\"name\":\"In the Last Month\",\"show_on_dashboard\":false,\"show_in_sidebar\":false,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":20,\"value\":\"created:[-1 month to now]\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"document_display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":7,\"name\":\"Inbox\",\"show_on_dashboard\":true,\"show_in_sidebar\":true,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":6,\"value\":\"9\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"document_display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":4,\"name\":\"Recently Added\",\"show_on_dashboard\":true,\"show_in_sidebar\":true,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"document_display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":11,\"name\":\"Tag: Another Sample Tag\",\"show_on_dashboard\":false,\"show_in_sidebar\":true,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":6,\"value\":\"4\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"document_display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":15,\"name\":\"View ASN not empty\",\"show_on_dashboard\":false,\"show_in_sidebar\":false,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":18,\"value\":\"false\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"document_display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]}]}" + "text": "{\"count\":6,\"next\":null,\"previous\":null,\"all\":[8,17,7,4,11,15],\"results\":[{\"id\":8,\"name\":\"Correspondent 2\",\"show_on_dashboard\":false,\"show_in_sidebar\":false,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":3,\"value\":\"2\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":17,\"name\":\"In the Last Month\",\"show_on_dashboard\":false,\"show_in_sidebar\":false,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":20,\"value\":\"created:[-1 month to now]\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":7,\"name\":\"Inbox\",\"show_on_dashboard\":true,\"show_in_sidebar\":true,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":6,\"value\":\"9\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":4,\"name\":\"Recently Added\",\"show_on_dashboard\":true,\"show_in_sidebar\":true,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":11,\"name\":\"Tag: Another Sample Tag\",\"show_on_dashboard\":false,\"show_in_sidebar\":true,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":6,\"value\":\"4\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":15,\"name\":\"View ASN not empty\",\"show_on_dashboard\":false,\"show_in_sidebar\":false,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":18,\"value\":\"false\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]}]}" }, "headersSize": -1, "bodySize": -1, diff --git a/src-ui/e2e/dashboard/requests/api-dashboard4.har b/src-ui/e2e/dashboard/requests/api-dashboard4.har index a65752705..ecd539fdd 100644 --- a/src-ui/e2e/dashboard/requests/api-dashboard4.har +++ b/src-ui/e2e/dashboard/requests/api-dashboard4.har @@ -124,7 +124,7 @@ "content": { "size": -1, "mimeType": "application/json", - "text": "{\"count\":6,\"next\":null,\"previous\":null,\"all\":[8,17,7,4,11,15],\"results\":[{\"id\":8,\"name\":\"Correspondent 2\",\"show_on_dashboard\":false,\"show_in_sidebar\":false,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":3,\"value\":\"2\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"document_display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":17,\"name\":\"In the Last Month\",\"show_on_dashboard\":false,\"show_in_sidebar\":false,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":20,\"value\":\"created:[-1 month to now]\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"document_display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":7,\"name\":\"Inbox\",\"show_on_dashboard\":true,\"show_in_sidebar\":true,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":6,\"value\":\"9\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"document_display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":4,\"name\":\"Recently Added\",\"show_on_dashboard\":true,\"show_in_sidebar\":true,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"document_display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":11,\"name\":\"Tag: Another Sample Tag\",\"show_on_dashboard\":false,\"show_in_sidebar\":true,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":6,\"value\":\"4\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"document_display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":15,\"name\":\"View ASN not empty\",\"show_on_dashboard\":false,\"show_in_sidebar\":false,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":18,\"value\":\"false\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"document_display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]}]}" + "text": "{\"count\":6,\"next\":null,\"previous\":null,\"all\":[8,17,7,4,11,15],\"results\":[{\"id\":8,\"name\":\"Correspondent 2\",\"show_on_dashboard\":false,\"show_in_sidebar\":false,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":3,\"value\":\"2\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":17,\"name\":\"In the Last Month\",\"show_on_dashboard\":false,\"show_in_sidebar\":false,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":20,\"value\":\"created:[-1 month to now]\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":7,\"name\":\"Inbox\",\"show_on_dashboard\":true,\"show_in_sidebar\":true,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":6,\"value\":\"9\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":4,\"name\":\"Recently Added\",\"show_on_dashboard\":true,\"show_in_sidebar\":true,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":11,\"name\":\"Tag: Another Sample Tag\",\"show_on_dashboard\":false,\"show_in_sidebar\":true,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":6,\"value\":\"4\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]},{\"id\":15,\"name\":\"View ASN not empty\",\"show_on_dashboard\":false,\"show_in_sidebar\":false,\"sort_field\":\"created\",\"sort_reverse\":true,\"filter_rules\":[{\"rule_type\":18,\"value\":\"false\"}],\"owner\":\"2\",\"user_can_change\":true,\"page_size\":10,\"display_mode\":\"table\",\"display_fields\":[\"created\",\"title\",\"tag\",\"documenttype\"]}]}" }, "headersSize": -1, "bodySize": -1, diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index 34533547b..4defa72b5 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -2365,7 +2365,7 @@ src/app/components/document-list/document-list.component.ts - 129 + 127 src/app/components/manage/management-list/management-list.component.html @@ -4228,7 +4228,7 @@ src/app/components/document-list/document-card-small/document-card-small.component.ts - 86 + 83 @@ -6340,14 +6340,14 @@ View "" saved successfully. src/app/components/document-list/document-list.component.ts - 250 + 241 View "" created successfully. src/app/components/document-list/document-list.component.ts - 291 + 282 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 1bfddb847..fe5c4b536 100644 --- a/src-ui/src/app/components/admin/settings/settings.component.html +++ b/src-ui/src/app/components/admin/settings/settings.component.html @@ -363,8 +363,8 @@ - @if (documentDisplayFields) { - + @if (displayFields) { + } 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 3055a5cec..7b9e8e42e 100644 --- a/src-ui/src/app/components/admin/settings/settings.component.ts +++ b/src-ui/src/app/components/admin/settings/settings.component.ts @@ -27,9 +27,9 @@ import { } from 'rxjs' import { Group } from 'src/app/data/group' import { - DEFAULT_DOCUMENT_DISPLAY_FIELDS, + DEFAULT_DISPLAY_FIELDS, DisplayMode, - DocumentDisplayField, + DisplayField, SavedView, } from 'src/app/data/saved-view' import { SETTINGS_KEYS } from 'src/app/data/ui-settings' @@ -117,8 +117,8 @@ export class SettingsComponent savedViews: SavedView[] SettingsNavIDs = SettingsNavIDs - get documentDisplayFields() { - return this.settings.allDocumentDisplayFields + get displayFields() { + return this.settings.allDisplayFields } store: BehaviorSubject @@ -353,7 +353,7 @@ export class SettingsComponent show_in_sidebar: view.show_in_sidebar, page_size: view.page_size, display_mode: view.display_mode, - document_display_fields: view.document_display_fields, + display_fields: view.display_fields, } this.savedViewGroup.addControl( view.id.toString(), @@ -364,7 +364,7 @@ export class SettingsComponent show_in_sidebar: new FormControl(null), page_size: new FormControl(null), display_mode: new FormControl(null), - document_display_fields: new FormControl([]), + display_fields: new FormControl([]), }) ) } 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 index b7a6da7a4..397394475 100644 --- 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 @@ -6,7 +6,7 @@ import { CustomFieldDisplayComponent } from './custom-field-display.component' import { Document } from 'src/app/data/document' import { HttpClientTestingModule } from '@angular/common/http/testing' import { CustomFieldsService } from 'src/app/services/rest/custom-fields.service' -import { DocumentDisplayField } from 'src/app/data/saved-view' +import { DisplayField } from 'src/app/data/saved-view' const customFields: CustomField[] = [ { id: 1, name: 'Field 1', data_type: CustomFieldDataType.String }, @@ -57,7 +57,7 @@ describe('CustomFieldDisplayComponent', () => { .spyOn(documentService, 'getFew') .mockReturnValue(of({ results: [] } as any)) - component.fieldDisplayKey = DocumentDisplayField.CUSTOM_FIELD + '2' + component.fieldDisplayKey = DisplayField.CUSTOM_FIELD + '2' expect(component.fieldId).toEqual(2) component.document = document expect(component.document.title).toEqual('Doc 1') 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 index db12bd397..2c62c468d 100644 --- 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 @@ -3,7 +3,7 @@ import { Subject, takeUntil } from 'rxjs' import { CustomField, CustomFieldDataType } from 'src/app/data/custom-field' import { Document } from 'src/app/data/document' import { Results } from 'src/app/data/results' -import { DocumentDisplayField } from 'src/app/data/saved-view' +import { DisplayField } from 'src/app/data/saved-view' import { CustomFieldsService } from 'src/app/services/rest/custom-fields.service' import { DocumentService } from 'src/app/services/rest/document.service' @@ -39,10 +39,7 @@ export class CustomFieldDisplayComponent implements OnInit, OnDestroy { @Input() set fieldDisplayKey(key: string) { - this.fieldId = parseInt( - key.replace(DocumentDisplayField.CUSTOM_FIELD, ''), - 10 - ) + this.fieldId = parseInt(key.replace(DisplayField.CUSTOM_FIELD, ''), 10) } value: any 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 a01d86820..f36024bb0 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 @@ -13,7 +13,7 @@ - @for (column of savedView.document_display_fields; track column; let i = $index) { + @for (column of savedView.display_fields; track column; let i = $index) { @if (activeDisplayFields.includes(column)) { - @for (column of savedView.document_display_fields; track column; let i = $index) { + @for (column of savedView.display_fields; track column; let i = $index) { @if (activeDisplayFields.includes(column)) {
@for (doc of documents; track doc.id) {
@switch (column) { @@ -67,7 +67,7 @@ @if (column.startsWith(DashboardViewTableColumn.CUSTOM_FIELD)) { } - @if (i === savedView.document_display_fields.length - 1) { + @if (i === savedView.display_fields.length - 1) {
{ }) it('should get correct column title', () => { - expect(component.getColumnTitle(DocumentDisplayField.TITLE)).toEqual( - '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(DocumentDisplayField.CREATED)).toEqual( - 'Created' + expect(component.getColumnTitle(DisplayField.DOCUMENT_TYPE)).toEqual( + 'Document type' ) - expect(component.getColumnTitle(DocumentDisplayField.ADDED)).toEqual( - 'Added' - ) - expect(component.getColumnTitle(DocumentDisplayField.TAGS)).toEqual('Tags') - expect( - component.getColumnTitle(DocumentDisplayField.CORRESPONDENT) - ).toEqual('Correspondent') - expect( - component.getColumnTitle(DocumentDisplayField.DOCUMENT_TYPE) - ).toEqual('Document type') - expect(component.getColumnTitle(DocumentDisplayField.STORAGE_PATH)).toEqual( + expect(component.getColumnTitle(DisplayField.STORAGE_PATH)).toEqual( 'Storage path' ) }) 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 7a45d8aff..200147f1d 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 @@ -10,11 +10,11 @@ import { Router } from '@angular/router' import { Subject, takeUntil } from 'rxjs' import { Document } from 'src/app/data/document' import { - DocumentDisplayField, + DisplayField, DisplayMode, SavedView, - DEFAULT_DOCUMENT_DISPLAY_FIELDS, - DEFAULT_PAGE_SIZE, + DEFAULT_DISPLAY_FIELDS, + DEFAULT_DASHBOARD_VIEW_PAGE_SIZE, } from 'src/app/data/saved-view' import { ConsumerStatusService } from 'src/app/services/consumer-status.service' import { DocumentService } from 'src/app/services/rest/document.service' @@ -47,7 +47,7 @@ export class SavedViewWidgetComponent implements OnInit, OnDestroy { public DashboardViewMode = DisplayMode - public DashboardViewTableColumn = DocumentDisplayField + public DashboardViewTableColumn = DisplayField public CustomFieldDataType = CustomFieldDataType loading: boolean = true @@ -80,10 +80,10 @@ export class SavedViewWidgetComponent mouseOnPreview = false popoverHidden = true - activeDisplayFields: DocumentDisplayField[] = [ - DocumentDisplayField.TITLE, - DocumentDisplayField.CREATED, - DocumentDisplayField.ADDED, + activeDisplayFields: DisplayField[] = [ + DisplayField.TITLE, + DisplayField.CREATED, + DisplayField.ADDED, ] ngOnInit(): void { @@ -109,11 +109,11 @@ export class SavedViewWidgetComponent }) } - this.savedView.document_display_fields?.forEach((column) => { + this.savedView.display_fields?.forEach((column) => { let type: PermissionType = Object.values(PermissionType).find((t) => t.includes(column) ) - if (column.startsWith(DocumentDisplayField.CUSTOM_FIELD)) { + if (column.startsWith(DisplayField.CUSTOM_FIELD)) { type = PermissionType.CustomField } if ( @@ -134,7 +134,7 @@ export class SavedViewWidgetComponent this.documentService .listFiltered( 1, - this.savedView.page_size ?? DEFAULT_PAGE_SIZE, + this.savedView.page_size ?? DEFAULT_DASHBOARD_VIEW_PAGE_SIZE, this.savedView.sort_field, this.savedView.sort_reverse, this.savedView.filter_rules, @@ -252,11 +252,11 @@ export class SavedViewWidgetComponent }, 300) } - public getColumnTitle(column: DocumentDisplayField): string { - if (column.startsWith(DocumentDisplayField.CUSTOM_FIELD)) { + public getColumnTitle(column: DisplayField): string { + if (column.startsWith(DisplayField.CUSTOM_FIELD)) { const id = column.split('_')[2] return this.customFields.find((c) => c.id === parseInt(id))?.name } - return DEFAULT_DOCUMENT_DISPLAY_FIELDS.find((c) => c.id === column)?.name + return DEFAULT_DISPLAY_FIELDS.find((c) => c.id === column)?.name } } 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 7f172016a..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 (displayFields.includes(DocumentDisplayField.CORRESPONDENT) && document.correspondent) { + @if (displayFields.includes(DisplayField.CORRESPONDENT) && document.correspondent) { @if (clickCorrespondent.observers.length ) { {{(document.correspondent$ | async)?.name}} } @else { @@ -23,10 +23,10 @@ } : } - @if (displayFields.includes(DocumentDisplayField.TITLE)) { + @if (displayFields.includes(DisplayField.TITLE)) { {{document.title | documentTitle}} } - @if (displayFields.includes(DocumentDisplayField.TAGS)) { + @if (displayFields.includes(DisplayField.TAGS)) { @for (t of document.tags$ | async; track t) { } @@ -70,29 +70,29 @@
- @if (displayFields.includes(DocumentDisplayField.NOTES) && notesEnabled && document.notes.length) { + @if (displayFields.includes(DisplayField.NOTES) && notesEnabled && document.notes.length) { } - @if (displayFields.includes(DocumentDisplayField.DOCUMENT_TYPE) && document.document_type) { + @if (displayFields.includes(DisplayField.DOCUMENT_TYPE) && document.document_type) { } - @if (displayFields.includes(DocumentDisplayField.STORAGE_PATH) && document.storage_path) { + @if (displayFields.includes(DisplayField.STORAGE_PATH) && document.storage_path) { } - @if (displayFields.includes(DocumentDisplayField.ASN) && document.archive_serial_number | isNumber) { + @if (displayFields.includes(DisplayField.ASN) && document.archive_serial_number | isNumber) {
#{{document.archive_serial_number}}
} - @if (displayFields.includes(DocumentDisplayField.CREATED) || displayFields.includes(DocumentDisplayField.ADDED)) { + @if (displayFields.includes(DisplayField.CREATED) || displayFields.includes(DisplayField.ADDED)) {
Created: {{ document.created | customDate }} @@ -100,23 +100,23 @@ Modified: {{ document.modified | customDate }}
- @if (displayFields.includes(DocumentDisplayField.CREATED)) { + @if (displayFields.includes(DisplayField.CREATED)) {
{{document.created_date | customDate:'mediumDate'}}
} - @if (displayFields.includes(DocumentDisplayField.ADDED)) { + @if (displayFields.includes(DisplayField.ADDED)) {
{{document.added | customDate:'mediumDate'}}
} } - @if (displayFields.includes(DocumentDisplayField.OWNER) && document.owner && document.owner !== settingsService.currentUser.id) { + @if (displayFields.includes(DisplayField.OWNER) && document.owner && document.owner !== settingsService.currentUser.id) {
{{document.owner | username}}
} - @if (displayFields.includes(DocumentDisplayField.SHARED) && document.is_shared_by_requester) { + @if (displayFields.includes(DisplayField.SHARED) && document.is_shared_by_requester) {
Shared
@@ -128,7 +128,7 @@
} @for (field of document.custom_fields; track field.id) { - @if (displayFields.includes(DocumentDisplayField.CUSTOM_FIELD + field.field)) { + @if (displayFields.includes(DisplayField.CUSTOM_FIELD + field.field)) {
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 4aac1da51..eb259a76b 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,10 +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 { - DEFAULT_DOCUMENT_DISPLAY_FIELDS, - DocumentDisplayField, -} from 'src/app/data/saved-view' +import { DEFAULT_DISPLAY_FIELDS, DisplayField } from 'src/app/data/saved-view' @Component({ selector: 'pngx-document-card-large', @@ -22,7 +19,7 @@ import { styleUrls: ['./document-card-large.component.scss'], }) export class DocumentCardLargeComponent extends ComponentWithPermissions { - DocumentDisplayField = DocumentDisplayField + DisplayField = DisplayField constructor( private documentService: DocumentService, @@ -35,7 +32,7 @@ export class DocumentCardLargeComponent extends ComponentWithPermissions { selected = false @Input() - displayFields: string[] = DEFAULT_DOCUMENT_DISPLAY_FIELDS.map((f) => f.id) + displayFields: string[] = DEFAULT_DISPLAY_FIELDS.map((f) => f.id) @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 f50c2e808..363d79184 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,7 +10,7 @@
- @if (displayFields?.includes(DocumentDisplayField.TAGS)) { + @if (displayFields?.includes(DisplayField.TAGS)) {
@for (t of getTagsLimited$() | async; track t) { @@ -24,7 +24,7 @@ }
- @if (displayFields.includes(DocumentDisplayField.NOTES) && notesEnabled && document.notes.length) { + @if (displayFields.includes(DisplayField.NOTES) && notesEnabled && document.notes.length) { @@ -34,31 +34,31 @@

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

- @if (displayFields.includes(DocumentDisplayField.DOCUMENT_TYPE) && document.document_type) { + @if (displayFields.includes(DisplayField.DOCUMENT_TYPE) && document.document_type) { } - @if (displayFields.includes(DocumentDisplayField.STORAGE_PATH) && document.storage_path) { + @if (displayFields.includes(DisplayField.STORAGE_PATH) && document.storage_path) { } - @if (displayFields.includes(DocumentDisplayField.CREATED) || displayFields.includes(DocumentDisplayField.ADDED)) { + @if (displayFields.includes(DisplayField.CREATED) || displayFields.includes(DisplayField.ADDED)) {
@@ -70,32 +70,32 @@
- @if (displayFields.includes(DocumentDisplayField.CREATED)) { {{document.created | customDate:'mediumDate'}} } + @if (displayFields.includes(DisplayField.CREATED)) { {{document.created | customDate:'mediumDate'}} } @else { {{document.added | customDate:'mediumDate'}} }
} - @if (displayFields.includes(DocumentDisplayField.ASN) && document.archive_serial_number | isNumber) { + @if (displayFields.includes(DisplayField.ASN) && document.archive_serial_number | isNumber) {
#{{document.archive_serial_number}}
} - @if (displayFields.includes(DocumentDisplayField.OWNER) && document.owner && document.owner !== settingsService.currentUser.id) { + @if (displayFields.includes(DisplayField.OWNER) && document.owner && document.owner !== settingsService.currentUser.id) {
{{document.owner | username}}
} - @if (displayFields.includes(DocumentDisplayField.SHARED) && document.is_shared_by_requester) { + @if (displayFields.includes(DisplayField.SHARED) && document.is_shared_by_requester) {
Shared
} @for (field of document.custom_fields; track field.id) { - @if (displayFields.includes(DocumentDisplayField.CUSTOM_FIELD + field.field)) { + @if (displayFields.includes(DisplayField.CUSTOM_FIELD + field.field)) {
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 01fafa57a..fa332c8c9 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,10 +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 { - DEFAULT_DOCUMENT_DISPLAY_FIELDS, - DocumentDisplayField, -} from 'src/app/data/saved-view' +import { DEFAULT_DISPLAY_FIELDS, DisplayField } from 'src/app/data/saved-view' @Component({ selector: 'pngx-document-card-small', @@ -23,7 +20,7 @@ import { styleUrls: ['./document-card-small.component.scss'], }) export class DocumentCardSmallComponent extends ComponentWithPermissions { - DocumentDisplayField = DocumentDisplayField + DisplayField = DisplayField constructor( private documentService: DocumentService, @@ -42,7 +39,7 @@ export class DocumentCardSmallComponent extends ComponentWithPermissions { document: Document @Input() - displayFields: string[] = DEFAULT_DOCUMENT_DISPLAY_FIELDS.map((f) => f.id) + displayFields: string[] = DEFAULT_DISPLAY_FIELDS.map((f) => f.id) @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 677be7a31..e0ff6f684 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 @@ -18,7 +18,7 @@
- @for (field of settingsService.allDocumentDisplayFields; track field.id) { + @for (field of settingsService.allDisplayFields; track field.id) {
@@ -160,7 +160,7 @@ - @if (activeDisplayFields.includes(DocumentDisplayField.ASN)) { + @if (activeDisplayFields.includes(DisplayField.ASN)) { } - @if (activeDisplayFields.includes(DocumentDisplayField.CORRESPONDENT) && permissionService.currentUserCan(PermissionAction.View, PermissionType.Correspondent)) { + @if (activeDisplayFields.includes(DisplayField.CORRESPONDENT) && permissionService.currentUserCan(PermissionAction.View, PermissionType.Correspondent)) { } - @if (activeDisplayFields.includes(DocumentDisplayField.TITLE)) { + @if (activeDisplayFields.includes(DisplayField.TITLE)) { } - @if (activeDisplayFields.includes(DocumentDisplayField.OWNER) && permissionService.currentUserCan(PermissionAction.View, PermissionType.User)) { + @if (activeDisplayFields.includes(DisplayField.OWNER) && permissionService.currentUserCan(PermissionAction.View, PermissionType.User)) { } - @if (activeDisplayFields.includes(DocumentDisplayField.NOTES) && notesEnabled) { + @if (activeDisplayFields.includes(DisplayField.NOTES) && notesEnabled) { } - @if (activeDisplayFields.includes(DocumentDisplayField.DOCUMENT_TYPE) && permissionService.currentUserCan(PermissionAction.View, PermissionType.DocumentType)) { + @if (activeDisplayFields.includes(DisplayField.DOCUMENT_TYPE) && permissionService.currentUserCan(PermissionAction.View, PermissionType.DocumentType)) { } - @if (activeDisplayFields.includes(DocumentDisplayField.STORAGE_PATH) && permissionService.currentUserCan(PermissionAction.View, PermissionType.StoragePath)) { + @if (activeDisplayFields.includes(DisplayField.STORAGE_PATH) && permissionService.currentUserCan(PermissionAction.View, PermissionType.StoragePath)) { } - @if (activeDisplayFields.includes(DocumentDisplayField.CREATED)) { + @if (activeDisplayFields.includes(DisplayField.CREATED)) { } - @if (activeDisplayFields.includes(DocumentDisplayField.ADDED)) { + @if (activeDisplayFields.includes(DisplayField.ADDED)) { } - @if (activeDisplayFields.includes(DocumentDisplayField.CORRESPONDENT) && permissionService.currentUserCan(PermissionAction.View, PermissionType.Correspondent)) { + @if (activeDisplayFields.includes(DisplayField.CORRESPONDENT) && permissionService.currentUserCan(PermissionAction.View, PermissionType.Correspondent)) { } - @if (activeDisplayFields.includes(DocumentDisplayField.OWNER) && permissionService.currentUserCan(PermissionAction.View, PermissionType.User)) { + @if (activeDisplayFields.includes(DisplayField.OWNER) && permissionService.currentUserCan(PermissionAction.View, PermissionType.User)) { } - @if (activeDisplayFields.includes(DocumentDisplayField.NOTES) && notesEnabled) { + @if (activeDisplayFields.includes(DisplayField.NOTES) && notesEnabled) { } - @if (activeDisplayFields.includes(DocumentDisplayField.DOCUMENT_TYPE) && permissionService.currentUserCan(PermissionAction.View, PermissionType.DocumentType)) { + @if (activeDisplayFields.includes(DisplayField.DOCUMENT_TYPE) && permissionService.currentUserCan(PermissionAction.View, PermissionType.DocumentType)) { } - @if (activeDisplayFields.includes(DocumentDisplayField.STORAGE_PATH) && permissionService.currentUserCan(PermissionAction.View, PermissionType.StoragePath)) { + @if (activeDisplayFields.includes(DisplayField.STORAGE_PATH) && permissionService.currentUserCan(PermissionAction.View, PermissionType.StoragePath)) { } - @if (activeDisplayFields.includes(DocumentDisplayField.CREATED)) { + @if (activeDisplayFields.includes(DisplayField.CREATED)) { } - @if (activeDisplayFields.includes(DocumentDisplayField.ADDED)) { + @if (activeDisplayFields.includes(DisplayField.ADDED)) { diff --git a/src-ui/src/app/components/document-list/document-list.component.spec.ts b/src-ui/src/app/components/document-list/document-list.component.spec.ts index b670db52c..55039b3c6 100644 --- a/src-ui/src/app/components/document-list/document-list.component.spec.ts +++ b/src-ui/src/app/components/document-list/document-list.component.spec.ts @@ -35,9 +35,9 @@ import { Subject, of, throwError } from 'rxjs' import { SavedViewService } from 'src/app/services/rest/saved-view.service' import { ActivatedRoute, Router, convertToParamMap } from '@angular/router' import { - DEFAULT_DOCUMENT_DISPLAY_FIELDS, + DEFAULT_DISPLAY_FIELDS, DisplayMode, - DocumentDisplayField, + DisplayField, SavedView, } from 'src/app/data/saved-view' import { @@ -331,7 +331,7 @@ describe('DocumentListComponent', () => { }) it('should support setting sort field by table head', () => { - component.activeDisplayFields = [DocumentDisplayField.ASN] + component.activeDisplayFields = [DisplayField.ASN] jest.spyOn(documentListService, 'documents', 'get').mockReturnValue(docs) fixture.detectChanges() expect(documentListService.sortField).toEqual('created') @@ -555,7 +555,7 @@ describe('DocumentListComponent', () => { ], page_size: 5, display_mode: DisplayMode.SMALL_CARDS, - document_display_fields: [DocumentDisplayField.TITLE], + display_fields: [DisplayField.TITLE], } jest.spyOn(savedViewService, 'getCached').mockReturnValue(of(view)) const queryParams = { view: view.id.toString() } @@ -567,9 +567,9 @@ describe('DocumentListComponent', () => { fixture.detectChanges() expect(documentListService.activeSavedViewId).toEqual(10) - component.list.documentDisplayFields = [DocumentDisplayField.ASN] + component.list.displayFields = [DisplayField.ASN] expect(component.savedViewIsModified).toBeTruthy() - component.list.documentDisplayFields = [DocumentDisplayField.TITLE] + component.list.displayFields = [DisplayField.TITLE] expect(component.savedViewIsModified).toBeFalsy() component.list.displayMode = DisplayMode.TABLE expect(component.savedViewIsModified).toBeTruthy() @@ -590,9 +590,7 @@ describe('DocumentListComponent', () => { expect(documentListService.sortField).toEqual('created') component.list.displayMode = DisplayMode.TABLE - component.list.documentDisplayFields = DEFAULT_DOCUMENT_DISPLAY_FIELDS.map( - (f) => f.id - ) + component.list.displayFields = DEFAULT_DISPLAY_FIELDS.map((f) => f.id) fixture.detectChanges() expect( @@ -635,19 +633,19 @@ describe('DocumentListComponent', () => { it('should support toggling display fields', () => { fixture.detectChanges() - component.activeDisplayFields = [DocumentDisplayField.ASN] - component.toggleDisplayField(DocumentDisplayField.TITLE) + component.activeDisplayFields = [DisplayField.ASN] + component.toggleDisplayField(DisplayField.TITLE) expect(component.activeDisplayFields).toEqual([ - DocumentDisplayField.ASN, - DocumentDisplayField.TITLE, + DisplayField.ASN, + DisplayField.TITLE, ]) - component.toggleDisplayField(DocumentDisplayField.ASN) - expect(component.activeDisplayFields).toEqual([DocumentDisplayField.TITLE]) + component.toggleDisplayField(DisplayField.ASN) + expect(component.activeDisplayFields).toEqual([DisplayField.TITLE]) }) it('should get custom field title', () => { fixture.detectChanges() - settingsService.allDocumentDisplayFields = [ + settingsService.allDisplayFields = [ { id: 'custom_field_1', name: 'Custom Field 1' }, ] expect(component.getDisplayCustomFieldTitle('custom_field_1')).toEqual( 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 a2b8e4730..8fed37126 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,11 +16,7 @@ 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, - DocumentDisplayField, - SavedView, -} from 'src/app/data/saved-view' +import { DisplayMode, DisplayField, SavedView } from 'src/app/data/saved-view' import { SETTINGS_KEYS } from 'src/app/data/ui-settings' import { SortableDirective, @@ -50,7 +46,7 @@ export class DocumentListComponent extends ComponentWithPermissions implements OnInit, OnDestroy { - DocumentDisplayField = DocumentDisplayField + DisplayField = DisplayField DisplayMode = DisplayMode constructor( @@ -73,12 +69,12 @@ export class DocumentListComponent @ViewChildren(SortableDirective) headers: QueryList - get activeDisplayFields(): DocumentDisplayField[] { - return this.list.documentDisplayFields + get activeDisplayFields(): DisplayField[] { + return this.list.displayFields } - set activeDisplayFields(fields: DocumentDisplayField[]) { - this.list.documentDisplayFields = fields + set activeDisplayFields(fields: DisplayField[]) { + this.list.displayFields = fields this.updateDisplayCustomFields() } activeDisplayCustomFields: Set = new Set() @@ -88,7 +84,7 @@ export class DocumentListComponent Array.from(this.activeDisplayFields).filter( (field) => typeof field === 'string' && - field.startsWith(DocumentDisplayField.CUSTOM_FIELD) + field.startsWith(DisplayField.CUSTOM_FIELD) ) ) } @@ -107,7 +103,7 @@ export class DocumentListComponent (this.unmodifiedSavedView.page_size && this.unmodifiedSavedView.page_size !== this.list.pageSize) || this.unmodifiedSavedView.display_mode !== this.list.displayMode || - this.unmodifiedSavedView.document_display_fields.join(',') !== + this.unmodifiedSavedView.display_fields.join(',') !== this.activeDisplayFields.join(',') || filterRulesDiffer( this.unmodifiedSavedView.filter_rules, @@ -153,7 +149,7 @@ export class DocumentListComponent return this.list.selected.size > 0 } - toggleDisplayField(field: DocumentDisplayField) { + toggleDisplayField(field: DisplayField) { if (this.activeDisplayFields.includes(field)) { this.activeDisplayFields = this.activeDisplayFields.filter( (f) => f !== field @@ -165,9 +161,8 @@ export class DocumentListComponent } public getDisplayCustomFieldTitle(field: string) { - return this.settingsService.allDocumentDisplayFields.find( - (f) => f.id === field - )?.name + return this.settingsService.allDisplayFields.find((f) => f.id === field) + ?.name } ngOnInit(): void { @@ -198,8 +193,8 @@ export class DocumentListComponent if (!view.display_mode) { view.display_mode = this.list.displayMode } - if (!view.document_display_fields) { - view.document_display_fields = this.list.documentDisplayFields + if (!view.display_fields) { + view.display_fields = this.list.displayFields } this.unmodifiedSavedView = view this.list.activateSavedViewWithQueryParams( diff --git a/src-ui/src/app/data/saved-view.ts b/src-ui/src/app/data/saved-view.ts index 2f416b73a..20b73b3aa 100644 --- a/src-ui/src/app/data/saved-view.ts +++ b/src-ui/src/app/data/saved-view.ts @@ -7,7 +7,7 @@ export enum DisplayMode { LARGE_CARDS = 'largeCards', } -export enum DocumentDisplayField { +export enum DisplayField { TITLE = 'title', CREATED = 'created', ADDED = 'added', @@ -22,51 +22,51 @@ export enum DocumentDisplayField { ASN = 'asn', } -export const DEFAULT_PAGE_SIZE = 10 +export const DEFAULT_DASHBOARD_VIEW_PAGE_SIZE = 10 -export const DEFAULT_DOCUMENT_DISPLAY_FIELDS = [ +export const DEFAULT_DISPLAY_FIELDS = [ { - id: DocumentDisplayField.TITLE, + id: DisplayField.TITLE, name: $localize`Title`, }, { - id: DocumentDisplayField.CREATED, + id: DisplayField.CREATED, name: $localize`Created`, }, { - id: DocumentDisplayField.ADDED, + id: DisplayField.ADDED, name: $localize`Added`, }, { - id: DocumentDisplayField.TAGS, + id: DisplayField.TAGS, name: $localize`Tags`, }, { - id: DocumentDisplayField.CORRESPONDENT, + id: DisplayField.CORRESPONDENT, name: $localize`Correspondent`, }, { - id: DocumentDisplayField.DOCUMENT_TYPE, + id: DisplayField.DOCUMENT_TYPE, name: $localize`Document type`, }, { - id: DocumentDisplayField.STORAGE_PATH, + id: DisplayField.STORAGE_PATH, name: $localize`Storage path`, }, { - id: DocumentDisplayField.NOTES, + id: DisplayField.NOTES, name: $localize`Notes`, }, { - id: DocumentDisplayField.OWNER, + id: DisplayField.OWNER, name: $localize`Owner`, }, { - id: DocumentDisplayField.SHARED, + id: DisplayField.SHARED, name: $localize`Shared`, }, { - id: DocumentDisplayField.ASN, + id: DisplayField.ASN, name: $localize`ASN`, }, ] @@ -88,5 +88,5 @@ export interface SavedView extends ObjectWithPermissions { display_mode?: DisplayMode - document_display_fields?: DocumentDisplayField[] + display_fields?: DisplayField[] } 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 ffb492d9d..3616779c2 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 @@ -13,9 +13,9 @@ import { FILTER_HAS_TAGS_ANY, } from '../data/filter-rule-type' import { - DEFAULT_DOCUMENT_DISPLAY_FIELDS, + DEFAULT_DISPLAY_FIELDS, DisplayMode, - DocumentDisplayField, + DisplayField, SavedView, } from '../data/saved-view' import { FilterRule } from '../data/filter-rule' @@ -569,25 +569,25 @@ describe('DocumentListViewService', () => { it('should update default view state when display fields change', () => { const localStorageSpy = jest.spyOn(localStorage, 'setItem') - documentListViewService.documentDisplayFields = [ - DocumentDisplayField.ADDED, - DocumentDisplayField.TITLE, + documentListViewService.displayFields = [ + DisplayField.ADDED, + DisplayField.TITLE, ] - expect(documentListViewService.documentDisplayFields).toEqual([ - DocumentDisplayField.ADDED, - DocumentDisplayField.TITLE, + expect(documentListViewService.displayFields).toEqual([ + DisplayField.ADDED, + DisplayField.TITLE, ]) expect(localStorageSpy).toHaveBeenCalled() // reload triggered httpTestingController.match( `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true` ) - documentListViewService.documentDisplayFields = null + documentListViewService.displayFields = null httpTestingController.match( `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true` ) - expect(documentListViewService.documentDisplayFields).toEqual( - DEFAULT_DOCUMENT_DISPLAY_FIELDS.map((f) => f.id) + expect(documentListViewService.displayFields).toEqual( + DEFAULT_DISPLAY_FIELDS.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 f0b7b91c7..4ae301081 100644 --- a/src-ui/src/app/services/document-list-view.service.ts +++ b/src-ui/src/app/services/document-list-view.service.ts @@ -9,9 +9,9 @@ import { } from '../utils/filter-rules' import { Document } from '../data/document' import { - DEFAULT_DOCUMENT_DISPLAY_FIELDS, + DEFAULT_DISPLAY_FIELDS, DisplayMode, - DocumentDisplayField, + DisplayField, SavedView, } from '../data/saved-view' import { SETTINGS_KEYS } from '../data/ui-settings' @@ -78,7 +78,7 @@ export interface ListViewState { /** * The fields to display in the document list. */ - documentDisplayFields?: DocumentDisplayField[] + displayFields?: DisplayField[] } /** @@ -196,8 +196,7 @@ export class DocumentListViewService { } this.activeListViewState.displayMode = view.display_mode this.activeListViewState.pageSize = view.page_size - this.activeListViewState.documentDisplayFields = - view.document_display_fields + this.activeListViewState.displayFields = view.display_fields this.reduceSelectionToFilter() @@ -411,15 +410,15 @@ export class DocumentListViewService { ) } - get documentDisplayFields(): DocumentDisplayField[] { + get displayFields(): DisplayField[] { return ( - this.activeListViewState.documentDisplayFields ?? - DEFAULT_DOCUMENT_DISPLAY_FIELDS.map((f) => f.id) + this.activeListViewState.displayFields ?? + DEFAULT_DISPLAY_FIELDS.map((f) => f.id) ) } - set documentDisplayFields(fields: DocumentDisplayField[]) { - this.activeListViewState.documentDisplayFields = fields + set displayFields(fields: DisplayField[]) { + this.activeListViewState.displayFields = fields this.saveDocumentListView() } @@ -432,7 +431,7 @@ export class DocumentListViewService { sortField: this.activeListViewState.sortField, sortReverse: this.activeListViewState.sortReverse, displayMode: this.activeListViewState.displayMode, - documentDisplayFields: this.activeListViewState.documentDisplayFields, + displayFields: this.activeListViewState.displayFields, } localStorage.setItem( DOCUMENT_LIST_SERVICE.CURRENT_VIEW_CONFIG, diff --git a/src-ui/src/app/services/settings.service.spec.ts b/src-ui/src/app/services/settings.service.spec.ts index 9784645dd..d3970e1ae 100644 --- a/src-ui/src/app/services/settings.service.spec.ts +++ b/src-ui/src/app/services/settings.service.spec.ts @@ -13,8 +13,8 @@ import { AppModule } from '../app.module' import { UiSettings, SETTINGS_KEYS } from '../data/ui-settings' import { SettingsService } from './settings.service' import { - DEFAULT_DOCUMENT_DISPLAY_FIELDS, - DocumentDisplayField, + DEFAULT_DISPLAY_FIELDS, + DisplayField, SavedView, } from '../data/saved-view' import { CustomFieldsService } from './rest/custom-fields.service' @@ -352,14 +352,11 @@ describe('SettingsService', () => { ) settingsService.initializeDisplayFields() expect( - settingsService.allDocumentDisplayFields.includes( - DEFAULT_DOCUMENT_DISPLAY_FIELDS[0] - ) + settingsService.allDisplayFields.includes(DEFAULT_DISPLAY_FIELDS[0]) ).toBeTruthy() expect( - settingsService.allDocumentDisplayFields.find( - (f) => - f.id === `${DocumentDisplayField.CUSTOM_FIELD}${customFields[0].id}` + settingsService.allDisplayFields.find( + (f) => f.id === `${DisplayField.CUSTOM_FIELD}${customFields[0].id}` ).name ).toEqual(customFields[0].name) }) diff --git a/src-ui/src/app/services/settings.service.ts b/src-ui/src/app/services/settings.service.ts index 7afebcd4d..c8d78f777 100644 --- a/src-ui/src/app/services/settings.service.ts +++ b/src-ui/src/app/services/settings.service.ts @@ -26,8 +26,8 @@ import { } from './permissions.service' import { ToastService } from './toast.service' import { - DEFAULT_DOCUMENT_DISPLAY_FIELDS, - DocumentDisplayField, + DEFAULT_DISPLAY_FIELDS, + DisplayField, SavedView, } from '../data/saved-view' import { CustomFieldsService } from './rest/custom-fields.service' @@ -266,7 +266,7 @@ export class SettingsService { public globalDropzoneActive: boolean = false public organizingSidebarSavedViews: boolean = false - public allDocumentDisplayFields: any + public allDisplayFields: any constructor( rendererFactory: RendererFactory2, @@ -307,7 +307,7 @@ export class SettingsService { } public initializeDisplayFields() { - this.allDocumentDisplayFields = DEFAULT_DOCUMENT_DISPLAY_FIELDS + this.allDisplayFields = DEFAULT_DISPLAY_FIELDS if ( this.permissionsService.currentUserCan( @@ -316,10 +316,10 @@ export class SettingsService { ) ) { this.customFieldsService.listAll().subscribe((r) => { - this.allDocumentDisplayFields = DEFAULT_DOCUMENT_DISPLAY_FIELDS.concat( + this.allDisplayFields = DEFAULT_DISPLAY_FIELDS.concat( r.results.map((field) => { return { - id: `${DocumentDisplayField.CUSTOM_FIELD}${field.id}` as any, + id: `${DisplayField.CUSTOM_FIELD}${field.id}` as any, name: field.name, } }) diff --git a/src/documents/migrations/1047_savedview_display_mode_and_more.py b/src/documents/migrations/1047_savedview_display_mode_and_more.py index 5093b9616..85f5d1660 100644 --- a/src/documents/migrations/1047_savedview_display_mode_and_more.py +++ b/src/documents/migrations/1047_savedview_display_mode_and_more.py @@ -40,7 +40,7 @@ class Migration(migrations.Migration): ), migrations.AddField( model_name="savedview", - name="document_display_fields", + name="display_fields", field=multiselectfield.db.fields.MultiSelectField( choices=[ ("title", "Title"), diff --git a/src/documents/models.py b/src/documents/models.py index 6e9137992..137024576 100644 --- a/src/documents/models.py +++ b/src/documents/models.py @@ -552,12 +552,12 @@ class DynamicMultiSelectField(MultiSelectField): class SavedView(ModelWithOwner): - class ViewDisplayMode(models.TextChoices): + class DisplayMode(models.TextChoices): TABLE = ("table", _("Table")) SMALL_CARDS = ("smallCards", _("Small Cards")) LARGE_CARDS = ("largeCards", _("Large Cards")) - class DocumentDisplayFields(models.TextChoices): + class DisplayFields(models.TextChoices): TITLE = ("title", _("Title")) CREATED = ("created", _("Created")) ADDED = ("added", _("Added")) @@ -566,7 +566,7 @@ class SavedView(ModelWithOwner): CORRESPONDENT = ("correspondent", _("Correspondent")) STORAGE_PATH = ("storagepath", _("Storage Path")) - class DynamicDocumentDisplayFields: + class DynamicDisplayFields: CUSTOM_FIELD = ("custom_field_%d", CustomField) name = models.CharField(_("name"), max_length=128) @@ -596,17 +596,17 @@ class SavedView(ModelWithOwner): display_mode = models.CharField( max_length=128, verbose_name=_("View display mode"), - choices=ViewDisplayMode.choices, + choices=DisplayMode.choices, null=True, blank=True, ) - document_display_fields = DynamicMultiSelectField( + display_fields = DynamicMultiSelectField( max_length=128, verbose_name=_("Document display fields"), - choices=DocumentDisplayFields.choices, - dyanmic_choices=[DynamicDocumentDisplayFields.CUSTOM_FIELD], - default=f"{DocumentDisplayFields.CREATED},{DocumentDisplayFields.TITLE},{DocumentDisplayFields.TAGS},{DocumentDisplayFields.CORRESPONDENT}", + choices=DisplayFields.choices, + dyanmic_choices=[DynamicDisplayFields.CUSTOM_FIELD], + default=f"{DisplayFields.CREATED},{DisplayFields.TITLE},{DisplayFields.TAGS},{DisplayFields.CORRESPONDENT}", ) class Meta: diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py index a64dcce10..a3cec7916 100644 --- a/src/documents/serialisers.py +++ b/src/documents/serialisers.py @@ -839,8 +839,8 @@ class DynamicOrderedMultipleChoiceField(fields.MultipleChoiceField): class SavedViewSerializer(OwnedObjectSerializer): filter_rules = SavedViewFilterRuleSerializer(many=True) - document_display_fields = DynamicOrderedMultipleChoiceField( - choices=SavedView.DocumentDisplayFields.choices, + display_fields = DynamicOrderedMultipleChoiceField( + choices=SavedView.DisplayFields.choices, dyanmic_choices=[("custom_field_%d", CustomField)], required=False, ) @@ -857,7 +857,7 @@ class SavedViewSerializer(OwnedObjectSerializer): "filter_rules", "page_size", "display_mode", - "document_display_fields", + "display_fields", "owner", "permissions", "user_can_change", diff --git a/src/documents/tests/test_api_documents.py b/src/documents/tests/test_api_documents.py index 410dd0716..aa0ee2dcf 100644 --- a/src/documents/tests/test_api_documents.py +++ b/src/documents/tests/test_api_documents.py @@ -1614,7 +1614,7 @@ class TestDocumentApi(DirectoriesMixin, DocumentConsumeDelayMixin, APITestCase): status.HTTP_404_NOT_FOUND, ) - def test_savedview_create_update_patch(self): + def test_saved_view_create_update_patch(self): User.objects.create_user("user1") view = { @@ -1661,7 +1661,7 @@ class TestDocumentApi(DirectoriesMixin, DocumentConsumeDelayMixin, APITestCase): v1 = SavedView.objects.get(id=v1.id) self.assertEqual(v1.filter_rules.count(), 0) - def test_saved_view_dashboard_view_options(self): + def test_saved_view_display_options(self): User.objects.create_user("user1") view = { @@ -1671,10 +1671,10 @@ class TestDocumentApi(DirectoriesMixin, DocumentConsumeDelayMixin, APITestCase): "sort_field": "created2", "filter_rules": [{"rule_type": 4, "value": "test"}], "page_size": 20, - "display_mode": SavedView.ViewDisplayMode.SMALL_CARDS, - "document_display_fields": [ - SavedView.DocumentDisplayFields.TITLE, - SavedView.DocumentDisplayFields.CREATED, + "display_mode": SavedView.DisplayMode.SMALL_CARDS, + "display_fields": [ + SavedView.DisplayFields.TITLE, + SavedView.DisplayFields.CREATED, ], } @@ -1685,23 +1685,23 @@ class TestDocumentApi(DirectoriesMixin, DocumentConsumeDelayMixin, APITestCase): self.assertEqual(v1.page_size, 20) self.assertEqual( v1.display_mode, - SavedView.ViewDisplayMode.SMALL_CARDS, + SavedView.DisplayMode.SMALL_CARDS, ) self.assertEqual( - v1.document_display_fields, + v1.display_fields, [ - SavedView.DocumentDisplayFields.TITLE, - SavedView.DocumentDisplayFields.CREATED, + SavedView.DisplayFields.TITLE, + SavedView.DisplayFields.CREATED, ], ) response = self.client.patch( f"/api/saved_views/{v1.id}/", { - "document_display_fields": [ - SavedView.DocumentDisplayFields.TAGS, - SavedView.DocumentDisplayFields.TITLE, - SavedView.DocumentDisplayFields.CREATED, + "display_fields": [ + SavedView.DisplayFields.TAGS, + SavedView.DisplayFields.TITLE, + SavedView.DisplayFields.CREATED, ], }, format="json", @@ -1710,15 +1710,15 @@ class TestDocumentApi(DirectoriesMixin, DocumentConsumeDelayMixin, APITestCase): v1.refresh_from_db() self.assertEqual( - v1.document_display_fields, + v1.display_fields, [ - SavedView.DocumentDisplayFields.TAGS, - SavedView.DocumentDisplayFields.TITLE, - SavedView.DocumentDisplayFields.CREATED, + SavedView.DisplayFields.TAGS, + SavedView.DisplayFields.TITLE, + SavedView.DisplayFields.CREATED, ], ) - def test_saved_view_dashboard_view_customfields(self): + def test_saved_view_display_customfields(self): view = { "name": "test", "show_on_dashboard": True, @@ -1726,10 +1726,10 @@ class TestDocumentApi(DirectoriesMixin, DocumentConsumeDelayMixin, APITestCase): "sort_field": "created2", "filter_rules": [{"rule_type": 4, "value": "test"}], "page_size": 20, - "display_mode": SavedView.ViewDisplayMode.SMALL_CARDS, - "document_display_fields": [ - SavedView.DocumentDisplayFields.TITLE, - SavedView.DocumentDisplayFields.CREATED, + "display_mode": SavedView.DisplayMode.SMALL_CARDS, + "display_fields": [ + SavedView.DisplayFields.TITLE, + SavedView.DisplayFields.CREATED, ], } @@ -1746,11 +1746,10 @@ class TestDocumentApi(DirectoriesMixin, DocumentConsumeDelayMixin, APITestCase): response = self.client.patch( f"/api/saved_views/{v1.id}/", { - "document_display_fields": [ - SavedView.DocumentDisplayFields.TITLE, - SavedView.DocumentDisplayFields.CREATED, - SavedView.DynamicDocumentDisplayFields.CUSTOM_FIELD[0] - % custom_field.id, + "display_fields": [ + SavedView.DisplayFields.TITLE, + SavedView.DisplayFields.CREATED, + SavedView.DynamicDisplayFields.CUSTOM_FIELD[0] % custom_field.id, ], }, format="json", @@ -1759,12 +1758,11 @@ class TestDocumentApi(DirectoriesMixin, DocumentConsumeDelayMixin, APITestCase): v1.refresh_from_db() self.assertEqual( - v1.document_display_fields, + v1.display_fields, [ - str(SavedView.DocumentDisplayFields.TITLE), - str(SavedView.DocumentDisplayFields.CREATED), - SavedView.DynamicDocumentDisplayFields.CUSTOM_FIELD[0] - % custom_field.id, + str(SavedView.DisplayFields.TITLE), + str(SavedView.DisplayFields.CREATED), + SavedView.DynamicDisplayFields.CUSTOM_FIELD[0] % custom_field.id, ], ) @@ -1772,10 +1770,10 @@ class TestDocumentApi(DirectoriesMixin, DocumentConsumeDelayMixin, APITestCase): response = self.client.patch( f"/api/saved_views/{v1.id}/", { - "document_display_fields": [ - SavedView.DocumentDisplayFields.TITLE, - SavedView.DocumentDisplayFields.CREATED, - SavedView.DynamicDocumentDisplayFields.CUSTOM_FIELD[0] % 99, + "display_fields": [ + SavedView.DisplayFields.TITLE, + SavedView.DisplayFields.CREATED, + SavedView.DynamicDisplayFields.CUSTOM_FIELD[0] % 99, ], }, format="json", diff --git a/src/locale/en_US/LC_MESSAGES/django.po b/src/locale/en_US/LC_MESSAGES/django.po index 6496b56b3..7564b6077 100644 --- a/src/locale/en_US/LC_MESSAGES/django.po +++ b/src/locale/en_US/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: paperless-ngx\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-19 01:15-0700\n" +"POT-Creation-Date: 2024-04-19 01:14-0700\n" "PO-Revision-Date: 2022-02-17 04:17\n" "Last-Translator: \n" "Language-Team: English\n" @@ -21,31 +21,31 @@ msgstr "" msgid "Documents" msgstr "" -#: documents/models.py:36 documents/models.py:739 +#: documents/models.py:36 documents/models.py:938 msgid "owner" msgstr "" -#: documents/models.py:53 documents/models.py:902 +#: documents/models.py:53 documents/models.py:963 msgid "None" msgstr "" -#: documents/models.py:54 documents/models.py:903 +#: documents/models.py:54 documents/models.py:964 msgid "Any word" msgstr "" -#: documents/models.py:55 documents/models.py:904 +#: documents/models.py:55 documents/models.py:965 msgid "All words" msgstr "" -#: documents/models.py:56 documents/models.py:905 +#: documents/models.py:56 documents/models.py:966 msgid "Exact match" msgstr "" -#: documents/models.py:57 documents/models.py:906 +#: documents/models.py:57 documents/models.py:967 msgid "Regular expression" msgstr "" -#: documents/models.py:58 documents/models.py:907 +#: documents/models.py:58 documents/models.py:968 msgid "Fuzzy word" msgstr "" @@ -53,20 +53,20 @@ msgstr "" msgid "Automatic" msgstr "" -#: documents/models.py:62 documents/models.py:397 documents/models.py:1223 +#: documents/models.py:62 documents/models.py:572 documents/models.py:1284 #: paperless_mail/models.py:18 paperless_mail/models.py:93 msgid "name" msgstr "" -#: documents/models.py:64 documents/models.py:963 +#: documents/models.py:64 documents/models.py:1024 msgid "match" msgstr "" -#: documents/models.py:67 documents/models.py:966 +#: documents/models.py:67 documents/models.py:1027 msgid "matching algorithm" msgstr "" -#: documents/models.py:72 documents/models.py:971 +#: documents/models.py:72 documents/models.py:1032 msgid "is insensitive" msgstr "" @@ -132,7 +132,7 @@ msgstr "" msgid "title" msgstr "" -#: documents/models.py:171 documents/models.py:653 +#: documents/models.py:171 documents/models.py:852 msgid "content" msgstr "" @@ -162,8 +162,8 @@ msgstr "" msgid "The checksum of the archived document." msgstr "" -#: documents/models.py:205 documents/models.py:385 documents/models.py:659 -#: documents/models.py:697 documents/models.py:767 documents/models.py:804 +#: documents/models.py:205 documents/models.py:385 documents/models.py:412 +#: documents/models.py:449 documents/models.py:858 documents/models.py:896 msgid "created" msgstr "" @@ -211,7 +211,7 @@ msgstr "" msgid "The position of this document in your physical document archive." msgstr "" -#: documents/models.py:279 documents/models.py:670 documents/models.py:724 +#: documents/models.py:279 documents/models.py:869 documents/models.py:923 msgid "document" msgstr "" @@ -259,602 +259,654 @@ msgstr "" msgid "logs" msgstr "" -#: documents/models.py:400 -msgid "show on dashboard" -msgstr "" - -#: documents/models.py:403 -msgid "show in sidebar" -msgstr "" - -#: documents/models.py:407 -msgid "sort field" -msgstr "" - -#: documents/models.py:412 -msgid "sort reverse" -msgstr "" - -#: documents/models.py:416 documents/models.py:469 -msgid "saved view" -msgstr "" - -#: documents/models.py:417 -msgid "saved views" -msgstr "" - -#: documents/models.py:425 -msgid "title contains" -msgstr "" - -#: documents/models.py:426 -msgid "content contains" -msgstr "" - -#: documents/models.py:427 -msgid "ASN is" -msgstr "" - -#: documents/models.py:428 -msgid "correspondent is" -msgstr "" - -#: documents/models.py:429 -msgid "document type is" -msgstr "" - -#: documents/models.py:430 -msgid "is in inbox" -msgstr "" - -#: documents/models.py:431 -msgid "has tag" -msgstr "" - -#: documents/models.py:432 -msgid "has any tag" -msgstr "" - -#: documents/models.py:433 -msgid "created before" -msgstr "" - -#: documents/models.py:434 -msgid "created after" -msgstr "" - -#: documents/models.py:435 -msgid "created year is" -msgstr "" - -#: documents/models.py:436 -msgid "created month is" -msgstr "" - -#: documents/models.py:437 -msgid "created day is" -msgstr "" - -#: documents/models.py:438 -msgid "added before" -msgstr "" - -#: documents/models.py:439 -msgid "added after" -msgstr "" - -#: documents/models.py:440 -msgid "modified before" -msgstr "" - -#: documents/models.py:441 -msgid "modified after" -msgstr "" - -#: documents/models.py:442 -msgid "does not have tag" -msgstr "" - -#: documents/models.py:443 -msgid "does not have ASN" -msgstr "" - -#: documents/models.py:444 -msgid "title or content contains" -msgstr "" - -#: documents/models.py:445 -msgid "fulltext query" -msgstr "" - -#: documents/models.py:446 -msgid "more like this" -msgstr "" - -#: documents/models.py:447 -msgid "has tags in" -msgstr "" - -#: documents/models.py:448 -msgid "ASN greater than" -msgstr "" - -#: documents/models.py:449 -msgid "ASN less than" -msgstr "" - -#: documents/models.py:450 -msgid "storage path is" -msgstr "" - -#: documents/models.py:451 -msgid "has correspondent in" -msgstr "" - -#: documents/models.py:452 -msgid "does not have correspondent in" -msgstr "" - -#: documents/models.py:453 -msgid "has document type in" -msgstr "" - -#: documents/models.py:454 -msgid "does not have document type in" -msgstr "" - -#: documents/models.py:455 -msgid "has storage path in" -msgstr "" - -#: documents/models.py:456 -msgid "does not have storage path in" -msgstr "" - -#: documents/models.py:457 -msgid "owner is" -msgstr "" - -#: documents/models.py:458 -msgid "has owner in" -msgstr "" - -#: documents/models.py:459 -msgid "does not have owner" -msgstr "" - -#: documents/models.py:460 -msgid "does not have owner in" -msgstr "" - -#: documents/models.py:461 -msgid "has custom field value" -msgstr "" - -#: documents/models.py:462 -msgid "is shared by me" -msgstr "" - -#: documents/models.py:472 -msgid "rule type" -msgstr "" - -#: documents/models.py:474 -msgid "value" -msgstr "" - -#: documents/models.py:477 -msgid "filter rule" -msgstr "" - -#: documents/models.py:478 -msgid "filter rules" -msgstr "" - -#: documents/models.py:589 -msgid "Task ID" -msgstr "" - -#: documents/models.py:590 -msgid "Celery ID for the Task that was run" -msgstr "" - -#: documents/models.py:595 -msgid "Acknowledged" -msgstr "" - -#: documents/models.py:596 -msgid "If the task is acknowledged via the frontend or API" -msgstr "" - -#: documents/models.py:602 -msgid "Task Filename" -msgstr "" - -#: documents/models.py:603 -msgid "Name of the file which the Task was run for" -msgstr "" - -#: documents/models.py:609 -msgid "Task Name" -msgstr "" - -#: documents/models.py:610 -msgid "Name of the Task which was run" -msgstr "" - -#: documents/models.py:617 -msgid "Task State" -msgstr "" - -#: documents/models.py:618 -msgid "Current state of the task being run" -msgstr "" - -#: documents/models.py:623 -msgid "Created DateTime" -msgstr "" - -#: documents/models.py:624 -msgid "Datetime field when the task result was created in UTC" -msgstr "" - -#: documents/models.py:629 -msgid "Started DateTime" -msgstr "" - -#: documents/models.py:630 -msgid "Datetime field when the task was started in UTC" -msgstr "" - -#: documents/models.py:635 -msgid "Completed DateTime" -msgstr "" - -#: documents/models.py:636 -msgid "Datetime field when the task was completed in UTC" -msgstr "" - -#: documents/models.py:641 -msgid "Result Data" -msgstr "" - -#: documents/models.py:643 -msgid "The data returned by the task" -msgstr "" - -#: documents/models.py:655 -msgid "Note for the document" -msgstr "" - -#: documents/models.py:679 -msgid "user" -msgstr "" - -#: documents/models.py:684 -msgid "note" -msgstr "" - -#: documents/models.py:685 -msgid "notes" -msgstr "" - -#: documents/models.py:693 -msgid "Archive" -msgstr "" - -#: documents/models.py:694 -msgid "Original" -msgstr "" - -#: documents/models.py:705 -msgid "expiration" -msgstr "" - -#: documents/models.py:712 -msgid "slug" -msgstr "" - -#: documents/models.py:744 -msgid "share link" -msgstr "" - -#: documents/models.py:745 -msgid "share links" -msgstr "" - -#: documents/models.py:757 +#: documents/models.py:402 msgid "String" msgstr "" -#: documents/models.py:758 +#: documents/models.py:403 msgid "URL" msgstr "" -#: documents/models.py:759 +#: documents/models.py:404 msgid "Date" msgstr "" -#: documents/models.py:760 +#: documents/models.py:405 msgid "Boolean" msgstr "" -#: documents/models.py:761 +#: documents/models.py:406 msgid "Integer" msgstr "" -#: documents/models.py:762 +#: documents/models.py:407 msgid "Float" msgstr "" -#: documents/models.py:763 +#: documents/models.py:408 msgid "Monetary" msgstr "" -#: documents/models.py:764 +#: documents/models.py:409 msgid "Document Link" msgstr "" -#: documents/models.py:776 +#: documents/models.py:421 msgid "data type" msgstr "" -#: documents/models.py:784 +#: documents/models.py:429 msgid "custom field" msgstr "" -#: documents/models.py:785 +#: documents/models.py:430 msgid "custom fields" msgstr "" -#: documents/models.py:847 +#: documents/models.py:492 msgid "custom field instance" msgstr "" -#: documents/models.py:848 +#: documents/models.py:493 msgid "custom field instances" msgstr "" -#: documents/models.py:910 -msgid "Consumption Started" +#: documents/models.py:556 +msgid "Table" +msgstr "" + +#: documents/models.py:557 +msgid "Small Cards" +msgstr "" + +#: documents/models.py:558 +msgid "Large Cards" +msgstr "" + +#: documents/models.py:561 +msgid "Title" +msgstr "" + +#: documents/models.py:562 +msgid "Created" +msgstr "" + +#: documents/models.py:563 +msgid "Added" +msgstr "" + +#: documents/models.py:564 +msgid "Tags" +msgstr "" + +#: documents/models.py:565 +msgid "Document Type" +msgstr "" + +#: documents/models.py:566 +msgid "Correspondent" +msgstr "" + +#: documents/models.py:567 +msgid "Storage Path" +msgstr "" + +#: documents/models.py:575 +msgid "show on dashboard" +msgstr "" + +#: documents/models.py:578 +msgid "show in sidebar" +msgstr "" + +#: documents/models.py:582 +msgid "sort field" +msgstr "" + +#: documents/models.py:587 +msgid "sort reverse" +msgstr "" + +#: documents/models.py:590 +msgid "View page size" +msgstr "" + +#: documents/models.py:598 +msgid "View display mode" +msgstr "" + +#: documents/models.py:606 +msgid "Document display fields" +msgstr "" + +#: documents/models.py:615 documents/models.py:668 +msgid "saved view" +msgstr "" + +#: documents/models.py:616 +msgid "saved views" +msgstr "" + +#: documents/models.py:624 +msgid "title contains" +msgstr "" + +#: documents/models.py:625 +msgid "content contains" +msgstr "" + +#: documents/models.py:626 +msgid "ASN is" +msgstr "" + +#: documents/models.py:627 +msgid "correspondent is" +msgstr "" + +#: documents/models.py:628 +msgid "document type is" +msgstr "" + +#: documents/models.py:629 +msgid "is in inbox" +msgstr "" + +#: documents/models.py:630 +msgid "has tag" +msgstr "" + +#: documents/models.py:631 +msgid "has any tag" +msgstr "" + +#: documents/models.py:632 +msgid "created before" +msgstr "" + +#: documents/models.py:633 +msgid "created after" +msgstr "" + +#: documents/models.py:634 +msgid "created year is" +msgstr "" + +#: documents/models.py:635 +msgid "created month is" +msgstr "" + +#: documents/models.py:636 +msgid "created day is" +msgstr "" + +#: documents/models.py:637 +msgid "added before" +msgstr "" + +#: documents/models.py:638 +msgid "added after" +msgstr "" + +#: documents/models.py:639 +msgid "modified before" +msgstr "" + +#: documents/models.py:640 +msgid "modified after" +msgstr "" + +#: documents/models.py:641 +msgid "does not have tag" +msgstr "" + +#: documents/models.py:642 +msgid "does not have ASN" +msgstr "" + +#: documents/models.py:643 +msgid "title or content contains" +msgstr "" + +#: documents/models.py:644 +msgid "fulltext query" +msgstr "" + +#: documents/models.py:645 +msgid "more like this" +msgstr "" + +#: documents/models.py:646 +msgid "has tags in" +msgstr "" + +#: documents/models.py:647 +msgid "ASN greater than" +msgstr "" + +#: documents/models.py:648 +msgid "ASN less than" +msgstr "" + +#: documents/models.py:649 +msgid "storage path is" +msgstr "" + +#: documents/models.py:650 +msgid "has correspondent in" +msgstr "" + +#: documents/models.py:651 +msgid "does not have correspondent in" +msgstr "" + +#: documents/models.py:652 +msgid "has document type in" +msgstr "" + +#: documents/models.py:653 +msgid "does not have document type in" +msgstr "" + +#: documents/models.py:654 +msgid "has storage path in" +msgstr "" + +#: documents/models.py:655 +msgid "does not have storage path in" +msgstr "" + +#: documents/models.py:656 +msgid "owner is" +msgstr "" + +#: documents/models.py:657 +msgid "has owner in" +msgstr "" + +#: documents/models.py:658 +msgid "does not have owner" +msgstr "" + +#: documents/models.py:659 +msgid "does not have owner in" +msgstr "" + +#: documents/models.py:660 +msgid "has custom field value" +msgstr "" + +#: documents/models.py:661 +msgid "is shared by me" +msgstr "" + +#: documents/models.py:671 +msgid "rule type" +msgstr "" + +#: documents/models.py:673 +msgid "value" +msgstr "" + +#: documents/models.py:676 +msgid "filter rule" +msgstr "" + +#: documents/models.py:677 +msgid "filter rules" +msgstr "" + +#: documents/models.py:788 +msgid "Task ID" +msgstr "" + +#: documents/models.py:789 +msgid "Celery ID for the Task that was run" +msgstr "" + +#: documents/models.py:794 +msgid "Acknowledged" +msgstr "" + +#: documents/models.py:795 +msgid "If the task is acknowledged via the frontend or API" +msgstr "" + +#: documents/models.py:801 +msgid "Task Filename" +msgstr "" + +#: documents/models.py:802 +msgid "Name of the file which the Task was run for" +msgstr "" + +#: documents/models.py:808 +msgid "Task Name" +msgstr "" + +#: documents/models.py:809 +msgid "Name of the Task which was run" +msgstr "" + +#: documents/models.py:816 +msgid "Task State" +msgstr "" + +#: documents/models.py:817 +msgid "Current state of the task being run" +msgstr "" + +#: documents/models.py:822 +msgid "Created DateTime" +msgstr "" + +#: documents/models.py:823 +msgid "Datetime field when the task result was created in UTC" +msgstr "" + +#: documents/models.py:828 +msgid "Started DateTime" +msgstr "" + +#: documents/models.py:829 +msgid "Datetime field when the task was started in UTC" +msgstr "" + +#: documents/models.py:834 +msgid "Completed DateTime" +msgstr "" + +#: documents/models.py:835 +msgid "Datetime field when the task was completed in UTC" +msgstr "" + +#: documents/models.py:840 +msgid "Result Data" +msgstr "" + +#: documents/models.py:842 +msgid "The data returned by the task" +msgstr "" + +#: documents/models.py:854 +msgid "Note for the document" +msgstr "" + +#: documents/models.py:878 +msgid "user" +msgstr "" + +#: documents/models.py:883 +msgid "note" +msgstr "" + +#: documents/models.py:884 +msgid "notes" +msgstr "" + +#: documents/models.py:892 +msgid "Archive" +msgstr "" + +#: documents/models.py:893 +msgid "Original" +msgstr "" + +#: documents/models.py:904 +msgid "expiration" msgstr "" #: documents/models.py:911 +msgid "slug" +msgstr "" + +#: documents/models.py:943 +msgid "share link" +msgstr "" + +#: documents/models.py:944 +msgid "share links" +msgstr "" + +#: documents/models.py:971 +msgid "Consumption Started" +msgstr "" + +#: documents/models.py:972 msgid "Document Added" msgstr "" -#: documents/models.py:912 +#: documents/models.py:973 msgid "Document Updated" msgstr "" -#: documents/models.py:915 +#: documents/models.py:976 msgid "Consume Folder" msgstr "" -#: documents/models.py:916 +#: documents/models.py:977 msgid "Api Upload" msgstr "" -#: documents/models.py:917 +#: documents/models.py:978 msgid "Mail Fetch" msgstr "" -#: documents/models.py:920 +#: documents/models.py:981 msgid "Workflow Trigger Type" msgstr "" -#: documents/models.py:932 +#: documents/models.py:993 msgid "filter path" msgstr "" -#: documents/models.py:937 +#: documents/models.py:998 msgid "" "Only consume documents with a path that matches this if specified. Wildcards " "specified as * are allowed. Case insensitive." msgstr "" -#: documents/models.py:944 +#: documents/models.py:1005 msgid "filter filename" msgstr "" -#: documents/models.py:949 paperless_mail/models.py:148 +#: documents/models.py:1010 paperless_mail/models.py:148 msgid "" "Only consume documents which entirely match this filename if specified. " "Wildcards such as *.pdf or *invoice* are allowed. Case insensitive." msgstr "" -#: documents/models.py:960 +#: documents/models.py:1021 msgid "filter documents from this mail rule" msgstr "" -#: documents/models.py:976 +#: documents/models.py:1037 msgid "has these tag(s)" msgstr "" -#: documents/models.py:984 +#: documents/models.py:1045 msgid "has this document type" msgstr "" -#: documents/models.py:992 +#: documents/models.py:1053 msgid "has this correspondent" msgstr "" -#: documents/models.py:996 +#: documents/models.py:1057 msgid "workflow trigger" msgstr "" -#: documents/models.py:997 +#: documents/models.py:1058 msgid "workflow triggers" msgstr "" -#: documents/models.py:1007 +#: documents/models.py:1068 msgid "Assignment" msgstr "" -#: documents/models.py:1011 +#: documents/models.py:1072 msgid "Removal" msgstr "" -#: documents/models.py:1015 +#: documents/models.py:1076 msgid "Workflow Action Type" msgstr "" -#: documents/models.py:1021 +#: documents/models.py:1082 msgid "assign title" msgstr "" -#: documents/models.py:1026 +#: documents/models.py:1087 msgid "" "Assign a document title, can include some placeholders, see documentation." msgstr "" -#: documents/models.py:1035 paperless_mail/models.py:216 +#: documents/models.py:1096 paperless_mail/models.py:216 msgid "assign this tag" msgstr "" -#: documents/models.py:1044 paperless_mail/models.py:224 +#: documents/models.py:1105 paperless_mail/models.py:224 msgid "assign this document type" msgstr "" -#: documents/models.py:1053 paperless_mail/models.py:238 +#: documents/models.py:1114 paperless_mail/models.py:238 msgid "assign this correspondent" msgstr "" -#: documents/models.py:1062 +#: documents/models.py:1123 msgid "assign this storage path" msgstr "" -#: documents/models.py:1071 +#: documents/models.py:1132 msgid "assign this owner" msgstr "" -#: documents/models.py:1078 +#: documents/models.py:1139 msgid "grant view permissions to these users" msgstr "" -#: documents/models.py:1085 +#: documents/models.py:1146 msgid "grant view permissions to these groups" msgstr "" -#: documents/models.py:1092 +#: documents/models.py:1153 msgid "grant change permissions to these users" msgstr "" -#: documents/models.py:1099 +#: documents/models.py:1160 msgid "grant change permissions to these groups" msgstr "" -#: documents/models.py:1106 +#: documents/models.py:1167 msgid "assign these custom fields" msgstr "" -#: documents/models.py:1113 +#: documents/models.py:1174 msgid "remove these tag(s)" msgstr "" -#: documents/models.py:1118 +#: documents/models.py:1179 msgid "remove all tags" msgstr "" -#: documents/models.py:1125 +#: documents/models.py:1186 msgid "remove these document type(s)" msgstr "" -#: documents/models.py:1130 +#: documents/models.py:1191 msgid "remove all document types" msgstr "" -#: documents/models.py:1137 +#: documents/models.py:1198 msgid "remove these correspondent(s)" msgstr "" -#: documents/models.py:1142 +#: documents/models.py:1203 msgid "remove all correspondents" msgstr "" -#: documents/models.py:1149 +#: documents/models.py:1210 msgid "remove these storage path(s)" msgstr "" -#: documents/models.py:1154 +#: documents/models.py:1215 msgid "remove all storage paths" msgstr "" -#: documents/models.py:1161 +#: documents/models.py:1222 msgid "remove these owner(s)" msgstr "" -#: documents/models.py:1166 +#: documents/models.py:1227 msgid "remove all owners" msgstr "" -#: documents/models.py:1173 +#: documents/models.py:1234 msgid "remove view permissions for these users" msgstr "" -#: documents/models.py:1180 +#: documents/models.py:1241 msgid "remove view permissions for these groups" msgstr "" -#: documents/models.py:1187 +#: documents/models.py:1248 msgid "remove change permissions for these users" msgstr "" -#: documents/models.py:1194 +#: documents/models.py:1255 msgid "remove change permissions for these groups" msgstr "" -#: documents/models.py:1199 +#: documents/models.py:1260 msgid "remove all permissions" msgstr "" -#: documents/models.py:1206 +#: documents/models.py:1267 msgid "remove these custom fields" msgstr "" -#: documents/models.py:1211 +#: documents/models.py:1272 msgid "remove all custom fields" msgstr "" -#: documents/models.py:1215 +#: documents/models.py:1276 msgid "workflow action" msgstr "" -#: documents/models.py:1216 +#: documents/models.py:1277 msgid "workflow actions" msgstr "" -#: documents/models.py:1225 paperless_mail/models.py:95 +#: documents/models.py:1286 paperless_mail/models.py:95 msgid "order" msgstr "" -#: documents/models.py:1231 +#: documents/models.py:1292 msgid "triggers" msgstr "" -#: documents/models.py:1238 +#: documents/models.py:1299 msgid "actions" msgstr "" -#: documents/models.py:1241 +#: documents/models.py:1302 msgid "enabled" msgstr "" -#: documents/serialisers.py:115 +#: documents/serialisers.py:114 #, python-format msgid "Invalid regular expression: %(error)s" msgstr "" -#: documents/serialisers.py:418 +#: documents/serialisers.py:417 msgid "Invalid color." msgstr "" -#: documents/serialisers.py:1148 +#: documents/serialisers.py:1186 #, python-format msgid "File type %(type)s not supported" msgstr "" -#: documents/serialisers.py:1257 +#: documents/serialisers.py:1295 msgid "Invalid variable detected." msgstr ""
ASNCorrespondentTitleOwnerNotesDocument typeStorage pathCreated - @if (activeDisplayFields.includes(DocumentDisplayField.ASN)) { + @if (activeDisplayFields.includes(DisplayField.ASN)) { {{d.archive_serial_number}} @if (d.correspondent) { {{(d.correspondent$ | async)?.name}} @@ -269,21 +269,21 @@ - @if (activeDisplayFields.includes(DocumentDisplayField.TITLE)) { + @if (activeDisplayFields.includes(DisplayField.TITLE)) { {{d.title | documentTitle}} } - @if (activeDisplayFields.includes(DocumentDisplayField.TAGS)) { + @if (activeDisplayFields.includes(DisplayField.TAGS)) { @for (t of d.tags$ | async; track t) { } } {{d.owner | username}} @if (d.notes.length) { @@ -294,26 +294,26 @@ } @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}}