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

Refactoring names

Browse Source
This commit is contained in:
shamoon 2024-04-17 20:48:00 -07:00
parent 9b075fb86b
commit 4dc8cea473
15 changed files with 77 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src-ui/e2e/dashboard/requests/api-dashboard1.har
View File

@ -124,7 +124,7 @@
"content": { "content": {
"size": -1, "size": -1,
"mimeType": "application/json", "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,\"dashboard_view_limit\":10,\"dashboard_view_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,\"dashboard_view_limit\":10,\"dashboard_view_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,\"dashboard_view_limit\":10,\"dashboard_view_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,\"dashboard_view_limit\":10,\"dashboard_view_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,\"dashboard_view_limit\":10,\"dashboard_view_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,\"dashboard_view_limit\":10,\"dashboard_view_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\",\"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\"]}]}"
}, },
"headersSize": -1, "headersSize": -1,
"bodySize": -1, "bodySize": -1,

2
src-ui/e2e/dashboard/requests/api-dashboard2.har
View File

@ -124,7 +124,7 @@
"content": { "content": {
"size": -1, "size": -1,
"mimeType": "application/json", "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,\"dashboard_view_limit\":10,\"dashboard_view_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,\"dashboard_view_limit\":10,\"dashboard_view_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,\"dashboard_view_limit\":10,\"dashboard_view_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,\"dashboard_view_limit\":10,\"dashboard_view_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,\"dashboard_view_limit\":10,\"dashboard_view_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,\"dashboard_view_limit\":10,\"dashboard_view_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\",\"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\"]}]}"
}, },
"headersSize": -1, "headersSize": -1,
"bodySize": -1, "bodySize": -1,

2
src-ui/e2e/dashboard/requests/api-dashboard3.har
View File

@ -124,7 +124,7 @@
"content": { "content": {
"size": -1, "size": -1,
"mimeType": "application/json", "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,\"dashboard_view_limit\":10,\"dashboard_view_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,\"dashboard_view_limit\":10,\"dashboard_view_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,\"dashboard_view_limit\":10,\"dashboard_view_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,\"dashboard_view_limit\":10,\"dashboard_view_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,\"dashboard_view_limit\":10,\"dashboard_view_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,\"dashboard_view_limit\":10,\"dashboard_view_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\",\"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\"]}]}"
}, },
"headersSize": -1, "headersSize": -1,
"bodySize": -1, "bodySize": -1,

2
src-ui/e2e/dashboard/requests/api-dashboard4.har
View File

@ -124,7 +124,7 @@
"content": { "content": {
"size": -1, "size": -1,
"mimeType": "application/json", "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,\"dashboard_view_limit\":10,\"dashboard_view_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,\"dashboard_view_limit\":10,\"dashboard_view_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,\"dashboard_view_limit\":10,\"dashboard_view_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,\"dashboard_view_limit\":10,\"dashboard_view_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,\"dashboard_view_limit\":10,\"dashboard_view_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,\"dashboard_view_limit\":10,\"dashboard_view_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\",\"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\"]}]}"
}, },
"headersSize": -1, "headersSize": -1,
"bodySize": -1, "bodySize": -1,

8
src-ui/src/app/components/admin/settings/settings.component.html
View File

@ -354,16 +354,16 @@
@if (savedViewGroup.get(view.id.toString()).get('show_on_dashboard').value) { @if (savedViewGroup.get(view.id.toString()).get('show_on_dashboard').value) {
<div class="row"> <div class="row">
<div class="col"> <div class="col">
<pngx-input-number i18n-title title="Widget list limit" [showAdd]="false" formControlName="dashboard_view_limit"></pngx-input-number> <pngx-input-number i18n-title title="Widget list limit" [showAdd]="false" formControlName="page_size"></pngx-input-number>
</div> </div>
<div class="col"> <div class="col">
<label class="form-label" for="dashboard_view_mode_{{view.id}}" i18n>Widget display</label> <label class="form-label" for="display_mode_{{view.id}}" i18n>Widget display</label>
<select class="form-select" formControlName="dashboard_view_mode"> <select class="form-select" formControlName="display_mode">
<option [ngValue]="DashboardViewMode.TABLE" i18n>Table</option> <option [ngValue]="DashboardViewMode.TABLE" i18n>Table</option>
<option [ngValue]="DashboardViewMode.SMALL_CARDS" i18n>Cards</option> <option [ngValue]="DashboardViewMode.SMALL_CARDS" i18n>Cards</option>
</select> </select>
</div> </div>
@if (savedViewGroup.get(view.id.toString()).get('dashboard_view_mode').value === DashboardViewMode.TABLE && documentDisplayFields) { @if (savedViewGroup.get(view.id.toString()).get('display_mode').value === DashboardViewMode.TABLE && documentDisplayFields) {
<pngx-input-drag-drop-select i18n-title title="Show" [items]="documentDisplayFields" formControlName="document_display_fields"></pngx-input-drag-drop-select> <pngx-input-drag-drop-select i18n-title title="Show" [items]="documentDisplayFields" formControlName="document_display_fields"></pngx-input-drag-drop-select>
} }
</div> </div>

12
src-ui/src/app/components/admin/settings/settings.component.ts
View File

@ -28,7 +28,7 @@ import {
import { Group } from 'src/app/data/group' import { Group } from 'src/app/data/group'
import { import {
DOCUMENT_DISPLAY_FIELDS, DOCUMENT_DISPLAY_FIELDS,
DashboardViewMode, DisplayMode,
DocumentDisplayField, DocumentDisplayField,
SavedView, SavedView,
} from 'src/app/data/saved-view' } from 'src/app/data/saved-view'
@ -80,7 +80,7 @@ export class SettingsComponent
implements OnInit, AfterViewInit, OnDestroy, DirtyComponent implements OnInit, AfterViewInit, OnDestroy, DirtyComponent
{ {
activeNavID: number activeNavID: number
DashboardViewMode = DashboardViewMode DashboardViewMode = DisplayMode
savedViewGroup = new FormGroup({}) savedViewGroup = new FormGroup({})
@ -367,8 +367,8 @@ export class SettingsComponent
name: view.name, name: view.name,
show_on_dashboard: view.show_on_dashboard, show_on_dashboard: view.show_on_dashboard,
show_in_sidebar: view.show_in_sidebar, show_in_sidebar: view.show_in_sidebar,
dashboard_view_limit: view.dashboard_view_limit, page_size: view.page_size,
dashboard_view_mode: view.dashboard_view_mode, display_mode: view.display_mode,
document_display_fields: view.document_display_fields, document_display_fields: view.document_display_fields,
} }
this.savedViewGroup.addControl( this.savedViewGroup.addControl(
@ -378,8 +378,8 @@ export class SettingsComponent
name: new FormControl(null), name: new FormControl(null),
show_on_dashboard: new FormControl(null), show_on_dashboard: new FormControl(null),
show_in_sidebar: new FormControl(null), show_in_sidebar: new FormControl(null),
dashboard_view_limit: new FormControl(null), page_size: new FormControl(null),
dashboard_view_mode: new FormControl(null), display_mode: new FormControl(null),
document_display_fields: new FormControl([]), document_display_fields: new FormControl([]),
}) })
) )

4
src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html
View File

@ -9,7 +9,7 @@
<a class="btn-link text-decoration-none" header-buttons [routerLink]="[]" (click)="showAll()" i18n>Show all</a> <a class="btn-link text-decoration-none" header-buttons [routerLink]="[]" (click)="showAll()" i18n>Show all</a>
} }
@if (documents.length && savedView.dashboard_view_mode === DashboardViewMode.TABLE) { @if (documents.length && savedView.display_mode === DashboardViewMode.TABLE) {
<table content class="table table-hover mb-0 mt-n2 align-middle"> <table content class="table table-hover mb-0 mt-n2 align-middle">
<thead> <thead>
<tr> <tr>
@ -111,7 +111,7 @@
} }
</tbody> </tbody>
</table> </table>
} @else if (documents.length && savedView.dashboard_view_mode === DashboardViewMode.SMALL_CARDS) { } @else if (documents.length && savedView.display_mode === DashboardViewMode.SMALL_CARDS) {
<div class="row row-cols-paperless-cards my-n2"> <div class="row row-cols-paperless-cards my-n2">
@for (d of documents; track d.id) { @for (d of documents; track d.id) {
<pngx-document-card-small class="p-0" (dblClickDocument)="openDocumentDetail(d)" [document]="d" (clickTag)="clickTag($event)" (clickCorrespondent)="clickCorrespondent($event)" (clickStoragePath)="clickStoragePath($event)" (clickDocumentType)="clickDocumentType($event)"></pngx-document-card-small> <pngx-document-card-small class="p-0" (dblClickDocument)="openDocumentDetail(d)" [document]="d" (clickTag)="clickTag($event)" (clickCorrespondent)="clickCorrespondent($event)" (clickStoragePath)="clickStoragePath($event)" (clickDocumentType)="clickDocumentType($event)"></pngx-document-card-small>

6
src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.spec.ts
View File

@ -18,7 +18,7 @@ import {
FILTER_STORAGE_PATH, FILTER_STORAGE_PATH,
} from 'src/app/data/filter-rule-type' } from 'src/app/data/filter-rule-type'
import { import {
DashboardViewMode, DisplayMode,
DocumentDisplayField, DocumentDisplayField,
SavedView, SavedView,
} from 'src/app/data/saved-view' } from 'src/app/data/saved-view'
@ -56,8 +56,8 @@ const savedView: SavedView = {
value: '1,2', value: '1,2',
}, },
], ],
dashboard_view_limit: 20, page_size: 20,
dashboard_view_mode: DashboardViewMode.TABLE, display_mode: DisplayMode.TABLE,
document_display_fields: [ document_display_fields: [
DocumentDisplayField.CREATED, DocumentDisplayField.CREATED,
DocumentDisplayField.TITLE, DocumentDisplayField.TITLE,

6
src-ui/src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.ts
View File

@ -11,7 +11,7 @@ import { Subject, takeUntil } from 'rxjs'
import { Document } from 'src/app/data/document' import { Document } from 'src/app/data/document'
import { import {
DocumentDisplayField, DocumentDisplayField,
DashboardViewMode, DisplayMode,
SavedView, SavedView,
DOCUMENT_DISPLAY_FIELDS, DOCUMENT_DISPLAY_FIELDS,
} from 'src/app/data/saved-view' } from 'src/app/data/saved-view'
@ -45,7 +45,7 @@ export class SavedViewWidgetComponent
extends ComponentWithPermissions extends ComponentWithPermissions
implements OnInit, OnDestroy implements OnInit, OnDestroy
{ {
public DashboardViewMode = DashboardViewMode public DashboardViewMode = DisplayMode
public DashboardViewTableColumn = DocumentDisplayField public DashboardViewTableColumn = DocumentDisplayField
public CustomFieldDataType = CustomFieldDataType public CustomFieldDataType = CustomFieldDataType
@ -136,7 +136,7 @@ export class SavedViewWidgetComponent
this.documentService this.documentService
.listFiltered( .listFiltered(
1, 1,
this.savedView.dashboard_view_limit, this.savedView.page_size,
this.savedView.sort_field, this.savedView.sort_field,
this.savedView.sort_reverse, this.savedView.sort_reverse,
this.savedView.filter_rules, this.savedView.filter_rules,

4
src-ui/src/app/components/document-list/document-list.component.ts
View File

@ -16,7 +16,7 @@ import {
} from 'src/app/utils/filter-rules' } from 'src/app/utils/filter-rules'
import { FILTER_FULLTEXT_MORELIKE } from 'src/app/data/filter-rule-type' import { FILTER_FULLTEXT_MORELIKE } from 'src/app/data/filter-rule-type'
import { Document } from 'src/app/data/document' import { Document } from 'src/app/data/document'
import { SavedView } from 'src/app/data/saved-view' import { DisplayMode, SavedView } from 'src/app/data/saved-view'
import { SETTINGS_KEYS } from 'src/app/data/ui-settings' import { SETTINGS_KEYS } from 'src/app/data/ui-settings'
import { import {
SortableDirective, SortableDirective,
@ -66,7 +66,7 @@ export class DocumentListComponent
@ViewChildren(SortableDirective) headers: QueryList<SortableDirective> @ViewChildren(SortableDirective) headers: QueryList<SortableDirective>
displayMode = 'smallCards' // largeCards, smallCards, details displayMode: string = DisplayMode.SMALL_CARDS // largeCards, smallCards, details
unmodifiedFilterRules: FilterRule[] = [] unmodifiedFilterRules: FilterRule[] = []
private unmodifiedSavedView: SavedView private unmodifiedSavedView: SavedView

8
src-ui/src/app/data/saved-view.ts
View File

@ -1,9 +1,9 @@
import { FilterRule } from './filter-rule' import { FilterRule } from './filter-rule'
import { ObjectWithPermissions } from './object-with-permissions' import { ObjectWithPermissions } from './object-with-permissions'
export enum DashboardViewMode { export enum DisplayMode {
TABLE = 'table', TABLE = 'table',
SMALL_CARDS = 'small_cards', SMALL_CARDS = 'smallCards',
} }
export enum DocumentDisplayField { export enum DocumentDisplayField {
@ -61,9 +61,9 @@ export interface SavedView extends ObjectWithPermissions {
filter_rules: FilterRule[] filter_rules: FilterRule[]
dashboard_view_limit?: number page_size?: number
dashboard_view_mode?: DashboardViewMode display_mode?: DisplayMode
document_display_fields?: DocumentDisplayField[] document_display_fields?: DocumentDisplayField[]
} }

6
src/documents/migrations/1047_savedview_dasboard_view_mode_and_more.py
View File

@ -15,9 +15,9 @@ class Migration(migrations.Migration):
operations = [ operations = [
migrations.AddField( migrations.AddField(
model_name="savedview", model_name="savedview",
name="dashboard_view_mode", name="display_mode",
field=models.CharField( field=models.CharField(
choices=[("table", "Table"), ("small_cards", "Small Cards")], choices=[("table", "Table"), ("smallCards", "Small Cards")],
default="table", default="table",
max_length=128, max_length=128,
verbose_name="Dashboard view display mode", verbose_name="Dashboard view display mode",
@ -25,7 +25,7 @@ class Migration(migrations.Migration):
), ),
migrations.AddField( migrations.AddField(
model_name="savedview", model_name="savedview",
name="dashboard_view_limit", name="page_size",
field=models.PositiveIntegerField( field=models.PositiveIntegerField(
default=10, default=10,
validators=[django.core.validators.MinValueValidator(1)], validators=[django.core.validators.MinValueValidator(1)],

28
src/documents/models.py
View File

@ -542,7 +542,7 @@ class DynamicMultiSelectField(MultiSelectField):
if self.dynamic_choices: if self.dynamic_choices:
for key, model in self.dynamic_choices: for key, model in self.dynamic_choices:
try: try:
for obj in model.objects.all(): for obj in model.objects.all(): # pragma: no cover
value.append((key % obj.pk, obj.name)) value.append((key % obj.pk, obj.name))
except Exception: except Exception:
pass pass
@ -552,11 +552,11 @@ class DynamicMultiSelectField(MultiSelectField):
class SavedView(ModelWithOwner): class SavedView(ModelWithOwner):
class DashboardViewDisplayMode(models.TextChoices): class ViewDisplayMode(models.TextChoices):
TABLE = ("table", _("Table")) TABLE = ("table", _("Table"))
SMALL_CARDS = ("small_cards", _("Small Cards")) SMALL_CARDS = ("smallCards", _("Small Cards"))
class DashboardViewTableColumns(models.TextChoices): class DocumentDisplayFields(models.TextChoices):
TITLE = ("title", _("Title")) TITLE = ("title", _("Title"))
CREATED = ("created", _("Created")) CREATED = ("created", _("Created"))
ADDED = ("added", _("Added")) ADDED = ("added", _("Added"))
@ -565,7 +565,7 @@ class SavedView(ModelWithOwner):
CORRESPONDENT = ("correspondent", _("Correspondent")) CORRESPONDENT = ("correspondent", _("Correspondent"))
STORAGE_PATH = ("storagepath", _("Storage Path")) STORAGE_PATH = ("storagepath", _("Storage Path"))
class DashboardViewDynamicTableColumns: class DynamicDocumentDisplayFields:
CUSTOM_FIELD = ("custom_field_%d", CustomField) CUSTOM_FIELD = ("custom_field_%d", CustomField)
name = models.CharField(_("name"), max_length=128) name = models.CharField(_("name"), max_length=128)
@ -585,25 +585,25 @@ class SavedView(ModelWithOwner):
) )
sort_reverse = models.BooleanField(_("sort reverse"), default=False) sort_reverse = models.BooleanField(_("sort reverse"), default=False)
dashboard_view_limit = models.PositiveIntegerField( page_size = models.PositiveIntegerField(
_("Dashboard view limit"), _("View page size"),
default=10, default=10,
validators=[MinValueValidator(1)], validators=[MinValueValidator(1)],
) )
dashboard_view_mode = models.CharField( display_mode = models.CharField(
max_length=128, max_length=128,
verbose_name=_("Dashboard view display mode"), verbose_name=_("View display mode"),
choices=DashboardViewDisplayMode.choices, choices=ViewDisplayMode.choices,
default=DashboardViewDisplayMode.TABLE, default=ViewDisplayMode.TABLE,
) )
document_display_fields = DynamicMultiSelectField( document_display_fields = DynamicMultiSelectField(
max_length=128, max_length=128,
verbose_name=_("Document display fields"), verbose_name=_("Document display fields"),
choices=DashboardViewTableColumns.choices, choices=DocumentDisplayFields.choices,
dyanmic_choices=[DashboardViewDynamicTableColumns.CUSTOM_FIELD], dyanmic_choices=[DynamicDocumentDisplayFields.CUSTOM_FIELD],
default=f"{DashboardViewTableColumns.CREATED},{DashboardViewTableColumns.TITLE},{DashboardViewTableColumns.TAGS},{DashboardViewTableColumns.CORRESPONDENT}", default=f"{DocumentDisplayFields.CREATED},{DocumentDisplayFields.TITLE},{DocumentDisplayFields.TAGS},{DocumentDisplayFields.CORRESPONDENT}",
) )
class Meta: class Meta:

12
src/documents/serialisers.py
View File

@ -828,12 +828,8 @@ class DynamicOrderedMultipleChoiceField(fields.MultipleChoiceField):
choices = property(_get_choices, _set_choices) choices = property(_get_choices, _set_choices)
def to_internal_value(self, data): def to_internal_value(self, data):
super().to_internal_value(data)
# MultipleChoiceField doesn't preserve order, so we use an array # MultipleChoiceField doesn't preserve order, so we use an array
if isinstance(data, str) or not hasattr(data, "__iter__"):
self.fail("not_a_list", input_type=type(data).__name__)
if not self.allow_empty and len(data) == 0:
self.fail("empty")
return [fields.ChoiceField.to_internal_value(self, item) for item in data] return [fields.ChoiceField.to_internal_value(self, item) for item in data]
def to_representation(self, value): def to_representation(self, value):
@ -844,7 +840,7 @@ class DynamicOrderedMultipleChoiceField(fields.MultipleChoiceField):
class SavedViewSerializer(OwnedObjectSerializer): class SavedViewSerializer(OwnedObjectSerializer):
filter_rules = SavedViewFilterRuleSerializer(many=True) filter_rules = SavedViewFilterRuleSerializer(many=True)
document_display_fields = DynamicOrderedMultipleChoiceField( document_display_fields = DynamicOrderedMultipleChoiceField(
choices=SavedView.DashboardViewTableColumns.choices, choices=SavedView.DocumentDisplayFields.choices,
dyanmic_choices=[("custom_field_%d", CustomField)], dyanmic_choices=[("custom_field_%d", CustomField)],
required=False, required=False,
) )
@ -859,8 +855,8 @@ class SavedViewSerializer(OwnedObjectSerializer):
"sort_field", "sort_field",
"sort_reverse", "sort_reverse",
"filter_rules", "filter_rules",
"dashboard_view_limit", "page_size",
"dashboard_view_mode", "display_mode",
"document_display_fields", "document_display_fields",
"owner", "owner",
"permissions", "permissions",

56
src/documents/tests/test_api_documents.py
View File

@ -1670,11 +1670,11 @@ class TestDocumentApi(DirectoriesMixin, DocumentConsumeDelayMixin, APITestCase):
"show_in_sidebar": True, "show_in_sidebar": True,
"sort_field": "created2", "sort_field": "created2",
"filter_rules": [{"rule_type": 4, "value": "test"}], "filter_rules": [{"rule_type": 4, "value": "test"}],
"dashboard_view_limit": 20, "page_size": 20,
"dashboard_view_mode": SavedView.DashboardViewDisplayMode.SMALL_CARDS, "display_mode": SavedView.ViewDisplayMode.SMALL_CARDS,
"document_display_fields": [ "document_display_fields": [
SavedView.DashboardViewTableColumns.TITLE, SavedView.DocumentDisplayFields.TITLE,
SavedView.DashboardViewTableColumns.CREATED, SavedView.DocumentDisplayFields.CREATED,
], ],
} }
@ -1682,16 +1682,16 @@ class TestDocumentApi(DirectoriesMixin, DocumentConsumeDelayMixin, APITestCase):
self.assertEqual(response.status_code, status.HTTP_201_CREATED) self.assertEqual(response.status_code, status.HTTP_201_CREATED)
v1 = SavedView.objects.get(name="test") v1 = SavedView.objects.get(name="test")
self.assertEqual(v1.dashboard_view_limit, 20) self.assertEqual(v1.page_size, 20)
self.assertEqual( self.assertEqual(
v1.dashboard_view_mode, v1.display_mode,
SavedView.DashboardViewDisplayMode.SMALL_CARDS, SavedView.ViewDisplayMode.SMALL_CARDS,
) )
self.assertEqual( self.assertEqual(
v1.document_display_fields, v1.document_display_fields,
[ [
SavedView.DashboardViewTableColumns.TITLE, SavedView.DocumentDisplayFields.TITLE,
SavedView.DashboardViewTableColumns.CREATED, SavedView.DocumentDisplayFields.CREATED,
], ],
) )
@ -1699,9 +1699,9 @@ class TestDocumentApi(DirectoriesMixin, DocumentConsumeDelayMixin, APITestCase):
f"/api/saved_views/{v1.id}/", f"/api/saved_views/{v1.id}/",
{ {
"document_display_fields": [ "document_display_fields": [
SavedView.DashboardViewTableColumns.TAGS, SavedView.DocumentDisplayFields.TAGS,
SavedView.DashboardViewTableColumns.TITLE, SavedView.DocumentDisplayFields.TITLE,
SavedView.DashboardViewTableColumns.CREATED, SavedView.DocumentDisplayFields.CREATED,
], ],
}, },
format="json", format="json",
@ -1712,9 +1712,9 @@ class TestDocumentApi(DirectoriesMixin, DocumentConsumeDelayMixin, APITestCase):
self.assertEqual( self.assertEqual(
v1.document_display_fields, v1.document_display_fields,
[ [
SavedView.DashboardViewTableColumns.TAGS, SavedView.DocumentDisplayFields.TAGS,
SavedView.DashboardViewTableColumns.TITLE, SavedView.DocumentDisplayFields.TITLE,
SavedView.DashboardViewTableColumns.CREATED, SavedView.DocumentDisplayFields.CREATED,
], ],
) )
@ -1725,11 +1725,11 @@ class TestDocumentApi(DirectoriesMixin, DocumentConsumeDelayMixin, APITestCase):
"show_in_sidebar": True, "show_in_sidebar": True,
"sort_field": "created2", "sort_field": "created2",
"filter_rules": [{"rule_type": 4, "value": "test"}], "filter_rules": [{"rule_type": 4, "value": "test"}],
"dashboard_view_limit": 20, "page_size": 20,
"dashboard_view_mode": SavedView.DashboardViewDisplayMode.SMALL_CARDS, "display_mode": SavedView.ViewDisplayMode.SMALL_CARDS,
"document_display_fields": [ "document_display_fields": [
SavedView.DashboardViewTableColumns.TITLE, SavedView.DocumentDisplayFields.TITLE,
SavedView.DashboardViewTableColumns.CREATED, SavedView.DocumentDisplayFields.CREATED,
], ],
} }
@ -1747,9 +1747,9 @@ class TestDocumentApi(DirectoriesMixin, DocumentConsumeDelayMixin, APITestCase):
f"/api/saved_views/{v1.id}/", f"/api/saved_views/{v1.id}/",
{ {
"document_display_fields": [ "document_display_fields": [
SavedView.DashboardViewTableColumns.TITLE, SavedView.DocumentDisplayFields.TITLE,
SavedView.DashboardViewTableColumns.CREATED, SavedView.DocumentDisplayFields.CREATED,
SavedView.DashboardViewDynamicTableColumns.CUSTOM_FIELD[0] SavedView.DynamicDocumentDisplayFields.CUSTOM_FIELD[0]
% custom_field.id, % custom_field.id,
], ],
}, },
@ -1761,9 +1761,9 @@ class TestDocumentApi(DirectoriesMixin, DocumentConsumeDelayMixin, APITestCase):
self.assertEqual( self.assertEqual(
v1.document_display_fields, v1.document_display_fields,
[ [
str(SavedView.DashboardViewTableColumns.TITLE), str(SavedView.DocumentDisplayFields.TITLE),
str(SavedView.DashboardViewTableColumns.CREATED), str(SavedView.DocumentDisplayFields.CREATED),
SavedView.DashboardViewDynamicTableColumns.CUSTOM_FIELD[0] SavedView.DynamicDocumentDisplayFields.CUSTOM_FIELD[0]
% custom_field.id, % custom_field.id,
], ],
) )
@ -1773,9 +1773,9 @@ class TestDocumentApi(DirectoriesMixin, DocumentConsumeDelayMixin, APITestCase):
f"/api/saved_views/{v1.id}/", f"/api/saved_views/{v1.id}/",
{ {
"document_display_fields": [ "document_display_fields": [
SavedView.DashboardViewTableColumns.TITLE, SavedView.DocumentDisplayFields.TITLE,
SavedView.DashboardViewTableColumns.CREATED, SavedView.DocumentDisplayFields.CREATED,
SavedView.DashboardViewDynamicTableColumns.CUSTOM_FIELD[0] % 99, SavedView.DynamicDocumentDisplayFields.CUSTOM_FIELD[0] % 99,
], ],
}, },
format="json", format="json",