Document index accent folding

.github/DISCUSSION_TEMPLATE/support.yml

@@ -1,55 +0,0 @@
-title: "[Support] "
-body:
-  - type: textarea
-    id: description
-    attributes:
-      label: What's your question or issue?
-      description: Provide a clear and concise description of what you're trying to do, and what's going wrong.
-      placeholder: |
-        I'm trying to...
-
-        [Include screenshots if helpful]
-    validations:
-      required: true
-  - type: textarea
-    id: steps
-    attributes:
-      label: What have you tried?
-      description: Describe any steps you've already taken to troubleshoot or solve the issue.
-      placeholder: |
-        - I checked the logs and saw...
-        - I followed the install guide and tried...
-  - type: input
-    id: version
-    attributes:
-      label: Paperless-ngx version
-      placeholder: e.g. 1.14.0
-    validations:
-      required: true
-  - type: input
-    id: host-os
-    attributes:
-      label: Host OS
-      description: Include architecture if relevant.
-      placeholder: e.g. Ubuntu 22.04 / Raspberry Pi arm64
-  - type: dropdown
-    id: install-method
-    attributes:
-      label: Installation method
-      options:
-        - Docker - official image
-        - Docker - linuxserver.io image
-        - Bare metal
-        - Other (please describe above)
-  - type: textarea
-    id: system-status
-    attributes:
-      label: System status
-      description: If available, copy & paste the system status output from Settings > System Status > Copy
-      render: json
-  - type: textarea
-    id: logs
-    attributes:
-      label: Relevant logs or output
-      description: If you have logs, errors that might help, paste it here.
-      render: bash

Dockerfile

@@ -21,7 +21,7 @@ ARG PNGX_TAG_VERSION=
 RUN set -eux && \
 case "${PNGX_TAG_VERSION}" in \
   dev|beta|fix*|feature*) \
-    sed -i -E "s/tag: '([a-z\.]+)'/tag: '${PNGX_TAG_VERSION}'/g" /src/src-ui/src/environments/environment.prod.ts \
+    sed -i -E "s/version: '([0-9\.]+)'/version: '\1 #${PNGX_TAG_VERSION}'/g" /src/src-ui/src/environments/environment.prod.ts \
     ;; \
 esac
 

docker/rootfs/etc/s6-overlay/s6-rc.d/init-start/run

@@ -13,8 +13,8 @@ echo $(date +%s) > /var/run/s6/container_environment/PAPERLESS_START_TIME_S
 # Check if we're starting as a non-root user
 if [ "$(id --user)" != "0" ]; then
 	printf "true" > /var/run/s6/container_environment/USER_IS_NON_ROOT
-	echo "${log_prefix} paperless-ngx docker container running under a user ($(id --user):$(id --group))"
+	echo "${log_prefix}  paperless-ngx docker container running under a user ($(id --user):$(id --group))"
 else
 	printf "/usr/src/paperless" > /var/run/s6/container_environment/HOME
-	echo "${log_prefix} paperless-ngx docker container starting init as root"
+	echo "${log_prefix}  paperless-ngx docker container starting init as root"
 fi

docs/changelog.md

@@ -1,64 +1,5 @@
 # Changelog
 
-## paperless-ngx 2.17.1
-
-### Bug Fixes
-
--   Fix: correct PAPERLESS_EMPTY_TRASH_DIR to Path [@shamoon](https://github.com/shamoon) ([#10227](https://github.com/paperless-ngx/paperless-ngx/pull/10227))
-
-### All App Changes
-
--   Fix: correct PAPERLESS_EMPTY_TRASH_DIR to Path [@shamoon](https://github.com/shamoon) ([#10227](https://github.com/paperless-ngx/paperless-ngx/pull/10227))
-
-## paperless-ngx 2.17.0
-
-### Breaking Changes
-
--   Fix: restore expected pre-2.16 scheduled workflow offset behavior [@shamoon](https://github.com/shamoon) ([#10218](https://github.com/paperless-ngx/paperless-ngx/pull/10218))
-
-### Features / Enhancements
-
--   QoL: log version at startup, show backend vs frontend mismatch in system status [@shamoon](https://github.com/shamoon) ([#10214](https://github.com/paperless-ngx/paperless-ngx/pull/10214))
--   Feature: add Persian translation [@shamoon](https://github.com/shamoon) ([#10183](https://github.com/paperless-ngx/paperless-ngx/pull/10183))
--   Enhancement: support import of zipped export [@kaerbr](https://github.com/kaerbr) ([#10073](https://github.com/paperless-ngx/paperless-ngx/pull/10073))
-
-### Bug Fixes
-
--   Fix: more api fixes [@shamoon](https://github.com/shamoon) ([#10204](https://github.com/paperless-ngx/paperless-ngx/pull/10204))
--   Fix: restore expected pre-2.16 scheduled workflow offset behavior [@shamoon](https://github.com/shamoon) ([#10218](https://github.com/paperless-ngx/paperless-ngx/pull/10218))
--   Fix: fix some API crashes [@shamoon](https://github.com/shamoon) ([#10196](https://github.com/paperless-ngx/paperless-ngx/pull/10196))
--   Fix: remove duplicate base path in websocket urls [@robertmx](https://github.com/robertmx) ([#10194](https://github.com/paperless-ngx/paperless-ngx/pull/10194))
--   Fix: use hard delete for custom fields with workflow removal [@shamoon](https://github.com/shamoon) ([#10191](https://github.com/paperless-ngx/paperless-ngx/pull/10191))
--   Fix: fix mail account test api schema [@shamoon](https://github.com/shamoon) ([#10164](https://github.com/paperless-ngx/paperless-ngx/pull/10164))
--   Fix: correct api schema for mail_account process [@shamoon](https://github.com/shamoon) ([#10157](https://github.com/paperless-ngx/paperless-ngx/pull/10157))
--   Fix: correct api schema for next_asn [@shamoon](https://github.com/shamoon) ([#10151](https://github.com/paperless-ngx/paperless-ngx/pull/10151))
--   Fix: fix email and notes endpoints api spec [@shamoon](https://github.com/shamoon) ([#10148](https://github.com/paperless-ngx/paperless-ngx/pull/10148))
-
-### Dependencies
-
--   Chore: bump angular/common to 19.12.14 [@shamoon](https://github.com/shamoon) ([#10212](https://github.com/paperless-ngx/paperless-ngx/pull/10212))
-
-### All App Changes
-
-<details>
-<summary>14 changes</summary>
-
--   QoL: log version at startup, show backend vs frontend mismatch in system status [@shamoon](https://github.com/shamoon) ([#10214](https://github.com/paperless-ngx/paperless-ngx/pull/10214))
--   Fix: more api fixes [@shamoon](https://github.com/shamoon) ([#10204](https://github.com/paperless-ngx/paperless-ngx/pull/10204))
--   Fix: restore expected pre-2.16 scheduled workflow offset behavior [@shamoon](https://github.com/shamoon) ([#10218](https://github.com/paperless-ngx/paperless-ngx/pull/10218))
--   Chore: switch from os.path to pathlib.Path [@gothicVI](https://github.com/gothicVI) ([#9933](https://github.com/paperless-ngx/paperless-ngx/pull/9933))
--   Chore: bump angular/common to 19.12.14 [@shamoon](https://github.com/shamoon) ([#10212](https://github.com/paperless-ngx/paperless-ngx/pull/10212))
--   Fix: fix some API crashes [@shamoon](https://github.com/shamoon) ([#10196](https://github.com/paperless-ngx/paperless-ngx/pull/10196))
--   Fix: remove duplicate base path in websocket urls [@robertmx](https://github.com/robertmx) ([#10194](https://github.com/paperless-ngx/paperless-ngx/pull/10194))
--   Fix: use hard delete for custom fields with workflow removal [@shamoon](https://github.com/shamoon) ([#10191](https://github.com/paperless-ngx/paperless-ngx/pull/10191))
--   Feature: add Persian translation [@shamoon](https://github.com/shamoon) ([#10183](https://github.com/paperless-ngx/paperless-ngx/pull/10183))
--   Enhancement: support import of zipped export [@kaerbr](https://github.com/kaerbr) ([#10073](https://github.com/paperless-ngx/paperless-ngx/pull/10073))
--   Fix: fix mail account test api schema [@shamoon](https://github.com/shamoon) ([#10164](https://github.com/paperless-ngx/paperless-ngx/pull/10164))
--   Fix: correct api schema for mail_account process [@shamoon](https://github.com/shamoon) ([#10157](https://github.com/paperless-ngx/paperless-ngx/pull/10157))
--   Fix: correct api schema for next_asn [@shamoon](https://github.com/shamoon) ([#10151](https://github.com/paperless-ngx/paperless-ngx/pull/10151))
--   Fix: fix email and notes endpoints api spec [@shamoon](https://github.com/shamoon) ([#10148](https://github.com/paperless-ngx/paperless-ngx/pull/10148))
-</details>
-
 ## paperless-ngx 2.16.3
 
 ### Features / Enhancements
@@ -6007,6 +5948,7 @@ primarily.
         a very good job at ocr'ing a document with the default
         language. Certain language specifics such as umlauts may not get
         picked up properly.
+    -   `PAPERLESS_DEBUG` defaults to `false`.
     -   The presence of `PAPERLESS_DBHOST` now determines whether to use
         PostgreSQL or SQLite.
     -   `PAPERLESS_OCR_THREADS` is gone and replaced with

docs/usage.md

@@ -408,7 +408,7 @@ Currently, there are three events that correspond to workflow trigger 'types':
    tags, doc type, or correspondent.
 4. **Scheduled**: a scheduled trigger that can be used to run workflows at a specific time. The date used can be either the document
    added, created, updated date or you can specify a (date) custom field. You can also specify a day offset from the date (positive
-   offsets will trigger after the date, negative offsets will trigger before).
+   offsets will trigger before the date, negative offsets will trigger after).
 
 The following flow diagram illustrates the three document trigger types:
 

paperless.conf.example

@@ -1,6 +1,10 @@
 # Have a look at the docs for documentation.
 # https://docs.paperless-ngx.com/configuration/
 
+# Debug. Only enable this for development.
+
+#PAPERLESS_DEBUG=false
+
 # Required services
 
 #PAPERLESS_REDIS=redis://localhost:6379

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "paperless-ngx"
-version = "2.17.1"
+version = "2.16.3"
 description = "A community-supported supercharged version of paperless: scan, index and archive all your physical documents"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -221,9 +221,22 @@ lint.per-file-ignores."src/documents/parsers.py" = [
 lint.per-file-ignores."src/documents/signals/handlers.py" = [
   "PTH",
 ] # TODO Enable & remove
+lint.per-file-ignores."src/documents/views.py" = [
+  "PTH",
+] # TODO Enable & remove
+lint.per-file-ignores."src/paperless/checks.py" = [
+  "PTH",
+] # TODO Enable & remove
+lint.per-file-ignores."src/paperless/settings.py" = [
+  "PTH",
+] # TODO Enable & remove
+lint.per-file-ignores."src/paperless_mail/mail.py" = [
+  "PTH",
+] # TODO Enable & remove
 lint.per-file-ignores."src/paperless_tesseract/tests/test_parser.py" = [
+  "PTH",
   "RUF001",
-]
+] # TODO PTH Enable & remove
 lint.isort.force-single-line = true
 
 [tool.pytest.ini_options]

src-ui/angular.json

@@ -60,12 +60,10 @@
                 "path": "./extra-webpack.config.ts"
             },
             "outputPath": "dist/paperless-ui",
-            "main": "src/main.ts",
             "outputHashing": "none",
             "index": "src/index.html",
-            "polyfills": [
+            "main": "src/main.ts",
-              "src/polyfills.ts"
+            "polyfills": "src/polyfills.ts",
-            ],
             "tsConfig": "tsconfig.app.json",
             "localize": true,
             "assets": [
@@ -88,15 +86,12 @@
               "file-saver",
               "utif"
             ],
+            "vendorChunk": true,
             "extractLicenses": false,
+            "buildOptimizer": false,
             "sourceMap": true,
             "optimization": false,
-            "namedChunks": true,
+            "namedChunks": true
-            "stylePreprocessorOptions": {
-              "includePaths": [
-                "."
-              ]
-            }
           },
           "configurations": {
             "production": {
@@ -112,6 +107,8 @@
               "sourceMap": false,
               "namedChunks": false,
               "extractLicenses": true,
+              "vendorChunk": false,
+              "buildOptimizer": true,
               "budgets": [
                 {
                   "type": "initial",
@@ -191,30 +188,6 @@
     },
     "@angular-eslint/schematics:library": {
       "setParserOptionsProject": true
-    },
-    "@schematics/angular:component": {
-      "type": "component"
-    },
-    "@schematics/angular:directive": {
-      "type": "directive"
-    },
-    "@schematics/angular:service": {
-      "type": "service"
-    },
-    "@schematics/angular:guard": {
-      "typeSeparator": "."
-    },
-    "@schematics/angular:interceptor": {
-      "typeSeparator": "."
-    },
-    "@schematics/angular:module": {
-      "typeSeparator": "."
-    },
-    "@schematics/angular:pipe": {
-      "typeSeparator": "."
-    },
-    "@schematics/angular:resolver": {
-      "typeSeparator": "."
     }
   }
 }

src-ui/jest.config.js

@@ -8,7 +8,7 @@ module.exports = {
     'abstract-paperless-service',
   ],
   transformIgnorePatterns: [
-    `<rootDir>/node_modules/.pnpm/(?!.*\\.mjs$|lodash-es|@angular\\+common.*locales)`,
+    `<rootDir>/node_modules/.pnpm/(?!.*\\.mjs$|lodash-es)`,
   ],
   moduleNameMapper: {
     '^src/(.*)': '<rootDir>/src/$1',

src-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "paperless-ngx-ui",
-  "version": "2.17.1",
+  "version": "2.16.3",
   "scripts": {
     "preinstall": "npx only-allow pnpm",
     "ng": "ng",
@@ -11,17 +11,17 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/cdk": "^20.0.4",
+    "@angular/cdk": "^19.2.14",
-    "@angular/common": "~20.0.5",
+    "@angular/common": "~19.2.13",
-    "@angular/compiler": "~20.0.5",
+    "@angular/compiler": "~19.2.14",
-    "@angular/core": "~20.0.5",
+    "@angular/core": "~19.2.14",
-    "@angular/forms": "~20.0.5",
+    "@angular/forms": "~19.2.14",
-    "@angular/localize": "~20.0.5",
+    "@angular/localize": "~19.2.14",
-    "@angular/platform-browser": "~20.0.5",
+    "@angular/platform-browser": "~19.2.14",
-    "@angular/platform-browser-dynamic": "~20.0.5",
+    "@angular/platform-browser-dynamic": "~19.2.14",
-    "@angular/router": "~20.0.5",
+    "@angular/router": "~19.2.14",
-    "@ng-bootstrap/ng-bootstrap": "^19.0.0",
+    "@ng-bootstrap/ng-bootstrap": "^18.0.0",
-    "@ng-select/ng-select": "^15.1.2",
+    "@ng-select/ng-select": "^14.9.0",
     "@ngneat/dirty-check-forms": "^3.0.3",
     "@popperjs/core": "^2.11.8",
     "bootstrap": "^5.3.6",
@@ -32,7 +32,7 @@
     "ngx-color": "^10.0.0",
     "ngx-cookie-service": "^19.1.2",
     "ngx-device-detector": "^9.0.0",
-    "ngx-ui-tour-ng-bootstrap": "^17.0.0",
+    "ngx-ui-tour-ng-bootstrap": "^16.0.0",
     "rxjs": "^7.8.2",
     "tslib": "^2.8.1",
     "utif": "^3.1.0",
@@ -40,25 +40,25 @@
     "zone.js": "^0.15.1"
   },
   "devDependencies": {
-    "@angular-builders/custom-webpack": "^20.0.0",
+    "@angular-builders/custom-webpack": "^19.0.1",
-    "@angular-builders/jest": "^20.0.0",
+    "@angular-builders/jest": "^19.0.1",
-    "@angular-devkit/core": "^20.0.4",
+    "@angular-devkit/build-angular": "^19.2.14",
-    "@angular-devkit/schematics": "^20.0.4",
+    "@angular-devkit/core": "^19.2.14",
-    "@angular-eslint/builder": "20.1.1",
+    "@angular-devkit/schematics": "^19.2.14",
-    "@angular-eslint/eslint-plugin": "20.1.1",
+    "@angular-eslint/builder": "19.7.0",
-    "@angular-eslint/eslint-plugin-template": "20.1.1",
+    "@angular-eslint/eslint-plugin": "19.7.0",
-    "@angular-eslint/schematics": "20.1.1",
+    "@angular-eslint/eslint-plugin-template": "19.7.0",
-    "@angular-eslint/template-parser": "20.1.1",
+    "@angular-eslint/schematics": "19.7.0",
-    "@angular/build": "^20.0.4",
+    "@angular-eslint/template-parser": "19.7.0",
-    "@angular/cli": "~20.0.4",
+    "@angular/cli": "~19.2.14",
-    "@angular/compiler-cli": "~20.0.5",
+    "@angular/compiler-cli": "~19.2.14",
     "@codecov/webpack-plugin": "^1.9.1",
     "@playwright/test": "^1.51.1",
     "@types/jest": "^29.5.14",
     "@types/node": "^22.15.29",
-    "@typescript-eslint/eslint-plugin": "^8.33.1",
+    "@typescript-eslint/eslint-plugin": "^8.33.0",
-    "@typescript-eslint/parser": "^8.33.1",
+    "@typescript-eslint/parser": "^8.33.0",
-    "@typescript-eslint/utils": "^8.33.1",
+    "@typescript-eslint/utils": "^8.33.0",
     "eslint": "^9.28.0",
     "jest": "29.7.0",
     "jest-environment-jsdom": "^29.7.0",
@@ -67,8 +67,7 @@
     "jest-websocket-mock": "^2.5.0",
     "prettier-plugin-organize-imports": "^4.1.0",
     "ts-node": "~10.9.1",
-    "typescript": "^5.8.3",
+    "typescript": "^5.5.4"
-    "webpack": "^5.98.0"
   },
   "pnpm": {
     "onlyBuiltDependencies": [
@@ -78,5 +77,6 @@
       "lmdb",
       "msgpackr-extract"
     ]
-  }
+  },
+  "typings": "./src/typings.d.ts"
 }

src-ui/src/app/app.component.ts

@@ -1,4 +1,4 @@
-import { Component, inject, OnDestroy, OnInit, Renderer2 } from '@angular/core'
+import { Component, OnDestroy, OnInit, Renderer2 } from '@angular/core'
 import { Router, RouterOutlet } from '@angular/router'
 import { TourNgBootstrapModule, TourService } from 'ngx-ui-tour-ng-bootstrap'
 import { first, Subscription } from 'rxjs'
@@ -29,22 +29,22 @@ import { WebsocketStatusService } from './services/websocket-status.service'
   ],
 })
 export class AppComponent implements OnInit, OnDestroy {
-  private settings = inject(SettingsService)
-  private websocketStatusService = inject(WebsocketStatusService)
-  private toastService = inject(ToastService)
-  private router = inject(Router)
-  private tasksService = inject(TasksService)
-  tourService = inject(TourService)
-  private renderer = inject(Renderer2)
-  private permissionsService = inject(PermissionsService)
-  private hotKeyService = inject(HotKeyService)
-  private componentRouterService = inject(ComponentRouterService)
-
   newDocumentSubscription: Subscription
   successSubscription: Subscription
   failedSubscription: Subscription
 
-  constructor() {
+  constructor(
+    private settings: SettingsService,
+    private websocketStatusService: WebsocketStatusService,
+    private toastService: ToastService,
+    private router: Router,
+    private tasksService: TasksService,
+    public tourService: TourService,
+    private renderer: Renderer2,
+    private permissionsService: PermissionsService,
+    private hotKeyService: HotKeyService,
+    private componentRouterService: ComponentRouterService
+  ) {
     let anyWindow = window as any
     anyWindow.pdfWorkerSrc = 'assets/js/pdf.worker.min.mjs'
     this.settings.updateAppearanceSettings()

src-ui/src/app/components/admin/config/config.component.ts

@@ -1,5 +1,5 @@
 import { AsyncPipe } from '@angular/common'
-import { Component, OnDestroy, OnInit, inject } from '@angular/core'
+import { Component, OnDestroy, OnInit } from '@angular/core'
 import {
   AbstractControl,
   FormControl,
@@ -57,10 +57,6 @@ export class ConfigComponent
   extends LoadingComponentWithPermissions
   implements OnInit, OnDestroy, DirtyComponent
 {
-  private configService = inject(ConfigService)
-  private toastService = inject(ToastService)
-  private settingsService = inject(SettingsService)
-
   public readonly ConfigOptionType = ConfigOptionType
 
   // generated dynamically
@@ -81,7 +77,11 @@ export class ConfigComponent
   storeSub: Subscription
   isDirty$: Observable<boolean>
 
-  constructor() {
+  constructor(
+    private configService: ConfigService,
+    private toastService: ToastService,
+    private settingsService: SettingsService
+  ) {
     super()
     this.configForm.addControl('id', new FormControl())
     PaperlessConfigOptions.forEach((option) => {

src-ui/src/app/components/admin/logs/logs.component.ts

@@ -5,7 +5,6 @@ import {
   OnDestroy,
   OnInit,
   ViewChild,
-  inject,
 } from '@angular/core'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'
@@ -29,8 +28,12 @@ export class LogsComponent
   extends LoadingComponentWithPermissions
   implements OnInit, OnDestroy
 {
-  private logService = inject(LogService)
+  constructor(
-  private changedetectorRef = inject(ChangeDetectorRef)
+    private logService: LogService,
+    private changedetectorRef: ChangeDetectorRef
+  ) {
+    super()
+  }
 
   public logs: string[] = []
 

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

@@ -176,7 +176,6 @@
             <div class="row">
               <div class="col">
                 <pngx-input-check i18n-title title="Show warning when closing saved views with unsaved changes" formControlName="savedViewsWarnOnUnsavedChange"></pngx-input-check>
-                <pngx-input-check i18n-title title="Show document counts in sidebar saved views" formControlName="sidebarViewsShowCount"></pngx-input-check>
               </div>
             </div>
 

src-ui/src/app/components/admin/settings/settings.component.spec.ts

@@ -31,7 +31,6 @@ import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe'
 import { SafeHtmlPipe } from 'src/app/pipes/safehtml.pipe'
 import { PermissionsService } from 'src/app/services/permissions.service'
 import { GroupService } from 'src/app/services/rest/group.service'
-import { SavedViewService } from 'src/app/services/rest/saved-view.service'
 import { UserService } from 'src/app/services/rest/user.service'
 import { SettingsService } from 'src/app/services/settings.service'
 import { SystemStatusService } from 'src/app/services/system-status.service'
@@ -73,7 +72,6 @@ describe('SettingsComponent', () => {
   let groupService: GroupService
   let modalService: NgbModal
   let systemStatusService: SystemStatusService
-  let savedViewsService: SavedViewService
 
   beforeEach(async () => {
     TestBed.configureTestingModule({
@@ -124,7 +122,6 @@ describe('SettingsComponent', () => {
     permissionsService = TestBed.inject(PermissionsService)
     modalService = TestBed.inject(NgbModal)
     systemStatusService = TestBed.inject(SystemStatusService)
-    savedViewsService = TestBed.inject(SavedViewService)
     jest.spyOn(permissionsService, 'currentUserCan').mockReturnValue(true)
     jest
       .spyOn(permissionsService, 'currentUserHasObjectPermissions')
@@ -215,7 +212,7 @@ describe('SettingsComponent', () => {
     expect(toastErrorSpy).toHaveBeenCalled()
     expect(storeSpy).toHaveBeenCalled()
     expect(appearanceSettingsSpy).not.toHaveBeenCalled()
-    expect(setSpy).toHaveBeenCalledTimes(30)
+    expect(setSpy).toHaveBeenCalledTimes(29)
 
     // succeed
     storeSpy.mockReturnValueOnce(of(true))
@@ -348,14 +345,4 @@ describe('SettingsComponent', () => {
     component.reset()
     expect(component.settingsForm.get('themeColor').value).toEqual('')
   })
-
-  it('should trigger maybeRefreshDocumentCounts on settings save', () => {
-    completeSetup()
-    const maybeRefreshSpy = jest.spyOn(
-      savedViewsService,
-      'maybeRefreshDocumentCounts'
-    )
-    settingsService.settingsSaved.emit(true)
-    expect(maybeRefreshSpy).toHaveBeenCalled()
-  })
 })

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

@@ -2,10 +2,10 @@ import { AsyncPipe, ViewportScroller } from '@angular/common'
 import {
   AfterViewInit,
   Component,
+  Inject,
   LOCALE_ID,
   OnDestroy,
   OnInit,
-  inject,
 } from '@angular/core'
 import {
   FormControl,
@@ -49,7 +49,6 @@ import {
   PermissionsService,
 } from 'src/app/services/permissions.service'
 import { GroupService } from 'src/app/services/rest/group.service'
-import { SavedViewService } from 'src/app/services/rest/saved-view.service'
 import { UserService } from 'src/app/services/rest/user.service'
 import {
   LanguageOption,
@@ -105,21 +104,6 @@ export class SettingsComponent
   extends ComponentWithPermissions
   implements OnInit, AfterViewInit, OnDestroy, DirtyComponent
 {
-  private documentListViewService = inject(DocumentListViewService)
-  private toastService = inject(ToastService)
-  private settings = inject(SettingsService)
-  currentLocale = inject(LOCALE_ID)
-  private viewportScroller = inject(ViewportScroller)
-  private activatedRoute = inject(ActivatedRoute)
-  readonly tourService = inject(TourService)
-  private usersService = inject(UserService)
-  private groupsService = inject(GroupService)
-  private router = inject(Router)
-  permissionsService = inject(PermissionsService)
-  private modalService = inject(NgbModal)
-  private systemStatusService = inject(SystemStatusService)
-  private savedViewsService = inject(SavedViewService)
-
   activeNavID: number
 
   settingsForm = new FormGroup({
@@ -154,7 +138,6 @@ export class SettingsComponent
     notificationsConsumerSuppressOnDashboard: new FormControl(null),
 
     savedViewsWarnOnUnsavedChange: new FormControl(null),
-    sidebarViewsShowCount: new FormControl(null),
   })
 
   SettingsNavIDs = SettingsNavIDs
@@ -196,11 +179,24 @@ export class SettingsComponent
     )
   }
 
-  constructor() {
+  constructor(
+    private documentListViewService: DocumentListViewService,
+    private toastService: ToastService,
+    private settings: SettingsService,
+    @Inject(LOCALE_ID) public currentLocale: string,
+    private viewportScroller: ViewportScroller,
+    private activatedRoute: ActivatedRoute,
+    public readonly tourService: TourService,
+    private usersService: UserService,
+    private groupsService: GroupService,
+    private router: Router,
+    public permissionsService: PermissionsService,
+    private modalService: NgbModal,
+    private systemStatusService: SystemStatusService
+  ) {
     super()
     this.settings.settingsSaved.subscribe(() => {
       if (!this.savePending) this.initialize()
-      this.savedViewsService.maybeRefreshDocumentCounts()
     })
   }
 
@@ -312,9 +308,6 @@ export class SettingsComponent
       savedViewsWarnOnUnsavedChange: this.settings.get(
         SETTINGS_KEYS.SAVED_VIEWS_WARN_ON_UNSAVED_CHANGE
       ),
-      sidebarViewsShowCount: this.settings.get(
-        SETTINGS_KEYS.SIDEBAR_VIEWS_SHOW_COUNT
-      ),
       defaultPermsOwner: this.settings.get(SETTINGS_KEYS.DEFAULT_PERMS_OWNER),
       defaultPermsViewUsers: this.settings.get(
         SETTINGS_KEYS.DEFAULT_PERMS_VIEW_USERS
@@ -492,10 +485,6 @@ export class SettingsComponent
       SETTINGS_KEYS.SAVED_VIEWS_WARN_ON_UNSAVED_CHANGE,
       this.settingsForm.value.savedViewsWarnOnUnsavedChange
     )
-    this.settings.set(
-      SETTINGS_KEYS.SIDEBAR_VIEWS_SHOW_COUNT,
-      this.settingsForm.value.sidebarViewsShowCount
-    )
     this.settings.set(
       SETTINGS_KEYS.DEFAULT_PERMS_OWNER,
       this.settingsForm.value.defaultPermsOwner

src-ui/src/app/components/admin/tasks/tasks.component.ts

@@ -1,5 +1,5 @@
 import { NgTemplateOutlet, SlicePipe } from '@angular/common'
-import { Component, inject, OnDestroy, OnInit } from '@angular/core'
+import { Component, OnDestroy, OnInit } from '@angular/core'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { Router } from '@angular/router'
 import {
@@ -69,10 +69,6 @@ export class TasksComponent
   extends LoadingComponentWithPermissions
   implements OnInit, OnDestroy
 {
-  tasksService = inject(TasksService)
-  private modalService = inject(NgbModal)
-  private readonly router = inject(Router)
-
   public activeTab: TaskTab
   public selectedTasks: Set<number> = new Set()
   public togggleAll: boolean = false
@@ -109,6 +105,14 @@ export class TasksComponent
       : $localize`Dismiss all`
   }
 
+  constructor(
+    public tasksService: TasksService,
+    private modalService: NgbModal,
+    private readonly router: Router
+  ) {
+    super()
+  }
+
   ngOnInit() {
     this.tasksService.reload()
     timer(5000, 5000)

src-ui/src/app/components/admin/trash/trash.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnDestroy, inject } from '@angular/core'
+import { Component, OnDestroy } from '@angular/core'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { Router } from '@angular/router'
 import {
@@ -36,19 +36,19 @@ export class TrashComponent
   extends LoadingComponentWithPermissions
   implements OnDestroy
 {
-  private trashService = inject(TrashService)
-  private toastService = inject(ToastService)
-  private modalService = inject(NgbModal)
-  private settingsService = inject(SettingsService)
-  private router = inject(Router)
-
   public documentsInTrash: Document[] = []
   public selectedDocuments: Set<number> = new Set()
   public allToggled: boolean = false
   public page: number = 1
   public totalDocuments: number
 
-  constructor() {
+  constructor(
+    private trashService: TrashService,
+    private toastService: ToastService,
+    private modalService: NgbModal,
+    private settingsService: SettingsService,
+    private router: Router
+  ) {
     super()
     this.reload()
   }

src-ui/src/app/components/admin/users-groups/users-groups.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnDestroy, OnInit, inject } from '@angular/core'
+import { Component, OnDestroy, OnInit } from '@angular/core'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { Subject, first, takeUntil } from 'rxjs'
@@ -31,18 +31,22 @@ export class UsersAndGroupsComponent
   extends ComponentWithPermissions
   implements OnInit, OnDestroy
 {
-  private usersService = inject(UserService)
-  private groupsService = inject(GroupService)
-  private toastService = inject(ToastService)
-  private modalService = inject(NgbModal)
-  permissionsService = inject(PermissionsService)
-  private settings = inject(SettingsService)
-
   users: User[]
   groups: Group[]
 
   unsubscribeNotifier: Subject<any> = new Subject()
 
+  constructor(
+    private usersService: UserService,
+    private groupsService: GroupService,
+    private toastService: ToastService,
+    private modalService: NgbModal,
+    public permissionsService: PermissionsService,
+    private settings: SettingsService
+  ) {
+    super()
+  }
+
   ngOnInit(): void {
     this.usersService
       .listAll(null, null, { full_perms: true })

src-ui/src/app/components/app-frame/app-frame.component.html

@@ -112,14 +112,7 @@
                     routerLinkActive="active" (click)="closeMenu()" [ngbPopover]="view.name"
                     [disablePopover]="!slimSidebarEnabled" placement="end" container="body" triggers="mouseenter:mouseleave"
                     popoverClass="popover-slim">
-                    <i-bs class="me-1" name="funnel"></i-bs><span>&nbsp;{{view.name}}
+                    <i-bs class="me-1" name="funnel"></i-bs><span>&nbsp;{{view.name}}</span>
-                      @if (showSidebarCounts && !slimSidebarEnabled) {
-                        <span><span class="badge bg-info text-dark ms-2 d-inline">{{ savedViewService.getDocumentCount(view) }}</span></span>
-                      }
-                    </span>
-                    @if (showSidebarCounts && slimSidebarEnabled) {
-                      <span class="badge bg-info text-dark position-absolute top-0 end-0 d-none d-md-block">{{ savedViewService.getDocumentCount(view) }}</span>
-                    }
                   </a>
                   @if (settingsService.organizingSidebarSavedViews) {
                     <div class="position-absolute end-0 top-0 px-3 py-2" [class.me-n3]="slimSidebarEnabled" cdkDragHandle>

src-ui/src/app/components/app-frame/app-frame.component.spec.ts

@@ -92,7 +92,6 @@ describe('AppFrameComponent', () => {
   let router: Router
   let savedViewSpy
   let modalService: NgbModal
-  let maybeRefreshSpy
 
   beforeEach(async () => {
     TestBed.configureTestingModule({
@@ -114,11 +113,7 @@ describe('AppFrameComponent', () => {
         {
           provide: SavedViewService,
           useValue: {
-            reload: (fn: any) => {
+            reload: () => {},
-              if (fn) {
-                fn()
-              }
-            },
             listAll: () =>
               of({
                 all: [saved_views.map((v) => v.id)],
@@ -126,8 +121,6 @@ describe('AppFrameComponent', () => {
                 results: saved_views,
               }),
             sidebarViews: saved_views.filter((v) => v.show_in_sidebar),
-            getDocumentCount: (view: SavedView) => 5,
-            maybeRefreshDocumentCounts: () => {},
           },
         },
         PermissionsService,
@@ -176,7 +169,6 @@ describe('AppFrameComponent', () => {
     jest.spyOn(permissionsService, 'currentUserCan').mockReturnValue(true)
 
     savedViewSpy = jest.spyOn(savedViewService, 'reload')
-    maybeRefreshSpy = jest.spyOn(savedViewService, 'maybeRefreshDocumentCounts')
 
     fixture = TestBed.createComponent(AppFrameComponent)
     component = fixture.componentInstance
@@ -367,8 +359,4 @@ describe('AppFrameComponent', () => {
     expect(toastErrorSpy).toHaveBeenCalledTimes(2)
     expect(toastInfoSpy).toHaveBeenCalledTimes(3)
   })
-
-  it('should call maybeRefreshDocumentCounts after saved views reload', () => {
-    expect(maybeRefreshSpy).toHaveBeenCalled()
-  })
 })

src-ui/src/app/components/app-frame/app-frame.component.ts

@@ -6,7 +6,7 @@ import {
   moveItemInArray,
 } from '@angular/cdk/drag-drop'
 import { NgClass } from '@angular/common'
-import { Component, HostListener, inject, OnInit } from '@angular/core'
+import { Component, HostListener, OnInit } from '@angular/core'
 import { ActivatedRoute, Router, RouterModule } from '@angular/router'
 import {
   NgbCollapseModule,
@@ -74,27 +74,27 @@ export class AppFrameComponent
   extends ComponentWithPermissions
   implements OnInit, ComponentCanDeactivate
 {
-  router = inject(Router)
+  versionString = `${environment.appTitle} ${environment.version}`
-  private activatedRoute = inject(ActivatedRoute)
-  private openDocumentsService = inject(OpenDocumentsService)
-  savedViewService = inject(SavedViewService)
-  private remoteVersionService = inject(RemoteVersionService)
-  settingsService = inject(SettingsService)
-  tasksService = inject(TasksService)
-  private readonly toastService = inject(ToastService)
-  private modalService = inject(NgbModal)
-  permissionsService = inject(PermissionsService)
-  private djangoMessagesService = inject(DjangoMessagesService)
-
   appRemoteVersion: AppRemoteVersion
 
   isMenuCollapsed: boolean = true
 
   slimSidebarAnimating: boolean = false
 
-  constructor() {
+  constructor(
+    public router: Router,
+    private activatedRoute: ActivatedRoute,
+    private openDocumentsService: OpenDocumentsService,
+    public savedViewService: SavedViewService,
+    private remoteVersionService: RemoteVersionService,
+    public settingsService: SettingsService,
+    public tasksService: TasksService,
+    private readonly toastService: ToastService,
+    private modalService: NgbModal,
+    public permissionsService: PermissionsService,
+    private djangoMessagesService: DjangoMessagesService
+  ) {
     super()
-    const permissionsService = this.permissionsService
 
     if (
       permissionsService.currentUserCan(
@@ -102,9 +102,7 @@ export class AppFrameComponent
         PermissionType.SavedView
       )
     ) {
-      this.savedViewService.reload(() => {
+      this.savedViewService.reload()
-        this.savedViewService.maybeRefreshDocumentCounts()
-      })
     }
   }
 
@@ -144,10 +142,6 @@ export class AppFrameComponent
     }, 200) // slightly longer than css animation for slim sidebar
   }
 
-  get versionString(): string {
-    return `${environment.appTitle} v${this.settingsService.get(SETTINGS_KEYS.VERSION)}${environment.production ? '' : ` #${environment.tag}`}`
-  }
-
   get customAppTitle(): string {
     return this.settingsService.get(SETTINGS_KEYS.APP_TITLE)
   }
@@ -285,8 +279,4 @@ export class AppFrameComponent
   onLogout() {
     this.openDocumentsService.closeAll()
   }
-
-  get showSidebarCounts(): boolean {
-    return this.settingsService.get(SETTINGS_KEYS.SIDEBAR_VIEWS_SHOW_COUNT)
-  }
 }

src-ui/src/app/components/app-frame/global-search/global-search.component.ts

@@ -6,7 +6,6 @@ import {
   QueryList,
   ViewChild,
   ViewChildren,
-  inject,
 } from '@angular/core'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { Router } from '@angular/router'
@@ -70,17 +69,6 @@ import { WorkflowEditDialogComponent } from '../../common/edit-dialog/workflow-e
   ],
 })
 export class GlobalSearchComponent implements OnInit {
-  searchService = inject(SearchService)
-  private router = inject(Router)
-  private modalService = inject(NgbModal)
-  private documentService = inject(DocumentService)
-  private documentListViewService = inject(DocumentListViewService)
-  private permissionsService = inject(PermissionsService)
-  private toastService = inject(ToastService)
-  private hotkeyService = inject(HotKeyService)
-  private settingsService = inject(SettingsService)
-  private locationStrategy = inject(LocationStrategy)
-
   public DataType = DataType
   public query: string
   public queryDebounce: Subject<string>
@@ -102,7 +90,18 @@ export class GlobalSearchComponent implements OnInit {
     )
   }
 
-  constructor() {
+  constructor(
+    public searchService: SearchService,
+    private router: Router,
+    private modalService: NgbModal,
+    private documentService: DocumentService,
+    private documentListViewService: DocumentListViewService,
+    private permissionsService: PermissionsService,
+    private toastService: ToastService,
+    private hotkeyService: HotKeyService,
+    private settingsService: SettingsService,
+    private locationStrategy: LocationStrategy
+  ) {
     this.queryDebounce = new Subject<string>()
 
     this.queryDebounce

src-ui/src/app/components/app-frame/toasts-dropdown/toasts-dropdown.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnDestroy, OnInit, inject } from '@angular/core'
+import { Component, OnDestroy, OnInit } from '@angular/core'
 import {
   NgbDropdownModule,
   NgbProgressbarModule,
@@ -20,7 +20,7 @@ import { ToastComponent } from '../../common/toast/toast.component'
   ],
 })
 export class ToastsDropdownComponent implements OnInit, OnDestroy {
-  toastService = inject(ToastService)
+  constructor(public toastService: ToastService) {}
 
   private subscription: Subscription
 

src-ui/src/app/components/common/confirm-dialog/confirm-dialog.component.ts

@@ -1,5 +1,5 @@
 import { DecimalPipe } from '@angular/common'
-import { Component, EventEmitter, Input, Output, inject } from '@angular/core'
+import { Component, EventEmitter, Input, Output } from '@angular/core'
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 import { Subject } from 'rxjs'
 import { SafeHtmlPipe } from 'src/app/pipes/safehtml.pipe'
@@ -12,7 +12,9 @@ import { LoadingComponentWithPermissions } from '../../loading-component/loading
   imports: [DecimalPipe, SafeHtmlPipe],
 })
 export class ConfirmDialogComponent extends LoadingComponentWithPermissions {
-  activeModal = inject(NgbActiveModal)
+  constructor(public activeModal: NgbActiveModal) {
+    super()
+  }
 
   @Output()
   public confirmClicked = new EventEmitter()

src-ui/src/app/components/common/confirm-dialog/delete-pages-confirm-dialog/delete-pages-confirm-dialog.component.ts

@@ -1,5 +1,6 @@
-import { Component, TemplateRef, ViewChild, inject } from '@angular/core'
+import { Component, TemplateRef, ViewChild } from '@angular/core'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 import {
   PDFDocumentProxy,
   PdfViewerComponent,
@@ -16,8 +17,6 @@ import { ConfirmDialogComponent } from '../confirm-dialog.component'
   imports: [PdfViewerModule, FormsModule, ReactiveFormsModule, SafeHtmlPipe],
 })
 export class DeletePagesConfirmDialogComponent extends ConfirmDialogComponent {
-  private documentService = inject(DocumentService)
-
   public documentID: number
   public pages: number[] = []
   public currentPage: number = 1
@@ -35,8 +34,11 @@ export class DeletePagesConfirmDialogComponent extends ConfirmDialogComponent {
     return this.documentService.getPreviewUrl(this.documentID)
   }
 
-  constructor() {
+  constructor(
-    super()
+    activeModal: NgbActiveModal,
+    private documentService: DocumentService
+  ) {
+    super(activeModal)
   }
 
   public pdfPreviewLoaded(pdf: PDFDocumentProxy) {

src-ui/src/app/components/common/confirm-dialog/merge-confirm-dialog/merge-confirm-dialog.component.ts

@@ -3,8 +3,9 @@ import {
   DragDropModule,
   moveItemInArray,
 } from '@angular/cdk/drag-drop'
-import { Component, OnInit, inject } from '@angular/core'
+import { Component, OnInit } from '@angular/core'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { takeUntil } from 'rxjs'
 import { Document } from 'src/app/data/document'
@@ -27,9 +28,6 @@ export class MergeConfirmDialogComponent
   extends ConfirmDialogComponent
   implements OnInit
 {
-  private documentService = inject(DocumentService)
-  private permissionService = inject(PermissionsService)
-
   public documentIDs: number[] = []
   public archiveFallback: boolean = false
   public deleteOriginals: boolean = false
@@ -40,8 +38,12 @@ export class MergeConfirmDialogComponent
 
   public metadataDocumentID: number = -1
 
-  constructor() {
+  constructor(
-    super()
+    activeModal: NgbActiveModal,
+    private documentService: DocumentService,
+    private permissionService: PermissionsService
+  ) {
+    super(activeModal)
   }
 
   ngOnInit() {

src-ui/src/app/components/common/confirm-dialog/rotate-confirm-dialog/rotate-confirm-dialog.component.ts

@@ -1,5 +1,6 @@
 import { NgStyle } from '@angular/common'
-import { Component, inject } from '@angular/core'
+import { Component } from '@angular/core'
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { SafeHtmlPipe } from 'src/app/pipes/safehtml.pipe'
 import { DocumentService } from 'src/app/services/rest/document.service'
@@ -12,8 +13,6 @@ import { ConfirmDialogComponent } from '../confirm-dialog.component'
   imports: [NgStyle, NgxBootstrapIconsModule, SafeHtmlPipe],
 })
 export class RotateConfirmDialogComponent extends ConfirmDialogComponent {
-  documentService = inject(DocumentService)
-
   public documentID: number
   public showPDFNote: boolean = true
 
@@ -26,8 +25,11 @@ export class RotateConfirmDialogComponent extends ConfirmDialogComponent {
     return degrees
   }
 
-  constructor() {
+  constructor(
-    super()
+    activeModal: NgbActiveModal,
+    public documentService: DocumentService
+  ) {
+    super(activeModal)
   }
 
   rotate(clockwise: boolean = true) {

src-ui/src/app/components/common/confirm-dialog/split-confirm-dialog/split-confirm-dialog.component.ts

@@ -1,5 +1,6 @@
-import { Component, OnInit, inject } from '@angular/core'
+import { Component, OnInit } from '@angular/core'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 import { PDFDocumentProxy, PdfViewerModule } from 'ng2-pdf-viewer'
 import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { Document } from 'src/app/data/document'
@@ -22,9 +23,6 @@ export class SplitConfirmDialogComponent
   extends ConfirmDialogComponent
   implements OnInit
 {
-  private documentService = inject(DocumentService)
-  private permissionService = inject(PermissionsService)
-
   public get pagesString(): string {
     let pagesStr = ''
 
@@ -64,8 +62,12 @@ export class SplitConfirmDialogComponent
     return this.documentService.getPreviewUrl(this.documentID)
   }
 
-  constructor() {
+  constructor(
-    super()
+    activeModal: NgbActiveModal,
+    private documentService: DocumentService,
+    private permissionService: PermissionsService
+  ) {
+    super(activeModal)
     this.confirmButtonEnabled = this.pages.size > 0
   }
 

src-ui/src/app/components/common/custom-field-display/custom-field-display.component.ts

@@ -1,5 +1,5 @@
 import { CurrencyPipe, getLocaleCurrencyCode } from '@angular/common'
-import { Component, Input, LOCALE_ID, OnInit, inject } from '@angular/core'
+import { Component, Inject, Input, LOCALE_ID, OnInit } from '@angular/core'
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'
 import { takeUntil } from 'rxjs'
 import { CustomField, CustomFieldDataType } from 'src/app/data/custom-field'
@@ -20,9 +20,6 @@ export class CustomFieldDisplayComponent
   extends LoadingComponentWithPermissions
   implements OnInit
 {
-  private customFieldService = inject(CustomFieldsService)
-  private documentService = inject(DocumentService)
-
   CustomFieldDataType = CustomFieldDataType
 
   private _document: Document
@@ -66,9 +63,11 @@ export class CustomFieldDisplayComponent
 
   private defaultCurrencyCode: any
 
-  constructor() {
+  constructor(
-    const currentLocale = inject(LOCALE_ID)
+    private customFieldService: CustomFieldsService,
-
+    private documentService: DocumentService,
+    @Inject(LOCALE_ID) currentLocale: string
+  ) {
     super()
     this.defaultCurrencyCode = getLocaleCurrencyCode(currentLocale)
     this.customFieldService.listAll().subscribe((r) => {

src-ui/src/app/components/common/custom-fields-dropdown/custom-fields-dropdown.component.ts

@@ -7,7 +7,6 @@ import {
   QueryList,
   ViewChild,
   ViewChildren,
-  inject,
 } from '@angular/core'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { NgbDropdownModule, NgbModal } from '@ng-bootstrap/ng-bootstrap'
@@ -38,11 +37,6 @@ import { CustomFieldEditDialogComponent } from '../edit-dialog/custom-field-edit
   ],
 })
 export class CustomFieldsDropdownComponent extends LoadingComponentWithPermissions {
-  private customFieldsService = inject(CustomFieldsService)
-  private modalService = inject(NgbModal)
-  private toastService = inject(ToastService)
-  private permissionsService = inject(PermissionsService)
-
   public popperOptions = pngxPopperOptions
 
   @Input()
@@ -84,7 +78,12 @@ export class CustomFieldsDropdownComponent extends LoadingComponentWithPermissio
     )
   }
 
-  constructor() {
+  constructor(
+    private customFieldsService: CustomFieldsService,
+    private modalService: NgbModal,
+    private toastService: ToastService,
+    private permissionsService: PermissionsService
+  ) {
     super()
     this.getFields()
   }

src-ui/src/app/components/common/custom-fields-query-dropdown/custom-fields-query-dropdown.component.ts

@@ -2,7 +2,6 @@ import { NgTemplateOutlet } from '@angular/common'
 import {
   Component,
   EventEmitter,
-  inject,
   Input,
   Output,
   QueryList,
@@ -179,8 +178,6 @@ export class CustomFieldQueriesModel {
   ],
 })
 export class CustomFieldsQueryDropdownComponent extends LoadingComponentWithPermissions {
-  protected customFieldsService = inject(CustomFieldsService)
-
   public CustomFieldQueryComponentType = CustomFieldQueryElementType
   public CustomFieldQueryOperator = CustomFieldQueryOperator
   public CustomFieldDataType = CustomFieldDataType
@@ -248,7 +245,7 @@ export class CustomFieldsQueryDropdownComponent extends LoadingComponentWithPerm
 
   public readonly today: string = new Date().toISOString().split('T')[0]
 
-  constructor() {
+  constructor(protected customFieldsService: CustomFieldsService) {
     super()
     this.selectionModel = new CustomFieldQueriesModel()
     this.getFields()

src-ui/src/app/components/common/dates-dropdown/dates-dropdown.component.ts

@@ -6,7 +6,6 @@ import {
   OnDestroy,
   OnInit,
   Output,
-  inject,
 } from '@angular/core'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import {
@@ -64,9 +63,7 @@ export enum RelativeDate {
 export class DatesDropdownComponent implements OnInit, OnDestroy {
   public popperOptions = pngxPopperOptions
 
-  constructor() {
+  constructor(settings: SettingsService) {
-    const settings = inject(SettingsService)
-
     this.datePlaceHolder = settings.getLocalizedDateInputFormat()
   }
 

src-ui/src/app/components/common/edit-dialog/correspondent-edit-dialog/correspondent-edit-dialog.component.html

@@ -13,6 +13,8 @@
     <pngx-input-select i18n-title title="Matching algorithm" [items]="getMatchingAlgorithms()" formControlName="matching_algorithm"></pngx-input-select>
     @if (patternRequired) {
       <pngx-input-text i18n-title title="Matching pattern" formControlName="match" [error]="error?.match"></pngx-input-text>
+    }
+    @if (patternRequired) {
       <pngx-input-check i18n-title title="Case insensitive" formControlName="is_insensitive" novalidate></pngx-input-check>
     }
 

src-ui/src/app/components/common/edit-dialog/correspondent-edit-dialog/correspondent-edit-dialog.component.ts

@@ -1,10 +1,11 @@
-import { Component, inject } from '@angular/core'
+import { Component } from '@angular/core'
 import {
   FormControl,
   FormGroup,
   FormsModule,
   ReactiveFormsModule,
 } from '@angular/forms'
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 import { EditDialogComponent } from 'src/app/components/common/edit-dialog/edit-dialog.component'
 import { Correspondent } from 'src/app/data/correspondent'
 import { DEFAULT_MATCHING_ALGORITHM } from 'src/app/data/matching-model'
@@ -12,7 +13,6 @@ import { IfOwnerDirective } from 'src/app/directives/if-owner.directive'
 import { CorrespondentService } from 'src/app/services/rest/correspondent.service'
 import { UserService } from 'src/app/services/rest/user.service'
 import { SettingsService } from 'src/app/services/settings.service'
-import { CheckComponent } from '../../input/check/check.component'
 import { PermissionsFormComponent } from '../../input/permissions/permissions-form/permissions-form.component'
 import { SelectComponent } from '../../input/select/select.component'
 import { TextComponent } from '../../input/text/text.component'
@@ -22,7 +22,6 @@ import { TextComponent } from '../../input/text/text.component'
   templateUrl: './correspondent-edit-dialog.component.html',
   styleUrls: ['./correspondent-edit-dialog.component.scss'],
   imports: [
-    CheckComponent,
     SelectComponent,
     PermissionsFormComponent,
     TextComponent,
@@ -32,11 +31,13 @@ import { TextComponent } from '../../input/text/text.component'
   ],
 })
 export class CorrespondentEditDialogComponent extends EditDialogComponent<Correspondent> {
-  constructor() {
+  constructor(
-    super()
+    service: CorrespondentService,
-    this.service = inject(CorrespondentService)
+    activeModal: NgbActiveModal,
-    this.userService = inject(UserService)
+    userService: UserService,
-    this.settingsService = inject(SettingsService)
+    settingsService: SettingsService
+  ) {
+    super(service, activeModal, userService, settingsService)
   }
 
   getCreateTitle() {

src-ui/src/app/components/common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component.ts

@@ -5,7 +5,6 @@ import {
   OnInit,
   QueryList,
   ViewChildren,
-  inject,
 } from '@angular/core'
 import {
   FormArray,
@@ -14,6 +13,7 @@ import {
   FormsModule,
   ReactiveFormsModule,
 } from '@angular/forms'
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { takeUntil } from 'rxjs'
 import {
@@ -54,11 +54,13 @@ export class CustomFieldEditDialogComponent
       .select_options as FormArray
   }
 
-  constructor() {
+  constructor(
-    super()
+    service: CustomFieldsService,
-    this.service = inject(CustomFieldsService)
+    activeModal: NgbActiveModal,
-    this.userService = inject(UserService)
+    userService: UserService,
-    this.settingsService = inject(SettingsService)
+    settingsService: SettingsService
+  ) {
+    super(service, activeModal, userService, settingsService)
   }
 
   ngOnInit(): void {

src-ui/src/app/components/common/edit-dialog/document-type-edit-dialog/document-type-edit-dialog.component.html

@@ -14,6 +14,8 @@
       <pngx-input-select i18n-title title="Matching algorithm" [items]="getMatchingAlgorithms()" formControlName="matching_algorithm"></pngx-input-select>
       @if (patternRequired) {
         <pngx-input-text i18n-title title="Matching pattern" formControlName="match" [error]="error?.match"></pngx-input-text>
+      }
+      @if (patternRequired) {
         <pngx-input-check i18n-title title="Case insensitive" formControlName="is_insensitive"></pngx-input-check>
       }
     </div>

src-ui/src/app/components/common/edit-dialog/document-type-edit-dialog/document-type-edit-dialog.component.ts

@@ -1,10 +1,11 @@
-import { Component, inject } from '@angular/core'
+import { Component } from '@angular/core'
 import {
   FormControl,
   FormGroup,
   FormsModule,
   ReactiveFormsModule,
 } from '@angular/forms'
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 import { EditDialogComponent } from 'src/app/components/common/edit-dialog/edit-dialog.component'
 import { DocumentType } from 'src/app/data/document-type'
 import { DEFAULT_MATCHING_ALGORITHM } from 'src/app/data/matching-model'
@@ -12,7 +13,6 @@ import { IfOwnerDirective } from 'src/app/directives/if-owner.directive'
 import { DocumentTypeService } from 'src/app/services/rest/document-type.service'
 import { UserService } from 'src/app/services/rest/user.service'
 import { SettingsService } from 'src/app/services/settings.service'
-import { CheckComponent } from '../../input/check/check.component'
 import { PermissionsFormComponent } from '../../input/permissions/permissions-form/permissions-form.component'
 import { SelectComponent } from '../../input/select/select.component'
 import { TextComponent } from '../../input/text/text.component'
@@ -22,7 +22,6 @@ import { TextComponent } from '../../input/text/text.component'
   templateUrl: './document-type-edit-dialog.component.html',
   styleUrls: ['./document-type-edit-dialog.component.scss'],
   imports: [
-    CheckComponent,
     SelectComponent,
     PermissionsFormComponent,
     TextComponent,
@@ -32,11 +31,13 @@ import { TextComponent } from '../../input/text/text.component'
   ],
 })
 export class DocumentTypeEditDialogComponent extends EditDialogComponent<DocumentType> {
-  constructor() {
+  constructor(
-    super()
+    service: DocumentTypeService,
-    this.service = inject(DocumentTypeService)
+    activeModal: NgbActiveModal,
-    this.userService = inject(UserService)
+    userService: UserService,
-    this.settingsService = inject(SettingsService)
+    settingsService: SettingsService
+  ) {
+    super(service, activeModal, userService, settingsService)
   }
 
   getCreateTitle() {

src-ui/src/app/components/common/edit-dialog/edit-dialog.component.spec.ts

@@ -41,9 +41,13 @@ import { EditDialogComponent, EditDialogMode } from './edit-dialog.component'
   imports: [FormsModule, ReactiveFormsModule],
 })
 class TestComponent extends EditDialogComponent<Tag> {
-  constructor() {
+  constructor(
-    super()
+    service: TagService,
-    this.service = TestBed.inject(TagService)
+    activeModal: NgbActiveModal,
+    userService: UserService,
+    settingsService: SettingsService
+  ) {
+    super(service, activeModal, userService, settingsService)
   }
 
   getForm(): FormGroup<any> {

src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts

@@ -1,11 +1,4 @@
-import {
+import { Directive, EventEmitter, Input, OnInit, Output } from '@angular/core'
-  Directive,
-  EventEmitter,
-  Input,
-  OnInit,
-  Output,
-  inject,
-} from '@angular/core'
 import { FormGroup } from '@angular/forms'
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 import { Observable } from 'rxjs'
@@ -36,12 +29,14 @@ export abstract class EditDialogComponent<
   extends LoadingComponentWithPermissions
   implements OnInit
 {
-  protected service = inject<AbstractPaperlessService<T>>(
+  constructor(
-    AbstractPaperlessService
+    protected service: AbstractPaperlessService<T>,
-  )
+    private activeModal: NgbActiveModal,
-  protected activeModal = inject(NgbActiveModal)
+    private userService: UserService,
-  protected userService = inject(UserService)
+    protected settingsService: SettingsService
-  protected settingsService = inject(SettingsService)
+  ) {
+    super()
+  }
 
   users: User[]
 

src-ui/src/app/components/common/edit-dialog/group-edit-dialog/group-edit-dialog.component.ts

@@ -1,10 +1,11 @@
-import { Component, inject } from '@angular/core'
+import { Component } from '@angular/core'
 import {
   FormControl,
   FormGroup,
   FormsModule,
   ReactiveFormsModule,
 } from '@angular/forms'
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 import { EditDialogComponent } from 'src/app/components/common/edit-dialog/edit-dialog.component'
 import { Group } from 'src/app/data/group'
 import { GroupService } from 'src/app/services/rest/group.service'
@@ -25,11 +26,13 @@ import { PermissionsSelectComponent } from '../../permissions-select/permissions
   ],
 })
 export class GroupEditDialogComponent extends EditDialogComponent<Group> {
-  constructor() {
+  constructor(
-    super()
+    service: GroupService,
-    this.service = inject(GroupService)
+    activeModal: NgbActiveModal,
-    this.userService = inject(UserService)
+    userService: UserService,
-    this.settingsService = inject(SettingsService)
+    settingsService: SettingsService
+  ) {
+    super(service, activeModal, userService, settingsService)
   }
 
   getCreateTitle() {

src-ui/src/app/components/common/edit-dialog/mail-account-edit-dialog/mail-account-edit-dialog.component.ts

@@ -1,11 +1,15 @@
-import { Component, ViewChild, inject } from '@angular/core'
+import { Component, ViewChild } from '@angular/core'
 import {
   FormControl,
   FormGroup,
   FormsModule,
   ReactiveFormsModule,
 } from '@angular/forms'
-import { NgbAlert, NgbAlertModule } from '@ng-bootstrap/ng-bootstrap'
+import {
+  NgbActiveModal,
+  NgbAlert,
+  NgbAlertModule,
+} from '@ng-bootstrap/ng-bootstrap'
 import { EditDialogComponent } from 'src/app/components/common/edit-dialog/edit-dialog.component'
 import { IMAPSecurity, MailAccount } from 'src/app/data/mail-account'
 import { MailAccountService } from 'src/app/services/rest/mail-account.service'
@@ -43,11 +47,13 @@ export class MailAccountEditDialogComponent extends EditDialogComponent<MailAcco
 
   @ViewChild('testResultAlert', { static: false }) testResultAlert: NgbAlert
 
-  constructor() {
+  constructor(
-    super()
+    service: MailAccountService,
-    this.service = inject(MailAccountService)
+    activeModal: NgbActiveModal,
-    this.userService = inject(UserService)
+    userService: UserService,
-    this.settingsService = inject(SettingsService)
+    settingsService: SettingsService
+  ) {
+    super(service, activeModal, userService, settingsService)
   }
 
   getCreateTitle() {

src-ui/src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.ts

@@ -1,10 +1,11 @@
-import { Component, inject } from '@angular/core'
+import { Component } from '@angular/core'
 import {
   FormControl,
   FormGroup,
   FormsModule,
   ReactiveFormsModule,
 } from '@angular/forms'
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 import { first } from 'rxjs'
 import { EditDialogComponent } from 'src/app/components/common/edit-dialog/edit-dialog.component'
 import { Correspondent } from 'src/app/data/correspondent'
@@ -154,34 +155,32 @@ const METADATA_CORRESPONDENT_OPTIONS = [
   ],
 })
 export class MailRuleEditDialogComponent extends EditDialogComponent<MailRule> {
-  private accountService: MailAccountService
-  private correspondentService: CorrespondentService
-  private documentTypeService: DocumentTypeService
-
   accounts: MailAccount[]
   correspondents: Correspondent[]
   documentTypes: DocumentType[]
 
-  constructor() {
+  constructor(
-    super()
+    service: MailRuleService,
-    this.service = inject(MailRuleService)
+    activeModal: NgbActiveModal,
-    this.accountService = inject(MailAccountService)
+    accountService: MailAccountService,
-    this.correspondentService = inject(CorrespondentService)
+    correspondentService: CorrespondentService,
-    this.documentTypeService = inject(DocumentTypeService)
+    documentTypeService: DocumentTypeService,
-    this.userService = inject(UserService)
+    userService: UserService,
-    this.settingsService = inject(SettingsService)
+    settingsService: SettingsService
+  ) {
+    super(service, activeModal, userService, settingsService)
 
-    this.accountService
+    accountService
       .listAll()
       .pipe(first())
       .subscribe((result) => (this.accounts = result.results))
 
-    this.correspondentService
+    correspondentService
       .listAll()
       .pipe(first())
       .subscribe((result) => (this.correspondents = result.results))
 
-    this.documentTypeService
+    documentTypeService
       .listAll()
       .pipe(first())
       .subscribe((result) => (this.documentTypes = result.results))

src-ui/src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.html

@@ -64,6 +64,8 @@
     <pngx-input-select i18n-title title="Matching algorithm" [items]="getMatchingAlgorithms()" formControlName="matching_algorithm"></pngx-input-select>
     @if (patternRequired) {
       <pngx-input-text i18n-title title="Matching pattern" formControlName="match" [error]="error?.match"></pngx-input-text>
+    }
+    @if (patternRequired) {
       <pngx-input-check i18n-title title="Case insensitive" formControlName="is_insensitive"></pngx-input-check>
     }
 

src-ui/src/app/components/common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component.ts

@@ -1,12 +1,12 @@
 import { AsyncPipe, NgTemplateOutlet } from '@angular/common'
-import { Component, OnDestroy, inject } from '@angular/core'
+import { Component, OnDestroy } from '@angular/core'
 import {
   FormControl,
   FormGroup,
   FormsModule,
   ReactiveFormsModule,
 } from '@angular/forms'
-import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap'
+import { NgbAccordionModule, NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 import { NgSelectComponent } from '@ng-select/ng-select'
 import {
   Observable,
@@ -60,8 +60,6 @@ export class StoragePathEditDialogComponent
   extends EditDialogComponent<StoragePath>
   implements OnDestroy
 {
-  private documentsService = inject(DocumentService)
-
   public documentsInput$ = new Subject<string>()
   public foundDocuments$: Observable<Document[]>
   private testDocument: Document
@@ -70,11 +68,14 @@ export class StoragePathEditDialogComponent
   public loading = false
   public testLoading = false
 
-  constructor() {
+  constructor(
-    super()
+    service: StoragePathService,
-    this.service = inject(StoragePathService)
+    activeModal: NgbActiveModal,
-    this.userService = inject(UserService)
+    userService: UserService,
-    this.settingsService = inject(SettingsService)
+    settingsService: SettingsService,
+    private documentsService: DocumentService
+  ) {
+    super(service, activeModal, userService, settingsService)
     this.initPathObservables()
   }
 

src-ui/src/app/components/common/edit-dialog/tag-edit-dialog/tag-edit-dialog.component.html

@@ -16,6 +16,8 @@
     <pngx-input-select i18n-title title="Matching algorithm" [items]="getMatchingAlgorithms()" formControlName="matching_algorithm"></pngx-input-select>
     @if (patternRequired) {
       <pngx-input-text i18n-title title="Matching pattern" formControlName="match" [error]="error?.match"></pngx-input-text>
+    }
+    @if (patternRequired) {
       <pngx-input-check i18n-title title="Case insensitive" formControlName="is_insensitive"></pngx-input-check>
     }
 

src-ui/src/app/components/common/edit-dialog/tag-edit-dialog/tag-edit-dialog.component.ts

@@ -1,10 +1,11 @@
-import { Component, inject } from '@angular/core'
+import { Component } from '@angular/core'
 import {
   FormControl,
   FormGroup,
   FormsModule,
   ReactiveFormsModule,
 } from '@angular/forms'
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 import { EditDialogComponent } from 'src/app/components/common/edit-dialog/edit-dialog.component'
 import { DEFAULT_MATCHING_ALGORITHM } from 'src/app/data/matching-model'
 import { Tag } from 'src/app/data/tag'
@@ -35,11 +36,13 @@ import { TextComponent } from '../../input/text/text.component'
   ],
 })
 export class TagEditDialogComponent extends EditDialogComponent<Tag> {
-  constructor() {
+  constructor(
-    super()
+    service: TagService,
-    this.service = inject(TagService)
+    activeModal: NgbActiveModal,
-    this.userService = inject(UserService)
+    userService: UserService,
-    this.settingsService = inject(SettingsService)
+    settingsService: SettingsService
+  ) {
+    super(service, activeModal, userService, settingsService)
   }
 
   getCreateTitle() {

src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.ts

@@ -1,10 +1,11 @@
-import { Component, OnInit, inject } from '@angular/core'
+import { Component, OnInit } from '@angular/core'
 import {
   FormControl,
   FormGroup,
   FormsModule,
   ReactiveFormsModule,
 } from '@angular/forms'
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 import { first } from 'rxjs'
 import { EditDialogComponent } from 'src/app/components/common/edit-dialog/edit-dialog.component'
 import { Group } from 'src/app/data/group'
@@ -36,21 +37,21 @@ export class UserEditDialogComponent
   extends EditDialogComponent<User>
   implements OnInit
 {
-  private toastService = inject(ToastService)
-  private permissionsService = inject(PermissionsService)
-  private groupsService: GroupService
-
   groups: Group[]
   passwordIsSet: boolean = false
   public totpLoading: boolean = false
 
-  constructor() {
+  constructor(
-    super()
+    service: UserService,
-    this.service = inject(UserService)
+    activeModal: NgbActiveModal,
-    this.groupsService = inject(GroupService)
+    groupsService: GroupService,
-    this.settingsService = inject(SettingsService)
+    settingsService: SettingsService,
+    private toastService: ToastService,
+    private permissionsService: PermissionsService
+  ) {
+    super(service, activeModal, service, settingsService)
 
-    this.groupsService
+    groupsService
       .listAll()
       .pipe(first())
       .subscribe((result) => (this.groups = result.results))

src-ui/src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html

@@ -129,7 +129,7 @@
             formControlName="schedule_offset_days"
             [showAdd]="false"
             [error]="error?.schedule_offset_days"
-            hint="Positive values will trigger after the date, negative values before."
+            hint="Positive values will trigger the workflow before the date, negative values after."
             i18n-hint
           ></pngx-input-number>
         </div>

src-ui/src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.ts

@@ -4,7 +4,7 @@ import {
   moveItemInArray,
 } from '@angular/cdk/drag-drop'
 import { NgTemplateOutlet } from '@angular/common'
-import { Component, OnInit, inject } from '@angular/core'
+import { Component, OnInit } from '@angular/core'
 import {
   FormArray,
   FormControl,
@@ -12,7 +12,7 @@ import {
   FormsModule,
   ReactiveFormsModule,
 } from '@angular/forms'
-import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap'
+import { NgbAccordionModule, NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { first } from 'rxjs'
 import { Correspondent } from 'src/app/data/correspondent'
@@ -171,12 +171,6 @@ export class WorkflowEditDialogComponent
   public WorkflowTriggerType = WorkflowTriggerType
   public WorkflowActionType = WorkflowActionType
 
-  private correspondentService: CorrespondentService
-  private documentTypeService: DocumentTypeService
-  private storagePathService: StoragePathService
-  private mailRuleService: MailRuleService
-  private customFieldsService: CustomFieldsService
-
   templates: Workflow[]
   correspondents: Correspondent[]
   documentTypes: DocumentType[]
@@ -189,38 +183,40 @@ export class WorkflowEditDialogComponent
 
   private allowedActionTypes = []
 
-  constructor() {
+  constructor(
-    super()
+    service: WorkflowService,
-    this.service = inject(WorkflowService)
+    activeModal: NgbActiveModal,
-    this.correspondentService = inject(CorrespondentService)
+    correspondentService: CorrespondentService,
-    this.documentTypeService = inject(DocumentTypeService)
+    documentTypeService: DocumentTypeService,
-    this.storagePathService = inject(StoragePathService)
+    storagePathService: StoragePathService,
-    this.mailRuleService = inject(MailRuleService)
+    mailRuleService: MailRuleService,
-    this.userService = inject(UserService)
+    userService: UserService,
-    this.settingsService = inject(SettingsService)
+    settingsService: SettingsService,
-    this.customFieldsService = inject(CustomFieldsService)
+    customFieldsService: CustomFieldsService
+  ) {
+    super(service, activeModal, userService, settingsService)
 
-    this.correspondentService
+    correspondentService
       .listAll()
       .pipe(first())
       .subscribe((result) => (this.correspondents = result.results))
 
-    this.documentTypeService
+    documentTypeService
       .listAll()
       .pipe(first())
       .subscribe((result) => (this.documentTypes = result.results))
 
-    this.storagePathService
+    storagePathService
       .listAll()
       .pipe(first())
       .subscribe((result) => (this.storagePaths = result.results))
 
-    this.mailRuleService
+    mailRuleService
       .listAll()
       .pipe(first())
       .subscribe((result) => (this.mailRules = result.results))
 
-    this.customFieldsService
+    customFieldsService
       .listAll()
       .pipe(first())
       .subscribe((result) => {

src-ui/src/app/components/common/email-document-dialog/email-document-dialog.component.ts

@@ -1,4 +1,4 @@
-import { Component, Input, inject } from '@angular/core'
+import { Component, Input } from '@angular/core'
 import { FormsModule } from '@angular/forms'
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
@@ -13,10 +13,6 @@ import { LoadingComponentWithPermissions } from '../../loading-component/loading
   imports: [FormsModule, NgxBootstrapIconsModule],
 })
 export class EmailDocumentDialogComponent extends LoadingComponentWithPermissions {
-  private activeModal = inject(NgbActiveModal)
-  private documentService = inject(DocumentService)
-  private toastService = inject(ToastService)
-
   @Input()
   title = $localize`Email Document`
 
@@ -41,7 +37,11 @@ export class EmailDocumentDialogComponent extends LoadingComponentWithPermission
   public emailSubject: string = ''
   public emailMessage: string = ''
 
-  constructor() {
+  constructor(
+    private activeModal: NgbActiveModal,
+    private documentService: DocumentService,
+    private toastService: ToastService
+  ) {
     super()
     this.loading = false
   }

src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts

@@ -7,7 +7,6 @@ import {
   OnInit,
   Output,
   ViewChild,
-  inject,
 } from '@angular/core'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { NgbDropdown, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'
@@ -435,9 +434,6 @@ export class FilterableDropdownComponent
   extends LoadingComponentWithPermissions
   implements OnInit
 {
-  private filterPipe = inject(FilterPipe)
-  private hotkeyService = inject(HotKeyService)
-
   @ViewChild('listFilterTextInput') listFilterTextInput: ElementRef
   @ViewChild('dropdown') dropdown: NgbDropdown
   @ViewChild('buttonItems') buttonItems: ElementRef
@@ -540,7 +536,10 @@ export class FilterableDropdownComponent
 
   private keyboardIndex: number
 
-  constructor() {
+  constructor(
+    private filterPipe: FilterPipe,
+    private hotkeyService: HotKeyService
+  ) {
     super()
     this.selectionModelChange.subscribe((updatedModel) => {
       this.modelIsDirty = updatedModel.isDirty()

src-ui/src/app/components/common/hotkey-dialog/hotkey-dialog.component.ts

@@ -1,4 +1,4 @@
-import { Component, inject } from '@angular/core'
+import { Component } from '@angular/core'
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 
 const SYMBOLS = {
@@ -19,11 +19,11 @@ const SYMBOLS = {
   styleUrl: './hotkey-dialog.component.scss',
 })
 export class HotkeyDialogComponent {
-  activeModal = inject(NgbActiveModal)
-
   public title: string = $localize`Keyboard shortcuts`
   public hotkeys: Map<string, string> = new Map()
 
+  constructor(public activeModal: NgbActiveModal) {}
+
   public close(): void {
     this.activeModal.close()
   }

src-ui/src/app/components/common/input/custom-fields-values/custom-fields-values.component.ts

@@ -2,7 +2,6 @@ import {
   Component,
   EventEmitter,
   forwardRef,
-  inject,
   Input,
   Output,
 } from '@angular/core'
@@ -56,9 +55,7 @@ import { UrlComponent } from '../url/url.component'
 export class CustomFieldsValuesComponent extends AbstractInputComponent<Object> {
   public CustomFieldDataType = CustomFieldDataType
 
-  constructor() {
+  constructor(customFieldsService: CustomFieldsService) {
-    const customFieldsService = inject(CustomFieldsService)
-
     super()
     customFieldsService.listAll().subscribe((items) => {
       this.fields = items.results

src-ui/src/app/components/common/input/date/date.component.ts

@@ -2,7 +2,6 @@ import {
   Component,
   EventEmitter,
   forwardRef,
-  inject,
   Input,
   OnInit,
   Output,
@@ -46,9 +45,13 @@ export class DateComponent
   extends AbstractInputComponent<string>
   implements OnInit
 {
-  private settings = inject(SettingsService)
+  constructor(
-  private ngbDateParserFormatter = inject(NgbDateParserFormatter)
+    private settings: SettingsService,
-  private isoDateAdapter = inject<NgbDateAdapter<string>>(NgbDateAdapter)
+    private ngbDateParserFormatter: NgbDateParserFormatter,
+    private isoDateAdapter: NgbDateAdapter<string>
+  ) {
+    super()
+  }
 
   @Input()
   suggestions: string[]

src-ui/src/app/components/common/input/document-link/document-link.component.ts

@@ -1,12 +1,5 @@
 import { AsyncPipe, NgTemplateOutlet } from '@angular/common'
-import {
+import { Component, forwardRef, Input, OnDestroy, OnInit } from '@angular/core'
-  Component,
-  forwardRef,
-  inject,
-  Input,
-  OnDestroy,
-  OnInit,
-} from '@angular/core'
 import {
   FormsModule,
   NG_VALUE_ACCESSOR,
@@ -59,8 +52,6 @@ export class DocumentLinkComponent
   extends AbstractInputComponent<any[]>
   implements OnInit, OnDestroy
 {
-  private documentsService = inject(DocumentService)
-
   documentsInput$ = new Subject<string>()
   foundDocuments$: Observable<Document[]>
   loading = false
@@ -84,6 +75,10 @@ export class DocumentLinkComponent
     return this.selectedDocuments.map((d) => d.id)
   }
 
+  constructor(private documentsService: DocumentService) {
+    super()
+  }
+
   ngOnInit() {
     this.loadDocs()
   }

src-ui/src/app/components/common/input/monetary/monetary.component.spec.ts

@@ -1,6 +1,5 @@
 import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
 import { provideHttpClientTesting } from '@angular/common/http/testing'
-import { LOCALE_ID } from '@angular/core'
 import { ComponentFixture, TestBed } from '@angular/core/testing'
 import { NG_VALUE_ACCESSOR } from '@angular/forms'
 import { MonetaryComponent } from './monetary.component'
@@ -42,6 +41,8 @@ describe('MonetaryComponent', () => {
 
   it('should set the default currency code based on LOCALE_ID', () => {
     expect(component.defaultCurrencyCode).toEqual('USD') // default
+    component = new MonetaryComponent('pt-BR')
+    expect(component.defaultCurrencyCode).toEqual('BRL')
   })
 
   it('should support setting a default currency code', () => {
@@ -86,28 +87,3 @@ describe('MonetaryComponent', () => {
     expect(component.value).toEqual('USD0.00')
   })
 })
-
-describe('MonetaryComponent (Alternate Locale)', () => {
-  let component: MonetaryComponent
-  let fixture: ComponentFixture<MonetaryComponent>
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [MonetaryComponent],
-      providers: [
-        { provide: LOCALE_ID, useValue: 'pt-BR' }, // Brazilian Portuguese
-        provideHttpClient(withInterceptorsFromDi()),
-        provideHttpClientTesting(),
-      ],
-    }).compileComponents()
-
-    fixture = TestBed.createComponent(MonetaryComponent)
-    fixture.debugElement.injector.get(NG_VALUE_ACCESSOR)
-    component = fixture.componentInstance
-    fixture.detectChanges()
-  })
-
-  it('should set the default currency code based on LOCALE_ID', () => {
-    expect(component.defaultCurrencyCode).toEqual('BRL')
-  })
-})

src-ui/src/app/components/common/input/monetary/monetary.component.ts

@@ -1,5 +1,5 @@
 import { CurrencyPipe, getLocaleCurrencyCode } from '@angular/common'
-import { Component, forwardRef, inject, Input, LOCALE_ID } from '@angular/core'
+import { Component, forwardRef, Inject, Input, LOCALE_ID } from '@angular/core'
 import {
   FormsModule,
   NG_VALUE_ACCESSOR,
@@ -27,8 +27,6 @@ import { AbstractInputComponent } from '../abstract-input'
   ],
 })
 export class MonetaryComponent extends AbstractInputComponent<string> {
-  currentLocale = inject(LOCALE_ID)
-
   public currency: string = ''
 
   public _monetaryValue: string = ''
@@ -47,10 +45,11 @@ export class MonetaryComponent extends AbstractInputComponent<string> {
     if (currency) this.defaultCurrencyCode = currency
   }
 
-  constructor() {
+  constructor(@Inject(LOCALE_ID) currentLocale: string) {
     super()
+
     this.currency = this.defaultCurrencyCode =
-      this.defaultCurrency ?? getLocaleCurrencyCode(this.currentLocale)
+      this.defaultCurrency ?? getLocaleCurrencyCode(currentLocale)
   }
 
   writeValue(newValue: any): void {

src-ui/src/app/components/common/input/number/number.component.ts

@@ -1,4 +1,4 @@
-import { Component, forwardRef, inject, Input } from '@angular/core'
+import { Component, forwardRef, Input } from '@angular/core'
 import {
   FormsModule,
   NG_VALUE_ACCESSOR,
@@ -22,14 +22,16 @@ import { AbstractInputComponent } from '../abstract-input'
   imports: [FormsModule, ReactiveFormsModule, NgxBootstrapIconsModule],
 })
 export class NumberComponent extends AbstractInputComponent<number> {
-  private documentService = inject(DocumentService)
-
   @Input()
   showAdd: boolean = true
 
   @Input()
   step: number = 1
 
+  constructor(private documentService: DocumentService) {
+    super()
+  }
+
   nextAsn() {
     if (this.value) {
       return

src-ui/src/app/components/common/input/permissions/permissions-group/permissions-group.component.ts

@@ -1,4 +1,4 @@
-import { Component, forwardRef, inject } from '@angular/core'
+import { Component, forwardRef } from '@angular/core'
 import {
   FormsModule,
   NG_VALUE_ACCESSOR,
@@ -26,9 +26,7 @@ import { AbstractInputComponent } from '../../abstract-input'
 export class PermissionsGroupComponent extends AbstractInputComponent<Group> {
   groups: Group[]
 
-  constructor() {
+  constructor(groupService: GroupService) {
-    const groupService = inject(GroupService)
-
     super()
     groupService
       .listAll()

src-ui/src/app/components/common/input/permissions/permissions-user/permissions-user.component.ts

@@ -1,4 +1,4 @@
-import { Component, forwardRef, inject } from '@angular/core'
+import { Component, forwardRef } from '@angular/core'
 import {
   FormsModule,
   NG_VALUE_ACCESSOR,
@@ -8,6 +8,7 @@ import { NgSelectComponent } from '@ng-select/ng-select'
 import { first } from 'rxjs/operators'
 import { User } from 'src/app/data/user'
 import { UserService } from 'src/app/services/rest/user.service'
+import { SettingsService } from 'src/app/services/settings.service'
 import { AbstractInputComponent } from '../../abstract-input'
 
 @Component({
@@ -26,9 +27,7 @@ import { AbstractInputComponent } from '../../abstract-input'
 export class PermissionsUserComponent extends AbstractInputComponent<User[]> {
   users: User[]
 
-  constructor() {
+  constructor(userService: UserService, settings: SettingsService) {
-    const userService = inject(UserService)
-
     super()
     userService
       .listAll()

src-ui/src/app/components/common/input/tags/tags.component.ts

@@ -2,7 +2,6 @@ import {
   Component,
   EventEmitter,
   forwardRef,
-  inject,
   Input,
   OnInit,
   Output,
@@ -46,10 +45,10 @@ import { TagComponent } from '../../tag/tag.component'
   ],
 })
 export class TagsComponent implements OnInit, ControlValueAccessor {
-  private tagService = inject(TagService)
+  constructor(
-  private modalService = inject(NgbModal)
+    private tagService: TagService,
-
+    private modalService: NgbModal
-  constructor() {
+  ) {
     this.createTagRef = this.createTag.bind(this)
   }
 

src-ui/src/app/components/common/logo/logo.component.ts

@@ -1,4 +1,4 @@
-import { Component, Input, inject } from '@angular/core'
+import { Component, Input } from '@angular/core'
 import { SETTINGS_KEYS } from 'src/app/data/ui-settings'
 import { SettingsService } from 'src/app/services/settings.service'
 import { environment } from 'src/environments/environment'
@@ -9,8 +9,6 @@ import { environment } from 'src/environments/environment'
   styleUrls: ['./logo.component.scss'],
 })
 export class LogoComponent {
-  private settingsService = inject(SettingsService)
-
   @Input()
   extra_classes: string
 
@@ -26,6 +24,8 @@ export class LogoComponent {
       : null
   }
 
+  constructor(private settingsService: SettingsService) {}
+
   getClasses() {
     return ['logo'].concat(this.extra_classes).join(' ')
   }

src-ui/src/app/components/common/page-header/page-header.component.ts

@@ -1,4 +1,4 @@
-import { Component, Input, inject } from '@angular/core'
+import { Component, Input } from '@angular/core'
 import { Title } from '@angular/platform-browser'
 import { NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap'
 import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
@@ -12,7 +12,7 @@ import { environment } from 'src/environments/environment'
   imports: [NgbPopoverModule, NgxBootstrapIconsModule, TourNgBootstrapModule],
 })
 export class PageHeaderComponent {
-  private titleService = inject(Title)
+  constructor(private titleService: Title) {}
 
   _title = ''
 

src-ui/src/app/components/common/permissions-dialog/permissions-dialog.component.ts

@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Input, Output, inject } from '@angular/core'
+import { Component, EventEmitter, Input, Output } from '@angular/core'
 import {
   FormControl,
   FormGroup,
@@ -24,13 +24,13 @@ import { SwitchComponent } from '../input/switch/switch.component'
   ],
 })
 export class PermissionsDialogComponent {
-  activeModal = inject(NgbActiveModal)
-  private userService = inject(UserService)
-
   users: User[]
   private o: ObjectWithPermissions = undefined
 
-  constructor() {
+  constructor(
+    public activeModal: NgbActiveModal,
+    private userService: UserService
+  ) {
     this.userService.listAll().subscribe((r) => (this.users = r.results))
   }
 

src-ui/src/app/components/common/permissions-filter-dropdown/permissions-filter-dropdown.component.ts

@@ -1,5 +1,5 @@
 import { NgClass } from '@angular/common'
-import { Component, EventEmitter, Input, Output, inject } from '@angular/core'
+import { Component, EventEmitter, Input, Output } from '@angular/core'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'
 import { NgSelectComponent } from '@ng-select/ng-select'
@@ -58,9 +58,6 @@ export enum OwnerFilterType {
   ],
 })
 export class PermissionsFilterDropdownComponent extends ComponentWithPermissions {
-  permissionsService = inject(PermissionsService)
-  private settingsService = inject(SettingsService)
-
   public OwnerFilterType = OwnerFilterType
 
   @Input()
@@ -86,12 +83,12 @@ export class PermissionsFilterDropdownComponent extends ComponentWithPermissions
     )
   }
 
-  constructor() {
+  constructor(
-    const userService = inject(UserService)
+    public permissionsService: PermissionsService,
-
+    userService: UserService,
+    private settingsService: SettingsService
+  ) {
     super()
-    const permissionsService = this.permissionsService
-
     if (
       permissionsService.currentUserCan(
         PermissionAction.View,

src-ui/src/app/components/common/permissions-select/permissions-select.component.ts

@@ -1,5 +1,5 @@
 import { KeyValuePipe } from '@angular/common'
-import { Component, forwardRef, inject, Input, OnInit } from '@angular/core'
+import { Component, forwardRef, Input, OnInit } from '@angular/core'
 import {
   AbstractControl,
   ControlValueAccessor,
@@ -43,9 +43,6 @@ export class PermissionsSelectComponent
   extends ComponentWithPermissions
   implements OnInit, ControlValueAccessor
 {
-  private readonly permissionsService = inject(PermissionsService)
-  private readonly settingsService = inject(SettingsService)
-
   @Input()
   title: string = 'Permissions'
 
@@ -79,7 +76,10 @@ export class PermissionsSelectComponent
 
   public allowedTypes = Object.keys(PermissionType)
 
-  constructor() {
+  constructor(
+    private readonly permissionsService: PermissionsService,
+    private readonly settingsService: SettingsService
+  ) {
     super()
     if (!this.settingsService.get(SETTINGS_KEYS.AUDITLOG_ENABLED)) {
       this.allowedTypes.splice(this.allowedTypes.indexOf('History'), 1)

src-ui/src/app/components/common/preview-popup/preview-popup.component.ts

@@ -1,5 +1,5 @@
 import { HttpClient } from '@angular/common/http'
-import { Component, inject, Input, OnDestroy, ViewChild } from '@angular/core'
+import { Component, Input, OnDestroy, ViewChild } from '@angular/core'
 import { NgbPopover, NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap'
 import { PdfViewerComponent, PdfViewerModule } from 'ng2-pdf-viewer'
 import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
@@ -24,10 +24,6 @@ import { SettingsService } from 'src/app/services/settings.service'
   ],
 })
 export class PreviewPopupComponent implements OnDestroy {
-  private settingsService = inject(SettingsService)
-  private documentService = inject(DocumentService)
-  private http = inject(HttpClient)
-
   private _document: Document
   @Input()
   set document(document: Document) {
@@ -86,6 +82,12 @@ export class PreviewPopupComponent implements OnDestroy {
     )
   }
 
+  constructor(
+    private settingsService: SettingsService,
+    private documentService: DocumentService,
+    private http: HttpClient
+  ) {}
+
   ngOnDestroy(): void {
     this.unsubscribeNotifier.next(this)
   }

src-ui/src/app/components/common/profile-edit-dialog/profile-edit-dialog.component.ts

@@ -1,5 +1,5 @@
 import { Clipboard } from '@angular/cdk/clipboard'
-import { Component, OnInit, inject } from '@angular/core'
+import { Component, OnInit } from '@angular/core'
 import {
   FormControl,
   FormGroup,
@@ -46,11 +46,6 @@ export class ProfileEditDialogComponent
   extends LoadingComponentWithPermissions
   implements OnInit
 {
-  private profileService = inject(ProfileService)
-  activeModal = inject(NgbActiveModal)
-  private toastService = inject(ToastService)
-  private clipboard = inject(Clipboard)
-
   public networkActive: boolean = false
   public error: any
 
@@ -88,6 +83,15 @@ export class ProfileEditDialogComponent
   public socialAccounts: SocialAccount[] = []
   public socialAccountProviders: SocialAccountProvider[] = []
 
+  constructor(
+    private profileService: ProfileService,
+    public activeModal: NgbActiveModal,
+    private toastService: ToastService,
+    private clipboard: Clipboard
+  ) {
+    super()
+  }
+
   ngOnInit(): void {
     this.networkActive = true
     this.profileService

src-ui/src/app/components/common/share-links-dialog/share-links-dialog.component.spec.ts

@@ -10,7 +10,6 @@ import {
   fakeAsync,
   tick,
 } from '@angular/core/testing'
-import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { By } from '@angular/platform-browser'
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
@@ -34,8 +33,6 @@ describe('ShareLinksDialogComponent', () => {
       imports: [
         ShareLinksDialogComponent,
         NgxBootstrapIconsModule.pick(allIcons),
-        FormsModule,
-        ReactiveFormsModule,
       ],
       providers: [
         provideHttpClient(withInterceptorsFromDi()),
@@ -226,18 +223,16 @@ describe('ShareLinksDialogComponent', () => {
     )
   })
 
-  it('should disable archive switch & option if no archive available', (done) => {
+  it('should disable archive switch & option if no archive available', () => {
     component.hasArchiveVersion = false
     component.ngOnInit()
     fixture.detectChanges()
     expect(component.useArchiveVersion).toBeFalsy()
-    setTimeout(() => {
+    expect(
-      // some stupid change detection issue
+      fixture.debugElement.query(By.css("input[type='checkbox']")).attributes[
-      const inputEl = fixture.debugElement.query(By.css('#versionSwitch'))
+        'ng-reflect-is-disabled'
-        .nativeElement as HTMLInputElement
+      ]
-      expect(inputEl.disabled).toBeTruthy()
+    ).toBeTruthy()
-      done()
-    })
   })
 
   it('should support close', () => {

src-ui/src/app/components/common/share-links-dialog/share-links-dialog.component.ts

@@ -1,5 +1,5 @@
 import { Clipboard } from '@angular/cdk/clipboard'
-import { Component, Input, OnInit, inject } from '@angular/core'
+import { Component, Input, OnInit } from '@angular/core'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
@@ -16,11 +16,6 @@ import { environment } from 'src/environments/environment'
   imports: [FormsModule, ReactiveFormsModule, NgxBootstrapIconsModule],
 })
 export class ShareLinksDialogComponent implements OnInit {
-  private activeModal = inject(NgbActiveModal)
-  private shareLinkService = inject(ShareLinkService)
-  private toastService = inject(ToastService)
-  private clipboard = inject(Clipboard)
-
   EXPIRATION_OPTIONS = [
     { label: $localize`1 day`, value: 1 },
     { label: $localize`7 days`, value: 7 },
@@ -63,6 +58,13 @@ export class ShareLinksDialogComponent implements OnInit {
 
   useArchiveVersion: boolean = true
 
+  constructor(
+    private activeModal: NgbActiveModal,
+    private shareLinkService: ShareLinkService,
+    private toastService: ToastService,
+    private clipboard: Clipboard
+  ) {}
+
   ngOnInit(): void {
     if (this._documentId !== undefined) this.refresh()
   }

src-ui/src/app/components/common/system-status-dialog/system-status-dialog.component.html

@@ -20,18 +20,7 @@
           <div class="card-body">
             <dl class="card-text">
               <dt i18n>Paperless-ngx Version</dt>
-              <dd>
+              <dd>{{status.pngx_version}}</dd>
-                {{status.pngx_version}}
-                @if (versionMismatch) {
-                    <button class="btn btn-sm d-inline align-items-center btn-dark text-uppercase small" [ngbPopover]="versionPopover" triggers="click mouseenter:mouseleave">
-                      <i-bs name="exclamation-triangle-fill" class="text-danger lh-1"></i-bs>
-                    </button>
-                }
-                <ng-template #versionPopover>
-                  Frontend version: {{frontendVersion}}<br>
-                  Backend version: {{status.pngx_version}}
-                </ng-template>
-              </dd>
               <dt i18n>Install Type</dt>
               <dd>{{status.install_type}}</dd>
               <dt i18n>Server OS</dt>

src-ui/src/app/components/common/system-status-dialog/system-status-dialog.component.spec.ts

@@ -1,18 +1,3 @@
-// Mock production environment for testing
-jest.mock('src/environments/environment', () => ({
-  environment: {
-    production: true,
-    apiBaseUrl: 'http://localhost:8000/api/',
-    apiVersion: '9',
-    appTitle: 'Paperless-ngx',
-    tag: 'prod',
-    version: '2.4.3',
-    webSocketHost: 'localhost:8000',
-    webSocketProtocol: 'ws:',
-    webSocketBaseUrl: '/ws/',
-  },
-}))
-
 import { Clipboard } from '@angular/cdk/clipboard'
 import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
 import { provideHttpClientTesting } from '@angular/common/http/testing'
@@ -157,15 +142,4 @@ describe('SystemStatusDialogComponent', () => {
       `Task ${PaperlessTaskName.IndexOptimize} started`
     )
   })
-
-  it('shoduld handle version mismatch', () => {
-    component.frontendVersion = '2.4.2'
-    component.ngOnInit()
-    expect(component.versionMismatch).toBeTruthy()
-    expect(component.status.pngx_version).toContain('(frontend: 2.4.2)')
-    component.frontendVersion = '2.4.3'
-    component.status.pngx_version = '2.4.3'
-    component.ngOnInit()
-    expect(component.versionMismatch).toBeFalsy()
-  })
 })

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 } from '@angular/core'
 import {
   NgbActiveModal,
   NgbModalModule,
@@ -18,7 +18,6 @@ import { PermissionsService } from 'src/app/services/permissions.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 { environment } from 'src/environments/environment'
 
 @Component({
   selector: 'pngx-system-status-dialog',
@@ -34,19 +33,10 @@ import { environment } from 'src/environments/environment'
     NgxBootstrapIconsModule,
   ],
 })
-export class SystemStatusDialogComponent implements OnInit {
+export class SystemStatusDialogComponent {
-  activeModal = inject(NgbActiveModal)
-  private clipboard = inject(Clipboard)
-  private systemStatusService = inject(SystemStatusService)
-  private tasksService = inject(TasksService)
-  private toastService = inject(ToastService)
-  private permissionsService = inject(PermissionsService)
-
   public SystemStatusItemStatus = SystemStatusItemStatus
   public PaperlessTaskName = PaperlessTaskName
   public status: SystemStatus
-  public frontendVersion: string = environment.version
-  public versionMismatch: boolean = false
 
   public copied: boolean = false
 
@@ -56,16 +46,14 @@ export class SystemStatusDialogComponent implements OnInit {
     return this.permissionsService.isSuperUser()
   }
 
-  public ngOnInit() {
+  constructor(
-    this.versionMismatch =
+    public activeModal: NgbActiveModal,
-      environment.production &&
+    private clipboard: Clipboard,
-      this.status.pngx_version &&
+    private systemStatusService: SystemStatusService,
-      this.frontendVersion &&
+    private tasksService: TasksService,
-      this.status.pngx_version !== this.frontendVersion
+    private toastService: ToastService,
-    if (this.versionMismatch) {
+    private permissionsService: PermissionsService
-      this.status.pngx_version = `${this.status.pngx_version} (frontend: ${this.frontendVersion})`
+  ) {}
-    }
-  }
 
   public close() {
     this.activeModal.close()

src-ui/src/app/components/common/tag/tag.component.ts

@@ -1,4 +1,4 @@
-import { Component, inject, Input } from '@angular/core'
+import { Component, Input } from '@angular/core'
 import { Tag } from 'src/app/data/tag'
 import {
   PermissionAction,
@@ -13,12 +13,14 @@ import { TagService } from 'src/app/services/rest/tag.service'
   styleUrls: ['./tag.component.scss'],
 })
 export class TagComponent {
-  private permissionsService = inject(PermissionsService)
-  private tagService = inject(TagService)
-
   private _tag: Tag
   private _tagID: number
 
+  constructor(
+    private permissionsService: PermissionsService,
+    private tagService: TagService
+  ) {}
+
   @Input()
   public set tag(tag: Tag) {
     this._tag = tag

src-ui/src/app/components/common/toast/toast.component.ts

@@ -1,6 +1,6 @@
 import { Clipboard } from '@angular/cdk/clipboard'
 import { DecimalPipe } from '@angular/common'
-import { Component, EventEmitter, Input, Output, inject } from '@angular/core'
+import { Component, EventEmitter, Input, Output } from '@angular/core'
 import {
   NgbProgressbarModule,
   NgbToastModule,
@@ -21,8 +21,6 @@ import { Toast } from 'src/app/services/toast.service'
   styleUrl: './toast.component.scss',
 })
 export class ToastComponent {
-  private clipboard = inject(Clipboard)
-
   @Input() toast: Toast
 
   @Input() autohide: boolean = true
@@ -33,6 +31,8 @@ export class ToastComponent {
 
   public copied: boolean = false
 
+  constructor(private clipboard: Clipboard) {}
+
   onShown(toast: Toast) {
     if (!this.autohide) return
 

src-ui/src/app/components/common/toasts/toasts.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnDestroy, OnInit, inject } from '@angular/core'
+import { Component, OnDestroy, OnInit } from '@angular/core'
 import {
   NgbAccordionModule,
   NgbProgressbarModule,
@@ -20,7 +20,7 @@ import { ToastComponent } from '../toast/toast.component'
   ],
 })
 export class ToastsComponent implements OnInit, OnDestroy {
-  toastService = inject(ToastService)
+  constructor(public toastService: ToastService) {}
 
   private subscription: Subscription
 

src-ui/src/app/components/dashboard/dashboard.component.ts

@@ -5,7 +5,7 @@ import {
   DragDropModule,
   moveItemInArray,
 } from '@angular/cdk/drag-drop'
-import { Component, inject } from '@angular/core'
+import { Component } from '@angular/core'
 import { RouterModule } from '@angular/router'
 import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { TourNgBootstrapModule, TourService } from 'ngx-ui-tour-ng-bootstrap'
@@ -42,13 +42,13 @@ import { WelcomeWidgetComponent } from './widgets/welcome-widget/welcome-widget.
   ],
 })
 export class DashboardComponent extends ComponentWithPermissions {
-  settingsService = inject(SettingsService)
-  savedViewService = inject(SavedViewService)
-  private tourService = inject(TourService)
-  private toastService = inject(ToastService)
-
   public dashboardViews: SavedView[] = []
-  constructor() {
+  constructor(
+    public settingsService: SettingsService,
+    public savedViewService: SavedViewService,
+    private tourService: TourService,
+    private toastService: ToastService
+  ) {
     super()
 
     this.savedViewService.listAll().subscribe(() => {

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

@@ -1,7 +1,6 @@
 <pngx-widget-frame
   *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.Document }"
   [title]="savedView.name"
-  [badge]="count"
   [loading]="loading"
   [draggable]="savedView"
   >

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

@@ -1,7 +1,6 @@
 import { AsyncPipe, NgClass, NgStyle } from '@angular/common'
 import {
   Component,
-  inject,
   Input,
   OnDestroy,
   OnInit,
@@ -85,22 +84,26 @@ export class SavedViewWidgetComponent
   extends LoadingComponentWithPermissions
   implements OnInit, OnDestroy
 {
-  private documentService = inject(DocumentService)
-  private router = inject(Router)
-  private list = inject(DocumentListViewService)
-  private websocketStatusService = inject(WebsocketStatusService)
-  openDocumentsService = inject(OpenDocumentsService)
-  documentListViewService = inject(DocumentListViewService)
-  permissionsService = inject(PermissionsService)
-  private settingsService = inject(SettingsService)
-  private customFieldService = inject(CustomFieldsService)
-
   public DisplayMode = DisplayMode
   public DisplayField = DisplayField
   public CustomFieldDataType = CustomFieldDataType
 
   private customFields: CustomField[] = []
 
+  constructor(
+    private documentService: DocumentService,
+    private router: Router,
+    private list: DocumentListViewService,
+    private websocketStatusService: WebsocketStatusService,
+    public openDocumentsService: OpenDocumentsService,
+    public documentListViewService: DocumentListViewService,
+    public permissionsService: PermissionsService,
+    private settingsService: SettingsService,
+    private customFieldService: CustomFieldsService
+  ) {
+    super()
+  }
+
   @Input()
   savedView: SavedView
 
@@ -118,8 +121,6 @@ export class SavedViewWidgetComponent
 
   displayFields: DisplayField[] = DEFAULT_DASHBOARD_DISPLAY_FIELDS
 
-  count: number
-
   ngOnInit(): void {
     this.reload()
     this.displayMode = this.savedView.display_mode ?? DisplayMode.TABLE
@@ -180,7 +181,6 @@ export class SavedViewWidgetComponent
         tap((result) => {
           this.show = true
           this.documents = result.results
-          this.count = result.count
         }),
         delay(500)
       )

src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.ts

@@ -1,6 +1,6 @@
 import { DecimalPipe } from '@angular/common'
 import { HttpClient } from '@angular/common/http'
-import { Component, inject, OnDestroy, OnInit } from '@angular/core'
+import { Component, OnDestroy, OnInit } from '@angular/core'
 import { RouterModule } from '@angular/router'
 import { NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap'
 import * as mimeTypeNames from 'mime-names'
@@ -51,12 +51,16 @@ export class StatisticsWidgetComponent
   extends ComponentWithPermissions
   implements OnInit, OnDestroy
 {
-  private http = inject(HttpClient)
-  private websocketConnectionService = inject(WebsocketStatusService)
-  private documentListViewService = inject(DocumentListViewService)
-
   loading: boolean = false
 
+  constructor(
+    private http: HttpClient,
+    private websocketConnectionService: WebsocketStatusService,
+    private documentListViewService: DocumentListViewService
+  ) {
+    super()
+  }
+
   statistics: Statistics = {}
 
   subscription: Subscription

src-ui/src/app/components/dashboard/widgets/upload-file-widget/upload-file-widget.component.ts

@@ -1,5 +1,5 @@
 import { NgClass, NgTemplateOutlet } from '@angular/common'
-import { Component, QueryList, ViewChildren, inject } from '@angular/core'
+import { Component, QueryList, ViewChildren } from '@angular/core'
 import { RouterModule } from '@angular/router'
 import {
   NgbAlert,
@@ -37,12 +37,16 @@ import { WidgetFrameComponent } from '../widget-frame/widget-frame.component'
   ],
 })
 export class UploadFileWidgetComponent extends ComponentWithPermissions {
-  private websocketStatusService = inject(WebsocketStatusService)
-  private uploadDocumentsService = inject(UploadDocumentsService)
-  settingsService = inject(SettingsService)
-
   @ViewChildren(NgbAlert) alerts: QueryList<NgbAlert>
 
+  constructor(
+    private websocketStatusService: WebsocketStatusService,
+    private uploadDocumentsService: UploadDocumentsService,
+    public settingsService: SettingsService
+  ) {
+    super()
+  }
+
   getStatus() {
     return this.websocketStatusService.getConsumerStatus()
   }

src-ui/src/app/components/dashboard/widgets/welcome-widget/welcome-widget.component.ts

@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Output, inject } from '@angular/core'
+import { Component, EventEmitter, Output } from '@angular/core'
 import { NgbAlertModule } from '@ng-bootstrap/ng-bootstrap'
 import { TourService } from 'ngx-ui-tour-ng-bootstrap'
 
@@ -9,7 +9,7 @@ import { TourService } from 'ngx-ui-tour-ng-bootstrap'
   imports: [NgbAlertModule],
 })
 export class WelcomeWidgetComponent {
-  readonly tourService = inject(TourService)
+  constructor(public readonly tourService: TourService) {}
 
   @Output()
   dismiss: EventEmitter<boolean> = new EventEmitter()

src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.html

@@ -2,16 +2,13 @@
   <div class="card shadow-sm bg-light fade" [class.show]="show" cdkDrag [cdkDragDisabled]="!draggable" cdkDragPreviewContainer="parent">
     <div class="card-header">
       <div class="d-flex justify-content-between align-items-center">
-        <div class="d-flex align-items-center">
+        <div class="d-flex">
           @if (draggable) {
             <div class="ms-n2 me-1" cdkDragHandle>
               <i-bs name="grip-vertical"></i-bs>
             </div>
           }
           <h6 class="card-title mb-0">{{title}}</h6>
-          @if (badge) {
-            <span class="badge bg-info text-dark ms-2">{{badge}}</span>
-          }
         </div>
         @if (loading) {
           <div class="spinner-border spinner-border-sm fw-normal ms-2 me-auto" role="status"></div>

src-ui/src/app/components/dashboard/widgets/widget-frame/widget-frame.component.ts

@@ -30,9 +30,6 @@ export class WidgetFrameComponent
   @Input()
   cardless: boolean = false
 
-  @Input()
-  badge: string
-
   ngAfterViewInit(): void {
     setTimeout(() => {
       this.show = true

src-ui/src/app/components/document-asn/document-asn.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, inject } from '@angular/core'
+import { Component, OnInit } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
 import { FILTER_ASN } from '../../data/filter-rule-type'
 import { DocumentService } from '../../services/rest/document.service'
@@ -9,11 +9,12 @@ import { DocumentService } from '../../services/rest/document.service'
   styleUrls: ['./document-asn.component.scss'],
 })
 export class DocumentAsnComponent implements OnInit {
-  private documentsService = inject(DocumentService)
-  private route = inject(ActivatedRoute)
-  private router = inject(Router)
-
   asn: string
+  constructor(
+    private documentsService: DocumentService,
+    private route: ActivatedRoute,
+    private router: Router
+  ) {}
 
   ngOnInit(): void {
     this.route.paramMap.subscribe((paramMap) => {

src-ui/src/app/components/document-detail/document-detail.component.ts

@@ -1,6 +1,6 @@
 import { AsyncPipe, NgTemplateOutlet } from '@angular/common'
 import { HttpClient, HttpResponse } from '@angular/common/http'
-import { Component, inject, OnDestroy, OnInit, ViewChild } from '@angular/core'
+import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'
 import {
   FormArray,
   FormControl,
@@ -73,7 +73,6 @@ import { CorrespondentService } from 'src/app/services/rest/correspondent.servic
 import { CustomFieldsService } from 'src/app/services/rest/custom-fields.service'
 import { DocumentTypeService } from 'src/app/services/rest/document-type.service'
 import { DocumentService } from 'src/app/services/rest/document.service'
-import { SavedViewService } from 'src/app/services/rest/saved-view.service'
 import { StoragePathService } from 'src/app/services/rest/storage-path.service'
 import { UserService } from 'src/app/services/rest/user.service'
 import { SettingsService } from 'src/app/services/settings.service'
@@ -177,27 +176,6 @@ export class DocumentDetailComponent
   extends ComponentWithPermissions
   implements OnInit, OnDestroy, DirtyComponent
 {
-  private documentsService = inject(DocumentService)
-  private route = inject(ActivatedRoute)
-  private correspondentService = inject(CorrespondentService)
-  private documentTypeService = inject(DocumentTypeService)
-  private router = inject(Router)
-  private modalService = inject(NgbModal)
-  private openDocumentService = inject(OpenDocumentsService)
-  private documentListViewService = inject(DocumentListViewService)
-  private documentTitlePipe = inject(DocumentTitlePipe)
-  private toastService = inject(ToastService)
-  private settings = inject(SettingsService)
-  private storagePathService = inject(StoragePathService)
-  private permissionsService = inject(PermissionsService)
-  private userService = inject(UserService)
-  private customFieldsService = inject(CustomFieldsService)
-  private http = inject(HttpClient)
-  private hotKeyService = inject(HotKeyService)
-  private componentRouterService = inject(ComponentRouterService)
-  private deviceDetectorService = inject(DeviceDetectorService)
-  private savedViewService = inject(SavedViewService)
-
   @ViewChild('inputTitle')
   titleInput: TextComponent
 
@@ -281,6 +259,30 @@ export class DocumentDetailComponent
   DocumentDetailNavIDs = DocumentDetailNavIDs
   activeNavID: number
 
+  constructor(
+    private documentsService: DocumentService,
+    private route: ActivatedRoute,
+    private correspondentService: CorrespondentService,
+    private documentTypeService: DocumentTypeService,
+    private router: Router,
+    private modalService: NgbModal,
+    private openDocumentService: OpenDocumentsService,
+    private documentListViewService: DocumentListViewService,
+    private documentTitlePipe: DocumentTitlePipe,
+    private toastService: ToastService,
+    private settings: SettingsService,
+    private storagePathService: StoragePathService,
+    private permissionsService: PermissionsService,
+    private userService: UserService,
+    private customFieldsService: CustomFieldsService,
+    private http: HttpClient,
+    private hotKeyService: HotKeyService,
+    private componentRouterService: ComponentRouterService,
+    private deviceDetectorService: DeviceDetectorService
+  ) {
+    super()
+  }
+
   titleKeyUp(event) {
     this.titleSubject.next(event.target?.value)
   }
@@ -843,7 +845,6 @@ export class DocumentDetailComponent
           } else {
             this.openDocumentService.refreshDocument(this.documentId)
           }
-          this.savedViewService.maybeRefreshDocumentCounts()
         },
         error: (error) => {
           this.networkActive = false
@@ -1191,7 +1192,6 @@ export class DocumentDetailComponent
   notesUpdated(notes: DocumentNote[]) {
     this.document.notes = notes
     this.openDocumentService.refreshDocument(this.documentId)
-    this.savedViewService.maybeRefreshDocumentCounts()
   }
 
   get userIsOwner(): boolean {

src-ui/src/app/components/document-history/document-history.component.ts

@@ -1,5 +1,5 @@
 import { AsyncPipe, KeyValuePipe, TitleCasePipe } from '@angular/common'
-import { Component, Input, OnInit, inject } from '@angular/core'
+import { Component, Input, OnInit } from '@angular/core'
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap'
 import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { Observable, first, map, of } from 'rxjs'
@@ -26,12 +26,6 @@ import { UserService } from 'src/app/services/rest/user.service'
   ],
 })
 export class DocumentHistoryComponent implements OnInit {
-  private documentService = inject(DocumentService)
-  private correspondentService = inject(CorrespondentService)
-  private storagePathService = inject(StoragePathService)
-  private documentTypeService = inject(DocumentTypeService)
-  private userService = inject(UserService)
-
   public AuditLogAction = AuditLogAction
 
   private _documentId: number
@@ -44,6 +38,14 @@ export class DocumentHistoryComponent implements OnInit {
   public loading: boolean = true
   public entries: AuditLogEntry[] = []
 
+  constructor(
+    private documentService: DocumentService,
+    private correspondentService: CorrespondentService,
+    private storagePathService: StoragePathService,
+    private documentTypeService: DocumentTypeService,
+    private userService: UserService
+  ) {}
+
   ngOnInit(): void {
     if (this._documentId) {
       this.loading = true

src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts

@@ -1,4 +1,4 @@
-import { Component, inject, Input, OnDestroy, OnInit } from '@angular/core'
+import { Component, Input, OnDestroy, OnInit } from '@angular/core'
 import {
   FormControl,
   FormGroup,
@@ -32,7 +32,6 @@ import {
   DocumentService,
   SelectionDataItem,
 } from 'src/app/services/rest/document.service'
-import { SavedViewService } from 'src/app/services/rest/saved-view.service'
 import { StoragePathService } from 'src/app/services/rest/storage-path.service'
 import { TagService } from 'src/app/services/rest/tag.service'
 import { SettingsService } from 'src/app/services/settings.service'
@@ -72,20 +71,6 @@ export class BulkEditorComponent
   extends ComponentWithPermissions
   implements OnInit, OnDestroy
 {
-  private documentTypeService = inject(DocumentTypeService)
-  private tagService = inject(TagService)
-  private correspondentService = inject(CorrespondentService)
-  list = inject(DocumentListViewService)
-  private documentService = inject(DocumentService)
-  private modalService = inject(NgbModal)
-  private openDocumentService = inject(OpenDocumentsService)
-  private settings = inject(SettingsService)
-  private toastService = inject(ToastService)
-  private storagePathService = inject(StoragePathService)
-  private customFieldService = inject(CustomFieldsService)
-  private permissionService = inject(PermissionsService)
-  private savedViewService = inject(SavedViewService)
-
   tagSelectionModel = new FilterableDropdownSelectionModel(true)
   correspondentSelectionModel = new FilterableDropdownSelectionModel()
   documentTypeSelectionModel = new FilterableDropdownSelectionModel()
@@ -109,6 +94,23 @@ export class BulkEditorComponent
   @Input()
   public disabled: boolean = false
 
+  constructor(
+    private documentTypeService: DocumentTypeService,
+    private tagService: TagService,
+    private correspondentService: CorrespondentService,
+    public list: DocumentListViewService,
+    private documentService: DocumentService,
+    private modalService: NgbModal,
+    private openDocumentService: OpenDocumentsService,
+    private settings: SettingsService,
+    private toastService: ToastService,
+    private storagePathService: StoragePathService,
+    private customFieldService: CustomFieldsService,
+    private permissionService: PermissionsService
+  ) {
+    super()
+  }
+
   applyOnClose: boolean = this.settings.get(
     SETTINGS_KEYS.BULK_EDIT_APPLY_ON_CLOSE
   )
@@ -272,7 +274,6 @@ export class BulkEditorComponent
           this.list.selected.forEach((id) => {
             this.openDocumentService.refreshDocument(id)
           })
-          this.savedViewService.maybeRefreshDocumentCounts()
           if (modal) {
             modal.close()
           }

src-ui/src/app/components/document-list/bulk-editor/custom-fields-bulk-edit-dialog/custom-fields-bulk-edit-dialog.component.ts

@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Output, inject } from '@angular/core'
+import { Component, EventEmitter, Output } from '@angular/core'
 import {
   FormControl,
   FormGroup,
@@ -38,9 +38,6 @@ import { DocumentService } from 'src/app/services/rest/document.service'
   ],
 })
 export class CustomFieldsBulkEditDialogComponent {
-  private activeModal = inject(NgbActiveModal)
-  private documentService = inject(DocumentService)
-
   CustomFieldDataType = CustomFieldDataType
 
   @Output()
@@ -76,6 +73,11 @@ export class CustomFieldsBulkEditDialogComponent {
 
   public documents: number[] = []
 
+  constructor(
+    private activeModal: NgbActiveModal,
+    private documentService: DocumentService
+  ) {}
+
   initForm() {
     Object.keys(this.form.controls).forEach((key) => {
       if (!this._fieldsToAddIds.includes(parseInt(key))) {

src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts

@@ -6,7 +6,6 @@ import {
   Input,
   Output,
   ViewChild,
-  inject,
 } from '@angular/core'
 import { RouterModule } from '@angular/router'
 import {
@@ -63,11 +62,15 @@ export class DocumentCardLargeComponent
   extends LoadingComponentWithPermissions
   implements AfterViewInit
 {
-  private documentService = inject(DocumentService)
-  settingsService = inject(SettingsService)
-
   DisplayField = DisplayField
 
+  constructor(
+    private documentService: DocumentService,
+    public settingsService: SettingsService
+  ) {
+    super()
+  }
+
   @Input()
   selected = false
 

src-ui/src/app/components/document-list/document-card-small/document-card-small.component.html

@@ -71,14 +71,14 @@
           }
           @if (displayFields.includes(DisplayField.CREATED)) {
             <div class="list-group-item bg-transparent p-0 border-0 d-flex flex-wrap-reverse justify-content-between">
-              <ng-template #dateCreatedTooltip>
+              <ng-template #dateTooltip>
                 <div class="d-flex flex-column text-light">
                   <span i18n>Created: {{ document.created | customDate }}</span>
                   <span i18n>Added: {{ document.added | customDate }}</span>
                   <span i18n>Modified: {{ document.modified | customDate }}</span>
                 </div>
               </ng-template>
-              <div class="ps-0 p-1" placement="top" [ngbTooltip]="dateCreatedTooltip">
+              <div class="ps-0 p-1" placement="top" [ngbTooltip]="dateTooltip">
                 <i-bs width="1em" height="1em" class="me-2 text-muted" name="calendar-event"></i-bs>
                 <small>{{document.created | customDate:'mediumDate'}}</small>
               </div>
@@ -86,14 +86,14 @@
           }
           @if (displayFields.includes(DisplayField.ADDED)) {
             <div class="list-group-item bg-transparent p-0 border-0 d-flex flex-wrap-reverse justify-content-between">
-              <ng-template #dateAddedTooltip>
+              <ng-template #dateTooltip>
                 <div class="d-flex flex-column text-light">
                   <span i18n>Created: {{ document.created | customDate }}</span>
                   <span i18n>Added: {{ document.added | customDate }}</span>
                   <span i18n>Modified: {{ document.modified | customDate }}</span>
                 </div>
               </ng-template>
-              <div class="ps-0 p-1" placement="top" [ngbTooltip]="dateAddedTooltip">
+              <div class="ps-0 p-1" placement="top" [ngbTooltip]="dateTooltip">
                 <i-bs width="1em" height="1em" class="me-2 text-muted" name="calendar-event"></i-bs>
                 <small>{{document.added | customDate:'mediumDate'}}</small>
               </div>

src-ui/src/app/components/document-list/document-card-small/document-card-small.component.ts

@@ -6,7 +6,6 @@ import {
   Input,
   Output,
   ViewChild,
-  inject,
 } from '@angular/core'
 import { RouterModule } from '@angular/router'
 import {
@@ -64,11 +63,15 @@ export class DocumentCardSmallComponent
   extends LoadingComponentWithPermissions
   implements AfterViewInit
 {
-  private documentService = inject(DocumentService)
-  settingsService = inject(SettingsService)
-
   DisplayField = DisplayField
 
+  constructor(
+    private documentService: DocumentService,
+    public settingsService: SettingsService
+  ) {
+    super()
+  }
+
   @Input()
   selected = false
 

src-ui/src/app/components/document-list/document-list.component.ts

@@ -1,7 +1,6 @@
 import { AsyncPipe, NgClass, NgTemplateOutlet } from '@angular/common'
 import {
   Component,
-  inject,
   OnDestroy,
   OnInit,
   QueryList,
@@ -104,21 +103,25 @@ export class DocumentListComponent
   extends ComponentWithPermissions
   implements OnInit, OnDestroy
 {
-  list = inject(DocumentListViewService)
-  savedViewService = inject(SavedViewService)
-  route = inject(ActivatedRoute)
-  private router = inject(Router)
-  private toastService = inject(ToastService)
-  private modalService = inject(NgbModal)
-  private websocketStatusService = inject(WebsocketStatusService)
-  openDocumentsService = inject(OpenDocumentsService)
-  settingsService = inject(SettingsService)
-  private hotKeyService = inject(HotKeyService)
-  permissionService = inject(PermissionsService)
-
   DisplayField = DisplayField
   DisplayMode = DisplayMode
 
+  constructor(
+    public list: DocumentListViewService,
+    public savedViewService: SavedViewService,
+    public route: ActivatedRoute,
+    private router: Router,
+    private toastService: ToastService,
+    private modalService: NgbModal,
+    private websocketStatusService: WebsocketStatusService,
+    public openDocumentsService: OpenDocumentsService,
+    public settingsService: SettingsService,
+    private hotKeyService: HotKeyService,
+    public permissionService: PermissionsService
+  ) {
+    super()
+  }
+
   @ViewChild('filterEditor')
   private filterEditor: FilterEditorComponent
 

src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts

@@ -8,7 +8,6 @@ import {
   OnInit,
   Output,
   ViewChild,
-  inject,
 } from '@angular/core'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import {
@@ -241,15 +240,6 @@ export class FilterEditorComponent
   extends LoadingComponentWithPermissions
   implements OnInit, OnDestroy, AfterViewInit
 {
-  private documentTypeService = inject(DocumentTypeService)
-  private tagService = inject(TagService)
-  private correspondentService = inject(CorrespondentService)
-  private documentService = inject(DocumentService)
-  private storagePathService = inject(StoragePathService)
-  permissionsService = inject(PermissionsService)
-  private customFieldService = inject(CustomFieldsService)
-  private searchService = inject(SearchService)
-
   generateFilterName() {
     if (this.filterRules.length == 1) {
       let rule = this.filterRules[0]
@@ -323,6 +313,19 @@ export class FilterEditorComponent
     return ''
   }
 
+  constructor(
+    private documentTypeService: DocumentTypeService,
+    private tagService: TagService,
+    private correspondentService: CorrespondentService,
+    private documentService: DocumentService,
+    private storagePathService: StoragePathService,
+    public permissionsService: PermissionsService,
+    private customFieldService: CustomFieldsService,
+    private searchService: SearchService
+  ) {
+    super()
+  }
+
   @ViewChild('textFilterInput')
   textFilterInput: ElementRef
 
@@ -1216,7 +1219,6 @@ export class FilterEditorComponent
 
   resetSelected() {
     this.textFilterTarget = TEXT_FILTER_TARGET_TITLE_CONTENT
-    this.documentService.searchQuery = ''
     this.filterRules = this._unmodifiedFilterRules
     this.updateRules()
   }

src-ui/src/app/components/document-list/save-view-config-dialog/save-view-config-dialog.component.ts

@@ -1,11 +1,4 @@
-import {
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'
-  Component,
-  EventEmitter,
-  Input,
-  OnInit,
-  Output,
-  inject,
-} from '@angular/core'
 import {
   FormControl,
   FormGroup,
@@ -23,7 +16,7 @@ import { TextComponent } from '../../common/input/text/text.component'
   imports: [CheckComponent, TextComponent, FormsModule, ReactiveFormsModule],
 })
 export class SaveViewConfigDialogComponent implements OnInit {
-  private modal = inject(NgbActiveModal)
+  constructor(private modal: NgbActiveModal) {}
 
   @Output()
   public saveClicked = new EventEmitter()

src-ui/src/app/components/document-notes/document-notes.component.ts

@@ -1,4 +1,4 @@
-import { Component, EventEmitter, Input, Output, inject } from '@angular/core'
+import { Component, EventEmitter, Input, Output } from '@angular/core'
 import {
   FormControl,
   FormGroup,
@@ -28,10 +28,6 @@ import { ComponentWithPermissions } from '../with-permissions/with-permissions.c
   ],
 })
 export class DocumentNotesComponent extends ComponentWithPermissions {
-  private notesService = inject(DocumentNotesService)
-  private toastService = inject(ToastService)
-  private usersService = inject(UserService)
-
   noteForm: FormGroup = new FormGroup({
     newNote: new FormControl(''),
   })
@@ -52,7 +48,11 @@ export class DocumentNotesComponent extends ComponentWithPermissions {
   updated: EventEmitter<DocumentNote[]> = new EventEmitter()
   users: User[]
 
-  constructor() {
+  constructor(
+    private notesService: DocumentNotesService,
+    private toastService: ToastService,
+    private usersService: UserService
+  ) {
     super()
     this.usersService.listAll().subscribe({
       next: (users) => {

src-ui/src/app/components/file-drop/file-drop.component.ts

@@ -1,4 +1,4 @@
-import { Component, HostListener, inject } from '@angular/core'
+import { Component, HostListener } from '@angular/core'
 import {
   PermissionAction,
   PermissionsService,
@@ -15,15 +15,17 @@ import { UploadDocumentsService } from 'src/app/services/upload-documents.servic
   imports: [],
 })
 export class FileDropComponent {
-  private settings = inject(SettingsService)
-  private toastService = inject(ToastService)
-  private uploadDocumentsService = inject(UploadDocumentsService)
-  private permissionsService = inject(PermissionsService)
-
   private fileLeaveTimeoutID: any
   fileIsOver: boolean = false
   hidden: boolean = true
 
+  constructor(
+    private settings: SettingsService,
+    private toastService: ToastService,
+    private uploadDocumentsService: UploadDocumentsService,
+    private permissionsService: PermissionsService
+  ) {}
+
   public get dragDropEnabled(): boolean {
     return (
       this.settings.globalDropzoneEnabled &&