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

Refactor dashboard_view_table_columns to document_display_fields

Browse Source
This commit is contained in:
shamoon
2024-04-17 17:58:40 -07:00
parent cd4cc4d9e1
commit 9decfbfcf2
14 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -351,7 +351,7 @@
</div>
</div>
@if (savedViewGroup.get(view.id.toString()).get('dashboard_view_mode').value === DashboardViewMode.TABLE) {
<pngx-input-drag-drop-select [items]="DASHBOARD_VIEW_TABLE_COLUMNS" formControlName="dashboard_view_table_columns"></pngx-input-drag-drop-select>
<pngx-input-drag-drop-select [items]="document_display_fields" formControlName="document_display_fields"></pngx-input-drag-drop-select>
}
}
</div>

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

@@ -27,7 +27,7 @@ import {
} from 'rxjs'
import { Group } from 'src/app/data/group'
import {
DASHBOARD_VIEW_TABLE_COLUMNS,
document_display_fields,
DashboardViewMode,
DashboardViewTableColumn,
SavedView,
@@ -116,7 +116,7 @@ export class SettingsComponent
savedViews: SavedView[]
SettingsNavIDs = SettingsNavIDs
DASHBOARD_VIEW_TABLE_COLUMNS = DASHBOARD_VIEW_TABLE_COLUMNS
document_display_fields = document_display_fields
store: BehaviorSubject<any>
storeSub: Subscription
@@ -349,7 +349,7 @@ export class SettingsComponent
show_in_sidebar: view.show_in_sidebar,
dashboard_view_limit: view.dashboard_view_limit,
dashboard_view_mode: view.dashboard_view_mode,
dashboard_view_table_columns: view.dashboard_view_table_columns,
document_display_fields: view.document_display_fields,
}
this.savedViewGroup.addControl(
view.id.toString(),
@@ -360,7 +360,7 @@ export class SettingsComponent
show_in_sidebar: new FormControl(null),
dashboard_view_limit: new FormControl(null),
dashboard_view_mode: new FormControl(null),
dashboard_view_table_columns: new FormControl([]),
document_display_fields: new FormControl([]),
})
)
}

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

@@ -13,7 +13,7 @@
<table content class="table table-hover mb-0 mt-n2 align-middle">
<thead>
<tr>
@for (column of savedView.dashboard_view_table_columns; track column; let i = $index) {
@for (column of savedView.document_display_fields; track column; let i = $index) {
@if (visibleColumns.includes(column)) {
<th
scope="col"
@@ -30,7 +30,7 @@
<tbody>
@for (doc of documents; track doc.id) {
<tr>
@for (column of savedView.dashboard_view_table_columns; track column; let i = $index) {
@for (column of savedView.document_display_fields; track column; let i = $index) {
@if (visibleColumns.includes(column)) {
<td class="py-2 py-md-3 position-relative" [ngClass]="{ 'd-none d-md-table-cell': i > 1 }">
@switch (column) {
@@ -89,7 +89,7 @@
}
}
}
@if (i === savedView.dashboard_view_table_columns.length - 1) {
@if (i === savedView.document_display_fields.length - 1) {
<div class="btn-group position-absolute top-50 end-0 translate-middle-y">
<a [href]="getPreviewUrl(doc)" title="View Preview" i18n-title target="_blank" class="btn px-4 btn-dark border-dark-subtle"
[ngbPopover]="previewContent" [popoverTitle]="doc.title | documentTitle"

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

@@ -58,7 +58,7 @@ const savedView: SavedView = {
],
dashboard_view_limit: 20,
dashboard_view_mode: DashboardViewMode.TABLE,
dashboard_view_table_columns: [
document_display_fields: [
DashboardViewTableColumn.CREATED,
DashboardViewTableColumn.TITLE,
DashboardViewTableColumn.TAGS,

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

@@ -13,7 +13,7 @@ import {
DashboardViewTableColumn,
DashboardViewMode,
SavedView,
DASHBOARD_VIEW_TABLE_COLUMNS,
document_display_fields,
} from 'src/app/data/saved-view'
import { ConsumerStatusService } from 'src/app/services/consumer-status.service'
import { DocumentService } from 'src/app/services/rest/document.service'
@@ -111,7 +111,7 @@ export class SavedViewWidgetComponent
})
}
this.savedView.dashboard_view_table_columns?.forEach((column) => {
this.savedView.document_display_fields?.forEach((column) => {
let type: PermissionType = Object.values(PermissionType).find((t) =>
t.includes(column)
)
@@ -254,7 +254,7 @@ export class SavedViewWidgetComponent
const id = column.split('_')[2]
return this.customFields.find((c) => c.id === parseInt(id))?.name
}
return DASHBOARD_VIEW_TABLE_COLUMNS.find((c) => c.id === column)?.name
return document_display_fields.find((c) => c.id === column)?.name
}
public getCustomFieldDataType(column_id: string): string {
@@ -284,7 +284,7 @@ export class SavedViewWidgetComponent
if (this.docLinkDocuments.length) return
let docIds = []
let docLinkColumns = []
this.savedView.dashboard_view_table_columns
this.savedView.document_display_fields
?.filter((column) =>
column.startsWith(DashboardViewTableColumn.CUSTOM_FIELD)
)

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

@@ -17,7 +17,7 @@ export enum DashboardViewTableColumn {
CUSTOM_FIELD = 'custom_field_',
}
export const DASHBOARD_VIEW_TABLE_COLUMNS = [
export const document_display_fields = [
{
id: DashboardViewTableColumn.TITLE,
name: $localize`Title`,
@@ -65,5 +65,5 @@ export interface SavedView extends ObjectWithPermissions {
dashboard_view_mode?: DashboardViewMode
dashboard_view_table_columns?: DashboardViewTableColumn[]
document_display_fields?: DashboardViewTableColumn[]
}