Update consumer.py

.devcontainer/docker-compose.devcontainer.sqlite-tika.yml

@@ -20,6 +20,7 @@
 #
 # This file is intended only to be used through VSCOde devcontainers. See README.md
 # in the folder .devcontainer.
+
 services:
   broker:
     image: docker.io/library/redis:7

.github/dependabot.yml

@@ -1,5 +1,6 @@
 # Please see the documentation for all configuration options:
 # https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
 version: 2
 # Required for uv support for now
 enable-beta-ecosystems: true

.github/workflows/ci.yml

@@ -12,10 +12,9 @@ on:
     branches-ignore:
       - 'translations**'
 env:
-  DEFAULT_UV_VERSION: "0.8.x"
+  DEFAULT_UV_VERSION: "0.7.x"
   # This is the default version of Python to use in most steps which aren't specific
   DEFAULT_PYTHON_VERSION: "3.11"
-  NLTK_DATA: "/usr/share/nltk_data"
 jobs:
   pre-commit:
     # We want to run on external PRs, but not on our own internal PRs as they'll be run
@@ -122,11 +121,8 @@ jobs:
       - name: List installed Python dependencies
         run: |
           uv pip list
-      - name: Install or update NLTK dependencies
-        run: uv run python -m nltk.downloader punkt punkt_tab snowball_data stopwords -d ${{ env.NLTK_DATA }}
       - name: Tests
         env:
-          NLTK_DATA: ${{ env.NLTK_DATA }}
           PAPERLESS_CI_TEST: 1
           # Enable paperless_mail testing against real server
           PAPERLESS_MAIL_TEST_HOST: ${{ secrets.TEST_MAIL_HOST }}

.github/workflows/cleanup-tags.yml

@@ -4,6 +4,7 @@
 # Requires a PAT with the correct scope set in the secrets.
 #
 # This workflow will not trigger runs on forked repos.
+
 name: Cleanup Image Tags
 on:
   delete:

.github/workflows/repo-maintenance.yml

@@ -19,19 +19,12 @@ jobs:
         with:
           days-before-stale: 7
           days-before-close: 14
-          any-of-issue-labels: 'cant-reproduce,not a bug'
+          any-of-labels: 'stale,cant-reproduce,not a bug'
           stale-issue-label: stale
+          stale-pr-label: stale
           stale-issue-message: >
             This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions. See our [contributing guidelines](https://github.com/paperless-ngx/paperless-ngx/blob/dev/CONTRIBUTING.md#automatic-repository-maintenance) for more details.
 
-          days-before-pr-stale: 14
-          days-before-pr-close: 7
-          stale-pr-message: ""
-          stale-pr-label: stale
-          exempt-pr-labels: 'notable'
-          close-pr-message: >
-            This pull request has been automatically closed because it has not had recent activity. Thank you for your contributions. Please open a new pull request or discussion if you would like to continue working on this change.
-
   lock-threads:
     name: 'Lock Old Threads'
     if: github.repository_owner == 'paperless-ngx'

.github/workflows/translate-strings.yml

@@ -61,7 +61,7 @@ jobs:
           cd src-ui
           pnpm run ng extract-i18n
       - name: Commit changes
-        uses: stefanzweifel/git-auto-commit-action@v6
+        uses: stefanzweifel/git-auto-commit-action@v5
         with:
           file_pattern: 'src-ui/messages.xlf src/locale/en_US/LC_MESSAGES/django.po'
           commit_message: "Auto translate strings"

.pre-commit-config.yaml

@@ -1,6 +1,7 @@
 # This file configures pre-commit hooks.
 # See https://pre-commit.com/ for general information
 # See https://pre-commit.com/hooks.html for a listing of possible hooks
+
 repos:
   # General hooks
   - repo: https://github.com/pre-commit/pre-commit-hooks
@@ -28,16 +29,16 @@ repos:
       - id: check-case-conflict
       - id: detect-private-key
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.4.1
+    rev: v2.4.0
     hooks:
       - id: codespell
-        exclude: "(^src-ui/src/locale/)|(^src-ui/pnpm-lock.yaml)|(^src-ui/e2e/)|(^src/paperless_mail/tests/samples/)|(^src/documents/tests/samples/)"
+        exclude: "(^src-ui/src/locale/)|(^src-ui/pnpm-lock.yaml)|(^src-ui/e2e/)|(^src/paperless_mail/tests/samples/)"
         exclude_types:
           - pofile
           - json
   # See https://github.com/prettier/prettier/issues/15742 for the fork reason
   - repo: https://github.com/rbubley/mirrors-prettier
-    rev: 'v3.6.2'
+    rev: 'v3.3.3'
     hooks:
       - id: prettier
         types_or:
@@ -49,17 +50,17 @@ repos:
           - 'prettier-plugin-organize-imports@4.1.0'
   # Python hooks
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.2
+    rev: v0.9.9
     hooks:
       - id: ruff
       - id: ruff-format
   - repo: https://github.com/tox-dev/pyproject-fmt
-    rev: "v2.6.0"
+    rev: "v2.5.1"
     hooks:
       - id: pyproject-fmt
   # Dockerfile hooks
   - repo: https://github.com/AleksaC/hadolint-py
-    rev: v2.12.1b3
+    rev: v2.12.0.3
     hooks:
       - id: hadolint
   # Shell script hooks
@@ -76,7 +77,7 @@ repos:
     hooks:
       - id: shellcheck
   - repo: https://github.com/google/yamlfmt
-    rev: v0.17.2
+    rev: v0.14.0
     hooks:
       - id: yamlfmt
         exclude: "^src-ui/pnpm-lock.yaml"

CONTRIBUTING.md

@@ -141,7 +141,7 @@ The admins occasionally invite contributors directly if we believe having them o
 # Automatic Repository Maintenance
 
 The Paperless-ngx team appreciates all effort and interest from the community in filing bug reports, creating feature requests, sharing ideas and helping other
-community members. That said, in an effort to keep the repository organized and manageable the project uses automatic handling of certain areas:
+community members. That said, in an effort to keep the repository organized and managebale the project uses automatic handling of certain areas:
 
 - Issues that cannot be reproduced will be marked 'stale' after 7 days of inactivity and closed after 14 further days of inactivity.
 - Issues, pull requests and discussions that are closed will be locked after 30 days of inactivity.

Dockerfile

@@ -32,7 +32,7 @@ RUN set -eux \
 # Purpose: Installs s6-overlay and rootfs
 # Comments:
 #  - Don't leave anything extra in here either
-FROM ghcr.io/astral-sh/uv:0.8.4-python3.12-bookworm-slim AS s6-overlay-base
+FROM ghcr.io/astral-sh/uv:0.7.9-python3.12-bookworm-slim AS s6-overlay-base
 
 WORKDIR /usr/src/s6
 
@@ -265,4 +265,4 @@ ENTRYPOINT ["/init"]
 
 EXPOSE 8000
 
-HEALTHCHECK --interval=30s --timeout=10s --retries=5 CMD [ "curl", "-fs", "-S", "-L", "--max-time", "2", "http://localhost:8000" ]
+HEALTHCHECK --interval=30s --timeout=10s --retries=5 CMD [ "curl", "-fs", "-S", "--max-time", "2", "http://localhost:8000" ]

docker/compose/docker-compose.ci-test.yml

@@ -1,7 +1,8 @@
-# Docker Compose file for running paperless testing with actual Gotenberg
+# Docker Compose file for running paperless testing with actual gotenberg
 # and Tika containers for a more end to end test of the Tika related functionality
 # Can be used locally or by the CI to start the necessary containers with the
 # correct networking for the tests
+
 services:
   gotenberg:
     image: docker.io/gotenberg/gotenberg:8.20

docker/compose/docker-compose.env

@@ -32,6 +32,6 @@
 # Note that this is different from PAPERLESS_OCR_LANGUAGE (default=eng), which defines
 # the language used for OCR.
 # The container installs English, German, Italian, Spanish and French by default.
-# See https://packages.debian.org/search?keywords=tesseract-ocr-&searchon=names
+# See https://packages.debian.org/search?keywords=tesseract-ocr-&searchon=names&suite=buster
 # for available languages.
 #PAPERLESS_OCR_LANGUAGES=tur ces

docker/compose/docker-compose.mariadb-tika.yml

@@ -17,7 +17,7 @@
 # - Apache Tika and Gotenberg servers are started with paperless and paperless
 #   is configured to use these services. These provide support for consuming
 #   Office documents (Word, Excel, Power Point and their LibreOffice counter-
-#   parts).
+#   parts.
 #
 # To install and update paperless with this file, do the following:
 #
@@ -25,9 +25,11 @@
 #   and '.env' into a folder.
 # - Run 'docker compose pull'.
 # - Run 'docker compose up -d'.
+
 #
 # For more extensive installation and update instructions, refer to the
 # documentation.
+
 services:
   broker:
     image: docker.io/library/redis:8

docker/compose/docker-compose.mariadb.yml

@@ -24,6 +24,7 @@
 #
 # For more extensive installation and update instructions, refer to the
 # documentation.
+
 services:
   broker:
     image: docker.io/library/redis:8

docker/compose/docker-compose.portainer.yml

@@ -25,6 +25,7 @@
 #
 # For more extensive installation and update instructions, refer to the
 # documentation.
+
 services:
   broker:
     image: docker.io/library/redis:8

docker/compose/docker-compose.postgres-tika.yml

@@ -17,7 +17,7 @@
 # - Apache Tika and Gotenberg servers are started with paperless and paperless
 #   is configured to use these services. These provide support for consuming
 #   Office documents (Word, Excel, Power Point and their LibreOffice counter-
-#   parts).
+#   parts.
 #
 # To install and update paperless with this file, do the following:
 #
@@ -28,6 +28,7 @@
 #
 # For more extensive installation and update instructions, refer to the
 # documentation.
+
 services:
   broker:
     image: docker.io/library/redis:8

docker/compose/docker-compose.postgres.yml

@@ -24,6 +24,7 @@
 #
 # For more extensive installation and update instructions, refer to the
 # documentation.
+
 services:
   broker:
     image: docker.io/library/redis:8

docker/compose/docker-compose.sqlite-tika.yml

@@ -17,7 +17,7 @@
 # - Apache Tika and Gotenberg servers are started with paperless and paperless
 #   is configured to use these services. These provide support for consuming
 #   Office documents (Word, Excel, Power Point and their LibreOffice counter-
-#   parts).
+#   parts.
 #
 # To install and update paperless with this file, do the following:
 #
@@ -28,6 +28,7 @@
 #
 # For more extensive installation and update instructions, refer to the
 # documentation.
+
 services:
   broker:
     image: docker.io/library/redis:8

docker/compose/docker-compose.sqlite.yml

@@ -21,6 +21,7 @@
 #
 # For more extensive installation and update instructions, refer to the
 # documentation.
+
 services:
   broker:
     image: docker.io/library/redis:8

docs/administration.md

@@ -179,14 +179,10 @@ following:
 
 ### Database Upgrades
 
-In general, Paperless-ngx supports current version of PostgreSQL and MariaDB and it is generally
+In general, paperless does not require a specific version of PostgreSQL or MariaDB and it is
 safe to update them to newer versions. However, you should always take a backup and follow
 the instructions from your database's documentation for how to upgrade between major versions.
 
-!!! note
-
-    As of Paperless-ngx v2.18, the minimum supported version of PostgreSQL is 13.
-
 For PostgreSQL, refer to [Upgrading a PostgreSQL Cluster](https://www.postgresql.org/docs/current/upgrading.html).
 
 For MariaDB, refer to [Upgrading MariaDB](https://mariadb.com/kb/en/upgrading/)
@@ -461,22 +457,6 @@ of the index and usually makes queries faster and also ensures that the
 autocompletion works properly. This command is regularly invoked by the
 task scheduler.
 
-### Clearing the database read cache
-
-If the database read cache is enabled, **you must run this command** after making any changes to the database outside the application context.
-This includes operations such as restoring a database backup or executing SQL statements like UPDATE, INSERT, DELETE, ALTER, CREATE, or DROP.
-
-Failing to invalidate the cache after such modifications can lead to stale data being served from the cache, and **may cause data corruption** or inconsistent behavior in the application.
-
-Use the following management command to clear the cache:
-
-```
-invalidate_cachalot
-```
-
-!!! info
-The database read cache is based on Django-Cachalot. You can refer to their [documentation](https://django-cachalot.readthedocs.io/en/latest/quickstart.html#manage-py-command).
-
 ### Managing filenames {#renamer}
 
 If you use paperless' feature to

docs/configuration.md

@@ -159,58 +159,6 @@ Available options are `postgresql` and `mariadb`.
 
     Defaults to unset, which uses Django’s built-in defaults.
 
-#### [`PAPERLESS_DB_POOLSIZE=<int>`](#PAPERLESS_DB_POOLSIZE) {#PAPERLESS_DB_POOLSIZE}
-
-: Defines the maximum number of database connections to keep in the pool.
-
-    Only applies to PostgreSQL. This setting is ignored for other database engines.
-
-    The value must be greater than or equal to 1 to be used.
-    Defaults to unset, which disables connection pooling.
-
-    !!! note
-
-    A small pool is typically sufficient — for example, a size of 4.
-    Make sure your PostgreSQL server's max_connections setting is large enough to handle:
-    ```(Paperless workers + Celery workers) × pool size + safety margin```
-    For example, with 4 Paperless workers and 2 Celery workers, and a pool size of 4:
-    (4 + 2) × 4 + 10 = 34 connections required.
-
-#### [`PAPERLESS_DB_READ_CACHE_ENABLED=<bool>`](#PAPERLESS_DB_READ_CACHE_ENABLED) {#PAPERLESS_DB_READ_CACHE_ENABLED}
-
-: Caches the database read query results into Redis. This can significantly improve application response times by caching database queries, at the cost of slightly increased memory usage.
-
-    Defaults to `false`.
-
-    !!! danger
-
-    **Do not modify the database outside the application while it is running.**
-    This includes actions such as restoring a backup, upgrading the database, or performing manual inserts. All external modifications must be done **only when the application is stopped**.
-    After making any such changes, you **must invalidate the DB read cache** using the `invalidate_cachalot` management command.
-
-#### [`PAPERLESS_READ_CACHE_TTL=<int>`](#PAPERLESS_READ_CACHE_TTL) {#PAPERLESS_READ_CACHE_TTL}
-
-: Specifies how long (in seconds) read data should be cached.
-
-    Allowed values are between `1` (one second) and `31536000` (one year). Defaults to `3600` (one hour).
-
-    !!! warning
-
-    A high TTL increases memory usage over time. Memory may be used until end of TTL, even if the cache is invalidated with the `invalidate_cachalot` command.
-
-In case of an out-of-memory (OOM) situation, Redis may stop accepting new data — including cache entries, scheduled tasks, and documents to consume.
-If your system has limited RAM, consider configuring a dedicated Redis instance for the read cache, with a memory limit and the eviction policy set to `allkeys-lru`.
-For more details, refer to the [Redis eviction policy documentation](https://redis.io/docs/latest/develop/reference/eviction/), and see the `PAPERLESS_READ_CACHE_REDIS_URL` setting to specify a separate Redis broker.
-
-#### [`PAPERLESS_READ_CACHE_REDIS_URL=<url>`](#PAPERLESS_READ_CACHE_REDIS_URL) {#PAPERLESS_READ_CACHE_REDIS_URL}
-
-: Defines the Redis instance used for the read cache.
-
-    Defaults to `None`.
-
-    !!! Note
-    If this value is not set, the same Redis instance used for scheduled tasks will be used for caching as well.
-
 ## Optional Services
 
 ### Tika {#tika}
@@ -1020,22 +968,6 @@ still perform some basic text pre-processing before matching.
 
     Defaults to 1.
 
-#### [`PAPERLESS_DATE_PARSER_LANGUAGES=<lang>`](#PAPERLESS_DATE_PARSER_LANGUAGES) {#PAPERLESS_DATE_PARSER_LANGUAGES}
-
-Specifies which language Paperless should use when parsing dates from documents.
-
-    This should be a language code supported by the dateparser library,
-    for example: "en", or a combination such as "en+de".
-    Locales are also supported (e.g., "en-AU").
-    Multiple languages can be combined using "+", for example: "en+de" or "en-AU+de".
-    For valid values, refer to the list of supported languages and locales in the [dateparser documentation](https://dateparser.readthedocs.io/en/latest/supported_locales.html).
-
-    Set this to match the languages in which most of your documents are written.
-    If not set, Paperless will attempt to infer the language(s) from the OCR configuration (`PAPERLESS_OCR_LANGUAGE`).
-
-!!! note
-This format differs from the `PAPERLESS_OCR_LANGUAGE` setting, which uses ISO 639-2 codes (3 letters, e.g., "eng+deu" for Tesseract OCR).
-
 #### [`PAPERLESS_EMAIL_TASK_CRON=<cron expression>`](#PAPERLESS_EMAIL_TASK_CRON) {#PAPERLESS_EMAIL_TASK_CRON}
 
 : Configures the scheduled email fetching frequency. The value

docs/development.md

@@ -95,13 +95,13 @@ first-time setup.
 
 7.  You can now either ...
 
-    -   install Redis or
+    -   install redis or
 
-    -   use the included `scripts/start_services.sh` to use Docker to fire
+    -   use the included `scripts/start_services.sh` to use docker to fire
-        up a Redis instance (and some other services such as Tika,
+        up a redis instance (and some other services such as tika,
-        Gotenberg and a database server) or
+        gotenberg and a database server) or
 
-    -   spin up a bare Redis container
+    -   spin up a bare redis container
 
         ```
         docker run -d -p 6379:6379 --restart unless-stopped redis:latest
@@ -147,7 +147,7 @@ $ ng build --configuration production
 ### Testing
 
 -   Run `pytest` in the `src/` directory to execute all tests. This also
-    generates a HTML coverage report. When running tests, `paperless.conf`
+    generates a HTML coverage report. When runnings test, `paperless.conf`
     is loaded as well. However, the tests rely on the default
     configuration. This is not ideal. But for now, make sure no settings
     except for DEBUG are overridden when testing.

docs/index.md

@@ -30,7 +30,7 @@ physical documents into a searchable online archive so you can keep, well, _less
 -   Utilizes the open-source Tesseract engine to recognize more than 100 languages.
 -   Documents are saved as PDF/A format which is designed for long term storage, alongside the unaltered originals.
 -   Uses machine-learning to automatically add tags, correspondents and document types to your documents.
--   Supports PDF documents, images, plain text files, Office documents (Word, Excel, PowerPoint, and LibreOffice equivalents)[^1] and more.
+-   Supports PDF documents, images, plain text files, Office documents (Word, Excel, Powerpoint, and LibreOffice equivalents)[^1] and more.
 -   Paperless stores your documents plain on disk. Filenames and folders are managed by paperless and their format can be configured freely with different configurations assigned to different documents.
 -   **Beautiful, modern web application** that features:
     -   Customizable dashboard with statistics.

docs/setup.md

@@ -445,7 +445,7 @@ are released, dependency support is confirmed, etc.
 13. Configure ImageMagick to allow processing of PDF documents. Most
     distributions have this disabled by default, since PDF documents can
     contain malware. If you don't do this, paperless will fall back to
-    Ghostscript for certain steps such as thumbnail generation.
+    ghostscript for certain steps such as thumbnail generation.
 
     Edit `/etc/ImageMagick-6/policy.xml` and adjust
 

docs/troubleshooting.md

@@ -335,7 +335,7 @@ You may see errors when deleting documents like:
 Data too long for column 'transaction_id' at row 1
 ```
 
-This error can occur in installations which have upgraded from a version of Paperless-ngx that used Django 4 (Paperless-ngx versions prior to v2.13.0) with a MariaDB/MySQL database. Due to the backwards-incompatible change in Django 5, the column "documents_document.transaction_id" will need to be re-created, which can be done with a one-time run of the following management command:
+This error can occur in installations which have upgraded from a version of Paperless-ngx that used Django 4 (Paperless-ngx versions prior to v2.13.0) with a MariaDB/MySQL database. Due to the backawards-incompatible change in Django 5, the column "documents_document.transaction_id" will need to be re-created, which can be done with a one-time run of the following management command:
 
 ```shell-session
 $ python3 manage.py convert_mariadb_uuid

docs/usage.md

@@ -30,9 +30,6 @@ Each document has data fields that you can assign to them:
 -   A _document type_ is used to demarcate the type of a document such
     as letter, bank statement, invoice, contract, etc. It is used to
     identify what a document is about.
--   The document _storage path_ is the location where the document files
-    are stored. See [Storage Paths](advanced_usage.md#storage-paths) for
-    more information.
 -   The _date added_ of a document is the date the document was scanned
     into paperless. You cannot and should not change this date.
 -   The _date created_ of a document is the date the document was

install-paperless-ngx.sh

@@ -52,12 +52,12 @@ if ! command -v wget &> /dev/null ; then
 fi
 
 if ! command -v docker &> /dev/null ; then
-	echo "docker executable not found. Is Docker installed?"
+	echo "docker executable not found. Is docker installed?"
 	exit 1
 fi
 
 if ! docker compose &> /dev/null ; then
-	echo "docker compose plugin not found. Is Docker Compose installed?"
+	echo "docker compose plugin not found. Is docker compose installed?"
 	exit 1
 fi
 
@@ -66,7 +66,7 @@ fi
 if ! docker stats --no-stream &> /dev/null ; then
 	echo ""
 	echo "WARN: It look like the current user does not have Docker permissions."
-	echo "WARN: Use 'sudo usermod -aG docker $USER' to assign Docker permissions to the user (may require restarting the shell)."
+	echo "WARN: Use 'sudo usermod -aG docker $USER' to assign Docker permissions to the user (may require restarting shell)."
 	echo ""
 	sleep 3
 fi
@@ -135,7 +135,7 @@ DATABASE_BACKEND=$ask_result
 
 echo ""
 echo "Paperless is able to use Apache Tika to support Office documents such as"
-echo "Word, Excel, PowerPoint, and LibreOffice equivalents. This feature"
+echo "Word, Excel, Powerpoint, and Libreoffice equivalents. This feature"
 echo "requires more resources due to the required services."
 echo ""
 
@@ -157,7 +157,7 @@ echo ""
 echo "Specify the user id and group id you wish to run paperless as."
 echo "Paperless will also change ownership on the data, media and consume"
 echo "folder to the specified values, so it's a good idea to supply the user id"
-echo "and group id of your Unix user account."
+echo "and group id of your unix user account."
 echo "If unsure, leave default."
 echo ""
 
@@ -212,7 +212,7 @@ if [[ "$DATABASE_BACKEND" == "sqlite" ]] ; then
 	echo -n "SQLite database, the "
 fi
 echo "search index and other data."
-echo "As with the media folder, leave empty to have this managed by Docker."
+echo "As with the media folder, leave empty to have this managed by docker."
 echo ""
 echo "CAUTION: If specified, you must specify an absolute path starting with /"
 echo "or a relative path starting with ./ here."
@@ -224,7 +224,7 @@ DATA_FOLDER=$ask_result
 if [[ "$DATABASE_BACKEND" == "postgres" || "$DATABASE_BACKEND" == "mariadb" ]] ; then
 	echo ""
 	echo "The database folder, where your database stores its data."
-	echo "Leave empty to have this managed by Docker."
+	echo "Leave empty to have this managed by docker."
 	echo ""
 	echo "CAUTION: If specified, you must specify an absolute path starting with /"
 	echo "or a relative path starting with ./ here."
@@ -276,18 +276,18 @@ echo ""
 echo "Target folder: $TARGET_FOLDER"
 echo "Consume folder: $CONSUME_FOLDER"
 if [[ -z $MEDIA_FOLDER ]] ; then
-	echo "Media folder: Managed by Docker"
+	echo "Media folder: Managed by docker"
 else
 	echo "Media folder: $MEDIA_FOLDER"
 fi
 if [[ -z $DATA_FOLDER ]] ; then
-	echo "Data folder: Managed by Docker"
+	echo "Data folder: Managed by docker"
 else
 	echo "Data folder: $DATA_FOLDER"
 fi
 if [[ "$DATABASE_BACKEND" == "postgres" || "$DATABASE_BACKEND" == "mariadb" ]] ; then
 	if [[ -z $DATABASE_FOLDER ]] ; then
-		echo "Database folder: Managed by Docker"
+		echo "Database folder: Managed by docker"
 	else
 		echo "Database folder: $DATABASE_FOLDER"
 	fi

pyproject.toml

@@ -23,36 +23,34 @@ dependencies = [
   "dateparser~=1.2",
   # WARNING: django does not use semver.
   #          Only patch versions are guaranteed to not introduce breaking changes.
-  "django~=5.2.5",
+  "django~=5.1.7",
   "django-allauth[socialaccount,mfa]~=65.4.0",
-  "django-auditlog~=3.2.1",
+  "django-auditlog~=3.1.2",
-  "django-cachalot~=2.8.0",
   "django-celery-results~=2.6.0",
   "django-compression-middleware~=0.5.0",
   "django-cors-headers~=4.7.0",
   "django-extensions~=4.1",
   "django-filter~=25.1",
-  "django-guardian~=3.0.3",
+  "django-guardian~=2.4.0",
-  "django-multiselectfield~=1.0.1",
+  "django-multiselectfield~=0.1.13",
   "django-soft-delete~=1.0.18",
   "djangorestframework~=3.15",
-  "djangorestframework-guardian~=0.4.0",
+  "djangorestframework-guardian~=0.3.0",
   "drf-spectacular~=0.28",
-  "drf-spectacular-sidecar~=2025.8.1",
+  "drf-spectacular-sidecar~=2025.4.1",
   "drf-writable-nested~=0.7.1",
   "filelock~=3.18.0",
   "flower~=2.0.1",
   "gotenberg-client~=0.10.0",
   "httpx-oauth~=0.16",
-  "imap-tools~=1.11.0",
+  "imap-tools~=1.10.0",
   "inotifyrecursive~=0.3",
   "jinja2~=3.1.5",
   "langdetect~=1.0.9",
   "nltk~=3.9.1",
   "ocrmypdf~=16.10.0",
-  "pathvalidate~=3.3.1",
+  "pathvalidate~=3.2.3",
   "pdf2image~=1.17.0",
-  "psycopg-pool",
   "python-dateutil~=2.9.0",
   "python-dotenv~=1.1.0",
   "python-gnupg~=0.5.4",
@@ -61,9 +59,9 @@ dependencies = [
   "pyzbar~=0.1.9",
   "rapidfuzz~=3.13.0",
   "redis[hiredis]~=5.2.1",
-  "scikit-learn~=1.7.0",
+  "scikit-learn~=1.6.1",
   "setproctitle~=1.3.4",
-  "tika-client~=0.10.0",
+  "tika-client~=0.9.0",
   "tqdm~=4.67.1",
   "watchdog~=6.0",
   "whitenoise~=6.9",
@@ -75,13 +73,12 @@ optional-dependencies.mariadb = [
   "mysqlclient~=2.2.7",
 ]
 optional-dependencies.postgres = [
-  "psycopg[c,pool]==3.2.9",
+  "psycopg[c]==3.2.5",
   # Direct dependency for proper resolution of the pre-built wheels
-  "psycopg-c==3.2.9",
+  "psycopg-c==3.2.5",
-  "psycopg-pool==3.2.6",
 ]
 optional-dependencies.webserver = [
-  "granian[uvloop]~=2.4.1",
+  "granian[uvloop]~=2.3.2",
 ]
 
 [dependency-groups]
@@ -101,9 +98,9 @@ testing = [
   "daphne",
   "factory-boy~=3.3.1",
   "imagehash",
-  "pytest~=8.4.1",
+  "pytest~=8.3.3",
-  "pytest-cov~=6.2.1",
+  "pytest-cov~=6.0.0",
-  "pytest-django~=4.11.1",
+  "pytest-django~=4.10.0",
   "pytest-env",
   "pytest-httpx",
   "pytest-mock",
@@ -113,9 +110,9 @@ testing = [
 ]
 
 lint = [
-  "pre-commit~=4.2.0",
+  "pre-commit~=4.1.0",
   "pre-commit-uv~=4.1.3",
-  "ruff~=0.12.2",
+  "ruff~=0.9.9",
 ]
 
 typing = [
@@ -175,7 +172,6 @@ lint.extend-select = [
 ]
 lint.ignore = [
   "DJ001",
-  "PLC0415",
   "RUF012",
   "SIM105",
 ]
@@ -204,9 +200,15 @@ lint.per-file-ignores."docker/wait-for-redis.py" = [
   "INP001",
   "T201",
 ]
+lint.per-file-ignores."src/documents/file_handling.py" = [
+  "PTH",
+] # TODO Enable & remove
 lint.per-file-ignores."src/documents/management/commands/document_consumer.py" = [
   "PTH",
 ] # TODO Enable & remove
+lint.per-file-ignores."src/documents/management/commands/document_exporter.py" = [
+  "PTH",
+] # TODO Enable & remove
 lint.per-file-ignores."src/documents/migrations/1012_fix_archive_files.py" = [
   "PTH",
 ] # TODO Enable & remove
@@ -216,6 +218,9 @@ lint.per-file-ignores."src/documents/models.py" = [
 lint.per-file-ignores."src/documents/parsers.py" = [
   "PTH",
 ] # TODO Enable & remove
+lint.per-file-ignores."src/documents/signals/handlers.py" = [
+  "PTH",
+] # TODO Enable & remove
 lint.per-file-ignores."src/paperless_tesseract/tests/test_parser.py" = [
   "RUF001",
 ]
@@ -232,7 +237,6 @@ testpaths = [
   "src/paperless_mail/tests/",
   "src/paperless_tesseract/tests/",
   "src/paperless_tika/tests",
-  "src/paperless_text/tests/",
 ]
 addopts = [
   "--pythonwarnings=all",
@@ -296,8 +300,8 @@ environments = [
 [tool.uv.sources]
 # Markers are chosen to select these almost exclusively when building the Docker image
 psycopg-c = [
-  { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-3.2.9/psycopg_c-3.2.9-cp312-cp312-linux_x86_64.whl", marker = "sys_platform == 'linux' and platform_machine == 'x86_64' and python_version == '3.12'" },
+  { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-3.2.5/psycopg_c-3.2.5-cp312-cp312-linux_x86_64.whl", marker = "sys_platform == 'linux' and platform_machine == 'x86_64' and python_version == '3.12'" },
-  { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-3.2.9/psycopg_c-3.2.9-cp312-cp312-linux_aarch64.whl", marker = "sys_platform == 'linux' and platform_machine == 'aarch64' and python_version == '3.12'" },
+  { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-3.2.5/psycopg_c-3.2.5-cp312-cp312-linux_aarch64.whl", marker = "sys_platform == 'linux' and platform_machine == 'aarch64' and python_version == '3.12'" },
 ]
 zxing-cpp = [
   { url = "https://github.com/paperless-ngx/builder/releases/download/zxing-2.3.0/zxing_cpp-2.3.0-cp312-cp312-linux_x86_64.whl", marker = "sys_platform == 'linux' and platform_machine == 'x86_64' and python_version == '3.12'" },

src-ui/angular.json

@@ -48,7 +48,6 @@
           "sv-SE": "src/locale/messages.sv_SE.xlf",
           "tr-TR": "src/locale/messages.tr_TR.xlf",
           "uk-UA": "src/locale/messages.uk_UA.xlf",
-          "vi-VN": "src/locale/messages.vi_VN.xlf",
           "zh-CN": "src/locale/messages.zh_CN.xlf",
           "zh-TW": "src/locale/messages.zh_TW.xlf"
         }
@@ -61,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": [
@@ -89,15 +86,12 @@
               "file-saver",
               "utif"
             ],
+            "vendorChunk": true,
             "extractLicenses": false,
+            "buildOptimizer": false,
             "sourceMap": true,
             "optimization": false,
-            "namedChunks": true,
+            "namedChunks": true
-            "stylePreprocessorOptions": {
-              "includePaths": [
-                "."
-              ]
-            }
           },
           "configurations": {
             "production": {
@@ -113,6 +107,8 @@
               "sourceMap": false,
               "namedChunks": false,
               "extractLicenses": true,
+              "vendorChunk": false,
+              "buildOptimizer": true,
               "budgets": [
                 {
                   "type": "initial",
@@ -192,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/package.json

@@ -11,28 +11,28 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/cdk": "^20.1.4",
+    "@angular/cdk": "^19.2.14",
-    "@angular/common": "~20.1.4",
+    "@angular/common": "~19.2.14",
-    "@angular/compiler": "~20.1.4",
+    "@angular/compiler": "~19.2.14",
-    "@angular/core": "~20.1.4",
+    "@angular/core": "~19.2.14",
-    "@angular/forms": "~20.1.4",
+    "@angular/forms": "~19.2.14",
-    "@angular/localize": "~20.1.4",
+    "@angular/localize": "~19.2.14",
-    "@angular/platform-browser": "~20.1.4",
+    "@angular/platform-browser": "~19.2.14",
-    "@angular/platform-browser-dynamic": "~20.1.4",
+    "@angular/platform-browser-dynamic": "~19.2.14",
-    "@angular/router": "~20.1.4",
+    "@angular/router": "~19.2.14",
-    "@ng-bootstrap/ng-bootstrap": "^19.0.1",
+    "@ng-bootstrap/ng-bootstrap": "^18.0.0",
-    "@ng-select/ng-select": "^20.0.1",
+    "@ng-select/ng-select": "^14.9.0",
     "@ngneat/dirty-check-forms": "^3.0.3",
     "@popperjs/core": "^2.11.8",
-    "bootstrap": "^5.3.7",
+    "bootstrap": "^5.3.6",
     "file-saver": "^2.0.5",
     "mime-names": "^1.0.0",
     "ng2-pdf-viewer": "^10.4.0",
     "ngx-bootstrap-icons": "^1.9.3",
     "ngx-color": "^10.0.0",
-    "ngx-cookie-service": "^20.0.1",
+    "ngx-cookie-service": "^19.1.2",
-    "ngx-device-detector": "^10.0.2",
+    "ngx-device-detector": "^9.0.0",
-    "ngx-ui-tour-ng-bootstrap": "^17.0.1",
+    "ngx-ui-tour-ng-bootstrap": "^16.0.0",
     "rxjs": "^7.8.2",
     "tslib": "^2.8.1",
     "utif": "^3.1.0",
@@ -40,35 +40,35 @@
     "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.1.4",
+    "@angular-devkit/build-angular": "^19.2.14",
-    "@angular-devkit/schematics": "^20.1.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.1.4",
+    "@angular-eslint/template-parser": "19.7.0",
-    "@angular/cli": "~20.1.4",
+    "@angular/cli": "~19.2.14",
-    "@angular/compiler-cli": "~20.1.4",
+    "@angular/compiler-cli": "~19.2.14",
     "@codecov/webpack-plugin": "^1.9.1",
-    "@playwright/test": "^1.54.2",
+    "@playwright/test": "^1.51.1",
-    "@types/jest": "^30.0.0",
+    "@types/jest": "^29.5.14",
-    "@types/node": "^24.1.0",
+    "@types/node": "^22.15.29",
-    "@typescript-eslint/eslint-plugin": "^8.38.0",
+    "@typescript-eslint/eslint-plugin": "^8.33.0",
-    "@typescript-eslint/parser": "^8.38.0",
+    "@typescript-eslint/parser": "^8.33.0",
-    "@typescript-eslint/utils": "^8.38.0",
+    "@typescript-eslint/utils": "^8.33.0",
-    "eslint": "^9.32.0",
+    "eslint": "^9.28.0",
-    "jest": "30.0.5",
+    "jest": "29.7.0",
-    "jest-environment-jsdom": "^30.0.5",
+    "jest-environment-jsdom": "^29.7.0",
     "jest-junit": "^16.0.0",
-    "jest-preset-angular": "^15.0.0",
+    "jest-preset-angular": "^14.5.5",
     "jest-websocket-mock": "^2.5.0",
-    "prettier-plugin-organize-imports": "^4.2.0",
+    "prettier-plugin-organize-imports": "^4.1.0",
     "ts-node": "~10.9.1",
-    "typescript": "^5.8.3",
+    "typescript": "^5.5.4",
-    "webpack": "^5.101.0"
+    "webpack": "^5.98.0"
   },
   "pnpm": {
     "onlyBuiltDependencies": [
@@ -78,5 +78,6 @@
       "lmdb",
       "msgpackr-extract"
     ]
-  }
+  },
+  "typings": "./src/typings.d.ts"
 }

src-ui/setup-jest.ts

@@ -1,16 +1,12 @@
 import '@angular/localize/init'
 import { jest } from '@jest/globals'
 import { setupZoneTestEnv } from 'jest-preset-angular/setup-env/zone'
-import { TextDecoder, TextEncoder } from 'node:util'
+import { TextDecoder, TextEncoder } from 'util'
 if (process.env.NODE_ENV === 'test') {
   setupZoneTestEnv()
 }
-;(globalThis as any).TextEncoder = TextEncoder as unknown as {
+global.TextEncoder = TextEncoder
-  new (): TextEncoder
+global.TextDecoder = TextDecoder
-}
-;(globalThis as any).TextDecoder = TextDecoder as unknown as {
-  new (): TextDecoder
-}
 
 import { registerLocaleData } from '@angular/common'
 import localeAf from '@angular/common/locales/af'
@@ -44,7 +40,6 @@ import localeSr from '@angular/common/locales/sr'
 import localeSv from '@angular/common/locales/sv'
 import localeTr from '@angular/common/locales/tr'
 import localeUk from '@angular/common/locales/uk'
-import localeVi from '@angular/common/locales/vi'
 import localeZh from '@angular/common/locales/zh'
 import localeZhHant from '@angular/common/locales/zh-Hant'
 
@@ -80,7 +75,6 @@ registerLocaleData(localeSr)
 registerLocaleData(localeSv)
 registerLocaleData(localeTr)
 registerLocaleData(localeUk)
-registerLocaleData(localeVi)
 registerLocaleData(localeZh)
 registerLocaleData(localeZhHant)
 
@@ -120,6 +114,10 @@ if (!URL.revokeObjectURL) {
   Object.defineProperty(window.URL, 'revokeObjectURL', { value: jest.fn() })
 }
 Object.defineProperty(window, 'ResizeObserver', { value: mock() })
+Object.defineProperty(window, 'location', {
+  configurable: true,
+  value: { reload: jest.fn() },
+})
 
 HTMLCanvasElement.prototype.getContext = <
   typeof HTMLCanvasElement.prototype.getContext

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.html

@@ -50,7 +50,7 @@
     <div [ngbNavOutlet]="nav" class="border-start border-end border-bottom p-3 mb-3 shadow-sm"></div>
     <div class="btn-toolbar" role="toolbar">
         <div class="btn-group me-2">
-            <button type="button" (click)="discardChanges()" class="btn btn-outline-secondary" [disabled]="loading || (isDirty$ | async) === false" i18n>Discard</button>
+            <button type="button" (click)="discardChanges()" class="btn btn-secondary" [disabled]="loading || (isDirty$ | async) === false" i18n>Discard</button>
         </div>
         <div class="btn-group">
             <button type="submit" class="btn btn-primary" [disabled]="loading || !configForm.valid || (isDirty$ | async) === false" i18n>Save</button>

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>
 
@@ -358,6 +357,6 @@
 
   <div [ngbNavOutlet]="nav" class="border-start border-end border-bottom p-3 mb-3 shadow-sm"></div>
 
-  <button type="button" (click)="reset()" class="btn btn-outline-secondary mb-2" [disabled]="(isDirty$ | async) === false" i18n>Cancel</button>
+  <button type="submit" class="btn btn-primary mb-2" [disabled]="(isDirty$ | async) === false" i18n>Save</button>
-  <button type="submit" class="btn btn-primary ms-2 mb-2" [disabled]="(isDirty$ | async) === false" i18n>Save</button>
+  <button type="button" (click)="reset()" class="btn btn-secondary ms-2 mb-2" [disabled]="(isDirty$ | async) === false" i18n>Cancel</button>
 </form>

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

@@ -31,12 +31,10 @@ 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'
 import { Toast, ToastService } from 'src/app/services/toast.service'
-import * as navUtils from 'src/app/utils/navigation'
 import { ConfirmButtonComponent } from '../../common/confirm-button/confirm-button.component'
 import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dialog.component'
 import { CheckComponent } from '../../common/input/check/check.component'
@@ -74,7 +72,6 @@ describe('SettingsComponent', () => {
   let groupService: GroupService
   let modalService: NgbModal
   let systemStatusService: SystemStatusService
-  let savedViewsService: SavedViewService
 
   beforeEach(async () => {
     TestBed.configureTestingModule({
@@ -125,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')
@@ -216,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))
@@ -226,9 +222,6 @@ describe('SettingsComponent', () => {
   })
 
   it('should offer reload if settings changes require', () => {
-    const reloadSpy = jest
-      .spyOn(navUtils, 'locationReload')
-      .mockImplementation(() => {})
     completeSetup()
     let toast: Toast
     toastService.getToasts().subscribe((t) => (toast = t[0]))
@@ -245,7 +238,6 @@ describe('SettingsComponent', () => {
 
     expect(toast.actionName).toEqual('Reload now')
     toast.action()
-    expect(reloadSpy).toHaveBeenCalled()
   })
 
   it('should allow setting theme color, visually apply change immediately but not save', () => {
@@ -274,7 +266,7 @@ describe('SettingsComponent', () => {
       )
     completeSetup(userService)
     fixture.detectChanges()
-    expect(toastErrorSpy).toHaveBeenCalled()
+    expect(toastErrorSpy).toBeCalled()
   })
 
   it('should show errors on load if load groups failure', () => {
@@ -286,7 +278,7 @@ describe('SettingsComponent', () => {
       )
     completeSetup(groupService)
     fixture.detectChanges()
-    expect(toastErrorSpy).toHaveBeenCalled()
+    expect(toastErrorSpy).toBeCalled()
   })
 
   it('should load system status on initialize, show errors if needed', () => {
@@ -353,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,
@@ -57,7 +56,6 @@ import {
 } from 'src/app/services/settings.service'
 import { SystemStatusService } from 'src/app/services/system-status.service'
 import { Toast, ToastService } from 'src/app/services/toast.service'
-import { locationReload } from 'src/app/utils/navigation'
 import { CheckComponent } from '../../common/input/check/check.component'
 import { ColorComponent } from '../../common/input/color/color.component'
 import { PermissionsGroupComponent } from '../../common/input/permissions/permissions-group/permissions-group.component'
@@ -106,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({
@@ -155,7 +138,6 @@ export class SettingsComponent
     notificationsConsumerSuppressOnDashboard: new FormControl(null),
 
     savedViewsWarnOnUnsavedChange: new FormControl(null),
-    sidebarViewsShowCount: new FormControl(null),
   })
 
   SettingsNavIDs = SettingsNavIDs
@@ -197,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()
     })
   }
 
@@ -313,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
@@ -493,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
@@ -551,7 +539,7 @@ export class SettingsComponent
             savedToast.content = $localize`Settings were saved successfully. Reload is required to apply some changes.`
             savedToast.actionName = $localize`Reload now`
             savedToast.action = () => {
-              locationReload()
+              location.reload()
             }
           }
 

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.spec.ts

@@ -19,7 +19,6 @@ import { GroupService } from 'src/app/services/rest/group.service'
 import { UserService } from 'src/app/services/rest/user.service'
 import { SettingsService } from 'src/app/services/settings.service'
 import { ToastService } from 'src/app/services/toast.service'
-import * as navUtils from 'src/app/utils/navigation'
 import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dialog.component'
 import { GroupEditDialogComponent } from '../../common/edit-dialog/group-edit-dialog/group-edit-dialog.component'
 import { UserEditDialogComponent } from '../../common/edit-dialog/user-edit-dialog/user-edit-dialog.component'
@@ -108,7 +107,7 @@ describe('UsersAndGroupsComponent', () => {
     const toastErrorSpy = jest.spyOn(toastService, 'showError')
     const toastInfoSpy = jest.spyOn(toastService, 'showInfo')
     editDialog.failed.emit()
-    expect(toastErrorSpy).toHaveBeenCalled()
+    expect(toastErrorSpy).toBeCalled()
     settingsService.currentUser = users[1] // simulate logged in as different user
     editDialog.succeeded.emit(users[0])
     expect(toastInfoSpy).toHaveBeenCalledWith(
@@ -131,7 +130,7 @@ describe('UsersAndGroupsComponent', () => {
       throwError(() => new Error('error deleting user'))
     )
     deleteDialog.confirm()
-    expect(toastErrorSpy).toHaveBeenCalled()
+    expect(toastErrorSpy).toBeCalled()
     deleteSpy.mockReturnValueOnce(of(true))
     deleteDialog.confirm()
     expect(listAllSpy).toHaveBeenCalled()
@@ -143,18 +142,19 @@ describe('UsersAndGroupsComponent', () => {
     let modal: NgbModalRef
     modalService.activeInstances.subscribe((refs) => (modal = refs[0]))
     component.editUser(users[0])
-    const navSpy = jest
-      .spyOn(navUtils, 'setLocationHref')
-      .mockImplementation(() => {})
     const editDialog = modal.componentInstance as UserEditDialogComponent
     editDialog.passwordIsSet = true
     settingsService.currentUser = users[0] // simulate logged in as same user
     editDialog.succeeded.emit(users[0])
     fixture.detectChanges()
+    Object.defineProperty(window, 'location', {
+      value: {
+        href: 'http://localhost/',
+      },
+      writable: true, // possibility to override
+    })
     tick(2600)
-    expect(navSpy).toHaveBeenCalledWith(
+    expect(window.location.href).toContain('logout')
-      `${window.location.origin}/accounts/logout/?next=/accounts/login/?next=/`
-    )
   }))
 
   it('should support edit / create group, show error if needed', () => {
@@ -166,7 +166,7 @@ describe('UsersAndGroupsComponent', () => {
     const toastErrorSpy = jest.spyOn(toastService, 'showError')
     const toastInfoSpy = jest.spyOn(toastService, 'showInfo')
     editDialog.failed.emit()
-    expect(toastErrorSpy).toHaveBeenCalled()
+    expect(toastErrorSpy).toBeCalled()
     editDialog.succeeded.emit(groups[0])
     expect(toastInfoSpy).toHaveBeenCalledWith(
       `Saved group "${groups[0].name}".`
@@ -188,7 +188,7 @@ describe('UsersAndGroupsComponent', () => {
       throwError(() => new Error('error deleting group'))
     )
     deleteDialog.confirm()
-    expect(toastErrorSpy).toHaveBeenCalled()
+    expect(toastErrorSpy).toBeCalled()
     deleteSpy.mockReturnValueOnce(of(true))
     deleteDialog.confirm()
     expect(listAllSpy).toHaveBeenCalled()
@@ -210,7 +210,7 @@ describe('UsersAndGroupsComponent', () => {
       )
     completeSetup(userService)
     fixture.detectChanges()
-    expect(toastErrorSpy).toHaveBeenCalled()
+    expect(toastErrorSpy).toBeCalled()
   })
 
   it('should show errors on load if load groups failure', () => {
@@ -222,6 +222,6 @@ describe('UsersAndGroupsComponent', () => {
       )
     completeSetup(groupService)
     fixture.detectChanges()
-    expect(toastErrorSpy).toHaveBeenCalled()
+    expect(toastErrorSpy).toBeCalled()
   })
 })

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'
@@ -10,7 +10,6 @@ import { GroupService } from 'src/app/services/rest/group.service'
 import { UserService } from 'src/app/services/rest/user.service'
 import { SettingsService } from 'src/app/services/settings.service'
 import { ToastService } from 'src/app/services/toast.service'
-import { setLocationHref } from 'src/app/utils/navigation'
 import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dialog.component'
 import { EditDialogMode } from '../../common/edit-dialog/edit-dialog.component'
 import { GroupEditDialogComponent } from '../../common/edit-dialog/group-edit-dialog/group-edit-dialog.component'
@@ -32,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 })
@@ -94,9 +97,7 @@ export class UsersAndGroupsComponent
             $localize`Password has been changed, you will be logged out momentarily.`
           )
           setTimeout(() => {
-            setLocationHref(
+            window.location.href = `${window.location.origin}/accounts/logout/?next=/accounts/login/?next=/`
-              `${window.location.origin}/accounts/logout/?next=/accounts/login/?next=/`
-            )
           }, 2500)
         } else {
           this.toastService.showInfo(

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,26 @@ export class AppFrameComponent
   extends ComponentWithPermissions
   implements OnInit, ComponentCanDeactivate
 {
-  router = inject(Router)
-  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 +101,7 @@ export class AppFrameComponent
         PermissionType.SavedView
       )
     ) {
-      this.savedViewService.reload(() => {
+      this.savedViewService.reload()
-        this.savedViewService.maybeRefreshDocumentCounts()
-      })
     }
   }
 
@@ -285,8 +282,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
@@ -246,9 +243,9 @@ export class CustomFieldsQueryDropdownComponent extends LoadingComponentWithPerm
 
   customFields: CustomField[] = []
 
-  public readonly today: string = new Date().toLocaleDateString('en-CA')
+  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()
   }
 
@@ -165,7 +162,7 @@ export class DatesDropdownComponent implements OnInit, OnDestroy {
   @Input()
   placement: string = 'bottom-start'
 
-  public readonly today: string = new Date().toLocaleDateString('en-CA')
+  public readonly today: string = new Date().toISOString().split('T')[0]
 
   get isActive(): boolean {
     return (

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() {
@@ -43,7 +46,7 @@ export class GroupEditDialogComponent extends EditDialogComponent<Group> {
   getForm(): FormGroup {
     return new FormGroup({
       name: new FormControl(''),
-      permissions: new FormControl([]),
+      permissions: new FormControl(null),
     })
   }
 }

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.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.html

@@ -30,7 +30,7 @@
       }
       <div class="list-group-item">
         <div class="input-group input-group-sm">
-          <input class="form-control" type="text" spellcheck="false" [(ngModel)]="filterText" [placeholder]="filterPlaceholder" (keyup.enter)="listFilterEnter()" #listFilterTextInput>
+          <input class="form-control" type="text" [(ngModel)]="filterText" [placeholder]="filterPlaceholder" (keyup.enter)="listFilterEnter()" #listFilterTextInput>
         </div>
       </div>
       @if (selectionModel.items) {

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[]
@@ -59,7 +62,7 @@ export class DateComponent
   @Output()
   filterDocuments = new EventEmitter<NgbDateStruct[]>()
 
-  public readonly today: string = new Date().toLocaleDateString('en-CA')
+  public readonly today: string = new Date().toISOString().split('T')[0]
 
   getSuggestions() {
     return this.suggestions == null

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.spec.ts

@@ -18,7 +18,6 @@ import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
 import { of, throwError } from 'rxjs'
 import { ProfileService } from 'src/app/services/profile.service'
 import { ToastService } from 'src/app/services/toast.service'
-import * as navUtils from 'src/app/utils/navigation'
 import { ConfirmButtonComponent } from '../confirm-button/confirm-button.component'
 import { PasswordComponent } from '../input/password/password.component'
 import { TextComponent } from '../input/text/text.component'
@@ -206,15 +205,16 @@ describe('ProfileEditDialogComponent', () => {
 
     const updateSpy = jest.spyOn(profileService, 'update')
     updateSpy.mockReturnValue(of(null))
-    const navSpy = jest
+    Object.defineProperty(window, 'location', {
-      .spyOn(navUtils, 'setLocationHref')
+      value: {
-      .mockImplementation(() => {})
+        href: 'http://localhost/',
+      },
+      writable: true, // possibility to override
+    })
     component.save()
     expect(updateSpy).toHaveBeenCalled()
     tick(2600)
-    expect(navSpy).toHaveBeenCalledWith(
+    expect(window.location.href).toContain('logout')
-      `${window.location.origin}/accounts/logout/?next=/accounts/login/?next=/`
-    )
   }))
 
   it('should support auth token copy', fakeAsync(() => {

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,
@@ -21,7 +21,6 @@ import {
 import { SafeHtmlPipe } from 'src/app/pipes/safehtml.pipe'
 import { ProfileService } from 'src/app/services/profile.service'
 import { ToastService } from 'src/app/services/toast.service'
-import { setLocationHref } from 'src/app/utils/navigation'
 import { LoadingComponentWithPermissions } from '../../loading-component/loading.component'
 import { ConfirmButtonComponent } from '../confirm-button/confirm-button.component'
 import { PasswordComponent } from '../input/password/password.component'
@@ -47,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
 
@@ -89,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
@@ -195,9 +198,7 @@ export class ProfileEditDialogComponent
               $localize`Password has been changed, you will be logged out momentarily.`
             )
             setTimeout(() => {
-              setLocationHref(
+              window.location.href = `${window.location.origin}/accounts/logout/?next=/accounts/login/?next=/`
-                `${window.location.origin}/accounts/logout/?next=/accounts/login/?next=/`
-              )
             }, 2500)
           }
           this.activeModal.close()

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.ts

@@ -1,5 +1,5 @@
 import { Clipboard, ClipboardModule } from '@angular/cdk/clipboard'
-import { Component, OnInit, inject } from '@angular/core'
+import { Component, OnInit } from '@angular/core'
 import {
   NgbActiveModal,
   NgbModalModule,
@@ -35,13 +35,6 @@ import { environment } from 'src/environments/environment'
   ],
 })
 export class SystemStatusDialogComponent implements OnInit {
-  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
@@ -56,6 +49,15 @@ export class SystemStatusDialogComponent implements OnInit {
     return this.permissionsService.isSuperUser()
   }
 
+  constructor(
+    public activeModal: NgbActiveModal,
+    private clipboard: Clipboard,
+    private systemStatusService: SystemStatusService,
+    private tasksService: TasksService,
+    private toastService: ToastService,
+    private permissionsService: PermissionsService
+  ) {}
+
   public ngOnInit() {
     this.versionMismatch =
       environment.production &&

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