Cleanup

src-ui/messages.xlf

@@ -951,7 +951,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/saved-view.ts</context>
-          <context context-type="linenumber">58</context>
+          <context context-type="linenumber">56</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
@@ -1557,21 +1557,21 @@
         <source>Use system language</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/admin/settings/settings.component.ts</context>
-          <context context-type="linenumber">67</context>
+          <context context-type="linenumber">61</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7729897675462249787" datatype="html">
         <source>Use date format of display language</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/admin/settings/settings.component.ts</context>
-          <context context-type="linenumber">70</context>
+          <context context-type="linenumber">64</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1235706724900303689" datatype="html">
         <source>Error retrieving users</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/admin/settings/settings.component.ts</context>
-          <context context-type="linenumber">194</context>
+          <context context-type="linenumber">187</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/admin/users-groups/users-groups.component.ts</context>
@@ -1582,7 +1582,7 @@
         <source>Error retrieving groups</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/admin/settings/settings.component.ts</context>
-          <context context-type="linenumber">213</context>
+          <context context-type="linenumber">206</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/admin/users-groups/users-groups.component.ts</context>
@@ -1593,35 +1593,35 @@
         <source>Saved view &quot;<x id="PH" equiv-text="savedView.name"/>&quot; deleted.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/admin/settings/settings.component.ts</context>
-          <context context-type="linenumber">427</context>
+          <context context-type="linenumber">420</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7217000812750597833" datatype="html">
         <source>Settings were saved successfully.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/admin/settings/settings.component.ts</context>
-          <context context-type="linenumber">552</context>
+          <context context-type="linenumber">545</context>
         </context-group>
       </trans-unit>
       <trans-unit id="525012668859298131" datatype="html">
         <source>Settings were saved successfully. Reload is required to apply some changes.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/admin/settings/settings.component.ts</context>
-          <context context-type="linenumber">556</context>
+          <context context-type="linenumber">549</context>
         </context-group>
       </trans-unit>
       <trans-unit id="8491974984518503778" datatype="html">
         <source>Reload now</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/admin/settings/settings.component.ts</context>
-          <context context-type="linenumber">557</context>
+          <context context-type="linenumber">550</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3011185103048412841" datatype="html">
         <source>An error occurred while saving settings.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/admin/settings/settings.component.ts</context>
-          <context context-type="linenumber">567</context>
+          <context context-type="linenumber">560</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/app-frame/app-frame.component.ts</context>
@@ -1632,7 +1632,7 @@
         <source>Error while storing settings on server.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/admin/settings/settings.component.ts</context>
-          <context context-type="linenumber">601</context>
+          <context context-type="linenumber">594</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2991443309752293110" datatype="html">
@@ -1792,7 +1792,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/saved-view.ts</context>
-          <context context-type="linenumber">34</context>
+          <context context-type="linenumber">32</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
@@ -2022,7 +2022,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html</context>
-          <context context-type="linenumber">44</context>
+          <context context-type="linenumber">43</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context>
@@ -2452,7 +2452,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/saved-view.ts</context>
-          <context context-type="linenumber">42</context>
+          <context context-type="linenumber">40</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4369111787961525769" datatype="html">
@@ -4914,14 +4914,14 @@
         <source>View Preview</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html</context>
-          <context context-type="linenumber">72</context>
+          <context context-type="linenumber">71</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3099741642167775297" datatype="html">
         <source>Download</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html</context>
-          <context context-type="linenumber">80</context>
+          <context context-type="linenumber">79</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.html</context>
@@ -4944,7 +4944,7 @@
         <source>No documents</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/widgets/saved-view-widget/saved-view-widget.component.html</context>
-          <context context-type="linenumber">123</context>
+          <context context-type="linenumber">121</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1069523139277190436" datatype="html">
@@ -5214,7 +5214,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/saved-view.ts</context>
-          <context context-type="linenumber">30</context>
+          <context context-type="linenumber">28</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
@@ -5255,7 +5255,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/saved-view.ts</context>
-          <context context-type="linenumber">46</context>
+          <context context-type="linenumber">44</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
@@ -5282,7 +5282,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/saved-view.ts</context>
-          <context context-type="linenumber">50</context>
+          <context context-type="linenumber">48</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
@@ -5309,7 +5309,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/saved-view.ts</context>
-          <context context-type="linenumber">54</context>
+          <context context-type="linenumber">52</context>
         </context-group>
       </trans-unit>
       <trans-unit id="5607669932062416162" datatype="html">
@@ -6086,7 +6086,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/saved-view.ts</context>
-          <context context-type="linenumber">66</context>
+          <context context-type="linenumber">64</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/pipes/username.pipe.ts</context>
@@ -6228,7 +6228,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/saved-view.ts</context>
-          <context context-type="linenumber">70</context>
+          <context context-type="linenumber">68</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
@@ -6264,7 +6264,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/saved-view.ts</context>
-          <context context-type="linenumber">62</context>
+          <context context-type="linenumber">60</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/services/rest/document.service.ts</context>
@@ -6318,7 +6318,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/saved-view.ts</context>
-          <context context-type="linenumber">38</context>
+          <context context-type="linenumber">36</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/saved-view.ts</context>

src-ui/src/app/components/admin/settings/settings.component.html

@@ -358,9 +358,9 @@
                 <div class="col">
                   <label class="form-label" for="display_mode_{{view.id}}" i18n>Display as</label>
                   <select class="form-select" formControlName="display_mode">
-                    <option [ngValue]="DashboardViewMode.TABLE" i18n>Table</option>
+                    <option [ngValue]="DisplayMode.TABLE" i18n>Table</option>
-                    <option [ngValue]="DashboardViewMode.SMALL_CARDS" i18n>Small Cards</option>
+                    <option [ngValue]="DisplayMode.SMALL_CARDS" i18n>Small Cards</option>
-                    <option [ngValue]="DashboardViewMode.LARGE_CARDS" i18n>Large Cards</option>
+                    <option [ngValue]="DisplayMode.LARGE_CARDS" i18n>Large Cards</option>
                   </select>
                 </div>
                   @if (displayFields) {

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')

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 {
+import { DisplayMode, SavedView } from 'src/app/data/saved-view'
-  DEFAULT_DISPLAY_FIELDS,
-  DisplayMode,
-  DisplayField,
-  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 systemStatusService: SystemStatusService
-    private customFieldsService: CustomFieldsService
   ) {
     super()
     this.settings.settingsSaved.subscribe(() => {

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) {
           <tr>
             @for (field of displayFields; track field; let i = $index) {
-              @if (displayFields.includes(field)) {
+              <td class="py-2 py-md-3 position-relative" [ngClass]="{ 'd-none d-md-table-cell': i > 1 }">
-                <td class="py-2 py-md-3 position-relative" [ngClass]="{ 'd-none d-md-table-cell': i > 1 }">
+                @switch (field) {
-                  @switch (field) {
+                  @case (DisplayField.ADDED) {
-                    @case (DisplayField.ADDED) {
+                    <a routerLink="/documents/{{doc.id}}" class="btn-link text-dark text-decoration-none py-2 py-md-3">{{doc.added | customDate}}</a>
-                      <a routerLink="/documents/{{doc.id}}" class="btn-link text-dark text-decoration-none py-2 py-md-3">{{doc.added | customDate}}</a>
+                  }
-                    }
+                  @case (DisplayField.CREATED) {
-                    @case (DisplayField.CREATED) {
+                    <a routerLink="/documents/{{doc.id}}" class="btn-link text-dark text-decoration-none py-2 py-md-3">{{doc.created_date | customDate}}</a>
-                      <a routerLink="/documents/{{doc.id}}" class="btn-link text-dark text-decoration-none py-2 py-md-3">{{doc.created_date | customDate}}</a>
+                  }
-                    }
+                  @case (DisplayField.TITLE) {
-                    @case (DisplayField.TITLE) {
+                    <a routerLink="/documents/{{doc.id}}" title="Edit" i18n-title class="btn-link text-dark text-decoration-none py-2 py-md-3">{{doc.title | documentTitle}}</a>
-                      <a routerLink="/documents/{{doc.id}}" title="Edit" i18n-title class="btn-link text-dark text-decoration-none py-2 py-md-3">{{doc.title | documentTitle}}</a>
+                  }
-                    }
+                  @case (DisplayField.CORRESPONDENT) {
-                    @case (DisplayField.CORRESPONDENT) {
+                    @if (doc.correspondent) {
-                      @if (doc.correspondent) {
+                      <a class="btn-link text-dark text-decoration-none" type="button" (click)="clickCorrespondent(doc.correspondent, $event)">{{(doc.correspondent$ | async)?.name}}</a>
-                        <a class="btn-link text-dark text-decoration-none" type="button" (click)="clickCorrespondent(doc.correspondent, $event)">{{(doc.correspondent$ | async)?.name}}</a>
-                      }
-                    }
-                    @case (DisplayField.TAGS) {
-                      @for (t of doc.tags$ | async; track t) {
-                        <pngx-tag [tag]="t" class="ms-1" (click)="clickTag(t.id, $event)"></pngx-tag>
-                      }
-                    }
-                    @case (DisplayField.DOCUMENT_TYPE) {
-                      @if (doc.document_type) {
-                        <a class="btn-link text-dark text-decoration-none" type="button" (click)="clickDocType(doc.document_type, $event)">{{(doc.document_type$ | async)?.name}}</a>
-                      }
-                    }
-                    @case (DisplayField.STORAGE_PATH) {
-                      @if (doc.storage_path) {
-                        <a class="btn-link text-dark text-decoration-none" type="button" (click)="clickStoragePath(doc.storage_path, $event)">{{(doc.storage_path$ | async)?.name}}</a>
-                      }
                     }
                   }
-                  @if (field.startsWith(DisplayField.CUSTOM_FIELD)) {
+                  @case (DisplayField.TAGS) {
-                    <pngx-custom-field-display [document]="doc" [fieldDisplayKey]="field"></pngx-custom-field-display>
+                    @for (t of doc.tags$ | async; track t) {
+                      <pngx-tag [tag]="t" class="ms-1" (click)="clickTag(t.id, $event)"></pngx-tag>
+                    }
                   }
-                  @if (i === displayFields.length - 1) {
+                  @case (DisplayField.DOCUMENT_TYPE) {
-                    <div class="btn-group position-absolute top-50 end-0 translate-middle-y">
+                    @if (doc.document_type) {
-                      <a [href]="getPreviewUrl(doc)" title="View Preview" i18n-title target="_blank" class="btn px-4 btn-dark border-dark-subtle"
+                      <a class="btn-link text-dark text-decoration-none" type="button" (click)="clickDocType(doc.document_type, $event)">{{(doc.document_type$ | async)?.name}}</a>
-                        [ngbPopover]="previewContent" [popoverTitle]="doc.title | documentTitle"
+                    }
-                        autoClose="true" popoverClass="shadow popover-preview" container="body" (mouseenter)="mouseEnterPreviewButton(doc)" (mouseleave)="mouseLeavePreviewButton()" #popover="ngbPopover">
-                        <i-bs width="0.8em" height="0.8em" name="eye"></i-bs>
-                      </a>
-                      <ng-template #previewContent>
-                        <pngx-preview-popup [document]="doc" (mouseenter)="mouseEnterPreview()" (mouseleave)="mouseLeavePreview()"></pngx-preview-popup>
-                      </ng-template>
-                      <a [href]="getDownloadUrl(doc)" class="btn px-4 btn-dark border-dark-subtle" title="Download" i18n-title (click)="$event.stopPropagation()">
-                        <i-bs width="0.8em" height="0.8em" name="download"></i-bs>
-                      </a>
-                    </div>
                   }
-                </td>
+                  @case (DisplayField.STORAGE_PATH) {
-              }
+                    @if (doc.storage_path) {
+                      <a class="btn-link text-dark text-decoration-none" type="button" (click)="clickStoragePath(doc.storage_path, $event)">{{(doc.storage_path$ | async)?.name}}</a>
+                    }
+                  }
+                }
+                @if (field.startsWith(DisplayField.CUSTOM_FIELD)) {
+                  <pngx-custom-field-display [document]="doc" [fieldDisplayKey]="field"></pngx-custom-field-display>
+                }
+                @if (i === displayFields.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"
+                      autoClose="true" popoverClass="shadow popover-preview" container="body" (mouseenter)="mouseEnterPreviewButton(doc)" (mouseleave)="mouseLeavePreviewButton()" #popover="ngbPopover">
+                      <i-bs width="0.8em" height="0.8em" name="eye"></i-bs>
+                    </a>
+                    <ng-template #previewContent>
+                      <pngx-preview-popup [document]="doc" (mouseenter)="mouseEnterPreview()" (mouseleave)="mouseLeavePreview()"></pngx-preview-popup>
+                    </ng-template>
+                    <a [href]="getDownloadUrl(doc)" class="btn px-4 btn-dark border-dark-subtle" title="Download" i18n-title (click)="$event.stopPropagation()">
+                      <i-bs width="0.8em" height="0.8em" name="download"></i-bs>
+                    </a>
+                  </div>
+                }
+              </td>
             }
           </tr>
         }

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[] = [
+  displayFields: DisplayField[] = DEFAULT_DASHBOARD_DISPLAY_FIELDS
-    DisplayField.CREATED,
-    DisplayField.TITLE,
-    DisplayField.TAGS,
-    DisplayField.CORRESPONDENT,
-  ]
 
   ngOnInit(): void {
     this.reload()
@@ -269,11 +265,11 @@ export class SavedViewWidgetComponent
     }, 300)
   }
 
-  public getColumnTitle(column: DisplayField): string {
+  public getColumnTitle(field: DisplayField): string {
-    if (column.startsWith(DisplayField.CUSTOM_FIELD)) {
+    if (field.startsWith(DisplayField.CUSTOM_FIELD)) {
-      const id = column.split('_')[2]
+      const id = field.split('_')[2]
-      return this.customFields.find((c) => c.id === parseInt(id))?.name
+      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
   }
 }

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