Merge branch 'dev' into feature-ai

2025-09-16 21:55:37 -05:00 · 2025-09-08 11:33:39 -07:00
parent 3825023337 f431578f43
commit e00dc63021
67 changed files with 5103 additions and 4099 deletions
--- a/src-ui/src/app/components/admin/settings/settings.component.spec.ts
+++ b/src-ui/src/app/components/admin/settings/settings.component.spec.ts
@@ -61,6 +61,43 @@ const groups = [
  { id: 2, name: 'group2' },
 ]

+const status: SystemStatus = {
+  pngx_version: '2.4.3',
+  server_os: 'macOS-14.1.1-arm64-arm-64bit',
+  install_type: InstallType.BareMetal,
+  storage: { total: 494384795648, available: 13573525504 },
+  database: {
+    type: 'sqlite',
+    url: '/paperless-ngx/data/db.sqlite3',
+    status: SystemStatusItemStatus.ERROR,
+    error: null,
+    migration_status: {
+      latest_migration: 'socialaccount.0006_alter_socialaccount_extra_data',
+      unapplied_migrations: [],
+    },
+  },
+  tasks: {
+    redis_url: 'redis://localhost:6379',
+    redis_status: SystemStatusItemStatus.ERROR,
+    redis_error: 'Error 61 connecting to localhost:6379. Connection refused.',
+    celery_status: SystemStatusItemStatus.ERROR,
+    celery_url: 'celery@localhost',
+    celery_error: 'Error connecting to celery@localhost',
+    index_status: SystemStatusItemStatus.OK,
+    index_last_modified: new Date().toISOString(),
+    index_error: null,
+    classifier_status: SystemStatusItemStatus.OK,
+    classifier_last_trained: new Date().toISOString(),
+    classifier_error: null,
+    sanity_check_status: SystemStatusItemStatus.ERROR,
+    sanity_check_last_run: new Date().toISOString(),
+    sanity_check_error: 'Error running sanity check.',
+    llmindex_status: SystemStatusItemStatus.DISABLED,
+    llmindex_last_modified: new Date().toISOString(),
+    llmindex_error: null,
+  },
+}
+
 describe('SettingsComponent', () => {
  let component: SettingsComponent
  let fixture: ComponentFixture<SettingsComponent>
@@ -290,43 +327,6 @@ describe('SettingsComponent', () => {
  })

  it('should load system status on initialize, show errors if needed', () => {
-    const status: SystemStatus = {
-      pngx_version: '2.4.3',
-      server_os: 'macOS-14.1.1-arm64-arm-64bit',
-      install_type: InstallType.BareMetal,
-      storage: { total: 494384795648, available: 13573525504 },
-      database: {
-        type: 'sqlite',
-        url: '/paperless-ngx/data/db.sqlite3',
-        status: SystemStatusItemStatus.ERROR,
-        error: null,
-        migration_status: {
-          latest_migration: 'socialaccount.0006_alter_socialaccount_extra_data',
-          unapplied_migrations: [],
-        },
-      },
-      tasks: {
-        redis_url: 'redis://localhost:6379',
-        redis_status: SystemStatusItemStatus.ERROR,
-        redis_error:
-          'Error 61 connecting to localhost:6379. Connection refused.',
-        celery_status: SystemStatusItemStatus.ERROR,
-        celery_url: 'celery@localhost',
-        celery_error: 'Error connecting to celery@localhost',
-        index_status: SystemStatusItemStatus.OK,
-        index_last_modified: new Date().toISOString(),
-        index_error: null,
-        classifier_status: SystemStatusItemStatus.OK,
-        classifier_last_trained: new Date().toISOString(),
-        classifier_error: null,
-        sanity_check_status: SystemStatusItemStatus.ERROR,
-        sanity_check_last_run: new Date().toISOString(),
-        sanity_check_error: 'Error running sanity check.',
-        llmindex_status: SystemStatusItemStatus.DISABLED,
-        llmindex_last_modified: new Date().toISOString(),
-        llmindex_error: null,
-      },
-    }
    jest.spyOn(systemStatusService, 'get').mockReturnValue(of(status))
    jest.spyOn(permissionsService, 'isAdmin').mockReturnValue(true)
    completeSetup()
@@ -343,6 +343,8 @@ describe('SettingsComponent', () => {

  it('should open system status dialog', () => {
    const modalOpenSpy = jest.spyOn(modalService, 'open')
+    jest.spyOn(systemStatusService, 'get').mockReturnValue(of(status))
+    jest.spyOn(permissionsService, 'isAdmin').mockReturnValue(true)
    completeSetup()
    component.showSystemStatus()
    expect(modalOpenSpy).toHaveBeenCalledWith(SystemStatusDialogComponent, {
--- a/src-ui/src/app/components/admin/settings/settings.component.ts
+++ b/src-ui/src/app/components/admin/settings/settings.component.ts
@@ -185,7 +185,8 @@ export class SettingsComponent
      this.systemStatus.tasks.classifier_status ===
        SystemStatusItemStatus.ERROR ||
      this.systemStatus.tasks.sanity_check_status ===
-        SystemStatusItemStatus.ERROR
+        SystemStatusItemStatus.ERROR ||
+      this.systemStatus.websocket_connected === SystemStatusItemStatus.ERROR
    )
  }

--- a/src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.html
+++ b/src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.html
@@ -51,7 +51,6 @@
    <ng-select #fieldSelects
      class="paperless-input-select rounded-end"
      [items]="getSelectOptionsForField(atom.field)"
-      [virtualScroll]="getSelectOptionsForField(atom.field)?.length > 100"
      bindLabel="label"
      bindValue="id"
      [(ngModel)]="atom.value"
--- a/src-ui/src/app/components/common/input/select/select.component.html
+++ b/src-ui/src/app/components/common/input/select/select.component.html
@@ -19,7 +19,6 @@
            [class.private]="isPrivate"
            [clearable]="allowNull"
            [items]="items"
-            [virtualScroll]="items?.length > 100"
            [addTag]="allowCreateNew && addItemRef"
            addTagText="Add item"
            i18n-addTagText="Used for both types, correspondents, storage paths"
--- a/src-ui/src/app/components/common/system-status-dialog/system-status-dialog.component.html
+++ b/src-ui/src/app/components/common/system-status-dialog/system-status-dialog.component.html
@@ -254,6 +254,18 @@
                  <h6><ng-container i18n>Error</ng-container>:</h6> <span class="font-monospace small">{{status.tasks.sanity_check_error}}</span>
                }
              </ng-template>
+              <dt i18n>WebSocket Connection</dt>
+              <dd>
+                <span class="btn btn-sm pe-none align-items-center btn-dark text-uppercase small">
+                  @if (status.websocket_connected === 'OK') {
+                    <ng-container i18n>OK</ng-container>
+                    <i-bs name="check-circle-fill" class="text-primary ms-2 lh-1"></i-bs>
+                  } @else {
+                    <ng-container i18n>Error</ng-container>
+                    <i-bs name="exclamation-triangle-fill" class="text-danger ms-2 lh-1"></i-bs>
+                  }
+                </span>
+              </dd>
              @if (aiEnabled) {
                <dt i18n>AI Index</dt>
                <dd class="d-flex align-items-center">
--- a/src-ui/src/app/components/common/system-status-dialog/system-status-dialog.component.spec.ts
+++ b/src-ui/src/app/components/common/system-status-dialog/system-status-dialog.component.spec.ts
@@ -24,7 +24,7 @@ import {
 } from '@angular/core/testing'
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
-import { of, throwError } from 'rxjs'
+import { Subject, of, throwError } from 'rxjs'
 import { PaperlessTaskName } from 'src/app/data/paperless-task'
 import {
  InstallType,
@@ -34,6 +34,7 @@ import {
 import { SystemStatusService } from 'src/app/services/system-status.service'
 import { TasksService } from 'src/app/services/tasks.service'
 import { ToastService } from 'src/app/services/toast.service'
+import { WebsocketStatusService } from 'src/app/services/websocket-status.service'
 import { SystemStatusDialogComponent } from './system-status-dialog.component'

 const status: SystemStatus = {
@@ -80,6 +81,8 @@ describe('SystemStatusDialogComponent', () => {
  let tasksService: TasksService
  let systemStatusService: SystemStatusService
  let toastService: ToastService
+  let websocketStatusService: WebsocketStatusService
+  let websocketSubject: Subject<boolean> = new Subject<boolean>()

  beforeEach(async () => {
    await TestBed.configureTestingModule({
@@ -101,6 +104,12 @@ describe('SystemStatusDialogComponent', () => {
    tasksService = TestBed.inject(TasksService)
    systemStatusService = TestBed.inject(SystemStatusService)
    toastService = TestBed.inject(ToastService)
+    websocketStatusService = TestBed.inject(WebsocketStatusService)
+    jest
+      .spyOn(websocketStatusService, 'onConnectionStatus')
+      .mockImplementation(() => {
+        return websocketSubject.asObservable()
+      })
    fixture.detectChanges()
  })

@@ -171,4 +180,19 @@ describe('SystemStatusDialogComponent', () => {
    component.ngOnInit()
    expect(component.versionMismatch).toBeFalsy()
  })
+
+  it('should update websocket connection status', () => {
+    websocketSubject.next(true)
+    expect(component.status.websocket_connected).toEqual(
+      SystemStatusItemStatus.OK
+    )
+    websocketSubject.next(false)
+    expect(component.status.websocket_connected).toEqual(
+      SystemStatusItemStatus.ERROR
+    )
+    websocketSubject.next(true)
+    expect(component.status.websocket_connected).toEqual(
+      SystemStatusItemStatus.OK
+    )
+  })
 })
--- a/src-ui/src/app/components/common/system-status-dialog/system-status-dialog.component.ts
+++ b/src-ui/src/app/components/common/system-status-dialog/system-status-dialog.component.ts
@@ -1,5 +1,5 @@
 import { Clipboard, ClipboardModule } from '@angular/cdk/clipboard'
-import { Component, OnInit, inject } from '@angular/core'
+import { Component, OnDestroy, OnInit, inject } from '@angular/core'
 import {
  NgbActiveModal,
  NgbModalModule,
@@ -7,6 +7,7 @@ import {
  NgbProgressbarModule,
 } from '@ng-bootstrap/ng-bootstrap'
 import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
+import { Subject, takeUntil } from 'rxjs'
 import { PaperlessTaskName } from 'src/app/data/paperless-task'
 import {
  SystemStatus,
@@ -20,6 +21,7 @@ import { SettingsService } from 'src/app/services/settings.service'
 import { SystemStatusService } from 'src/app/services/system-status.service'
 import { TasksService } from 'src/app/services/tasks.service'
 import { ToastService } from 'src/app/services/toast.service'
+import { WebsocketStatusService } from 'src/app/services/websocket-status.service'
 import { environment } from 'src/environments/environment'

@Component({
@@ -36,13 +38,14 @@ import { environment } from 'src/environments/environment'
    NgxBootstrapIconsModule,
  ],
 })
-export class SystemStatusDialogComponent implements OnInit {
+export class SystemStatusDialogComponent implements OnInit, OnDestroy {
  activeModal = inject(NgbActiveModal)
  private clipboard = inject(Clipboard)
  private systemStatusService = inject(SystemStatusService)
  private tasksService = inject(TasksService)
  private toastService = inject(ToastService)
  private permissionsService = inject(PermissionsService)
+  private websocketStatusService = inject(WebsocketStatusService)
  private settingsService = inject(SettingsService)

  public SystemStatusItemStatus = SystemStatusItemStatus
@@ -54,6 +57,7 @@ export class SystemStatusDialogComponent implements OnInit {
  public copied: boolean = false

  private runningTasks: Set<PaperlessTaskName> = new Set()
+  private unsubscribeNotifier: Subject<any> = new Subject()

  get currentUserIsSuperUser(): boolean {
    return this.permissionsService.isSuperUser()
@@ -72,6 +76,17 @@ export class SystemStatusDialogComponent implements OnInit {
    if (this.versionMismatch) {
      this.status.pngx_version = `${this.status.pngx_version} (frontend: ${this.frontendVersion})`
    }
+    this.status.websocket_connected = this.websocketStatusService.isConnected()
+      ? SystemStatusItemStatus.OK
+      : SystemStatusItemStatus.ERROR
+    this.websocketStatusService
+      .onConnectionStatus()
+      .pipe(takeUntil(this.unsubscribeNotifier))
+      .subscribe((connected) => {
+        this.status.websocket_connected = connected
+          ? SystemStatusItemStatus.OK
+          : SystemStatusItemStatus.ERROR
+      })
  }

  public close() {
@@ -104,7 +119,7 @@ export class SystemStatusDialogComponent implements OnInit {
        this.runningTasks.delete(taskName)
        this.systemStatusService.get().subscribe({
          next: (status) => {
-            this.status = status
+            Object.assign(this.status, status)
          },
        })
      },
@@ -117,4 +132,9 @@ export class SystemStatusDialogComponent implements OnInit {
      },
    })
  }
+
+  ngOnDestroy(): void {
+    this.unsubscribeNotifier.next(this)
+    this.unsubscribeNotifier.complete()
+  }
 }
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -964,6 +964,7 @@ export class DocumentDetailComponent
      .patch(this.getChangedFields())
      .pipe(
        switchMap((updateResult) => {
+          this.savedViewService.maybeRefreshDocumentCounts()
          return this.documentListViewService.getNext(this.documentId).pipe(
            map((nextDocId) => ({ nextDocId, updateResult })),
            takeUntil(this.unsubscribeNotifier)
--- a/src-ui/src/app/data/system-status.ts
+++ b/src-ui/src/app/data/system-status.ts
@@ -48,4 +48,5 @@ export interface SystemStatus {
    llmindex_last_modified: string // ISO date string
    llmindex_error: string
  }
+  websocket_connected?: SystemStatusItemStatus // added client-side
 }
--- a/src-ui/src/app/services/websocket-status.service.ts
+++ b/src-ui/src/app/services/websocket-status.service.ts
@@ -103,6 +103,7 @@ export class WebsocketStatusService {
  private documentConsumptionFinishedSubject = new Subject<FileStatus>()
  private documentConsumptionFailedSubject = new Subject<FileStatus>()
  private documentDeletedSubject = new Subject<boolean>()
+  private connectionStatusSubject = new Subject<boolean>()

  private get(taskId: string, filename?: string) {
    let status =
@@ -153,6 +154,15 @@ export class WebsocketStatusService {
    this.statusWebSocket = new WebSocket(
      `${environment.webSocketProtocol}//${environment.webSocketHost}${environment.webSocketBaseUrl}status/`
    )
+    this.statusWebSocket.onopen = () => {
+      this.connectionStatusSubject.next(true)
+    }
+    this.statusWebSocket.onclose = () => {
+      this.connectionStatusSubject.next(false)
+    }
+    this.statusWebSocket.onerror = () => {
+      this.connectionStatusSubject.next(false)
+    }
    this.statusWebSocket.onmessage = (ev: MessageEvent) => {
      const {
        type,
@@ -286,4 +296,12 @@ export class WebsocketStatusService {
  onDocumentDeleted() {
    return this.documentDeletedSubject
  }
+
+  onConnectionStatus() {
+    return this.connectionStatusSubject.asObservable()
+  }
+
+  isConnected(): boolean {
+    return this.statusWebSocket?.readyState === WebSocket.OPEN
+  }
 }