From c1bf77a1c9d170586ad31d702f97ce89ad9a0e1f Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Fri, 19 Apr 2024 01:44:32 -0700 Subject: [PATCH] Cleanup --- src-ui/messages.xlf | 50 +++++----- .../admin/settings/settings.component.html | 6 +- .../admin/settings/settings.component.spec.ts | 4 - .../admin/settings/settings.component.ts | 13 +-- .../saved-view-widget.component.html | 96 +++++++++---------- .../saved-view-widget.component.ts | 18 ++-- src-ui/src/app/data/saved-view.ts | 11 ++- 7 files changed, 94 insertions(+), 104 deletions(-) diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index 4defa72b5..9167e9318 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -951,7 +951,7 @@ src/app/data/saved-view.ts - 58 + 56 src/app/services/rest/document.service.ts @@ -1557,21 +1557,21 @@ Use system language src/app/components/admin/settings/settings.component.ts - 67 + 61 Use date format of display language src/app/components/admin/settings/settings.component.ts - 70 + 64 Error retrieving users src/app/components/admin/settings/settings.component.ts - 194 + 187 src/app/components/admin/users-groups/users-groups.component.ts @@ -1582,7 +1582,7 @@ Error retrieving groups src/app/components/admin/settings/settings.component.ts - 213 + 206 src/app/components/admin/users-groups/users-groups.component.ts @@ -1593,35 +1593,35 @@ Saved view "" deleted. src/app/components/admin/settings/settings.component.ts - 427 + 420 Settings were saved successfully. src/app/components/admin/settings/settings.component.ts - 552 + 545 Settings were saved successfully. Reload is required to apply some changes. src/app/components/admin/settings/settings.component.ts - 556 + 549 Reload now src/app/components/admin/settings/settings.component.ts - 557 + 550 An error occurred while saving settings. src/app/components/admin/settings/settings.component.ts - 567 + 560 src/app/components/app-frame/app-frame.component.ts @@ -1632,7 +1632,7 @@ Error while storing settings on server. src/app/components/admin/settings/settings.component.ts - 601 + 594 @@ -1792,7 +1792,7 @@ src/app/data/saved-view.ts - 34 + 32 src/app/services/rest/document.service.ts @@ -2022,7 +2022,7 @@ src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html - 44 + 43 src/app/components/document-list/document-card-large/document-card-large.component.html @@ -2452,7 +2452,7 @@ src/app/data/saved-view.ts - 42 + 40 @@ -4914,14 +4914,14 @@ View Preview src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html - 72 + 71 Download src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html - 80 + 79 src/app/components/document-detail/document-detail.component.html @@ -4944,7 +4944,7 @@ No documents src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html - 123 + 121 @@ -5214,7 +5214,7 @@ src/app/data/saved-view.ts - 30 + 28 src/app/services/rest/document.service.ts @@ -5255,7 +5255,7 @@ src/app/data/saved-view.ts - 46 + 44 src/app/services/rest/document.service.ts @@ -5282,7 +5282,7 @@ src/app/data/saved-view.ts - 50 + 48 src/app/services/rest/document.service.ts @@ -5309,7 +5309,7 @@ src/app/data/saved-view.ts - 54 + 52 @@ -6086,7 +6086,7 @@ src/app/data/saved-view.ts - 66 + 64 src/app/pipes/username.pipe.ts @@ -6228,7 +6228,7 @@ src/app/data/saved-view.ts - 70 + 68 src/app/services/rest/document.service.ts @@ -6264,7 +6264,7 @@ src/app/data/saved-view.ts - 62 + 60 src/app/services/rest/document.service.ts @@ -6318,7 +6318,7 @@ src/app/data/saved-view.ts - 38 + 36 src/app/data/saved-view.ts 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 fe5c4b536..7aba40d89 100644 --- a/src-ui/src/app/components/admin/settings/settings.component.html +++ b/src-ui/src/app/components/admin/settings/settings.component.html @@ -358,9 +358,9 @@
@if (displayFields) { diff --git a/src-ui/src/app/components/admin/settings/settings.component.spec.ts b/src-ui/src/app/components/admin/settings/settings.component.spec.ts index c144a8c74..2f76ec361 100644 --- a/src-ui/src/app/components/admin/settings/settings.component.spec.ts +++ b/src-ui/src/app/components/admin/settings/settings.component.spec.ts @@ -48,8 +48,6 @@ import { InstallType, SystemStatusItemStatus, } from 'src/app/data/system-status' -import { CustomFieldsService } from 'src/app/services/rest/custom-fields.service' -import { CustomFieldDataType } from 'src/app/data/custom-field' const savedViews = [ { id: 1, name: 'view1', show_in_sidebar: true, show_on_dashboard: true }, @@ -78,7 +76,6 @@ describe('SettingsComponent', () => { let groupService: GroupService let modalService: NgbModal let systemStatusService: SystemStatusService - let customFieldsService: CustomFieldsService beforeEach(async () => { TestBed.configureTestingModule({ @@ -124,7 +121,6 @@ describe('SettingsComponent', () => { permissionsService = TestBed.inject(PermissionsService) modalService = TestBed.inject(NgbModal) systemStatusService = TestBed.inject(SystemStatusService) - customFieldsService = TestBed.inject(CustomFieldsService) jest.spyOn(permissionsService, 'currentUserCan').mockReturnValue(true) jest .spyOn(permissionsService, 'currentUserHasObjectPermissions') 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 7b9e8e42e..984aa8378 100644 --- a/src-ui/src/app/components/admin/settings/settings.component.ts +++ b/src-ui/src/app/components/admin/settings/settings.component.ts @@ -26,12 +26,7 @@ import { tap, } from 'rxjs' import { Group } from 'src/app/data/group' -import { - DEFAULT_DISPLAY_FIELDS, - DisplayMode, - DisplayField, - 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 { User } from 'src/app/data/user' import { DocumentListViewService } from 'src/app/services/document-list-view.service' @@ -55,7 +50,6 @@ import { SystemStatusItemStatus, SystemStatus, } from 'src/app/data/system-status' -import { CustomFieldsService } from 'src/app/services/rest/custom-fields.service' enum SettingsNavIDs { General = 1, @@ -80,7 +74,7 @@ export class SettingsComponent implements OnInit, AfterViewInit, OnDestroy, DirtyComponent { activeNavID: number - DashboardViewMode = DisplayMode + DisplayMode = DisplayMode savedViewGroup = new FormGroup({}) @@ -165,8 +159,7 @@ export class SettingsComponent private router: Router, public permissionsService: PermissionsService, private modalService: NgbModal, - private systemStatusService: SystemStatusService, - private customFieldsService: CustomFieldsService + private systemStatusService: SystemStatusService ) { super() this.settings.settingsSaved.subscribe(() => { 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 66c40ec13..4ea602098 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 @@ -31,59 +31,57 @@ @for (doc of documents; track doc.id) { @for (field of displayFields; track field; let i = $index) { - @if (displayFields.includes(field)) { - - @switch (field) { - @case (DisplayField.ADDED) { - {{doc.added | customDate}} - } - @case (DisplayField.CREATED) { - {{doc.created_date | customDate}} - } - @case (DisplayField.TITLE) { - {{doc.title | documentTitle}} - } - @case (DisplayField.CORRESPONDENT) { - @if (doc.correspondent) { - {{(doc.correspondent$ | async)?.name}} - } - } - @case (DisplayField.TAGS) { - @for (t of doc.tags$ | async; track t) { - - } - } - @case (DisplayField.DOCUMENT_TYPE) { - @if (doc.document_type) { - {{(doc.document_type$ | async)?.name}} - } - } - @case (DisplayField.STORAGE_PATH) { - @if (doc.storage_path) { - {{(doc.storage_path$ | async)?.name}} - } + + @switch (field) { + @case (DisplayField.ADDED) { + {{doc.added | customDate}} + } + @case (DisplayField.CREATED) { + {{doc.created_date | customDate}} + } + @case (DisplayField.TITLE) { + {{doc.title | documentTitle}} + } + @case (DisplayField.CORRESPONDENT) { + @if (doc.correspondent) { + {{(doc.correspondent$ | async)?.name}} } } - @if (field.startsWith(DisplayField.CUSTOM_FIELD)) { - + @case (DisplayField.TAGS) { + @for (t of doc.tags$ | async; track t) { + + } } - @if (i === displayFields.length - 1) { -
- - - - - - - - - -
+ @case (DisplayField.DOCUMENT_TYPE) { + @if (doc.document_type) { + {{(doc.document_type$ | async)?.name}} + } } - - } + @case (DisplayField.STORAGE_PATH) { + @if (doc.storage_path) { + {{(doc.storage_path$ | async)?.name}} + } + } + } + @if (field.startsWith(DisplayField.CUSTOM_FIELD)) { + + } + @if (i === displayFields.length - 1) { +
+ + + + + + + + + +
+ } + } } 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 90c03f239..09235510e 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 @@ -15,6 +15,7 @@ import { SavedView, DEFAULT_DISPLAY_FIELDS, DEFAULT_DASHBOARD_VIEW_PAGE_SIZE, + DEFAULT_DASHBOARD_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' @@ -82,12 +83,7 @@ export class SavedViewWidgetComponent displayMode: DisplayMode - displayFields: DisplayField[] = [ - DisplayField.CREATED, - DisplayField.TITLE, - DisplayField.TAGS, - DisplayField.CORRESPONDENT, - ] + displayFields: DisplayField[] = DEFAULT_DASHBOARD_DISPLAY_FIELDS ngOnInit(): void { this.reload() @@ -269,11 +265,11 @@ export class SavedViewWidgetComponent }, 300) } - 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 + public getColumnTitle(field: DisplayField): string { + if (field.startsWith(DisplayField.CUSTOM_FIELD)) { + const id = field.split('_')[2] + return this.customFields.find((f) => f.id === parseInt(id))?.name } - return DEFAULT_DISPLAY_FIELDS.find((c) => c.id === column)?.name + return DEFAULT_DISPLAY_FIELDS.find((f) => f.id === field)?.name } } diff --git a/src-ui/src/app/data/saved-view.ts b/src-ui/src/app/data/saved-view.ts index 20b73b3aa..a2de0d126 100644 --- a/src-ui/src/app/data/saved-view.ts +++ b/src-ui/src/app/data/saved-view.ts @@ -22,8 +22,6 @@ export enum DisplayField { ASN = 'asn', } -export const DEFAULT_DASHBOARD_VIEW_PAGE_SIZE = 10 - export const DEFAULT_DISPLAY_FIELDS = [ { id: DisplayField.TITLE, @@ -71,6 +69,15 @@ export const DEFAULT_DISPLAY_FIELDS = [ }, ] +export const DEFAULT_DASHBOARD_VIEW_PAGE_SIZE = 10 + +export const DEFAULT_DASHBOARD_DISPLAY_FIELDS = [ + DisplayField.CREATED, + DisplayField.TITLE, + DisplayField.TAGS, + DisplayField.CORRESPONDENT, +] + export interface SavedView extends ObjectWithPermissions { name?: string