Adds an option for funding through GitHub sponsors

.codecov.yml

@@ -1,17 +1,19 @@
 codecov:
   require_ci_to_pass: true
-  # https://docs.codecov.com/docs/components
+# https://docs.codecov.com/docs/flags#recommended-automatic-flag-management
-component_management:
+# Require each flag to have 1 upload before notification
-  individual_components:
+flag_management:
-    - component_id: backend
+  individual_flags:
+    - name: backend
       paths:
-        - src/**
+        - src/
-    - component_id: frontend
+    - name: frontend
       paths:
-        - src-ui/**
+        - src-ui/
 # https://docs.codecov.com/docs/pull-request-comments
+# codecov will only comment if coverage changes
 comment:
-  layout: "header, diff, components, flags, files"
+  require_changes: true
   # https://docs.codecov.com/docs/javascript-bundle-analysis
   require_bundle_changes: true
   bundle_change_threshold: "50Kb"

.codespellrc

@@ -0,0 +1,3 @@
+[codespell]
+write-changes = True
+ignore-words-list = criterias,afterall,valeu,ureue,equest,ure,assertIn

.devcontainer/Dockerfile

@@ -83,8 +83,7 @@ RUN set -eux \
     && apt-get update \
     && apt-get install --yes --quiet ${PYTHON_PACKAGES}
 
-COPY --from=ghcr.io/astral-sh/uv:0.7.8 /uv /bin/uv
+COPY --from=ghcr.io/astral-sh/uv:0.6 /uv /bin/uv
-
 
 RUN set -eux \
   && echo "Installing pre-built updates" \
@@ -129,6 +128,7 @@ RUN set -eux \
   && echo "Configuring ImageMagick" \
     && mv paperless-policy.xml /etc/ImageMagick-6/policy.xml
 
+COPY --from=ghcr.io/astral-sh/uv:0.6 /uv /bin/uv
 
 # Packages needed only for building a few quick Python
 # dependencies
@@ -149,7 +149,7 @@ RUN --mount=type=cache,target=/root/.cache/uv,id=pip-cache \
     && apt-get install --yes --quiet ${BUILD_PACKAGES}
 
 RUN set -eux \
-  && npm update -g pnpm
+  && npm update npm -g
 
 # add users, setup scripts
 # Mount the compiled frontend to expected location

.devcontainer/README.md

@@ -47,19 +47,39 @@ To start the DevContainer:
 
 1. Open VSCode.
 2. Open the project folder.
-3. Open the command palette and choose `Dev Containers: Rebuild and Reopen in Container`.
+3. Open the command palette:
+   - **Windows/Linux**: `Ctrl+Shift+P`
+   - **Mac**: `Cmd+Shift+P`
+4. Type and select `Dev Containers: Rebuild and Reopen in Container`.
 
 VSCode will build and start the DevContainer environment.
 
 ### Step 2: Initial Setup
 
-Once the DevContainer is up and running, run the `Project Setup: Run all Init Tasks` task to initialize the project.
+Once the DevContainer is up and running, perform the following steps:
 
-Alternatively, the Project Setup can be done with individual tasks:
+1. **Compile Frontend Assets**:
 
-1. **Compile Frontend Assets**: `Maintenance: Compile frontend for production`.
+   - Open the command palette:
-2. **Run Database Migrations**: `Maintenance: manage.py migrate`.
+     - **Windows/Linux**: `Ctrl+Shift+P`
-3. **Create Superuser**: `Maintenance: manage.py createsuperuser`.
+     - **Mac**: `Cmd+Shift+P`
+   - Select `Tasks: Run Task`.
+   - Choose `Frontend Compile`.
+
+2. **Run Database Migrations**:
+
+   - Open the command palette:
+     - **Windows/Linux**: `Ctrl+Shift+P`
+     - **Mac**: `Cmd+Shift+P`
+   - Select `Tasks: Run Task`.
+   - Choose `Migrate Database`.
+
+3. **Create Superuser**:
+   - Open the command palette:
+     - **Windows/Linux**: `Ctrl+Shift+P`
+     - **Mac**: `Cmd+Shift+P`
+   - Select `Tasks: Run Task`.
+   - Choose `Create Superuser`.
 
 ### Debugging and Running Services
 
@@ -75,8 +95,11 @@ You can start and debug backend services either as debugging sessions via `launc
 
 #### Using Tasks
 
-1. Open the command palette and select `Tasks: Run Task`.
+1. Open the command palette:
-2. Choose the desired task:
+   - **Windows/Linux**: `Ctrl+Shift+P`
+   - **Mac**: `Cmd+Shift+P`
+2. Select `Tasks: Run Task`.
+3. Choose the desired task:
    - `Runserver`
    - `Document Consumer`
    - `Celery`

.devcontainer/devcontainer.json

@@ -3,7 +3,7 @@
     "dockerComposeFile": "docker-compose.devcontainer.sqlite-tika.yml",
     "service": "paperless-development",
     "workspaceFolder": "/usr/src/paperless/paperless-ngx",
-    "postCreateCommand": "/bin/bash -c 'rm -rf .venv/.*  && uv sync --group dev && uv run pre-commit install'",
+    "postCreateCommand": "/bin/bash -c 'uv sync --group dev && uv run pre-commit install'",
     "customizations": {
         "vscode": {
           "extensions": [

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

@@ -20,17 +20,20 @@
 #
 # 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
     restart: unless-stopped
     volumes:
       - ./redisdata:/data
+
   # No ports need to be exposed; the VSCode DevContainer plugin manages them.
   paperless-development:
     image: paperless-ngx
     build:
-      context: ../ # Dockerfile cannot access files from parent directories if context is not set.
+      context: ../    # Dockerfile cannot access files from parent directories if context is not set.
       dockerfile: ./.devcontainer/Dockerfile
     restart: unless-stopped
     depends_on:
@@ -49,6 +52,7 @@ services:
       - ./data:/usr/src/paperless/paperless-ngx/data
       - ./media:/usr/src/paperless/paperless-ngx/media
       - ./consume:/usr/src/paperless/paperless-ngx/consume
+      - ~/.gitconfig:/usr/src/paperless/.gitconfig:ro
     environment:
       PAPERLESS_REDIS: redis://broker:6379
       PAPERLESS_TIKA_ENABLED: 1
@@ -56,20 +60,25 @@ services:
       PAPERLESS_TIKA_ENDPOINT: http://tika:9998
       PAPERLESS_STATICDIR: ./src/documents/static
       PAPERLESS_DEBUG: true
+
     # Overrides default command so things don't shut down after the process ends.
     command: /bin/sh -c "chown -R paperless:paperless /usr/src/paperless/paperless-ngx/src/documents/static/frontend && chown -R paperless:paperless /usr/src/paperless/paperless-ngx/.ruff_cache && while sleep 1000; do :; done"
+
   gotenberg:
     image: docker.io/gotenberg/gotenberg:8.17
     restart: unless-stopped
+
     # The Gotenberg Chromium route is used to convert .eml files. We do not
     # want to allow external content like tracking pixels or even JavaScript.
     command:
       - "gotenberg"
       - "--chromium-disable-javascript=true"
       - "--chromium-allow-list=file:///tmp/.*"
+
   tika:
     image: docker.io/apache/tika:latest
     restart: unless-stopped
+
 volumes:
   data:
   media:

.devcontainer/vscode/settings.json

@@ -1,10 +1,11 @@
 {
-    "python.testing.pytestArgs": [],
+    "python.testing.pytestArgs": [
+        "src"
+    ],
     "python.testing.unittestEnabled": false,
     "python.testing.pytestEnabled": true,
     "files.watcherExclude": {
         "**/.venv/**": true,
         "**/pytest_cache/**": true
-    },
+    }
-    "python.testing.cwd": "${workspaceFolder}/src"
 }

.devcontainer/vscode/tasks.json

@@ -33,7 +33,7 @@
 			"label": "Start: Frontend Angular",
 			"description": "Start the Frontend Angular Dev Server",
 			"type": "shell",
-			"command": "pnpm start",
+			"command": "npm start",
 			"isBackground": true,
 			"options": {
 				"cwd": "${workspaceFolder}/src-ui"
@@ -156,7 +156,7 @@
 			"label": "Maintenance: recreate .venv",
 			"description": "Recreate the python virtual environment and install python dependencies",
 			"type": "shell",
-			"command": "rm -rf .venv && uv venv && uv sync --dev",
+			"command": "rm -R -v .venv/* || uv install --dev",
 			"group": "none",
 			"presentation": {
 				"echo": true,
@@ -173,8 +173,8 @@
 		},
 		{
 			"label": "Maintenance: Install Frontend Dependencies",
-			"description": "Install frontend (pnpm) dependencies",
+			"description": "Install frontend (npm) dependencies",
-			"type": "pnpm",
+			"type": "npm",
 			"script": "install",
 			"path": "src-ui",
 			"group": "clean",
@@ -185,7 +185,7 @@
 			"description": "Clean install frontend dependencies and build the frontend for production",
 			"label": "Maintenance: Compile frontend for production",
 			"type": "shell",
-			"command": "pnpm install && ./node_modules/.bin/ng build --configuration production",
+			"command": "npm ci && ./node_modules/.bin/ng build --configuration production",
 			"group": "none",
 			"presentation": {
 				"echo": true,

.github/DISCUSSION_TEMPLATE/support.yml

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

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -6,8 +6,8 @@ body:
   - type: markdown
     attributes:
       value: |
-        ### ⚠️ Please remember: issues are for *bugs* only! ⚠️
+        ### ⚠️ Please remember: issues are for *bugs*
-        That is, something you believe affects every single user of Paperless-ngx (and the demo, for example), not just you. If you are not sure, start with one of the other options below.
+        That is, something you believe affects every single user of Paperless-ngx, not just you. If you're not sure, start with one of the other options below.
 
         Also, note that **Paperless-ngx does not perform OCR or archive file creation itself**, those are handled by other tools. Problems with OCR or archive versions of specific files should likely be raised 'upstream', see https://github.com/ocrmypdf/OCRmyPDF/issues or https://github.com/tesseract-ocr/tesseract/issues
   - type: markdown
@@ -59,12 +59,6 @@ body:
       label: Browser logs
       description: Logs from the web browser related to your issue, if needed
       render: bash
-  - type: textarea
-    id: logs_services
-    attributes:
-      label: Services logs
-      description: Logs from other services (or containers) related to your issue, if needed. For example, the database or redis logs.
-      render: bash
   - type: input
     id: version
     attributes:

.github/dependabot.yml

@@ -1,13 +1,14 @@
-# Please see the documentation for all configuration options:
+# https://docs.github.com/en/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/configuration-options-for-dependency-updates#package-ecosystem
-# 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
 updates:
-  # Enable version updates for pnpm
+
+  # Enable version updates for npm
   - package-ecosystem: "npm"
     target-branch: "dev"
-    # Look for `pnpm-lock.yaml` file in the `/src-ui` directory
+    # Look for `package.json` and `lock` files in the `/src-ui` directory
     directory: "/src-ui"
     open-pull-requests-limit: 10
     schedule:
@@ -15,6 +16,9 @@ updates:
     labels:
       - "frontend"
       - "dependencies"
+    # Add reviewers
+    reviewers:
+      - "paperless-ngx/frontend"
     groups:
       frontend-angular-dependencies:
         patterns:
@@ -30,6 +34,7 @@ updates:
         patterns:
           - "@typescript-eslint*"
           - "eslint"
+
   # Enable version updates for Python
   - package-ecosystem: "uv"
     target-branch: "dev"
@@ -40,6 +45,9 @@ updates:
     labels:
       - "backend"
       - "dependencies"
+    # Add reviewers
+    reviewers:
+      - "paperless-ngx/backend"
     groups:
       development:
         patterns:
@@ -50,7 +58,6 @@ updates:
       django:
         patterns:
           - "*django*"
-          - "drf-*"
       major-versions:
         update-types:
           - "major"
@@ -58,13 +65,11 @@ updates:
         update-types:
           - "minor"
           - "patch"
-        exclude-patterns:
-          - "*django*"
-          - "drf-*"
       pre-built:
         patterns:
           - psycopg*
           - zxing-cpp
+
   # Enable updates for GitHub Actions
   - package-ecosystem: "github-actions"
     target-branch: "dev"
@@ -75,50 +80,12 @@ updates:
     labels:
       - "ci-cd"
       - "dependencies"
+    # Add reviewers
+    reviewers:
+      - "paperless-ngx/ci-cd"
     groups:
       actions:
         update-types:
           - "major"
           - "minor"
           - "patch"
-  # Update Dockerfile in root directory
-  - package-ecosystem: "docker"
-    directories:
-      - "/"
-      - "/.devcontainer/"
-    schedule:
-      interval: "weekly"
-    open-pull-requests-limit: 5
-    labels:
-      - "dependencies"
-    commit-message:
-      prefix: "docker"
-      include: "scope"
-  # Update Docker Compose files in docker/compose directory
-  - package-ecosystem: "docker-compose"
-    directory: "/docker/compose/"
-    schedule:
-      interval: "weekly"
-    open-pull-requests-limit: 5
-    labels:
-      - "dependencies"
-    commit-message:
-      prefix: "docker-compose"
-      include: "scope"
-    groups:
-      # Individual groups for each image
-      gotenberg:
-        patterns:
-          - "docker.io/gotenberg/gotenberg*"
-      tika:
-        patterns:
-          - "docker.io/apache/tika*"
-      redis:
-        patterns:
-          - "docker.io/library/redis*"
-      mariadb:
-        patterns:
-          - "docker.io/library/mariadb*"
-      postgres:
-        patterns:
-          - "docker.io/library/postgres*"

.github/labeler.yml

@@ -1,26 +0,0 @@
-backend:
-  - changed-files:
-      - any-glob-to-any-file:
-          - 'src/**'
-          - 'pyproject.toml'
-          - 'uv.lock'
-          - 'requirements.txt'
-frontend:
-  - changed-files:
-      - any-glob-to-any-file:
-          - 'src-ui/**'
-documentation:
-  - changed-files:
-      - any-glob-to-any-file:
-          - 'docs/**'
-ci-cd:
-  - changed-files:
-      - any-glob-to-any-file:
-          - '.github/**'
-# pr types
-bug:
-  - head-branch:
-      - ['^fix']
-enhancement:
-  - head-branch:
-      - ['^feature']

.github/release-drafter.yml

@@ -1,3 +1,15 @@
+autolabeler:
+  - label: "bug"
+    branch:
+      - '/^fix/'
+    title:
+      - "/^fix/i"
+      - "/^Bugfix/i"
+  - label: "enhancement"
+    branch:
+      - '/^feature/'
+    title:
+      - "/^feature/i"
 categories:
   - title: 'Breaking Changes'
     labels:
@@ -5,7 +17,7 @@ categories:
   - title: 'Notable Changes'
     labels:
       - 'notable'
-  - title: 'Features / Enhancements'
+  - title: 'Features'
     labels:
       - 'enhancement'
   - title: 'Bug Fixes'

.github/workflows/ci.yml

@@ -1,4 +1,5 @@
 name: ci
+
 on:
   push:
     tags:
@@ -11,99 +12,72 @@ on:
   pull_request:
     branches-ignore:
       - 'translations**'
+
 env:
-  DEFAULT_UV_VERSION: "0.9.x"
+  DEFAULT_UV_VERSION: "0.6.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:
-  detect-duplicate:
-    name: Detect Duplicate Run
-    runs-on: ubuntu-24.04
-    outputs:
-      should_run: ${{ steps.check.outputs.should_run }}
-    steps:
-      - name: Check if workflow should run
-        id: check
-        uses: actions/github-script@v8
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            if (context.eventName !== 'push') {
-              core.info('Not a push event; running workflow.');
-              core.setOutput('should_run', 'true');
-              return;
-            }
-
-            const ref = context.ref || '';
-            if (!ref.startsWith('refs/heads/')) {
-              core.info('Push is not to a branch; running workflow.');
-              core.setOutput('should_run', 'true');
-              return;
-            }
-
-            const branch = ref.substring('refs/heads/'.length);
-            const { owner, repo } = context.repo;
-            const prs = await github.paginate(github.rest.pulls.list, {
-              owner,
-              repo,
-              state: 'open',
-              head: `${owner}:${branch}`,
-              per_page: 100,
-            });
-
-            if (prs.length === 0) {
-              core.info(`No open PR found for ${branch}; running workflow.`);
-              core.setOutput('should_run', 'true');
-            } else {
-              core.info(`Found ${prs.length} open PR(s) for ${branch}; skipping duplicate push run.`);
-              core.setOutput('should_run', 'false');
-            }
   pre-commit:
-    needs:
+    # We want to run on external PRs, but not on our own internal PRs as they'll be run
-      - detect-duplicate
+    # by the push to the branch. Without this if check, checks are duplicated since
-    if: needs.detect-duplicate.outputs.should_run == 'true'
+    # internal PRs match both the push and pull_request events.
+    if:
+      github.event_name == 'push' || github.event.pull_request.head.repo.full_name !=
+      github.repository
+
     name: Linting Checks
     runs-on: ubuntu-24.04
     steps:
-      - name: Checkout repository
+      -
-        uses: actions/checkout@v5
+        name: Checkout repository
-      - name: Install python
+        uses: actions/checkout@v4
-        uses: actions/setup-python@v6
+      -
+        name: Install python
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
-      - name: Check files
+      -
+        name: Check files
         uses: pre-commit/action@v3.0.1
+
   documentation:
     name: "Build & Deploy Documentation"
     runs-on: ubuntu-24.04
     needs:
       - pre-commit
     steps:
-      - name: Checkout
+      -
-        uses: actions/checkout@v5
+        name: Checkout
-      - name: Set up Python
+        uses: actions/checkout@v4
+      -
+        name: Set up Python
         id: setup-python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
-      - name: Install uv
+      -
-        uses: astral-sh/setup-uv@v6
+        name: Install uv
+        uses: astral-sh/setup-uv@v5
         with:
           version: ${{ env.DEFAULT_UV_VERSION }}
           enable-cache: true
           python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
-      - name: Install Python dependencies
+      -
+        name: Install Python dependencies
         run: |
           uv sync --python ${{ steps.setup-python.outputs.python-version }} --dev --frozen
-      - name: Make documentation
+      -
+        name: Make documentation
         run: |
           uv run \
             --python ${{ steps.setup-python.outputs.python-version }} \
             --dev \
             --frozen \
             mkdocs build --config-file ./mkdocs.yml
-      - name: Deploy documentation
+      -
+        name: Deploy documentation
         if: github.event_name == 'push' && github.ref == 'refs/heads/main'
         run: |
           echo "docs.paperless-ngx.com" > "${{ github.workspace }}/docs/CNAME"
@@ -114,12 +88,14 @@ jobs:
             --dev \
             --frozen \
             mkdocs gh-deploy --force --no-history
-      - name: Upload artifact
+      -
+        name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
           name: documentation
           path: site/
           retention-days: 7
+
   tests-backend:
     name: "Backend Tests (Python ${{ matrix.python-version }})"
     runs-on: ubuntu-24.04
@@ -130,44 +106,50 @@ jobs:
         python-version: ['3.10', '3.11', '3.12']
       fail-fast: false
     steps:
-      - name: Checkout
+      -
-        uses: actions/checkout@v5
+        name: Checkout
-      - name: Start containers
+        uses: actions/checkout@v4
+      -
+        name: Start containers
         run: |
           docker compose --file ${{ github.workspace }}/docker/compose/docker-compose.ci-test.yml pull --quiet
           docker compose --file ${{ github.workspace }}/docker/compose/docker-compose.ci-test.yml up --detach
-      - name: Set up Python
+      -
+        name: Set up Python
         id: setup-python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
         with:
           python-version: "${{ matrix.python-version }}"
-      - name: Install uv
+      -
-        uses: astral-sh/setup-uv@v6
+        name: Install uv
+        uses: astral-sh/setup-uv@v5
         with:
           version: ${{ env.DEFAULT_UV_VERSION }}
           enable-cache: true
           python-version: ${{ steps.setup-python.outputs.python-version }}
-      - name: Install system dependencies
+      -
+        name: Install system dependencies
         run: |
           sudo apt-get update -qq
           sudo apt-get install -qq --no-install-recommends unpaper tesseract-ocr imagemagick ghostscript libzbar0 poppler-utils
-      - name: Configure ImageMagick
+      -
+        name: Configure ImageMagick
         run: |
           sudo cp docker/rootfs/etc/ImageMagick-6/paperless-policy.xml /etc/ImageMagick-6/policy.xml
-      - name: Install Python dependencies
+      -
+        name: Install Python dependencies
         run: |
           uv sync \
             --python ${{ steps.setup-python.outputs.python-version }} \
             --group testing \
             --frozen
-      - name: List installed Python dependencies
+      -
+        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
-      - 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 }}
@@ -179,55 +161,60 @@ jobs:
             --dev \
             --frozen \
             pytest
-      - name: Upload backend test results to Codecov
+      -
-        if: always()
+        name: Upload coverage
-        uses: codecov/codecov-action@v5
+        if: ${{ matrix.python-version == env.DEFAULT_PYTHON_VERSION }}
+        uses: actions/upload-artifact@v4
         with:
-          flags: backend-python-${{ matrix.python-version }}
+          name: backend-coverage-report
-          files: junit.xml
+          path: |
-          report_type: test_results
+            coverage.xml
-      - name: Upload backend coverage to Codecov
+            junit.xml
-        uses: codecov/codecov-action@v5
+          retention-days: 7
-        with:
+          if-no-files-found: error
-          flags: backend-python-${{ matrix.python-version }}
+      -
-          files: coverage.xml
+        name: Stop containers
-      - name: Stop containers
         if: always()
         run: |
           docker compose --file ${{ github.workspace }}/docker/compose/docker-compose.ci-test.yml logs
           docker compose --file ${{ github.workspace }}/docker/compose/docker-compose.ci-test.yml down
-  install-frontend-dependencies:
+
+  install-frontend-depedendencies:
     name: "Install Frontend Dependencies"
     runs-on: ubuntu-24.04
     needs:
       - pre-commit
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
-      - name: Install pnpm
+      -
-        uses: pnpm/action-setup@v4
+        name: Use Node.js 20
-        with:
+        uses: actions/setup-node@v4
-          version: 10
-      - name: Use Node.js 20
-        uses: actions/setup-node@v5
         with:
           node-version: 20.x
-          cache: 'pnpm'
+          cache: 'npm'
-          cache-dependency-path: 'src-ui/pnpm-lock.yaml'
+          cache-dependency-path: 'src-ui/package-lock.json'
       - name: Cache frontend dependencies
         id: cache-frontend-deps
         uses: actions/cache@v4
         with:
           path: |
-            ~/.pnpm-store
+            ~/.npm
             ~/.cache
-          key: ${{ runner.os }}-frontenddeps-${{ hashFiles('src-ui/pnpm-lock.yaml') }}
+          key: ${{ runner.os }}-frontenddeps-${{ hashFiles('src-ui/package-lock.json') }}
-      - name: Install dependencies
+      -
-        run: cd src-ui && pnpm install
+        name: Install dependencies
+        if: steps.cache-frontend-deps.outputs.cache-hit != 'true'
+        run: cd src-ui && npm ci
+      -
+        name: Install Playwright
+        if: steps.cache-frontend-deps.outputs.cache-hit != 'true'
+        run: cd src-ui && npx playwright install --with-deps
+
   tests-frontend:
-    name: "Frontend Unit Tests (Node ${{ matrix.node-version }} - ${{ matrix.shard-index }}/${{ matrix.shard-count }})"
+    name: "Frontend Tests (Node ${{ matrix.node-version }} - ${{ matrix.shard-index }}/${{ matrix.shard-count }})"
     runs-on: ubuntu-24.04
     needs:
-      - install-frontend-dependencies
+      - install-frontend-depedendencies
     strategy:
       fail-fast: false
       matrix:
@@ -235,136 +222,172 @@ jobs:
         shard-index: [1, 2, 3, 4]
         shard-count: [4]
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
-      - name: Install pnpm
+      -
-        uses: pnpm/action-setup@v4
+        name: Use Node.js 20
-        with:
+        uses: actions/setup-node@v4
-          version: 10
-      - name: Use Node.js 20
-        uses: actions/setup-node@v5
         with:
           node-version: 20.x
-          cache: 'pnpm'
+          cache: 'npm'
-          cache-dependency-path: 'src-ui/pnpm-lock.yaml'
+          cache-dependency-path: 'src-ui/package-lock.json'
       - name: Cache frontend dependencies
         id: cache-frontend-deps
         uses: actions/cache@v4
         with:
           path: |
-            ~/.pnpm-store
+            ~/.npm
-            ~/.cache
-          key: ${{ runner.os }}-frontenddeps-${{ hashFiles('src-ui/pnpm-lock.yaml') }}
-      - name: Re-link Angular cli
-        run: cd src-ui && pnpm link @angular/cli
-      - name: Linting checks
-        run: cd src-ui && pnpm run lint
-      - name: Run Jest unit tests
-        run: cd src-ui && pnpm run test --max-workers=2 --shard=${{ matrix.shard-index }}/${{ matrix.shard-count }}
-      - name: Upload frontend test results to Codecov
-        if: always()
-        uses: codecov/codecov-action@v5
-        with:
-          flags: frontend-node-${{ matrix.node-version }}
-          directory: src-ui/
-          report_type: test_results
-      - name: Upload frontend coverage to Codecov
-        uses: codecov/codecov-action@v5
-        with:
-          flags: frontend-node-${{ matrix.node-version }}
-          directory: src-ui/coverage/
-  tests-frontend-e2e:
-    name: "Frontend E2E Tests (Node ${{ matrix.node-version }} - ${{ matrix.shard-index }}/${{ matrix.shard-count }})"
-    runs-on: ubuntu-24.04
-    needs:
-      - install-frontend-dependencies
-    strategy:
-      fail-fast: false
-      matrix:
-        node-version: [20.x]
-        shard-index: [1, 2]
-        shard-count: [2]
-    steps:
-      - uses: actions/checkout@v5
-      - name: Install pnpm
-        uses: pnpm/action-setup@v4
-        with:
-          version: 10
-      - name: Use Node.js 20
-        uses: actions/setup-node@v5
-        with:
-          node-version: 20.x
-          cache: 'pnpm'
-          cache-dependency-path: 'src-ui/pnpm-lock.yaml'
-      - name: Cache frontend dependencies
-        id: cache-frontend-deps
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.pnpm-store
-            ~/.cache
-          key: ${{ runner.os }}-frontenddeps-${{ hashFiles('src-ui/pnpm-lock.yaml') }}
-      - name: Re-link Angular cli
-        run: cd src-ui && pnpm link @angular/cli
-      - name: Cache Playwright browsers
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/ms-playwright
-          key: ${{ runner.os }}-playwright-${{ hashFiles('src-ui/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-playwright-
-      - name: Install Playwright system dependencies
-        run: npx playwright install-deps
-      - name: Install dependencies
-        run: cd src-ui && pnpm install --no-frozen-lockfile
-      - name: Install Playwright
-        run: cd src-ui && pnpm exec playwright install
-      - name: Run Playwright e2e tests
-        run: cd src-ui && pnpm exec playwright test --shard ${{ matrix.shard-index }}/${{ matrix.shard-count }}
-  frontend-bundle-analysis:
-    name: "Frontend Bundle Analysis"
-    runs-on: ubuntu-24.04
-    needs:
-      - tests-frontend
-      - tests-frontend-e2e
-    steps:
-      - uses: actions/checkout@v5
-      - name: Install pnpm
-        uses: pnpm/action-setup@v4
-        with:
-          version: 10
-      - name: Use Node.js 20
-        uses: actions/setup-node@v5
-        with:
-          node-version: 20.x
-          cache: 'pnpm'
-          cache-dependency-path: 'src-ui/pnpm-lock.yaml'
-      - name: Cache frontend dependencies
-        id: cache-frontend-deps
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.pnpm-store
             ~/.cache
           key: ${{ runner.os }}-frontenddeps-${{ hashFiles('src-ui/package-lock.json') }}
       - name: Re-link Angular cli
-        run: cd src-ui && pnpm link @angular/cli
+        run: cd src-ui && npm link @angular/cli
-      - name: Build frontend and upload analysis
+      -
+        name: Linting checks
+        run: cd src-ui && npm run lint
+      -
+        name: Run Jest unit tests
+        env:
+          JEST_JUNIT_OUTPUT_FILE: junit-report-${{ matrix.shard-index }}.xml
+        run: cd src-ui && npm run test -- --max-workers=2 --shard=${{ matrix.shard-index }}/${{ matrix.shard-count }}
+      -
+        name: Upload Jest coverage
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: jest-coverage-report-${{ matrix.shard-index }}
+          path: |
+            src-ui/coverage/coverage-final.json
+            src-ui/coverage/lcov.info
+            src-ui/coverage/clover.xml
+          retention-days: 7
+          if-no-files-found: error
+      -
+        name: Run Playwright e2e tests
+        run: cd src-ui && npx playwright test --shard ${{ matrix.shard-index }}/${{ matrix.shard-count }}
+      -
+        name: Upload Playwright test results
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: playwright-report-${{ matrix.shard-index }}
+          path: src-ui/playwright-report
+          retention-days: 7
+      -
+        name: Upload frontend test results
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: junit-report-${{ matrix.shard-index }}
+          path: src-ui/junit-report-${{ matrix.shard-index }}.xml
+          retention-days: 7
+
+  tests-coverage-upload:
+    name: "Upload to Codecov"
+    runs-on: ubuntu-24.04
+    needs:
+      - tests-backend
+      - tests-frontend
+    steps:
+      -
+        uses: actions/checkout@v4
+      -
+        name: Download frontend jest coverage
+        uses: actions/download-artifact@v4
+        with:
+          path: src-ui/coverage/
+          pattern: jest-coverage-report-*
+      -
+        name: Download frontend playwright coverage
+        uses: actions/download-artifact@v4
+        with:
+          path: src-ui/coverage/
+          pattern: playwright-report-*
+          merge-multiple: true
+      -
+        name: Download frontend test results
+        uses: actions/download-artifact@v4
+        with:
+          path: src-ui/junit/
+          pattern: junit-report-*
+          merge-multiple: true
+      -
+        name: Upload frontend coverage to Codecov
+        uses: codecov/codecov-action@v5
+        with:
+          # not required for public repos, but intermittently fails otherwise
+          token: ${{ secrets.CODECOV_TOKEN }}
+          flags: frontend
+          directory: src-ui/coverage/
+          # dont include backend coverage files here
+          files: '!coverage.xml'
+      -
+        name: Upload frontend test results to Codecov
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@v1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          flags: frontend
+          directory: src-ui/junit/
+      -
+        name: Download backend coverage
+        uses: actions/download-artifact@v4
+        with:
+          name: backend-coverage-report
+          path: src/
+      -
+        name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v5
+        with:
+          # not required for public repos, but intermittently fails otherwise
+          token: ${{ secrets.CODECOV_TOKEN }}
+          # future expansion
+          flags: backend
+          directory: src/
+      -
+        name: Upload backend test results to Codecov
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@v1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          flags: backend
+          directory: src/
+      -
+        name: Use Node.js 20
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20.x
+          cache: 'npm'
+          cache-dependency-path: 'src-ui/package-lock.json'
+      -
+        name: Cache frontend dependencies
+        id: cache-frontend-deps
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.npm
+            ~/.cache
+          key: ${{ runner.os }}-frontenddeps-${{ hashFiles('src-ui/package-lock.json') }}
+      -
+        name: Re-link Angular cli
+        run: cd src-ui && npm link @angular/cli
+      -
+        name: Build frontend and upload analysis
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-        run: cd src-ui && pnpm run build --configuration=production
+        run: cd src-ui && ng build --configuration=production
+
   build-docker-image:
     name: Build Docker image for ${{ github.ref_name }}
     runs-on: ubuntu-24.04
-    if: github.event_name == 'push' && (startsWith(github.ref, 'refs/heads/feature-') || startsWith(github.ref, 'refs/heads/fix-') || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/beta' || contains(github.ref, 'beta.rc') || startsWith(github.ref, 'refs/tags/v') || startsWith(github.ref, 'refs/heads/l10n_'))
+    if: github.event_name == 'push' && (startsWith(github.ref, 'refs/heads/feature-') || startsWith(github.ref, 'refs/heads/fix-') || github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/beta' || contains(github.ref, 'beta.rc') || startsWith(github.ref, 'refs/tags/v'))
     concurrency:
       group: ${{ github.workflow }}-build-docker-image-${{ github.ref_name }}
       cancel-in-progress: true
     needs:
       - tests-backend
       - tests-frontend
-      - tests-frontend-e2e
     steps:
-      - name: Check pushing to Docker Hub
+      -
+        name: Check pushing to Docker Hub
         id: push-other-places
         # Only push to Dockerhub from the main repo AND the ref is either:
         #  main
@@ -380,13 +403,15 @@ jobs:
             echo "Not pushing to DockerHub"
             echo "enable=false" >> $GITHUB_OUTPUT
           fi
-      - name: Set ghcr repository name
+      -
+        name: Set ghcr repository name
         id: set-ghcr-repository
         run: |
           ghcr_name=$(echo "${{ github.repository }}" | awk '{ print tolower($0) }')
           echo "Name is ${ghcr_name}"
           echo "ghcr-repository=${ghcr_name}" >> $GITHUB_OUTPUT
-      - name: Gather Docker metadata
+      -
+        name: Gather Docker metadata
         id: docker-meta
         uses: docker/metadata-action@v5
         with:
@@ -401,31 +426,37 @@ jobs:
             # For a tag x.y.z or vX.Y.Z, output an x.y.z and x.y image tag
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
-      - name: Checkout
+      -
-        uses: actions/checkout@v5
+        name: Checkout
+        uses: actions/checkout@v4
       # If https://github.com/docker/buildx/issues/1044 is resolved,
       # the append input with a native arm64 arch could be used to
       # significantly speed up building
-      - name: Set up Docker Buildx
+      -
+        name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      - name: Set up QEMU
+      -
+        name: Set up QEMU
         uses: docker/setup-qemu-action@v3
         with:
           platforms: arm64
-      - name: Login to GitHub Container Registry
+      -
+        name: Login to GitHub Container Registry
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Login to Docker Hub
+      -
+        name: Login to Docker Hub
         uses: docker/login-action@v3
         # Don't attempt to login if not pushing to Docker Hub
         if: steps.push-other-places.outputs.enable == 'true'
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Login to Quay.io
+      -
+        name: Login to Quay.io
         uses: docker/login-action@v3
         # Don't attempt to login if not pushing to Quay.io
         if: steps.push-other-places.outputs.enable == 'true'
@@ -433,7 +464,8 @@ jobs:
           registry: quay.io
           username: ${{ secrets.QUAY_USERNAME }}
           password: ${{ secrets.QUAY_ROBOT_TOKEN }}
-      - name: Build and push
+      -
+        name: Build and push
         uses: docker/build-push-action@v6
         with:
           context: .
@@ -451,19 +483,23 @@ jobs:
             type=registry,ref=ghcr.io/${{ steps.set-ghcr-repository.outputs.ghcr-repository }}/builder/cache/app:dev
           cache-to: |
             type=registry,mode=max,ref=ghcr.io/${{ steps.set-ghcr-repository.outputs.ghcr-repository }}/builder/cache/app:${{ github.ref_name }}
-      - name: Inspect image
+      -
+        name: Inspect image
         run: |
           docker buildx imagetools inspect ${{ fromJSON(steps.docker-meta.outputs.json).tags[0] }}
-      - name: Export frontend artifact from docker
+      -
+        name: Export frontend artifact from docker
         run: |
           docker create --name frontend-extract ${{ fromJSON(steps.docker-meta.outputs.json).tags[0] }}
           docker cp frontend-extract:/usr/src/paperless/src/documents/static/frontend src/documents/static/frontend/
-      - name: Upload frontend artifact
+      -
+        name: Upload frontend artifact
         uses: actions/upload-artifact@v4
         with:
           name: frontend-compiled
           path: src/documents/static/frontend/
           retention-days: 7
+
   build-release:
     name: "Build Release"
     needs:
@@ -471,52 +507,63 @@ jobs:
       - documentation
     runs-on: ubuntu-24.04
     steps:
-      - name: Checkout
+      -
-        uses: actions/checkout@v5
+        name: Checkout
-      - name: Set up Python
+        uses: actions/checkout@v4
+      -
+        name: Set up Python
         id: setup-python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
-      - name: Install uv
+      -
-        uses: astral-sh/setup-uv@v6
+        name: Install uv
+        uses: astral-sh/setup-uv@v5
         with:
           version: ${{ env.DEFAULT_UV_VERSION }}
           enable-cache: true
           python-version: ${{ steps.setup-python.outputs.python-version }}
-      - name: Install Python dependencies
+      -
+        name: Install Python dependencies
         run: |
           uv sync --python ${{ steps.setup-python.outputs.python-version }} --dev --frozen
-      - name: Install system dependencies
+      -
+        name: Install system dependencies
         run: |
           sudo apt-get update -qq
           sudo apt-get install -qq --no-install-recommends gettext liblept5
-      - name: Download frontend artifact
+      -
-        uses: actions/download-artifact@v5
+        name: Download frontend artifact
+        uses: actions/download-artifact@v4
         with:
           name: frontend-compiled
           path: src/documents/static/frontend/
-      - name: Download documentation artifact
+      -
-        uses: actions/download-artifact@v5
+        name: Download documentation artifact
+        uses: actions/download-artifact@v4
         with:
           name: documentation
           path: docs/_build/html/
-      - name: Generate requirements file
+      -
+        name: Generate requirements file
         run: |
-          uv export --quiet --no-dev --all-extras --format requirements-txt --output-file requirements.txt
+           uv export --quiet --no-dev --all-extras --format requirements-txt --output-file requirements.txt
-      - name: Compile messages
+      -
+        name: Compile messages
         run: |
           cd src/
           uv run \
             --python ${{ steps.setup-python.outputs.python-version }} \
             manage.py compilemessages
-      - name: Collect static files
+      -
+        name: Collect static files
         run: |
           cd src/
           uv run \
             --python ${{ steps.setup-python.outputs.python-version }} \
             manage.py collectstatic --no-input
-      - name: Move files
+      -
+        name: Move files
         run: |
           echo "Making dist folders"
           for directory in dist \
@@ -535,7 +582,8 @@ jobs:
                           requirements.txt \
                           LICENSE \
                           README.md \
-                          paperless.conf.example
+                          paperless.conf.example \
+                          webserver.py
           do
             cp --verbose ${file_name} dist/paperless-ngx/
           done
@@ -553,18 +601,21 @@ jobs:
           cp --recursive docs/_build/html/ dist/paperless-ngx/docs
 
           mv --verbose static dist/paperless-ngx
-      - name: Make release package
+      -
+        name: Make release package
         run: |
           echo "Creating release archive"
           cd dist
           sudo chown -R 1000:1000 paperless-ngx/
           tar -cJf paperless-ngx.tar.xz paperless-ngx/
-      - name: Upload release artifact
+      -
+        name: Upload release artifact
         uses: actions/upload-artifact@v4
         with:
           name: release
           path: dist/paperless-ngx.tar.xz
           retention-days: 7
+
   publish-release:
     name: "Publish Release"
     runs-on: ubuntu-24.04
@@ -576,12 +627,14 @@ jobs:
       - build-release
     if: github.ref_type == 'tag' && (startsWith(github.ref_name, 'v') || contains(github.ref_name, '-beta.rc'))
     steps:
-      - name: Download release artifact
+      -
-        uses: actions/download-artifact@v5
+        name: Download release artifact
+        uses: actions/download-artifact@v4
         with:
           name: release
           path: ./
-      - name: Get version
+      -
+        name: Get version
         id: get_version
         run: |
           echo "version=${{ github.ref_name }}" >> $GITHUB_OUTPUT
@@ -590,7 +643,8 @@ jobs:
           else
             echo "prerelease=false" >> $GITHUB_OUTPUT
           fi
-      - name: Create Release and Changelog
+      -
+        name: Create Release and Changelog
         id: create-release
         uses: release-drafter/release-drafter@v6
         with:
@@ -601,7 +655,8 @@ jobs:
           publish: true # ensures release is not marked as draft
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Upload release archive
+      -
+        name: Upload release archive
         id: upload-release-asset
         uses: shogo82148/actions-upload-release-asset@v1
         with:
@@ -610,6 +665,7 @@ jobs:
           asset_path: ./paperless-ngx.tar.xz
           asset_name: paperless-ngx-${{ steps.get_version.outputs.version }}.tar.xz
           asset_content_type: application/x-xz
+
   append-changelog:
     name: "Append Changelog"
     runs-on: ubuntu-24.04
@@ -617,22 +673,26 @@ jobs:
       - publish-release
     if: needs.publish-release.outputs.prerelease == 'false'
     steps:
-      - name: Checkout
+      -
-        uses: actions/checkout@v5
+        name: Checkout
+        uses: actions/checkout@v4
         with:
           ref: main
-      - name: Set up Python
+      -
+        name: Set up Python
         id: setup-python
-        uses: actions/setup-python@v6
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
-      - name: Install uv
+      -
-        uses: astral-sh/setup-uv@v6
+        name: Install uv
+        uses: astral-sh/setup-uv@v5
         with:
           version: ${{ env.DEFAULT_UV_VERSION }}
           enable-cache: true
           python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
-      - name: Append Changelog to docs
+      -
+        name: Append Changelog to docs
         id: append-Changelog
         working-directory: docs
         run: |
@@ -654,8 +714,9 @@ jobs:
           git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
           git commit -am "Changelog ${{ needs.publish-release.outputs.version }} - GHA"
           git push origin ${{ needs.publish-release.outputs.version }}-changelog
-      - name: Create Pull Request
+      -
-        uses: actions/github-script@v8
+        name: Create Pull Request
+        uses: actions/github-script@v7
         with:
           script: |
             const { repo, owner } = context.repo;

.github/workflows/cleanup-tags.yml

@@ -4,14 +4,19 @@
 # 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:
-  workflow_dispatch:
+  delete:
-  schedule:
+  push:
-    - cron: '0 0 * * 0'
+    paths:
+      - ".github/workflows/cleanup-tags.yml"
+
 concurrency:
   group: registry-tags-cleanup
   cancel-in-progress: false
+
 jobs:
   cleanup-images:
     name: Cleanup Image Tags for ${{ matrix.primary-name }}
@@ -25,9 +30,10 @@ jobs:
       # Requires a personal access token with the OAuth scope delete:packages
       TOKEN: ${{ secrets.GHA_CONTAINER_DELETE_TOKEN }}
     steps:
-      - name: Clean temporary images
+      -
+        name: Clean temporary images
         if: "${{ env.TOKEN != '' }}"
-        uses: stumpylog/image-cleaner-action/ephemeral@v0.11.0
+        uses: stumpylog/image-cleaner-action/ephemeral@v0.10.0
         with:
           token: "${{ env.TOKEN }}"
           owner: "${{ github.repository_owner }}"
@@ -37,6 +43,7 @@ jobs:
           repo_name: "paperless-ngx"
           match_regex: "(feature|fix)"
           do_delete: "true"
+
   cleanup-untagged-images:
     name: Cleanup Untagged Images Tags for ${{ matrix.primary-name }}
     if: github.repository_owner == 'paperless-ngx'
@@ -51,9 +58,10 @@ jobs:
       # Requires a personal access token with the OAuth scope delete:packages
       TOKEN: ${{ secrets.GHA_CONTAINER_DELETE_TOKEN }}
     steps:
-      - name: Clean untagged images
+      -
+        name: Clean untagged images
         if: "${{ env.TOKEN != '' }}"
-        uses: stumpylog/image-cleaner-action/untagged@v0.11.0
+        uses: stumpylog/image-cleaner-action/untagged@v0.10.0
         with:
           token: "${{ env.TOKEN }}"
           owner: "${{ github.repository_owner }}"

.github/workflows/codeql-analysis.yml

@@ -10,14 +10,16 @@
 # supported CodeQL languages.
 #
 name: "CodeQL"
+
 on:
   push:
-    branches: [main, dev]
+    branches: [ main, dev ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [dev]
+    branches: [ dev ]
   schedule:
     - cron: '28 13 * * 5'
+
 jobs:
   analyze:
     name: Analyze
@@ -26,23 +28,27 @@ jobs:
       actions: read
       contents: read
       security-events: write
+
     strategy:
       fail-fast: false
       matrix:
-        language: ['javascript', 'python']
+        language: [ 'javascript', 'python' ]
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
         # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
     steps:
-      - name: Checkout repository
+    - name: Checkout repository
-        uses: actions/checkout@v5
+      uses: actions/checkout@v4
-      # Initializes the CodeQL tools for scanning.
+
-      - name: Initialize CodeQL
+    # Initializes the CodeQL tools for scanning.
-        uses: github/codeql-action/init@v3
+    - name: Initialize CodeQL
-        with:
+      uses: github/codeql-action/init@v3
-          languages: ${{ matrix.language }}
+      with:
-          # If you wish to specify custom queries, you can do so here or in a config file.
+        languages: ${{ matrix.language }}
-          # By default, queries listed here will override any specified in a config file.
+        # If you wish to specify custom queries, you can do so here or in a config file.
-          # Prefix the list here with "+" to use these queries and those in the config file.
+        # By default, queries listed here will override any specified in a config file.
-          # queries: ./path/to/local/query, your-org/your-repo/queries@main
+        # Prefix the list here with "+" to use these queries and those in the config file.
-      - name: Perform CodeQL Analysis
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
-        uses: github/codeql-action/analyze@v3
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3

.github/workflows/crowdin.yml

@@ -1,30 +1,35 @@
 name: Crowdin Action
+
 on:
   workflow_dispatch:
   schedule:
     - cron: '2 */12 * * *'
   push:
-    paths: ['src/locale/**', 'src-ui/messages.xlf', 'src-ui/src/locale/**']
+    paths: [
-    branches: [dev]
+      'src/locale/**',
+      'src-ui/messages.xlf',
+      'src-ui/src/locale/**'
+    ]
+    branches: [ dev ]
+
 jobs:
   synchronize-with-crowdin:
     name: Crowdin Sync
     if: github.repository_owner == 'paperless-ngx'
     runs-on: ubuntu-24.04
+
     steps:
-      - name: Checkout
+    - name: Checkout
-        uses: actions/checkout@v5
+      uses: actions/checkout@v4
-        with:
+    - name: crowdin action
-          token: ${{ secrets.PNGX_BOT_PAT }}
+      uses: crowdin/github-action@v2
-      - name: crowdin action
+      with:
-        uses: crowdin/github-action@v2
+        upload_translations: false
-        with:
+        download_translations: true
-          upload_translations: false
+        crowdin_branch_name: 'dev'
-          download_translations: true
+        localization_branch_name: l10n_dev
-          crowdin_branch_name: 'dev'
+        pull_request_labels: 'skip-changelog, translation'
-          localization_branch_name: l10n_dev
+      env:
-          pull_request_labels: 'skip-changelog, translation'
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        env:
+        CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
-          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
-          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

.github/workflows/pr-bot.yml

@@ -1,112 +0,0 @@
-name: PR Bot
-on:
-  pull_request_target:
-    types: [opened]
-permissions:
-  contents: read
-  pull-requests: write
-jobs:
-  pr-bot:
-    name: Automated PR Bot
-    runs-on: ubuntu-latest
-    steps:
-      - name: Label PR by file path or branch name
-        # see .github/labeler.yml for the labeler config
-        uses: actions/labeler@v6
-        with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-      - name: Label by size
-        uses: Gascon1/pr-size-labeler@v1.3.0
-        with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          xs_label: 'small-change'
-          xs_diff: '9'
-          s_label: 'non-trivial'
-          s_diff: '99999'
-          fail_if_xl: 'false'
-          excluded_files: /\.lock$/ /\.txt$/ ^src-ui/pnpm-lock\.yaml$ ^src-ui/messages\.xlf$ ^src/locale/en_US/LC_MESSAGES/django\.po$
-      - name: Label by PR title
-        uses: actions/github-script@v8
-        with:
-          script: |
-            const pr = context.payload.pull_request;
-            const title = pr.title.toLowerCase();
-            const labels = [];
-
-            if (/^(fix|bugfix)/i.test(title)) {
-              labels.push('bug');
-            } else if (/^feature/i.test(title)) {
-              labels.push('enhancement');
-            } else if (!/^(dependabot)/i.test(title) && !/^(chore)/i.test(title)) {
-              labels.push('enhancement'); // Default fallback
-            }
-
-            if (labels.length) {
-              await github.rest.issues.addLabels({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: pr.number,
-                labels,
-              });
-              core.info(`Added labels based on title: ${labels.join(', ')}`);
-            }
-      - name: Label bot-generated PRs
-        if: ${{ contains(github.actor, 'dependabot') || contains(github.actor, 'crowdin-bot') }}
-        uses: actions/github-script@v8
-        with:
-          script: |
-            const pr = context.payload.pull_request;
-            const user = pr.user.login.toLowerCase();
-            const labels = [];
-
-            if (user.includes('dependabot')) {
-              labels.push('dependencies');
-            }
-
-            if (user.includes('crowdin-bot')) {
-              labels.push('translation', 'skip-changelog');
-            }
-
-            if (labels.length) {
-              await github.rest.issues.addLabels({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: pr.number,
-                labels,
-              });
-            }
-      - name: Welcome comment
-        if: ${{ !contains(github.actor, 'bot') }}
-        uses: actions/github-script@v8
-        with:
-          script: |
-            const pr = context.payload.pull_request;
-            const user = pr.user.login;
-
-            const { data: members } = await github.rest.orgs.listMembers({
-              org: 'paperless-ngx',
-            });
-
-            const memberLogins = members.map(m => m.login.toLowerCase());
-            if (memberLogins.includes(user.toLowerCase())) {
-              core.info('Skipping comment: user is org member');
-              return;
-            }
-
-            const body =
-                "Hello @" + user + ",\n\n" +
-                "Thank you very much for submitting this PR to us!\n\n" +
-                "This is what will happen next:\n\n" +
-                "1. CI tests will run against your PR to ensure quality and consistency.\n" +
-                "2. Next, human contributors from paperless-ngx review your changes.\n" +
-                "3. Please address any issues that come up during the review as soon as you are able to.\n" +
-                "4. If accepted, your pull request will be merged into the `dev` branch and changes there will be tested further.\n" +
-                "5. Eventually, changes from you and other contributors will be merged into `main` and a new release will be made.\n\n" +
-                "You'll be hearing from us soon, and thank you again for contributing to our project.";
-
-            await github.rest.issues.createComment({
-              issue_number: pr.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body,
-            });

.github/workflows/project-actions.yml

@@ -1,4 +1,5 @@
 name: Project Automations
+
 on:
   pull_request_target: #_target allows access to secrets
     types:
@@ -7,8 +8,10 @@ on:
     branches:
       - main
       - dev
+
 permissions:
   contents: read
+
 jobs:
   pr_opened_or_reopened:
     name: pr_opened_or_reopened

.github/workflows/repo-maintenance.yml

@@ -1,37 +1,35 @@
 name: 'Repository Maintenance'
+
 on:
   schedule:
     - cron: '0 3 * * *'
   workflow_dispatch:
+
 permissions:
   issues: write
   pull-requests: write
   discussions: write
+
 concurrency:
   group: lock
+
 jobs:
   stale:
     name: 'Stale'
     if: github.repository_owner == 'paperless-ngx'
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/stale@v10
+      - uses: actions/stale@v9
         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-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'
+          stale-issue-message: >
-          close-pr-message: >
+            This issue has been automatically marked as stale because it has not had
-            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.
+            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.
   lock-threads:
     name: 'Lock Old Threads'
     if: github.repository_owner == 'paperless-ngx'
@@ -44,20 +42,26 @@ jobs:
           discussion-inactive-days: '30'
           log-output: true
           issue-comment: >
-            This issue has been automatically locked since there has not been any recent activity after it was closed. Please open a new discussion or issue for related concerns. See our [contributing guidelines](https://github.com/paperless-ngx/paperless-ngx/blob/dev/CONTRIBUTING.md#automatic-repository-maintenance) for more details.
+            This issue has been automatically locked since there
-
+            has not been any recent activity after it was closed.
+            Please open a new discussion or issue for related concerns.
+            See our [contributing guidelines](https://github.com/paperless-ngx/paperless-ngx/blob/dev/CONTRIBUTING.md#automatic-repository-maintenance) for more details.
           pr-comment: >
-            This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new discussion or issue for related concerns. See our [contributing guidelines](https://github.com/paperless-ngx/paperless-ngx/blob/dev/CONTRIBUTING.md#automatic-repository-maintenance) for more details.
+            This pull request has been automatically locked since there
-
+            has not been any recent activity after it was closed.
+            Please open a new discussion or issue for related concerns.
+            See our [contributing guidelines](https://github.com/paperless-ngx/paperless-ngx/blob/dev/CONTRIBUTING.md#automatic-repository-maintenance) for more details.
           discussion-comment: >
-            This discussion has been automatically locked since there has not been any recent activity after it was closed. Please open a new discussion for related concerns. See our [contributing guidelines](https://github.com/paperless-ngx/paperless-ngx/blob/dev/CONTRIBUTING.md#automatic-repository-maintenance) for more details.
+            This discussion has been automatically locked since there
-
+            has not been any recent activity after it was closed.
+            Please open a new discussion for related concerns.
+            See our [contributing guidelines](https://github.com/paperless-ngx/paperless-ngx/blob/dev/CONTRIBUTING.md#automatic-repository-maintenance) for more details.
   close-answered-discussions:
     name: 'Close Answered Discussions'
     if: github.repository_owner == 'paperless-ngx'
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/github-script@v8
+      - uses: actions/github-script@v7
         with:
           script: |
             function sleep(ms) {
@@ -114,7 +118,7 @@ jobs:
     if: github.repository_owner == 'paperless-ngx'
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/github-script@v8
+      - uses: actions/github-script@v7
         with:
           script: |
             function sleep(ms) {
@@ -206,7 +210,7 @@ jobs:
     if: github.repository_owner == 'paperless-ngx'
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/github-script@v8
+      - uses: actions/github-script@v7
         with:
           script: |
             function sleep(ms) {
@@ -241,7 +245,6 @@ jobs:
                 ) {
                   nodes {
                     id,
-                    createdAt,
                     number,
                     updatedAt,
                     upvoteCount,

.github/workflows/translate-strings.yml

@@ -1,69 +0,0 @@
-name: Generate Translation Strings
-on:
-  push:
-    branches:
-      - dev
-jobs:
-  generate-translate-strings:
-    name: Generate Translation Strings
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v5
-        with:
-          token: ${{ secrets.PNGX_BOT_PAT }}
-          ref: ${{ github.head_ref }}
-      - name: Set up Python
-        id: setup-python
-        uses: actions/setup-python@v6
-      - name: Install system dependencies
-        run: |
-          sudo apt-get update -qq
-          sudo apt-get install -qq --no-install-recommends gettext
-      - name: Install uv
-        uses: astral-sh/setup-uv@v6
-        with:
-          enable-cache: true
-      - name: Install backend python dependencies
-        run: |
-          uv sync \
-            --group dev \
-            --frozen
-      - name: Generate backend translation strings
-        run: cd src/ && uv run manage.py makemessages -l en_US -i "samples*"
-      - name: Install pnpm
-        uses: pnpm/action-setup@v4
-        with:
-          version: 10
-      - name: Use Node.js 20
-        uses: actions/setup-node@v5
-        with:
-          node-version: 20.x
-          cache: 'pnpm'
-          cache-dependency-path: 'src-ui/pnpm-lock.yaml'
-      - name: Cache frontend dependencies
-        id: cache-frontend-deps
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.pnpm-store
-            ~/.cache
-          key: ${{ runner.os }}-frontenddeps-${{ hashFiles('src-ui/pnpm-lock.yaml') }}
-      - name: Install frontend dependencies
-        if: steps.cache-frontend-deps.outputs.cache-hit != 'true'
-        run: cd src-ui && pnpm install
-      - name: Re-link Angular cli
-        run: cd src-ui && pnpm link @angular/cli
-      - name: Generate frontend translation strings
-        run: |
-          cd src-ui
-          pnpm run ng extract-i18n
-      - name: Commit changes
-        uses: stefanzweifel/git-auto-commit-action@v6
-        with:
-          file_pattern: 'src-ui/messages.xlf src/locale/en_US/LC_MESSAGES/django.po'
-          commit_message: "Auto translate strings"
-          commit_user_name: "GitHub Actions"
-          commit_author: "GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com>"

.gitignore

@@ -107,6 +107,3 @@ celerybeat-schedule*
 /.devcontainer/data/
 /.devcontainer/media/
 /.devcontainer/redisdata/
-
-# ignore pnpm package store folder created when setting up the devcontainer
-.pnpm-store/

.pre-commit-config.yaml

@@ -1,10 +1,11 @@
 # 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
-    rev: v6.0.0
+    rev: v5.0.0
     hooks:
       - id: check-docstring-first
       - id: check-json
@@ -18,7 +19,7 @@ repos:
         exclude_types:
           - svg
           - pofile
-        exclude: "(^LICENSE$|^src/documents/static/bootstrap.min.css$)"
+        exclude: "(^LICENSE$)"
       - id: mixed-line-ending
         args:
           - "--fix=lf"
@@ -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
-        additional_dependencies: [tomli]
+        exclude: "(^src-ui/src/locale/)|(^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.14.0
+    rev: v0.9.9
     hooks:
-      - id: ruff-check
+      - id: ruff
       - id: ruff-format
   - repo: https://github.com/tox-dev/pyproject-fmt
-    rev: "v2.11.0"
+    rev: "v2.5.1"
     hooks:
       - id: pyproject-fmt
   # Dockerfile hooks
   - repo: https://github.com/AleksaC/hadolint-py
-    rev: v2.14.0
+    rev: v2.12.0.3
     hooks:
       - id: hadolint
   # Shell script hooks
@@ -72,13 +73,6 @@ repos:
         args:
           - "--tab"
   - repo: https://github.com/shellcheck-py/shellcheck-py
-    rev: "v0.11.0.1"
+    rev: "v0.10.0.1"
     hooks:
       - id: shellcheck
-  - repo: https://github.com/google/yamlfmt
-    rev: v0.18.0
-    hooks:
-      - id: yamlfmt
-        exclude: "^src-ui/pnpm-lock.yaml"
-        types:
-          - yaml

.yamlfmt

@@ -1 +0,0 @@
-line_ending: lf

CONTRIBUTING.md

@@ -2,11 +2,9 @@
 
 If you feel like contributing to the project, please do! Bug fixes and improvements are always welcome.
 
-⚠️ Please note: Pull requests that implement a new feature or enhancement _should almost always target an existing feature request_ with evidence of community interest and discussion. This is in order to balance the work of implementing and maintaining new features / enhancements. Pull requests that are opened without meeting this requirement may not be merged.
-
 If you want to implement something big:
 
-- As above, please start with a discussion! Maybe something similar is already in development and we can make it happen together.
+- Please start a discussion about that in the issues! Maybe something similar is already in development and we can make it happen together.
 - When making additions to the project, consider if the majority of users will benefit from your change. If not, you're probably better of forking the project.
 - Also consider if your change will get in the way of other users. A good change is a change that enhances the experience of some users who want that change and does not affect users who do not care about the change.
 - Please see the [paperless-ngx merge process](#merging-prs) below.
@@ -39,8 +37,6 @@ Before you can run `pytest`, ensure to [properly set up your local environment](
 
 Once you have submitted a **P**ull **R**equest it will be reviewed, approved, and merged by one or more community members of any team. Automated code tests and formatting checks must be passed.
 
-Important: Pull requests that implement a new feature or enhancement _should almost always target an existing feature request_ with evidence of community interest and discussion. This is in order to balance the work of implementing and maintaining new features / enhancements. Instead of opening a PR which does not meet this requirement, please open a feature request instead, to gather feedback from both users and the project maintainers.
-
 ## Non-Trivial Requests
 
 PRs deemed `non-trivial` will go through a stricter review process before being merged into `dev`. This is to ensure code quality and complete functionality (free of side effects).
@@ -85,7 +81,7 @@ Some notes about translation:
 
 If a language has already been added, and you would like to contribute new translations or change existing translations, please read the "Translation" section in the README.md file for further details on that.
 
-If you would like the project to be translated to another language, first head over to https://crowdin.com/project/paperless-ngx to check if that language has already been enabled for translation.
+If you would like the project to be translated to another language, first head over to https://crwd.in/paperless-ngx to check if that language has already been enabled for translation.
 If not, please request the language to be added by creating an issue on GitHub. The issue should contain:
 
 - English name of the language (the localized name can be added on Crowdin).
@@ -113,12 +109,28 @@ Paperless-ngx is a community project. We do our best to delegate permission and
 
 ## Structure
 
-There are currently 2 members in paperless-ngx with complete administrative privileges to the repo:
+As of writing, there are 21 members in paperless-ngx. 4 of these people have complete administrative privileges to the repo:
 
 - [@shamoon](https://github.com/shamoon)
-- [@stumpylog](https://github.com/stumpylog)
+- [@bauerj](https://github.com/bauerj)
+- [@qcasey](https://github.com/qcasey)
+- [@FrankStrieter](https://github.com/FrankStrieter)
 
-There are other members who occasionally contribute but we are actively seeking more dedicated maintainers of the project. Please reach out if you are interested.
+There are 5 teams collaborating on specific tasks within paperless-ngx:
+
+- @paperless-ngx/backend (Python / django)
+- @paperless-ngx/frontend (JavaScript / Typescript)
+- @paperless-ngx/ci-cd (GitHub Actions / Deployment)
+- @paperless-ngx/issues (Issue triage)
+- @paperless-ngx/test (General testing for larger PRs)
+
+## Permissions
+
+All team members are notified when mentioned or assigned to a relevant issue or pull request. Additionally, each team has slightly different access to paperless-ngx:
+
+- The **test** team has no special permissions.
+- The **issues** team has `triage` access. This means they can organize issues and pull requests.
+- The **backend**, **frontend**, and **ci-cd** teams have `write` access. This means they can approve PRs and push code, containers, releases, and more.
 
 ## Joining
 
@@ -129,13 +141,13 @@ 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.
 - Discussions with a marked answer will be automatically closed.
 - Discussions in the 'General' or 'Support' categories will be closed after 180 days of inactivity.
-- Feature requests that do not meet the following thresholds will be closed: 180 days of inactivity with less than 80 "up-votes", < 5 "up-votes" after 180 days, < 20 "up-votes" after 1 year or < 40 "up-votes" at 2 years.
+- Feature requests that do not meet the following thresholds will be closed: 180 days of inactivity, < 5 "up-votes" after 180 days, < 20 "up-votes" after 1 year or < 80 "up-votes" at 2 years.
 
 In all cases, threads can be re-opened by project maintainers and, of course, users can always create a new discussion for related concerns.
 Finally, remember that all information remains searchable and 'closed' feature requests can still serve as inspiration for new features.

Dockerfile

@@ -4,24 +4,22 @@
 # Stage: compile-frontend
 # Purpose: Compiles the frontend
 # Notes:
-#  - Does PNPM stuff with Typescript and such
+#  - Does NPM stuff with Typescript and such
 FROM --platform=$BUILDPLATFORM docker.io/node:20-bookworm-slim AS compile-frontend
 
 COPY ./src-ui /src/src-ui
 
 WORKDIR /src/src-ui
 RUN set -eux \
-  && npm update -g pnpm \
+  && npm update npm -g \
-  && npm install -g corepack@latest \
+  && npm ci
-  && corepack enable \
-  && pnpm install
 
 ARG PNGX_TAG_VERSION=
 # Add the tag to the environment file if its a tagged dev build
 RUN set -eux && \
 case "${PNGX_TAG_VERSION}" in \
   dev|beta|fix*|feature*) \
-    sed -i -E "s/tag: '([a-z\.]+)'/tag: '${PNGX_TAG_VERSION}'/g" /src/src-ui/src/environments/environment.prod.ts \
+    sed -i -E "s/version: '([0-9\.]+)'/version: '\1 #${PNGX_TAG_VERSION}'/g" /src/src-ui/src/environments/environment.prod.ts \
     ;; \
 esac
 
@@ -32,7 +30,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.9.7-python3.12-bookworm-slim AS s6-overlay-base
+FROM ghcr.io/astral-sh/uv:0.6.3-python3.12-bookworm-slim AS s6-overlay-base
 
 WORKDIR /usr/src/s6
 
@@ -47,7 +45,7 @@ ENV \
 ARG TARGETARCH
 ARG TARGETVARIANT
 # Lock this version
-ARG S6_OVERLAY_VERSION=3.2.1.0
+ARG S6_OVERLAY_VERSION=3.2.0.2
 
 ARG S6_BUILD_TIME_PKGS="curl \
                         xz-utils"
@@ -192,6 +190,11 @@ RUN set -eux \
         && rm --force --verbose *.deb \
     && rm --recursive --force --verbose /var/lib/apt/lists/*
 
+# Copy webserver config
+# Changes very infrequently
+WORKDIR /usr/src/paperless/
+COPY --chown=1000:1000 webserver.py /usr/src/paperless/webserver.py
+
 WORKDIR /usr/src/paperless/src/
 
 # Python dependencies
@@ -239,7 +242,6 @@ COPY --from=compile-frontend --chown=1000:1000 /src/src/documents/static/fronten
 # add users, setup scripts
 # Mount the compiled frontend to expected location
 RUN set -eux \
-  && sed -i '1s|^#!/usr/bin/env python3|#!/command/with-contenv python3|' manage.py \
   && echo "Setting up user/group" \
     && addgroup --gid 1000 paperless \
     && useradd --uid 1000 --gid paperless --home-dir /usr/src/paperless paperless \
@@ -265,4 +267,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" ]

README.md

@@ -83,7 +83,7 @@ People interested in continuing the work on paperless-ngx are encouraged to reac
 
 ## Translation
 
-Paperless-ngx is available in many languages that are coordinated on Crowdin. If you want to help out by translating paperless-ngx into your language, please head over to https://crowdin.com/project/paperless-ngx, and thank you! More details can be found in [CONTRIBUTING.md](https://github.com/paperless-ngx/paperless-ngx/blob/main/CONTRIBUTING.md#translating-paperless-ngx).
+Paperless-ngx is available in many languages that are coordinated on Crowdin. If you want to help out by translating paperless-ngx into your language, please head over to https://crwd.in/paperless-ngx, and thank you! More details can be found in [CONTRIBUTING.md](https://github.com/paperless-ngx/paperless-ngx/blob/main/CONTRIBUTING.md#translating-paperless-ngx).
 
 ## Feature Requests
 

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

@@ -1,10 +1,11 @@
-# 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.24
+    image: docker.io/gotenberg/gotenberg:8.17
     hostname: gotenberg
     container_name: gotenberg
     network_mode: host

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

@@ -16,26 +16,29 @@
 # - Instead of SQLite (default), MariaDB is used as the database server.
 # - 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, PowerPoint and their LibreOffice counter-
+#   Office documents (Word, Excel, Power Point and their LibreOffice counter-
-#   parts).
+#   parts.
 #
 # To install and update paperless with this file, do the following:
 #
 # - Copy this file as 'docker-compose.yml' and the files 'docker-compose.env'
 #   and '.env' into a folder.
 # - Run 'docker compose pull'.
+# - Run 'docker compose run --rm webserver createsuperuser' to create a user.
 # - Run 'docker compose up -d'.
 #
 # For more extensive installation and update instructions, refer to the
 # documentation.
+
 services:
   broker:
-    image: docker.io/library/redis:8
+    image: docker.io/library/redis:7
     restart: unless-stopped
     volumes:
       - redisdata:/data
+
   db:
-    image: docker.io/library/mariadb:12
+    image: docker.io/library/mariadb:11
     restart: unless-stopped
     volumes:
       - dbdata:/var/lib/mysql
@@ -45,6 +48,7 @@ services:
       MARIADB_USER: paperless
       MARIADB_PASSWORD: paperless
       MARIADB_ROOT_PASSWORD: paperless
+
   webserver:
     image: ghcr.io/paperless-ngx/paperless-ngx:latest
     restart: unless-stopped
@@ -71,8 +75,9 @@ services:
       PAPERLESS_TIKA_ENABLED: 1
       PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000
       PAPERLESS_TIKA_ENDPOINT: http://tika:9998
+
   gotenberg:
-    image: docker.io/gotenberg/gotenberg:8.24
+    image: docker.io/gotenberg/gotenberg:8.17
     restart: unless-stopped
     # The gotenberg chromium route is used to convert .eml files. We do not
     # want to allow external content like tracking pixels or even javascript.
@@ -80,9 +85,11 @@ services:
       - "gotenberg"
       - "--chromium-disable-javascript=true"
       - "--chromium-allow-list=file:///tmp/.*"
+
   tika:
     image: docker.io/apache/tika:latest
     restart: unless-stopped
+
 volumes:
   data:
   media:

docker/compose/docker-compose.mariadb.yml

@@ -20,18 +20,21 @@
 # - Copy this file as 'docker-compose.yml' and the files 'docker-compose.env'
 #   and '.env' into a folder.
 # - Run 'docker compose pull'.
+# - Run 'docker compose run --rm webserver createsuperuser' to create a user.
 # - Run 'docker compose up -d'.
 #
 # For more extensive installation and update instructions, refer to the
 # documentation.
+
 services:
   broker:
-    image: docker.io/library/redis:8
+    image: docker.io/library/redis:7
     restart: unless-stopped
     volumes:
       - redisdata:/data
+
   db:
-    image: docker.io/library/mariadb:12
+    image: docker.io/library/mariadb:11
     restart: unless-stopped
     volumes:
       - dbdata:/var/lib/mysql
@@ -41,6 +44,7 @@ services:
       MARIADB_USER: paperless
       MARIADB_PASSWORD: paperless
       MARIADB_ROOT_PASSWORD: paperless
+
   webserver:
     image: ghcr.io/paperless-ngx/paperless-ngx:latest
     restart: unless-stopped
@@ -62,6 +66,7 @@ services:
       PAPERLESS_DBUSER: paperless # only needed if non-default username
       PAPERLESS_DBPASS: paperless # only needed if non-default password
       PAPERLESS_DBPORT: 3306
+
 volumes:
   data:
   media:

docker/compose/docker-compose.portainer.yml

@@ -22,24 +22,31 @@
 # - Upload 'docker-compose.env' by clicking on 'Load variables from .env file'
 # - Modify the environment variables as needed
 # - Click 'Deploy the stack' and wait for it to be deployed
+# - Open the list of containers, select paperless_webserver_1
+# - Click 'Console' and then 'Connect' to open the command line inside the container
+# - Run 'python3 manage.py createsuperuser' to create a user
+# - Exit the console
 #
 # For more extensive installation and update instructions, refer to the
 # documentation.
+
 services:
   broker:
-    image: docker.io/library/redis:8
+    image: docker.io/library/redis:7
     restart: unless-stopped
     volumes:
       - redisdata:/data
+
   db:
-    image: docker.io/library/postgres:18
+    image: docker.io/library/postgres:16
     restart: unless-stopped
     volumes:
-      - pgdata:/var/lib/postgresql
+      - pgdata:/var/lib/postgresql/data
     environment:
       POSTGRES_DB: paperless
       POSTGRES_USER: paperless
       POSTGRES_PASSWORD: paperless
+
   webserver:
     image: ghcr.io/paperless-ngx/paperless-ngx:latest
     restart: unless-stopped
@@ -58,6 +65,7 @@ services:
       PAPERLESS_DBHOST: db
     env_file:
       - stack.env
+
 volumes:
   data:
   media:

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

@@ -16,33 +16,37 @@
 # - Instead of SQLite (default), PostgreSQL is used as the database server.
 # - 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, PowerPoint and their LibreOffice counter-
+#   Office documents (Word, Excel, Power Point and their LibreOffice counter-
-#   parts).
+#   parts.
 #
 # To install and update paperless with this file, do the following:
 #
 # - Copy this file as 'docker-compose.yml' and the files 'docker-compose.env'
 #   and '.env' into a folder.
 # - Run 'docker compose pull'.
+# - Run 'docker compose run --rm webserver createsuperuser' to create a user.
 # - Run 'docker compose up -d'.
 #
 # For more extensive installation and update instructions, refer to the
 # documentation.
+
 services:
   broker:
-    image: docker.io/library/redis:8
+    image: docker.io/library/redis:7
     restart: unless-stopped
     volumes:
       - redisdata:/data
+
   db:
-    image: docker.io/library/postgres:18
+    image: docker.io/library/postgres:16
     restart: unless-stopped
     volumes:
-      - pgdata:/var/lib/postgresql
+      - pgdata:/var/lib/postgresql/data
     environment:
       POSTGRES_DB: paperless
       POSTGRES_USER: paperless
       POSTGRES_PASSWORD: paperless
+
   webserver:
     image: ghcr.io/paperless-ngx/paperless-ngx:latest
     restart: unless-stopped
@@ -65,18 +69,22 @@ services:
       PAPERLESS_TIKA_ENABLED: 1
       PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000
       PAPERLESS_TIKA_ENDPOINT: http://tika:9998
+
   gotenberg:
-    image: docker.io/gotenberg/gotenberg:8.24
+    image: docker.io/gotenberg/gotenberg:8.17
     restart: unless-stopped
+
     # The gotenberg chromium route is used to convert .eml files. We do not
     # want to allow external content like tracking pixels or even javascript.
     command:
       - "gotenberg"
       - "--chromium-disable-javascript=true"
       - "--chromium-allow-list=file:///tmp/.*"
+
   tika:
     image: docker.io/apache/tika:latest
     restart: unless-stopped
+
 volumes:
   data:
   media:

docker/compose/docker-compose.postgres.yml

@@ -20,25 +20,29 @@
 # - Copy this file as 'docker-compose.yml' and the files 'docker-compose.env'
 #   and '.env' into a folder.
 # - Run 'docker compose pull'.
+# - Run 'docker compose run --rm webserver createsuperuser' to create a user.
 # - Run 'docker compose up -d'.
 #
 # For more extensive installation and update instructions, refer to the
 # documentation.
+
 services:
   broker:
-    image: docker.io/library/redis:8
+    image: docker.io/library/redis:7
     restart: unless-stopped
     volumes:
       - redisdata:/data
+
   db:
-    image: docker.io/library/postgres:18
+    image: docker.io/library/postgres:16
     restart: unless-stopped
     volumes:
-      - pgdata:/var/lib/postgresql
+      - pgdata:/var/lib/postgresql/data
     environment:
       POSTGRES_DB: paperless
       POSTGRES_USER: paperless
       POSTGRES_PASSWORD: paperless
+
   webserver:
     image: ghcr.io/paperless-ngx/paperless-ngx:latest
     restart: unless-stopped
@@ -56,6 +60,7 @@ services:
     environment:
       PAPERLESS_REDIS: redis://broker:6379
       PAPERLESS_DBHOST: db
+
 volumes:
   data:
   media:

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

@@ -16,24 +16,27 @@
 #
 # - 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, PowerPoint and their LibreOffice counter-
+#   Office documents (Word, Excel, Power Point and their LibreOffice counter-
-#   parts).
+#   parts.
 #
 # To install and update paperless with this file, do the following:
 #
 # - Copy this file as 'docker-compose.yml' and the files 'docker-compose.env'
 #   and '.env' into a folder.
 # - Run 'docker compose pull'.
+# - Run 'docker compose run --rm webserver createsuperuser' to create a user.
 # - Run 'docker compose up -d'.
 #
 # For more extensive installation and update instructions, refer to the
 # documentation.
+
 services:
   broker:
-    image: docker.io/library/redis:8
+    image: docker.io/library/redis:7
     restart: unless-stopped
     volumes:
       - redisdata:/data
+
   webserver:
     image: ghcr.io/paperless-ngx/paperless-ngx:latest
     restart: unless-stopped
@@ -54,18 +57,22 @@ services:
       PAPERLESS_TIKA_ENABLED: 1
       PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000
       PAPERLESS_TIKA_ENDPOINT: http://tika:9998
+
   gotenberg:
-    image: docker.io/gotenberg/gotenberg:8.24
+    image: docker.io/gotenberg/gotenberg:8.17
     restart: unless-stopped
+
     # The gotenberg chromium route is used to convert .eml files. We do not
     # want to allow external content like tracking pixels or even javascript.
     command:
       - "gotenberg"
       - "--chromium-disable-javascript=true"
       - "--chromium-allow-list=file:///tmp/.*"
+
   tika:
     image: docker.io/apache/tika:latest
     restart: unless-stopped
+
 volumes:
   data:
   media:

docker/compose/docker-compose.sqlite.yml

@@ -17,16 +17,19 @@
 # - Copy this file as 'docker-compose.yml' and the files 'docker-compose.env'
 #   and '.env' into a folder.
 # - Run 'docker compose pull'.
+# - Run 'docker compose run --rm webserver createsuperuser' to create a user.
 # - Run 'docker compose up -d'.
 #
 # For more extensive installation and update instructions, refer to the
 # documentation.
+
 services:
   broker:
-    image: docker.io/library/redis:8
+    image: docker.io/library/redis:7
     restart: unless-stopped
     volumes:
       - redisdata:/data
+
   webserver:
     image: ghcr.io/paperless-ngx/paperless-ngx:latest
     restart: unless-stopped
@@ -42,6 +45,7 @@ services:
     env_file: docker-compose.env
     environment:
       PAPERLESS_REDIS: redis://broker:6379
+
 volumes:
   data:
   media:

docker/docker-entrypoint.sh

@@ -0,0 +1,179 @@
+#!/usr/bin/env bash
+
+set -e
+
+# Source: https://github.com/sameersbn/docker-gitlab/
+map_uidgid() {
+	local -r usermap_original_uid=$(id -u paperless)
+	local -r usermap_original_gid=$(id -g paperless)
+	local -r usermap_new_uid=${USERMAP_UID:-$usermap_original_uid}
+	local -r usermap_new_gid=${USERMAP_GID:-${usermap_original_gid:-$usermap_new_uid}}
+	if [[ ${usermap_new_uid} != "${usermap_original_uid}" || ${usermap_new_gid} != "${usermap_original_gid}" ]]; then
+		echo "Mapping UID and GID for paperless:paperless to $usermap_new_uid:$usermap_new_gid"
+		usermod --non-unique --uid "${usermap_new_uid}" paperless
+		groupmod --non-unique --gid "${usermap_new_gid}" paperless
+	fi
+}
+
+map_folders() {
+	# Export these so they can be used in docker-prepare.sh
+	export DATA_DIR="${PAPERLESS_DATA_DIR:-/usr/src/paperless/data}"
+	export MEDIA_ROOT_DIR="${PAPERLESS_MEDIA_ROOT:-/usr/src/paperless/media}"
+	export CONSUME_DIR="${PAPERLESS_CONSUMPTION_DIR:-/usr/src/paperless/consume}"
+}
+
+custom_container_init() {
+	# Mostly borrowed from the LinuxServer.io base image
+	# https://github.com/linuxserver/docker-baseimage-ubuntu/tree/bionic/root/etc/cont-init.d
+	local -r custom_script_dir="/custom-cont-init.d"
+	# Tamper checking.
+	# Don't run files which are owned by anyone except root
+	# Don't run files which are writeable by others
+	if [ -d "${custom_script_dir}" ]; then
+		if [ -n "$(/usr/bin/find "${custom_script_dir}" -maxdepth 1 ! -user root)" ]; then
+			echo "**** Potential tampering with custom scripts detected ****"
+			echo "**** The folder '${custom_script_dir}' must be owned by root ****"
+			return 0
+		fi
+		if [ -n "$(/usr/bin/find "${custom_script_dir}" -maxdepth 1 -perm -o+w)" ]; then
+			echo "**** The folder '${custom_script_dir}' or some of contents have write permissions for others, which is a security risk. ****"
+			echo "**** Please review the permissions and their contents to make sure they are owned by root, and can only be modified by root. ****"
+			return 0
+		fi
+
+		# Make sure custom init directory has files in it
+		if [ -n "$(/bin/ls --almost-all "${custom_script_dir}" 2>/dev/null)" ]; then
+			echo "[custom-init] files found in ${custom_script_dir} executing"
+			# Loop over files in the directory
+			for SCRIPT in "${custom_script_dir}"/*; do
+				NAME="$(basename "${SCRIPT}")"
+				if [ -f "${SCRIPT}" ]; then
+					echo "[custom-init] ${NAME}: executing..."
+					/bin/bash "${SCRIPT}"
+					echo "[custom-init] ${NAME}: exited $?"
+				elif [ ! -f "${SCRIPT}" ]; then
+					echo "[custom-init] ${NAME}: is not a file"
+				fi
+			done
+		else
+			echo "[custom-init] no custom files found exiting..."
+		fi
+
+	fi
+}
+
+initialize() {
+
+	# Setup environment from secrets before anything else
+	# Check for a version of this var with _FILE appended
+	# and convert the contents to the env var value
+	# Source it so export is persistent
+	# shellcheck disable=SC1091
+	source /sbin/env-from-file.sh
+
+	# Change the user and group IDs if needed
+	map_uidgid
+
+	# Check for overrides of certain folders
+	map_folders
+
+	local -r export_dir="/usr/src/paperless/export"
+
+	for dir in \
+		"${export_dir}" \
+		"${DATA_DIR}" "${DATA_DIR}/index" \
+		"${MEDIA_ROOT_DIR}" "${MEDIA_ROOT_DIR}/documents" "${MEDIA_ROOT_DIR}/documents/originals" "${MEDIA_ROOT_DIR}/documents/thumbnails" \
+		"${CONSUME_DIR}"; do
+		if [[ ! -d "${dir}" ]]; then
+			echo "Creating directory ${dir}"
+			mkdir --parents --verbose "${dir}"
+		fi
+	done
+
+	local -r tmp_dir="${PAPERLESS_SCRATCH_DIR:=/tmp/paperless}"
+	echo "Creating directory scratch directory ${tmp_dir}"
+	mkdir --parents --verbose "${tmp_dir}"
+
+	set +e
+	echo "Adjusting permissions of paperless files. This may take a while."
+	chown -R paperless:paperless "${tmp_dir}"
+	for dir in \
+		"${export_dir}" \
+		"${DATA_DIR}" \
+		"${MEDIA_ROOT_DIR}" \
+		"${CONSUME_DIR}"; do
+		find "${dir}" -not \( -user paperless -and -group paperless \) -exec chown --changes paperless:paperless {} +
+	done
+	set -e
+
+	"${gosu_cmd[@]}" /sbin/docker-prepare.sh
+
+	# Leave this last thing
+	custom_container_init
+
+}
+
+install_languages() {
+	echo "Installing languages..."
+
+	read -ra langs <<<"$1"
+
+	# Check that it is not empty
+	if [ ${#langs[@]} -eq 0 ]; then
+		return
+	fi
+
+	# Build list of packages to install
+	to_install=()
+	for lang in "${langs[@]}"; do
+		pkg="tesseract-ocr-$lang"
+
+		if dpkg --status "$pkg" &>/dev/null; then
+			echo "Package $pkg already installed!"
+			continue
+		else
+			to_install+=("$pkg")
+		fi
+	done
+
+	# Use apt only when we install packages
+	if [ ${#to_install[@]} -gt 0 ]; then
+		apt-get update
+
+		for pkg in "${to_install[@]}"; do
+
+			if ! apt-cache show "$pkg" &>/dev/null; then
+				echo "Skipped $pkg: Package not found! :("
+				continue
+			fi
+
+			echo "Installing package $pkg..."
+			if ! apt-get --assume-yes install "$pkg" &>/dev/null; then
+				echo "Could not install $pkg"
+				exit 1
+			fi
+		done
+	fi
+}
+
+echo "Paperless-ngx docker container starting..."
+
+gosu_cmd=(gosu paperless)
+if [ "$(id --user)" == "$(id --user paperless)" ]; then
+	gosu_cmd=()
+fi
+
+# Install additional languages if specified
+if [[ -n "$PAPERLESS_OCR_LANGUAGES" ]]; then
+	install_languages "$PAPERLESS_OCR_LANGUAGES"
+fi
+
+initialize
+
+if [[ "$1" != "/"* ]]; then
+	echo Executing management command "$@"
+	exec "${gosu_cmd[@]}" python3 manage.py "$@"
+else
+	echo Executing "$@"
+	exec "$@"
+fi

docker/install_management_commands.sh

@@ -18,10 +18,9 @@ for command in decrypt_documents \
 	document_fuzzy_match \
 	manage_superuser \
 	convert_mariadb_uuid \
-	prune_audit_logs \
+	prune_audit_logs;
-	createsuperuser;
 do
 	echo "installing $command..."
 	sed "s/management_command/$command/g" management_script.sh >"$PWD/rootfs/usr/local/bin/$command"
-	chmod u=rwx,g=rwx,o=rx "$PWD/rootfs/usr/local/bin/$command"
+	chmod +x "$PWD/rootfs/usr/local/bin/$command"
 done

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

@@ -9,7 +9,7 @@ if find /run/s6/container_environment/*"_FILE" -maxdepth 1 > /dev/null 2>&1; the
 	for FILENAME in /run/s6/container_environment/*; do
 		if [[ "${FILENAME##*/}" == PAPERLESS_*_FILE ]]; then
 			# This should have been named different..
-			if [[ "${FILENAME##*/}" == "PAPERLESS_OCR_SKIP_ARCHIVE_FILE" || "${FILENAME##*/}" == "PAPERLESS_MODEL_FILE" ]]; then
+			if [[ ${FILENAME} == "PAPERLESS_OCR_SKIP_ARCHIVE_FILE" || ${FILENAME} == "PAPERLESS_MODEL_FILE" ]]; then
 				continue
 			fi
 			SECRETFILE=$(cat "${FILENAME}")
@@ -17,9 +17,6 @@ if find /run/s6/container_environment/*"_FILE" -maxdepth 1 > /dev/null 2>&1; the
 			if [[ -f ${SECRETFILE} ]]; then
 				# Trim off trailing _FILE
 				FILESTRIP=${FILENAME//_FILE/}
-				if [[ $(tail -n1 "${SECRETFILE}" | wc -l) != 0 ]]; then
-					echo "${log_prefix} Your secret: ${FILENAME##*/} contains a trailing newline and may not work as expected"
-				fi
 				# Set environment variable
 				cat "${SECRETFILE}" > "${FILESTRIP}"
 				echo "${log_prefix} ${FILESTRIP##*/} set from ${FILENAME##*/}"

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

@@ -9,57 +9,25 @@ declare -r media_root_dir="${PAPERLESS_MEDIA_ROOT:-/usr/src/paperless/media}"
 declare -r consume_dir="${PAPERLESS_CONSUMPTION_DIR:-/usr/src/paperless/consume}"
 declare -r tmp_dir="${PAPERLESS_SCRATCH_DIR:=/tmp/paperless}"
 
-declare -r main_dirs=(
+echo "${log_prefix} Checking for folder existence"
-	"${export_dir}"
-	"${data_dir}"
-	"${media_root_dir}"
-	"${consume_dir}"
-	"${tmp_dir}"
-)
 
-declare -r extra_dirs=(
+for dir in \
-	"${main_dirs[@]}"
+	"${export_dir}" \
-	"${data_dir}/index"
+	"${data_dir}" "${data_dir}/index" \
-	"${media_root_dir}/documents"
+	"${media_root_dir}" "${media_root_dir}/documents" "${media_root_dir}/documents/originals" "${media_root_dir}/documents/thumbnails" \
-	"${media_root_dir}/documents/originals"
+	"${consume_dir}" \
-	"${media_root_dir}/documents/thumbnails"
+	"${tmp_dir}"; do
-)
+	if [[ ! -d "${dir}" ]]; then
+		mkdir --parents --verbose "${dir}"
+	fi
+done
 
-if [[ -n "${USER_IS_NON_ROOT}" ]]; then
+echo "${log_prefix} Adjusting file and folder permissions"
-	# Non-root mode: Create directories as current user, warn about permission issues
+for dir in \
-	echo "${log_prefix} Running in non-root mode, checking directories"
+	"${export_dir}" \
-	current_uid=$(id --user)
+	"${data_dir}" \
-	current_gid=$(id --group)
+	"${media_root_dir}" \
-
+	"${consume_dir}" \
-	for dir in "${extra_dirs[@]}"; do
+	"${tmp_dir}"; do
-		if [[ ! -d "${dir}" ]]; then
+	find "${dir}" -not \( -user paperless -and -group paperless \) -exec chown --changes paperless:paperless {} +
-			mkdir --parents --verbose "${dir}" || echo "${log_prefix} WARNING: Could not create ${dir} - permission denied"
+done
-		fi
-		# Check permissions on existing directories too
-		if [[ -d "${dir}" && ! -w "${dir}" ]]; then
-			echo "${log_prefix} WARNING: No write permission to ${dir}"
-		fi
-	done
-
-	# Warn about ownership issues
-	for dir in "${main_dirs[@]}"; do
-		if [[ -d "${dir}" ]]; then
-			find "${dir}" -not \( -user ${current_uid} -and -group ${current_gid} \) -exec echo "${log_prefix} WARNING: Permission issue on {}: not owned by current user (${current_uid}:${current_gid})" \; 2>/dev/null || echo "${log_prefix} WARNING: Cannot check permissions on ${dir}"
-		fi
-	done
-else
-	# Root mode: Create and fix permissions as needed
-	echo "${log_prefix} Running with root privileges, adjusting directories and permissions"
-
-	# First create directories
-	for dir in "${extra_dirs[@]}"; do
-		if [[ ! -d "${dir}" ]]; then
-			mkdir --parents --verbose "${dir}"
-		fi
-	done
-
-	# Then fix permissions on all directories
-	for dir in "${main_dirs[@]}"; do
-		find "${dir}" -not \( -user paperless -and -group paperless \) -exec chown --changes paperless:paperless {} +
-	done
-fi

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

@@ -1,18 +1,20 @@
 #!/command/with-contenv /usr/bin/bash
 # shellcheck shell=bash
 declare -r log_prefix="[init-migrations]"
-
 declare -r data_dir="${PAPERLESS_DATA_DIR:-/usr/src/paperless/data}"
 
-echo "${log_prefix} Apply database migrations..."
+(
+	# flock is in place to prevent multiple containers from doing migrations
+	# simultaneously. This also ensures that the db is ready when the command
+	# of the current container starts.
+	flock 200
+	echo "${log_prefix} Apply database migrations..."
+	cd "${PAPERLESS_SRC_DIR}"
 
-cd "${PAPERLESS_SRC_DIR}"
+	if [[ -n "${USER_IS_NON_ROOT}" ]]; then
+		exec python3 manage.py migrate --skip-checks --no-input
+	else
+		exec s6-setuidgid paperless python3 manage.py migrate --skip-checks --no-input
+	fi
 
-# The whole migrate, with flock, needs to run as the right user
+) 200>"${data_dir}/migration_lock"
-if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-	exec s6-setlock -n "${data_dir}/migration_lock" python3 manage.py migrate --skip-checks --no-input
-else
-	exec s6-setuidgid paperless \
-		s6-setlock -n "${data_dir}/migration_lock" \
-		python3 manage.py migrate --skip-checks --no-input
-fi

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

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

docker/rootfs/etc/s6-overlay/s6-rc.d/svc-webserver/run

@@ -3,18 +3,8 @@
 
 cd ${PAPERLESS_SRC_DIR}
 
-# Translate between things, preferring GRANIAN_
-export GRANIAN_HOST=${GRANIAN_HOST:-${PAPERLESS_BIND_ADDR:-"::"}}
-export GRANIAN_PORT=${GRANIAN_PORT:-${PAPERLESS_PORT:-8000}}
-export GRANIAN_WORKERS=${GRANIAN_WORKERS:-${PAPERLESS_WEBSERVER_WORKERS:-1}}
-
-# Only set GRANIAN_URL_PATH_PREFIX if PAPERLESS_FORCE_SCRIPT_NAME is set
-if [[ -n "${PAPERLESS_FORCE_SCRIPT_NAME}" ]]; then
-  export GRANIAN_URL_PATH_PREFIX=${PAPERLESS_FORCE_SCRIPT_NAME}
-fi
-
 if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-  exec granian --interface asginl --ws --loop uvloop "paperless.asgi:application"
+	exec python3 /usr/src/paperless/webserver.py
 else
-  exec s6-setuidgid paperless granian --interface asginl --ws --loop uvloop "paperless.asgi:application"
+	exec s6-setuidgid paperless python3 /usr/src/paperless/webserver.py
 fi

docker/rootfs/usr/local/bin/createsuperuser

@@ -1,14 +0,0 @@
-#!/command/with-contenv /usr/bin/bash
-# shellcheck shell=bash
-
-set -e
-
-cd "${PAPERLESS_SRC_DIR}"
-
-if [[ $(id -u) == 0 ]]; then
-	s6-setuidgid paperless python3 manage.py createsuperuser "$@"
-elif [[ $(id -un) == "paperless" ]]; then
-	python3 manage.py createsuperuser "$@"
-else
-	echo "Unknown user."
-fi

docs/administration.md

@@ -179,14 +179,10 @@ following:
 
 ### Database Upgrades
 
-Paperless-ngx is compatible with Django-supported versions 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 14.
-
 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/)
@@ -310,7 +306,7 @@ in dedicated folders according to their nature: `archive`, `originals`,
 If `-sm` or `--split-manifest` is provided, information about document
 will be placed in individual json files, instead of a single JSON file. The main
 manifest.json will still contain application wide information (e.g. tags, correspondent,
-document type, etc)
+documenttype, etc)
 
 If `-z` or `--zip` is provided, the export will be a zip file
 in the target directory, named according to the current local date or the
@@ -337,7 +333,7 @@ must be provided to import. If this value is lost, the export cannot be imported
 The document importer takes the export produced by the [Document
 exporter](#exporter) and imports it into paperless.
 
-The importer works just like the exporter. You point it at a directory or the generated .zip file,
+The importer works just like the exporter. You point it at a directory,
 and the script does the rest of the work:
 
 ```shell
@@ -355,6 +351,9 @@ When you use the provided docker compose script, put the export inside
 the `export` folder in your paperless source directory. Specify
 `../export` as the `source`.
 
+Note that .zip files (as can be generated from the exporter) are not supported. You must unzip them into
+the target directory first.
+
 !!! note
 
     Importing from a previous version of Paperless may work, but for best
@@ -461,22 +460,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:
-
-```
-python3 manage.py 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
@@ -582,15 +565,19 @@ document.
 
 ### Managing encryption {#encryption}
 
+Documents can be stored in Paperless using GnuPG encryption.
+
 !!! warning
 
-    Encryption was removed in [paperless-ng 0.9](changelog.md#paperless-ng-090)
+    Encryption is deprecated since [paperless-ng 0.9](changelog.md#paperless-ng-090) and doesn't really
-    because it did not really provide any additional security, the passphrase
+    provide any additional security, since you have to store the passphrase
-    was stored in a configuration file on the same system as the documents.
+    in a configuration file on the same system as the encrypted documents
-    Furthermore, the entire text content of the documents is stored plain in
+    for paperless to work. Furthermore, the entire text content of the
-    the database, even if your documents are encrypted. Filenames are not
+    documents is stored plain in the database, even if your documents are
-    encrypted as well. Finally, the web server provides transparent access to
+    encrypted. Filenames are not encrypted as well.
-    your encrypted documents.
+
+    Also, the web server provides transparent access to your encrypted
+    documents.
 
     Consider running paperless on an encrypted filesystem instead, which
     will then at least provide security against physical hardware theft.
@@ -646,11 +633,3 @@ entries created prior to this are not removed. This command allows you to prune
 ```shell
 prune_audit_logs
 ```
-
-### Create superuser {#create-superuser}
-
-If you need to create a superuser, use the following command:
-
-```shell
-createsuperuser
-```

docs/advanced_usage.md

@@ -179,7 +179,6 @@ variables:
 | ---------------------------- | ---------------------------------------------- |
 | `DOCUMENT_ID`                | Database primary key of the document           |
 | `DOCUMENT_FILE_NAME`         | Formatted filename, not including paths        |
-| `DOCUMENT_TYPE`              | The document type (if any)                     |
 | `DOCUMENT_CREATED`           | Date & time when document created              |
 | `DOCUMENT_MODIFIED`          | Date & time when document was last modified    |
 | `DOCUMENT_ADDED`             | Date & time when document was added            |
@@ -434,134 +433,6 @@ provided. The template is provided as a string, potentially multiline, and rende
 In addition, the entire Document instance is available to be utilized in a more advanced way, as well as some variables which only make sense to be accessed
 with more complex logic.
 
-#### Custom Jinja2 Filters
-
-##### Custom Field Access
-
-The `get_cf_value` filter retrieves a value from custom field data with optional default fallback.
-
-###### Syntax
-
-```jinja2
-{{ custom_fields | get_cf_value('field_name') }}
-{{ custom_fields | get_cf_value('field_name', 'default_value') }}
-```
-
-###### Parameters
-
--   `custom_fields`: This _must_ be the provided custom field data
--   `name` (str): Name of the custom field to retrieve
--   `default` (str, optional): Default value to return if field is not found or has no value
-
-###### Returns
-
--   `str | None`: The field value, default value, or `None` if neither exists
-
-###### Examples
-
-```jinja2
-<!-- Basic usage -->
-{{ custom_fields | get_cf_value('department') }}
-
-<!-- With default value -->
-{{ custom_fields | get_cf_value('phone', 'Not provided') }}
-```
-
-##### Datetime Formatting
-
-The `datetime` filter formats a datetime string or datetime object using Python's strftime formatting.
-
-###### Syntax
-
-```jinja2
-{{ datetime_value | datetime('%Y-%m-%d %H:%M:%S') }}
-```
-
-###### Parameters
-
--   `value` (str | datetime): Date/time value to format (strings will be parsed automatically)
--   `format` (str): Python strftime format string
-
-###### Returns
-
--   `str`: Formatted datetime string
-
-###### Examples
-
-```jinja2
-<!-- Format datetime object -->
-{{ created | datetime('%B %d, %Y at %I:%M %p') }}
-<!-- Output: "January 15, 2024 at 02:30 PM" -->
-
-<!-- Custom formatting -->
-{{ custom_fields | get_cf_value('Date Field') | datetime('%A, %B %d, %Y') }}
-<!-- Output: "Monday, January 15, 2024" -->
-```
-
-See the [strftime format code documentation](https://docs.python.org/3.13/library/datetime.html#strftime-and-strptime-format-codes)
-for the possible codes and their meanings.
-
-##### Date Localization
-
-The `localize_date` filter formats a date or datetime object into a localized string using Babel internationalization.
-This takes into account the provided locale for translation. Since this must be used on a date or datetime object,
-you must access the field directly, i.e. `document.created`.
-An ISO string can also be provided to control the output format.
-
-###### Syntax
-
-```jinja2
-{{ date_value | localize_date('medium', 'en_US') }}
-{{ datetime_value | localize_date('short', 'fr_FR') }}
-```
-
-###### Parameters
-
--   `value` (date | datetime | str): Date, datetime object or ISO string to format (datetime should be timezone-aware)
--   `format` (str): Format type - either a Babel preset ('short', 'medium', 'long', 'full') or custom pattern
--   `locale` (str): Locale code for localization (e.g., 'en_US', 'fr_FR', 'de_DE')
-
-###### Returns
-
--   `str`: Localized, formatted date string
-
-###### Examples
-
-```jinja2
-<!-- Preset formats -->
-{{ document.created | localize_date('short', 'en_US') }}
-<!-- Output: "1/15/24" -->
-
-{{ document.created | localize_date('medium', 'en_US') }}
-<!-- Output: "Jan 15, 2024" -->
-
-{{ document.created | localize_date('long', 'en_US') }}
-<!-- Output: "January 15, 2024" -->
-
-{{ document.created | localize_date('full', 'en_US') }}
-<!-- Output: "Monday, January 15, 2024" -->
-
-<!-- Different locales -->
-{{ document.created | localize_date('medium', 'fr_FR') }}
-<!-- Output: "15 janv. 2024" -->
-
-{{ document.created | localize_date('medium', 'de_DE') }}
-<!-- Output: "15.01.2024" -->
-
-<!-- Custom patterns -->
-{{ document.created | localize_date('dd/MM/yyyy', 'en_GB') }}
-<!-- Output: "15/01/2024" -->
-```
-
-See the [supported format codes](https://unicode.org/reports/tr35/tr35-dates.html#Date_Format_Patterns) for more options.
-
-### Format Presets
-
--   **short**: Abbreviated format (e.g., "1/15/24")
--   **medium**: Medium-length format (e.g., "Jan 15, 2024")
--   **long**: Long format with full month name (e.g., "January 15, 2024")
--   **full**: Full format including day of week (e.g., "Monday, January 15, 2024")
-
 #### Additional Variables
 
 -   `{{ tag_name_list }}`: A list of tag names applied to the document, ordered by the tag name. Note this is a list, not a single string

docs/api.md

@@ -132,7 +132,7 @@ use cases:
 
 5. Documents with a custom field "address" (text) that is empty:
 
-    `?custom_field_query=["OR", [["address", "isnull", true], ["address", "exact", ""]]]`
+    `?custom_field_query=["OR", ["address", "isnull", true], ["address", "exact", ""]]`
 
 6. Documents that don't have a field called "foo":
 
@@ -192,8 +192,8 @@ The endpoint supports the following optional form fields:
 -   `tags`: Similar to correspondent. Specify this multiple times to
     have multiple tags added to the document.
 -   `archive_serial_number`: An optional archive serial number to set.
--   `custom_fields`: Either an array of custom field ids to assign (with an empty
+-   `custom_fields`: An array of custom field ids to assign (with an empty
-    value) to the document or an object mapping field id -> value.
+    value) to the document.
 
 The endpoint will immediately return HTTP 200 if the document consumption
 process was started successfully, with the UUID of the consumption task
@@ -270,7 +270,7 @@ The following methods are supported:
 -   `remove_tag`
     -   Requires `parameters`: `{ "tag": TAG_ID }`
 -   `modify_tags`
-    -   Requires `parameters`: `{ "add_tags": [LIST_OF_TAG_IDS] }` and `{ "remove_tags": [LIST_OF_TAG_IDS] }`
+    -   Requires `parameters`: `{ "add_tags": [LIST_OF_TAG_IDS] }` and / or `{ "remove_tags": [LIST_OF_TAG_IDS] }`
 -   `delete`
     -   No `parameters` required
 -   `reprocess`
@@ -282,18 +282,6 @@ The following methods are supported:
         -   `"merge": true or false` (defaults to false)
     -   The `merge` flag determines if the supplied permissions will overwrite all existing permissions (including
         removing them) or be merged with existing permissions.
--   `edit_pdf`
-    -   Requires `parameters`:
-        -   `"doc_ids": [DOCUMENT_ID]` A list of a single document ID to edit.
-        -   `"operations": [OPERATION, ...]` A list of operations to perform on the documents. Each operation is a dictionary
-            with the following keys:
-            -   `"page": PAGE_NUMBER` The page number to edit (1-based).
-            -   `"rotate": DEGREES` Optional rotation in degrees (90, 180, 270).
-            -   `"doc": OUTPUT_DOCUMENT_INDEX` Optional index of the output document for split operations.
-    -   Optional `parameters`:
-        -   `"delete_original": true` to delete the original documents after editing.
-        -   `"update_document": true` to update the existing document with the edited PDF.
-        -   `"include_metadata": true` to copy metadata from the original document to the edited document.
 -   `merge`
     -   No additional `parameters` required.
     -   The ordering of the merged document is determined by the list of IDs.
@@ -425,14 +413,3 @@ Initial API version.
     list of strings. When creating or updating a custom field value of a
     document for a select type custom field, the value should be the `id` of
     the option whereas previously was the index of the option.
-
-#### Version 8
-
--   The user field of document notes now returns a simplified user object
-    rather than just the user ID.
-
-#### Version 9
-
--   The document `created` field is now a date, not a datetime. The
-    `created_date` field is considered deprecated and will be removed in a
-    future version.

docs/configuration.md

@@ -50,48 +50,47 @@ matcher.
 
 ### Database
 
-By default, Paperless uses **SQLite** with a database stored at `data/db.sqlite3`.
-To switch to **PostgreSQL** or **MariaDB**, set [`PAPERLESS_DBHOST`](#PAPERLESS_DBHOST) and optionally configure other
-database-related environment variables.
-
-#### [`PAPERLESS_DBHOST=<hostname>`](#PAPERLESS_DBHOST) {#PAPERLESS_DBHOST}
-
-: If unset, Paperless uses **SQLite** by default.
-
-    Set `PAPERLESS_DBHOST` to switch to PostgreSQL or MariaDB instead.
-
 #### [`PAPERLESS_DBENGINE=<engine_name>`](#PAPERLESS_DBENGINE) {#PAPERLESS_DBENGINE}
 
-: Optional. Specifies the database engine to use when connecting to a remote database.
+: Optional, gives the ability to choose Postgres or MariaDB for
-Available options are `postgresql` and `mariadb`.
+database engine. Available options are `postgresql` and
+`mariadb`.
 
-    Defaults to `postgresql` if `PAPERLESS_DBHOST` is set.
+    Default is `postgresql`.
 
     !!! warning
 
         Using MariaDB comes with some caveats. See [MySQL Caveats](advanced_usage.md#mysql-caveats).
 
+#### [`PAPERLESS_DBHOST=<hostname>`](#PAPERLESS_DBHOST) {#PAPERLESS_DBHOST}
+
+: By default, sqlite is used as the database backend. This can be
+changed here.
+
+    Set PAPERLESS_DBHOST and another database will be used instead of
+    sqlite.
+
 #### [`PAPERLESS_DBPORT=<port>`](#PAPERLESS_DBPORT) {#PAPERLESS_DBPORT}
 
-: Port to use when connecting to PostgreSQL or MariaDB.
+: Adjust port if necessary.
 
-    Default is `5432` for PostgreSQL and `3306` for MariaDB.
+    Default is 5432.
 
 #### [`PAPERLESS_DBNAME=<name>`](#PAPERLESS_DBNAME) {#PAPERLESS_DBNAME}
 
-: Name of the database to connect to when using PostgreSQL or MariaDB.
+: Database name in PostgreSQL or MariaDB.
 
     Defaults to "paperless".
 
 #### [`PAPERLESS_DBUSER=<name>`](#PAPERLESS_DBUSER) {#PAPERLESS_DBUSER}
 
-: Username for authenticating with the PostgreSQL or MariaDB database.
+: Database user in PostgreSQL or MariaDB.
 
     Defaults to "paperless".
 
 #### [`PAPERLESS_DBPASS=<password>`](#PAPERLESS_DBPASS) {#PAPERLESS_DBPASS}
 
-: Password for the PostgreSQL or MariaDB database user.
+: Database password for PostgreSQL or MariaDB.
 
     Defaults to "paperless".
 
@@ -111,20 +110,20 @@ Available options are `postgresql` and `mariadb`.
 
 #### [`PAPERLESS_DBSSLROOTCERT=<ca-path>`](#PAPERLESS_DBSSLROOTCERT) {#PAPERLESS_DBSSLROOTCERT}
 
-: Path to the SSL root certificate used to verify the database server.
+: SSL root certificate path
 
     See [the official documentation about
     sslmode for PostgreSQL](https://www.postgresql.org/docs/current/libpq-ssl.html).
-    Changes the location of `root.crt`.
+    Changes path of `root.crt`.
 
     See [the official documentation about
     sslmode for MySQL and MariaDB](https://dev.mysql.com/doc/refman/8.0/en/connection-options.html#option_general_ssl-ca).
 
-    Defaults to unset, using the standard location in the home directory.
+    Defaults to unset, using the documented path in the home directory.
 
 #### [`PAPERLESS_DBSSLCERT=<client-cert-path>`](#PAPERLESS_DBSSLCERT) {#PAPERLESS_DBSSLCERT}
 
-: Path to the client SSL certificate used when connecting securely.
+: SSL client certificate path
 
     See [the official documentation about
     sslmode for PostgreSQL](https://www.postgresql.org/docs/current/libpq-ssl.html).
@@ -132,13 +131,13 @@ Available options are `postgresql` and `mariadb`.
     See [the official documentation about
     sslmode for MySQL and MariaDB](https://dev.mysql.com/doc/refman/8.0/en/connection-options.html#option_general_ssl-cert).
 
-    Changes the location of `postgresql.crt`.
+    Changes path of `postgresql.crt`.
 
-    Defaults to unset, using the standard location in the home directory.
+    Defaults to unset, using the documented path in the home directory.
 
 #### [`PAPERLESS_DBSSLKEY=<client-cert-key>`](#PAPERLESS_DBSSLKEY) {#PAPERLESS_DBSSLKEY}
 
-: Path to the client SSL private key used when connecting securely.
+: SSL client key path
 
     See [the official documentation about
     sslmode for PostgreSQL](https://www.postgresql.org/docs/current/libpq-ssl.html).
@@ -146,70 +145,17 @@ Available options are `postgresql` and `mariadb`.
     See [the official documentation about
     sslmode for MySQL and MariaDB](https://dev.mysql.com/doc/refman/8.0/en/connection-options.html#option_general_ssl-key).
 
-    Changes the location of `postgresql.key`.
+    Changes path of `postgresql.key`.
 
-    Defaults to unset, using the standard location in the home directory.
+    Defaults to unset, using the documented path in the home directory.
 
 #### [`PAPERLESS_DB_TIMEOUT=<int>`](#PAPERLESS_DB_TIMEOUT) {#PAPERLESS_DB_TIMEOUT}
 
-: Sets how long a database connection should wait before timing out.
+: Amount of time for a database connection to wait for the database to
+unlock. Mostly applicable for sqlite based installation. Consider changing
+to postgresql if you are having concurrency problems with sqlite.
 
-    For SQLite, this sets how long to wait if the database is locked.
+    Defaults to unset, keeping the Django defaults.
-    For PostgreSQL or MariaDB, this sets the connection timeout.
-
-    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
 
@@ -254,7 +200,7 @@ and watch out for indentation if editing the YAML file.
 
 ### Email Parsing
 
-#### [`PAPERLESS_EMAIL_PARSE_DEFAULT_LAYOUT=<int>`](#PAPERLESS_EMAIL_PARSE_DEFAULT_LAYOUT) {#PAPERLESS_EMAIL_PARSE_DEFAULT_LAYOUT}
+#### [`PAPERLESS_EMAIL_PARSE_DEFAULT_LAYOUT=<int>`(#PAPERLESS_EMAIL_PARSE_DEFAULT_LAYOUT) {#PAPERLESS_EMAIL_PARSE_DEFAULT_LAYOUT}
 
 : The default layout to use for emails that are consumed as documents. Must be one of the integer choices below. Note that mail
 rules can specify this setting, thus this fallback is used for the default selection and for .eml files consumed by other means.
@@ -458,7 +404,7 @@ set this value to /paperless. No trailing slash!
 #### [`PAPERLESS_STATIC_URL=<path>`](#PAPERLESS_STATIC_URL) {#PAPERLESS_STATIC_URL}
 
 : Override the STATIC_URL here. Unless you're hosting Paperless off a
-specific path like /paperless/, you probably don't need to change this.
+subdomain like /paperless/, you probably don't need to change this.
 If you do change it, be sure to include the trailing slash.
 
     Defaults to "/static/".
@@ -683,13 +629,7 @@ If both the [PAPERLESS_ACCOUNT_DEFAULT_GROUPS](#PAPERLESS_ACCOUNT_DEFAULT_GROUPS
 
 !!! note
 
-    If you do not have a working email server set up this will be set to 'none'.
+    If you do not have a working email server set up you should set this to 'none'.
-
-#### [`PAPERLESS_ACCOUNT_EMAIL_UNKNOWN_ACCOUNTS=<bool>`](#PAPERLESS_ACCOUNT_EMAIL_UNKNOWN_ACCOUNTS) {#PAPERLESS_ACCOUNT_EMAIL_UNKNOWN_ACCOUNTS}
-
-: See the relevant [django-allauth documentation](https://docs.allauth.org/en/latest/account/configuration.html)
-
-    Defaults to True (from allauth)
 
 #### [`PAPERLESS_DISABLE_REGULAR_LOGIN=<bool>`](#PAPERLESS_DISABLE_REGULAR_LOGIN) {#PAPERLESS_DISABLE_REGULAR_LOGIN}
 
@@ -980,10 +920,21 @@ paperless will process in parallel on a single document.
         process very large documents faster, use a higher thread per worker
         count.
 
-    If unset, paperless uses `max(floor(cpu_count / PAPERLESS_TASK_WORKERS), 1)`
+    The default is a balance between the two, according to your CPU core
-    threads per worker. The idea behind this is that as long as there are enough cores,
+    count, with a slight favor towards threads per worker:
-    the total number of threads should less than or equal to the total number of (logical)
+
-    CPU cores.
+    | CPU core count | Workers | Threads |
+    | -------------- | ------- | ------- |
+    | > 1            | > 1     | > 1     |
+    | > 2            | > 2     | > 1     |
+    | > 4            | > 2     | > 2     |
+    | > 6            | > 2     | > 3     |
+    | > 8            | > 2     | > 4     |
+    | > 12           | > 3     | > 4     |
+    | > 16           | > 4     | > 4     |
+
+    If you only specify PAPERLESS_TASK_WORKERS, paperless will adjust
+    PAPERLESS_THREADS_PER_WORKER automatically.
 
 #### [`PAPERLESS_WORKER_TIMEOUT=<num>`](#PAPERLESS_WORKER_TIMEOUT) {#PAPERLESS_WORKER_TIMEOUT}
 
@@ -1009,22 +960,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
@@ -1122,9 +1057,9 @@ be used with caution!
 
 ## Document Consumption {#consume_config}
 
-#### [`PAPERLESS_CONSUMER_DISABLE`](#PAPERLESS_CONSUMER_DISABLE) {#PAPERLESS_CONSUMER_DISABLE}
+#### [`PAPERLESS_CONSUMER_DISABLE=<bool>`](#PAPERLESS_CONSUMER_DISABLE) {#PAPERLESS_CONSUMER_DISABLE}
 
-: If set (to anything), this completely disables the directory-based consumer in docker. If you don't plan to consume documents
+: Completely disable the directory-based consumer in docker. If you don't plan to consume documents
 via the consumption directory, you can disable the consumer to save resources.
 
 #### [`PAPERLESS_CONSUMER_DELETE_DUPLICATES=<bool>`](#PAPERLESS_CONSUMER_DELETE_DUPLICATES) {#PAPERLESS_CONSUMER_DELETE_DUPLICATES}
@@ -1271,30 +1206,6 @@ within your documents.
 
     Defaults to false.
 
-## Workflow webhooks
-
-#### [`PAPERLESS_WEBHOOKS_ALLOWED_SCHEMES=<str>`](#PAPERLESS_WEBHOOKS_ALLOWED_SCHEMES) {#PAPERLESS_WEBHOOKS_ALLOWED_SCHEMES}
-
-: A comma-separated list of allowed schemes for webhooks. This setting
-controls which URL schemes are permitted for webhook URLs.
-
-    Defaults to `http,https`.
-
-#### [`PAPERLESS_WEBHOOKS_ALLOWED_PORTS=<str>`](#PAPERLESS_WEBHOOKS_ALLOWED_PORTS) {#PAPERLESS_WEBHOOKS_ALLOWED_PORTS}
-
-: A comma-separated list of allowed ports for webhooks. This setting
-controls which ports are permitted for webhook URLs. For example, if you
-set this to `80,443`, webhooks will only be sent to URLs that use these
-ports.
-
-    Defaults to empty list, which allows all ports.
-
-#### [`PAPERLESS_WEBHOOKS_ALLOW_INTERNAL_REQUESTS=<bool>`](#PAPERLESS_WEBHOOKS_ALLOW_INTERNAL_REQUESTS) {#PAPERLESS_WEBHOOKS_ALLOW_INTERNAL_REQUESTS}
-
-: If set to false, webhooks cannot be sent to internal URLs (e.g., localhost).
-
-    Defaults to true, which allows internal requests.
-
 ### Polling {#polling}
 
 #### [`PAPERLESS_CONSUMER_POLLING=<num>`](#PAPERLESS_CONSUMER_POLLING) {#PAPERLESS_CONSUMER_POLLING}
@@ -1748,11 +1659,6 @@ started by the container.
 
 : Path to an image file in the /media/logo directory, must include 'logo', e.g. `/logo/Atari_logo.svg`
 
-!!! note
-
-    The logo file will be viewable by anyone with access to the Paperless instance login page,
-    so consider your choice of logo carefully and removing exif data from images before uploading.
-
 #### [`PAPERLESS_ENABLE_UPDATE_CHECK=<bool>`](#PAPERLESS_ENABLE_UPDATE_CHECK) {#PAPERLESS_ENABLE_UPDATE_CHECK}
 
 !!! note
@@ -1764,7 +1670,7 @@ started by the container.
 
 ## Email sending
 
-Setting an SMTP server for the backend will allow you to use the Email workflow action, send documents from the UI as well as reset your
+Setting an SMTP server for the backend will allow you to reset your
 password. All of these options come from their similarly-named [Django settings](https://docs.djangoproject.com/en/4.2/ref/settings/#email-host)
 
 #### [`PAPERLESS_EMAIL_HOST=<str>`](#PAPERLESS_EMAIL_HOST) {#PAPERLESS_EMAIL_HOST}

docs/development.md

@@ -84,7 +84,7 @@ first-time setup.
     $ uv run pre-commit install
     ```
 
-6.  Apply migrations and create a superuser (also can be done via the web UI) for your development instance:
+6.  Apply migrations and create a superuser for your development instance:
 
     ```bash
     # src/
@@ -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
@@ -140,14 +140,14 @@ To build the front end once use this command:
 ```bash
 # src-ui/
 
-$ pnpm install
+$ npm install
 $ 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.
@@ -176,7 +176,7 @@ To add a new development package `uv add --dev <package>`
 ## Front end development
 
 The front end is built using AngularJS. In order to get started, you need Node.js (version 14.15+) and
-`pnpm`.
+`npm`.
 
 !!! note
 
@@ -185,7 +185,7 @@ The front end is built using AngularJS. In order to get started, you need Node.j
 1.  Install the Angular CLI. You might need sudo privileges to perform this command:
 
     ```bash
-    pnpm install -g @angular/cli
+    npm install -g @angular/cli
     ```
 
 2.  Make sure that it's on your path.
@@ -193,7 +193,7 @@ The front end is built using AngularJS. In order to get started, you need Node.j
 3.  Install all necessary modules:
 
     ```bash
-    pnpm install
+    npm install
     ```
 
 4.  You can launch a development server by running:
@@ -207,7 +207,7 @@ The front end is built using AngularJS. In order to get started, you need Node.j
     restart it.
 
     By default, the development server is available on `http://localhost:4200/` and is configured to access the API at
-    `http://localhost:8000/api/`, which is the default of the backend. If you enabled `DEBUG` on the back end, several security overrides for allowed hosts and CORS are in place so that the front end behaves exactly as in production.
+    `http://localhost:8000/api/`, which is the default of the backend. If you enabled `DEBUG` on the back end, several security overrides for allowed hosts, CORS and X-Frame-Options are in place so that the front end behaves exactly as in production.
 
 ### Testing and code style
 
@@ -470,14 +470,9 @@ To get started:
 
 2. VS Code will prompt you with "Reopen in container". Do so and wait for the environment to start.
 
-3. In case your host operating system is Windows:
+3. Initialize the project by running the task **Project Setup: Run all Init Tasks**. This
-
-    - The Source Control view in Visual Studio Code might show: "The detected Git repository is potentially unsafe as the folder is owned by someone other than the current user." Use "Manage Unsafe Repositories" to fix this.
-    - Git might have detecteded modifications for all files, because Windows is using CRLF line endings. Run `git checkout .` in the containers terminal to fix this issue.
-
-4. Initialize the project by running the task **Project Setup: Run all Init Tasks**. This
    will initialize the database tables and create a superuser. Then you can compile the front end
    for production or run the frontend in debug mode.
 
-5. The project is ready for debugging, start either run the fullstack debug or individual debug
+4. The project is ready for debugging, start either run the fullstack debug or individual debug
    processes. Yo spin up the project without debugging run the task **Project Start: Run all Services**

docs/faq.md

@@ -112,6 +112,30 @@ able to run paperless, you're a bit on your own. If you can't run the
 docker image, the documentation has instructions for bare metal
 installs.
 
+## _How do I proxy this with NGINX?_
+
+**A:** See [the wiki](https://github.com/paperless-ngx/paperless-ngx/wiki/Using-a-Reverse-Proxy-with-Paperless-ngx#nginx).
+
+## _How do I get WebSocket support with Apache mod_wsgi_?
+
+**A:** `mod_wsgi` by itself does not support ASGI. Paperless will
+continue to work with WSGI, but certain features such as status
+notifications about document consumption won't be available.
+
+If you want to continue using `mod_wsgi`, you will have to run an
+ASGI-enabled web server as well that processes WebSocket connections,
+and configure Apache to redirect WebSocket connections to this server.
+Multiple options for ASGI servers exist:
+
+-   `gunicorn` with `uvicorn` as the worker implementation (the default
+    of paperless)
+-   `daphne` as a standalone server, which is the reference
+    implementation for ASGI.
+-   `uvicorn` as a standalone server
+
+You may also find the [Django documentation](https://docs.djangoproject.com/en/5.1/howto/deployment/asgi/) on ASGI
+useful to review.
+
 ## _What about the Redis licensing change and using one of the open source forks_?
 
 Currently (October 2024), forks of Redis such as Valkey or Redirect are not officially supported by our upstream

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.
@@ -197,7 +197,7 @@ People interested in continuing the work on paperless-ngx are encouraged to reac
 
 ### Translation
 
-Paperless-ngx is available in many languages that are coordinated on [Crowdin](https://crowdin.com/project/paperless-ngx). If you want to help out by translating paperless-ngx into your language, please head over to the [Paperless-ngx project at Crowdin](https://crowdin.com/project/paperless-ngx), and thank you!
+Paperless-ngx is available in many languages that are coordinated on [Crowdin](https://crwd.in/paperless-ngx). If you want to help out by translating paperless-ngx into your language, please head over to the [Paperless-ngx project at Crowdin](https://crwd.in/paperless-ngx), and thank you!
 
 ## Scanners & Software
 

docs/setup.md

@@ -131,11 +131,26 @@ account. The script essentially automatically performs the steps described in [D
     by default but you can change the image to pull from Docker Hub by changing the `image`
     line to `image: paperlessngx/paperless-ngx:latest`.
 
-6.  Run `docker compose up -d`. This will create and start the necessary containers.
+6.  To be able to login, you will need a "superuser". To create it,
+    execute the following command:
 
-7.  Congratulations! Your Paperless-ngx instance should now be accessible at `http://127.0.0.1:8000`
+    ```shell-session
-    (or similar, depending on your configuration). When you first access the web interface, you will be
+    docker compose run --rm webserver createsuperuser
-    prompted to create a superuser account.
+    ```
+
+    or using docker exec from within the container:
+
+    ```shell-session
+    python3 manage.py createsuperuser
+    ```
+
+    This will guide you through the superuser setup.
+
+7.  Run `docker compose up -d`. This will create and start the necessary containers.
+
+8.  Congratulations! Your Paperless-ngx instance should now be accessible at `http://127.0.0.1:8000`
+    (or similar, depending on your configuration). Use the superuser credentials you have
+    created in the previous step to login.
 
 ### Build the Docker image yourself {#docker_build}
 
@@ -371,14 +386,15 @@ are released, dependency support is confirmed, etc.
         dependencies for Postgres or Mariadb.  You can select those extras with `--extra <EXTRA>`
         or all with `--all-extras`
 
-9.  Go to `/opt/paperless/src`, and execute the following command:
+9.  Go to `/opt/paperless/src`, and execute the following commands:
 
     ```bash
     # This creates the database schema.
     sudo -Hu paperless python3 manage.py migrate
-    ```
 
-    When you first access the web interface you will be prompted to create a superuser account.
+    # This creates your first paperless user
+    sudo -Hu paperless python3 manage.py createsuperuser
+    ```
 
 10. Optional: Test that paperless is working by executing
 
@@ -445,7 +461,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
 
@@ -692,8 +708,7 @@ Paperless runs on Raspberry Pi. However, some things are rather slow on
 the Pi and configuring some options in paperless can help improve
 performance immensely:
 
--   Stick with SQLite to save some resources. See [troubleshooting](troubleshooting.md#log-reports-creating-paperlesstask-failed)
+-   Stick with SQLite to save some resources.
-    if you encounter issues with SQLite locking.
 -   If you do not need the filesystem-based consumer, consider disabling it
     entirely by setting [`PAPERLESS_CONSUMER_DISABLE`](configuration.md#PAPERLESS_CONSUMER_DISABLE) to `true`.
 -   Consider setting [`PAPERLESS_OCR_PAGES`](configuration.md#PAPERLESS_OCR_PAGES) to 1, so that paperless will

docs/troubleshooting.md

@@ -33,7 +33,7 @@ warns that
 `OCR for XX failed, but we're going to stick with what we've got since FORGIVING_OCR is enabled`,
 then you might need to install the [Tesseract language
 files](https://packages.ubuntu.com/search?keywords=tesseract-ocr)
-matching your document's languages.
+marching your document's languages.
 
 As an example, if you are running Paperless-ngx from any Ubuntu or
 Debian box, and your documents are written in Spanish you may need to
@@ -130,7 +130,7 @@ command:
     - 'gotenberg'
     - '--chromium-disable-javascript=true'
     - '--chromium-allow-list=file:///tmp/.*'
-    - '--api-timeout=60s'
+    - '--api-timeout=60'
 ```
 
 ## Permission denied errors in the consumption directory
@@ -292,9 +292,7 @@ many workers attempting to access the database simultaneously.
 Consider changing to the PostgreSQL database if you will be processing
 many documents at once often. Otherwise, try tweaking the
 [`PAPERLESS_DB_TIMEOUT`](configuration.md#PAPERLESS_DB_TIMEOUT) setting to allow more time for the database to
-unlock. Additionally, you can change your SQLite database to use ["Write-Ahead Logging"](https://sqlite.org/wal.html).
+unlock. This may have minor performance implications.
-These changes may have minor performance implications but can help
-prevent database locking issues.
 
 ## granian fails to start with "is not a valid port number"
 
@@ -335,7 +333,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
@@ -92,17 +89,7 @@ and more. These areas allow you to view, add, edit, delete and manage permission
 for these objects. You can also manage saved views, mail accounts, mail rules,
 workflows and more from the management sections.
 
-### Nested Tags
+## Adding documents to paperless
-
-Paperless-ngx v2.19 introduces support for nested tags, allowing you to create a
-hierarchy of tags, which may be useful for organizing your documents. Tags can
-have a 'parent' tag, creating a tree-like structure, to a maximum depth of 5. When
-a tag is added to a document, all of its parent tags are also added automatically
-and similarly, when a tag is removed from a document, all of its child tags are
-also removed. Additionally, assigning a parent to an existing tag will automatically
-update all documents that have this tag assigned, adding the parent tag as well.
-
-## Adding documents to Paperless-ngx
 
 Once you've got Paperless setup, you need to start feeding documents
 into it. When adding documents to paperless, it will perform the
@@ -128,8 +115,7 @@ following operations on your documents:
 
     No matter which options you choose, Paperless will always store the
     original document that it found in the consumption directory or in the
-    mail and will never overwrite that document (except when using certain
+    mail and will never overwrite that document. Archived versions are
-    document actions, which make that clear). Archived versions are
     stored alongside the original versions. Any files found in the
     consumption directory will stored inside the Paperless-ngx file
     structure and will not be retained in the consumption directory.
@@ -173,7 +159,7 @@ process.
 Please see [the wiki](https://github.com/paperless-ngx/paperless-ngx/wiki/Related-Projects) for a user-maintained list of related projects and
 software (e.g. for mobile devices) that is compatible with Paperless-ngx.
 
-### Incoming Email {#incoming-mail}
+### Email {#usage-email}
 
 You can tell paperless-ngx to consume documents from your email
 accounts. This is a very flexible and powerful feature, if you regularly
@@ -261,10 +247,6 @@ different means. These are as follows:
 Paperless is set up to check your mails every 10 minutes. This can be
 configured via [`PAPERLESS_EMAIL_TASK_CRON`](configuration.md#PAPERLESS_EMAIL_TASK_CRON)
 
-#### Processed Mail
-
-Paperless keeps track of emails it has processed in order to avoid processing the same mail multiple times. This uses the message `UID` provided by the mail server, which should be unique for each message. You can view and manage processed mails from the web UI under Mail > Processed Mails. If you need to re-process a message, you can delete the corresponding processed mail entry, which will allow Paperless-ngx to process the email again the next time the mail fetch task runs.
-
 #### OAuth Email Setup
 
 Paperless-ngx supports OAuth2 authentication for Gmail and Outlook email accounts. To set up an email account with OAuth2, you will need to create a 'developer' app with the respective provider and obtain the client ID and client secret and set the appropriate [configuration variables](configuration.md#email_oauth). You will also need to set either [`PAPERLESS_OAUTH_CALLBACK_BASE_URL`](configuration.md#PAPERLESS_OAUTH_CALLBACK_BASE_URL) or [`PAPERLESS_URL`](configuration.md#PAPERLESS_URL) to the correct value for the OAuth2 flow to work correctly.
@@ -278,31 +260,6 @@ Once setup, navigating to the email settings page in Paperless-ngx will allow yo
 You can also submit a document using the REST API, see [POSTing documents](api.md#file-uploads)
 for details.
 
-## Sharing documents from Paperless-ngx
-
-Paperless-ngx supports sharing documents with other users by assigning them [permissions](#object-permissions)
-to the document. Document files can also be shared externally via [share links](#share-links), [email](#email-sharing)
-or using [email](#workflow-action-email) or [webhook](#workflow-action-webhook) actions in workflows.
-
-### Share Links
-
-"Share links" are shareable public links to files and can be created and managed under the 'Send' button on the document detail screen.
-
--   Share links do not require a user to login and thus link directly to a file.
--   Links are unique and are of the form `{paperless-url}/share/{randomly-generated-slug}`.
--   Links can optionally have an expiration time set.
--   After a link expires or is deleted users will be redirected to the regular paperless-ngx login.
-
-!!! tip
-
-    If your paperless-ngx instance is behind a reverse-proxy you may want to create an exception to bypass any authentication layers that are part of your setup in order to make links truly publicly-accessible. Of course, do so with caution.
-
-### Email Sharing {#email-sharing}
-
-Paperless-ngx supports directly sending documents via email. If an email server has been [configured](configuration.md#email-sending)
-the "Send" button on the document detail page will include an "Email" option. You can also share files via email automatically by using
-a [workflow action](#workflow-action-email).
-
 ## Permissions
 
 Permissions in Paperless-ngx are based around ['global' permissions](#global-permissions) as well as
@@ -355,25 +312,25 @@ Global permissions define what areas of the app and API endpoints users can acce
 determine if a user can create, edit, delete or view _any_ documents, but individual documents themselves
 still have "object-level" permissions.
 
-| Type          | Details                                                                                                                                                                                                                         |
+| Type          | Details                                                                                                                                                                  |
-| ------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| ------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| AppConfig     | _Change_ or higher permissions grants access to the "Application Configuration" area.                                                                                                                                           |
+| AppConfig     | _Change_ or higher permissions grants access to the "Application Configuration" area.                                                                                    |
-| Correspondent | Add, edit, delete or view Correspondents.                                                                                                                                                                                       |
+| Correspondent | Add, edit, delete or view Correspondents.                                                                                                                                |
-| CustomField   | Add, edit, delete or view Custom Fields.                                                                                                                                                                                        |
+| CustomField   | Add, edit, delete or view Custom Fields.                                                                                                                                 |
-| Document      | Add, edit, delete or view Documents.                                                                                                                                                                                            |
+| Document      | Add, edit, delete or view Documents.                                                                                                                                     |
-| DocumentType  | Add, edit, delete or view Document Types.                                                                                                                                                                                       |
+| DocumentType  | Add, edit, delete or view Document Types.                                                                                                                                |
-| Group         | Add, edit, delete or view Groups.                                                                                                                                                                                               |
+| Group         | Add, edit, delete or view Groups.                                                                                                                                        |
-| MailAccount   | Add, edit, delete or view Mail Accounts.                                                                                                                                                                                        |
+| MailAccount   | Add, edit, delete or view Mail Accounts.                                                                                                                                 |
-| MailRule      | Add, edit, delete or view Mail Rules.                                                                                                                                                                                           |
+| MailRule      | Add, edit, delete or view Mail Rules.                                                                                                                                    |
-| Note          | Add, edit, delete or view Notes.                                                                                                                                                                                                |
+| Note          | Add, edit, delete or view Notes.                                                                                                                                         |
-| PaperlessTask | View or dismiss (_Change_) File Tasks.                                                                                                                                                                                          |
+| PaperlessTask | View or dismiss (_Change_) File Tasks.                                                                                                                                   |
-| SavedView     | Add, edit, delete or view Saved Views.                                                                                                                                                                                          |
+| SavedView     | Add, edit, delete or view Saved Views.                                                                                                                                   |
-| ShareLink     | Add, delete or view Share Links.                                                                                                                                                                                                |
+| ShareLink     | Add, delete or view Share Links.                                                                                                                                         |
-| StoragePath   | Add, edit, delete or view Storage Paths.                                                                                                                                                                                        |
+| StoragePath   | Add, edit, delete or view Storage Paths.                                                                                                                                 |
-| Tag           | Add, edit, delete or view Tags.                                                                                                                                                                                                 |
+| Tag           | Add, edit, delete or view Tags.                                                                                                                                          |
-| UISettings    | Add, edit, delete or view the UI settings that are used by the web app.<br/>:warning: **Users that will access the web UI must be granted at least _View_ permissions.**                                                        |
+| UISettings    | Add, edit, delete or view the UI settings that are used by the web app.<br/>:warning: **Users that will access the web UI must be granted at least _View_ permissions.** |
-| User          | Add, edit, delete or view Users.                                                                                                                                                                                                |
+| User          | Add, edit, delete or view Users.                                                                                                                                         |
-| Workflow      | Add, edit, delete or view Workflows.<br/>Note that Workflows are global; all users who can access workflows see the same set. Workflows have other permission implications — see [Workflow permissions](#workflow-permissions). |
+| Workflow      | Add, edit, delete or view Workflows.<br/>Note that Workflows are global, in other words all users who can access workflows have access to the same set of them.          |
 
 #### Detailed Explanation of Object Permissions {#object-permissions}
 
@@ -412,9 +369,9 @@ fields and permissions, which will be merged.
 
 ### Workflow Triggers
 
-#### Types {#workflow-trigger-types}
+#### Types
 
-Currently, there are four events that correspond to workflow trigger 'types':
+Currently, there are three events that correspond to workflow trigger 'types':
 
 1. **Consumption Started**: _before_ a document is consumed, so events can include filters by source (mail, consumption
    folder or API), file path, file name, mail rule
@@ -422,12 +379,11 @@ Currently, there are four events that correspond to workflow trigger 'types':
    but the document content has been extracted and metadata such as document type, tags, etc. have been set, so these can now
    be used for filtering.
 3. **Document Updated**: when a document is updated. Similar to 'added' events, triggers can include filtering by content matching,
-   tags, doc type, correspondent or storage path.
+   tags, doc type, or correspondent.
 4. **Scheduled**: a scheduled trigger that can be used to run workflows at a specific time. The date used can be either the document
-   added, created, updated date or you can specify a (date) custom field. You can also specify a day offset from the date (positive
+   added, created, updated date or you can specify a (date) custom field. You can also specify a day offset from the date.
-   offsets will trigger after the date, negative offsets will trigger before).
 
-The following flow diagram illustrates the four document trigger types:
+The following flow diagram illustrates the three document trigger types:
 
 ```mermaid
 flowchart TD
@@ -462,32 +418,22 @@ flowchart TD
 Workflows allow you to filter by:
 
 -   Source, e.g. documents uploaded via consume folder, API (& the web UI) and mail fetch
--   File name, including wildcards e.g. \*.pdf will apply to all pdfs.
+-   File name, including wildcards e.g. \*.pdf will apply to all pdfs
 -   File path, including wildcards. Note that enabling `PAPERLESS_CONSUMER_RECURSIVE` would allow, for
     example, automatically assigning documents to different owners based on the upload directory.
 -   Mail rule. Choosing this option will force 'mail fetch' to be the workflow source.
--   Content matching (`Added`, `Updated` and `Scheduled` triggers only). Filter document content using the matching settings.
+-   Content matching (`Added` and `Updated` triggers only). Filter document content using the matching settings.
-
+-   Tags (`Added` and `Updated` triggers only). Filter for documents with any of the specified tags
-There are also 'advanced' filters available for `Added`, `Updated` and `Scheduled` triggers:
+-   Document type (`Added` and `Updated` triggers only). Filter documents with this doc type
-
+-   Correspondent (`Added` and `Updated` triggers only). Filter documents with this correspondent
--   Any Tags: Filter for documents with any of the specified tags.
--   All Tags: Filter for documents with all of the specified tags.
--   No Tags: Filter for documents with none of the specified tags.
--   Document type: Filter documents with this document type.
--   Not Document types: Filter documents without any of these document types.
--   Correspondent: Filter documents with this correspondent.
--   Not Correspondents: Filter documents without any of these correspondents.
--   Storage path: Filter documents with this storage path.
--   Not Storage paths: Filter documents without any of these storage paths.
--   Custom field query: Filter documents with a custom field query (the same as used for the document list filters).
 
 ### Workflow Actions
 
-#### Types {#workflow-action-types}
+#### Types
 
 The following workflow action types are available:
 
-##### Assignment {#workflow-action-assignment}
+##### Assignment
 
 "Assignment" actions can assign:
 
@@ -497,7 +443,7 @@ The following workflow action types are available:
 -   View and / or edit permissions to users or groups
 -   Custom fields. Note that no value for the field will be set
 
-##### Removal {#workflow-action-removal}
+##### Removal
 
 "Removal" actions can remove either all of or specific sets of the following:
 
@@ -506,7 +452,7 @@ The following workflow action types are available:
 -   View and / or edit permissions
 -   Custom fields
 
-##### Email {#workflow-action-email}
+##### Email
 
 "Email" actions can send documents via email. This action requires a mail server to be [configured](configuration.md#email-sending). You can specify:
 
@@ -514,7 +460,7 @@ The following workflow action types are available:
 -   The subject and body of the email, which can include placeholders, see [placeholders](usage.md#workflow-placeholders) below
 -   Whether to include the document as an attachment
 
-##### Webhook {#workflow-action-webhook}
+##### Webhook
 
 "Webhook" actions send a POST request to a specified URL. You can specify:
 
@@ -523,65 +469,44 @@ The following workflow action types are available:
 -   Encoding for the request body, either JSON or form data
 -   The request headers as key-value pairs
 
-For security reasons, webhooks can be limited to specific ports and disallowed from connecting to local URLs. See the relevant
-[configuration settings](configuration.md#workflow-webhooks) to change this behavior. If you are allowing non-admins to create workflows,
-you may want to adjust these settings to prevent abuse.
-
 #### Workflow placeholders
 
-Titles can be assigned by workflows using [Jinja templates](https://jinja.palletsprojects.com/en/3.1.x/templates/).
+Some workflow text can include placeholders but the available options differ depending on the type of
-This allows for complex logic to be used to generate the title, including [logical structures](https://jinja.palletsprojects.com/en/3.1.x/templates/#list-of-control-structures)
+workflow trigger. This is because at the time of consumption (when the text is to be set), no automatic tags etc. have been
-and [filters](https://jinja.palletsprojects.com/en/3.1.x/templates/#id11).
+applied. You can use the following placeholders with any trigger type:
-The template is provided as a string.
 
-Using Jinja2 Templates is also useful for [Date localization](advanced_usage.md#Date-Localization) in the title.
+-   `{correspondent}`: assigned correspondent name
-
+-   `{document_type}`: assigned document type name
-The available inputs differ depending on the type of workflow trigger.
+-   `{owner_username}`: assigned owner username
-This is because at the time of consumption (when the text is to be set), no automatic tags etc. have been
+-   `{added}`: added datetime
-applied. You can use the following placeholders in the template with any trigger type:
+-   `{added_year}`: added year
-
+-   `{added_year_short}`: added year
--   `{{correspondent}}`: assigned correspondent name
+-   `{added_month}`: added month
--   `{{document_type}}`: assigned document type name
+-   `{added_month_name}`: added month name
--   `{{owner_username}}`: assigned owner username
+-   `{added_month_name_short}`: added month short name
--   `{{added}}`: added datetime
+-   `{added_day}`: added day
--   `{{added_year}}`: added year
+-   `{added_time}`: added time in HH:MM format
--   `{{added_year_short}}`: added year
+-   `{original_filename}`: original file name without extension
--   `{{added_month}}`: added month
+-   `{filename}`: current file name without extension
--   `{{added_month_name}}`: added month name
--   `{{added_month_name_short}}`: added month short name
--   `{{added_day}}`: added day
--   `{{added_time}}`: added time in HH:MM format
--   `{{original_filename}}`: original file name without extension
--   `{{filename}}`: current file name without extension
 
 The following placeholders are only available for "added" or "updated" triggers
 
--   `{{created}}`: created datetime
+-   `{created}`: created datetime
--   `{{created_year}}`: created year
+-   `{created_year}`: created year
--   `{{created_year_short}}`: created year
+-   `{created_year_short}`: created year
--   `{{created_month}}`: created month
+-   `{created_month}`: created month
--   `{{created_month_name}}`: created month name
+-   `{created_month_name}`: created month name
--   `{created_month_name_short}}`: created month short name
+-   `{created_month_name_short}`: created month short name
--   `{{created_day}}`: created day
+-   `{created_day}`: created day
--   `{{created_time}}`: created time in HH:MM format
+-   `{created_time}`: created time in HH:MM format
--   `{{doc_url}}`: URL to the document in the web UI. Requires the `PAPERLESS_URL` setting to be set.
+-   `{doc_url}`: URL to the document in the web UI. Requires the `PAPERLESS_URL` setting to be set.
-
-##### Examples
-
-```jinja2
-{{ created | localize_date('MMMM', 'en_US') }}
-<!-- Output: "January" -->
-
-{{ added | localize_date('MMMM', 'de_DE') }}
-<!-- Output: "Juni" --> # codespell:ignore
-```
 
 ### Workflow permissions
 
 All users who have application permissions for editing workflows can see the same set
 of workflows. In other words, workflows themselves intentionally do not have an owner or permissions.
 
-Given their potentially far-reaching capabilities, including changing the permissions of existing documents, you may want to restrict access to workflows.
+Given their potentially far-reaching capabilities, you may want to restrict access to workflows.
 
 Upon migration, existing installs will grant access to workflows to users who can add
 documents (and superusers who can always access all parts of the app).
@@ -619,16 +544,27 @@ The following custom field types are supported:
 -   `Document Link`: reference(s) to other document(s) displayed as links, automatically creates a symmetrical link in reverse
 -   `Select`: a pre-defined list of strings from which the user can choose
 
+## Share Links
+
+Paperless-ngx added the ability to create shareable links to files in version 2.0. You can find the button for this on the document detail screen.
+
+-   Share links do not require a user to login and thus link directly to a file.
+-   Links are unique and are of the form `{paperless-url}/share/{randomly-generated-slug}`.
+-   Links can optionally have an expiration time set.
+-   After a link expires or is deleted users will be redirected to the regular paperless-ngx login.
+
+!!! tip
+
+    If your paperless-ngx instance is behind a reverse-proxy you may want to create an exception to bypass any authentication layers that are part of your setup in order to make links truly publicly-accessible. Of course, do so with caution.
+
 ## PDF Actions
 
-Paperless-ngx supports basic editing operations for PDFs (these operations currently cannot be performed on non-PDF files). When viewing an individual document you can
+Paperless-ngx supports four basic editing operations for PDFs (these operations currently cannot be performed on non-PDF files):
-open the 'PDF Editor' to use a simple UI for re-arranging, rotating, deleting pages and splitting documents.
 
 -   Merging documents: available when selecting multiple documents for 'bulk editing'.
--   Rotating documents: available when selecting multiple documents for 'bulk editing' and via the pdf editor on an individual document's details page.
+-   Rotating documents: available when selecting multiple documents for 'bulk editing' and from an individual document's details page.
--   Splitting documents: via the pdf editor on an individual document's details page.
+-   Splitting documents: available from an individual document's details page.
--   Deleting pages: via the pdf editor on an individual document's details page.
+-   Deleting pages: available from an individual document's details page.
--   Re-arranging pages: via the pdf editor on an individual document's details page.
 
 !!! important
 
@@ -646,7 +582,7 @@ When you first delete a document it is moved to the 'trash' until either it is e
 You can set how long documents remain in the trash before being automatically deleted with [`PAPERLESS_EMPTY_TRASH_DELAY`](configuration.md#PAPERLESS_EMPTY_TRASH_DELAY), which defaults
 to 30 days. Until the file is actually deleted (e.g. the trash is emptied), all files and database content remains intact and can be restored at any point up until that time.
 
-Additionally you may configure a directory where deleted files are moved to when the trash is emptied with [`PAPERLESS_EMPTY_TRASH_DIR`](configuration.md#PAPERLESS_EMPTY_TRASH_DIR).
+Additionally you may configure a directory where deleted files are moved to when they the trash is emptied with [`PAPERLESS_EMPTY_TRASH_DIR`](configuration.md#PAPERLESS_EMPTY_TRASH_DIR).
 Note that the empty trash directory only stores the original file, the archive file and all database information is permanently removed once a document is fully deleted.
 
 ## Best practices {#basic-searching}
@@ -901,7 +837,7 @@ Paperless-ngx consists of the following components:
 
     ```shell-session
     cd /path/to/paperless/src/
-    granian --interface asginl --ws "paperless.asgi:application"
+    python3 webserver.py
     ```
 
     or by any other means such as Apache `mod_wsgi`.

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
@@ -374,7 +374,7 @@ fi
 # of the provided folder
 if [[ -n $DATABASE_FOLDER ]] ; then
 	if [[ "$DATABASE_BACKEND" == "postgres" ]] ; then
-		sed -i "s#- pgdata:/var/lib/postgresql#- $DATABASE_FOLDER:/var/lib/postgresql#g" docker-compose.yml
+		sed -i "s#- pgdata:/var/lib/postgresql/data#- $DATABASE_FOLDER:/var/lib/postgresql/data#g" docker-compose.yml
 		sed -i "/^\s*pgdata:/d" docker-compose.yml
 	elif [[ "$DATABASE_BACKEND" == "mariadb" ]]; then
 		sed -i "s#- dbdata:/var/lib/mysql#- $DATABASE_FOLDER:/var/lib/mysql#g" docker-compose.yml

mkdocs.yml

@@ -11,12 +11,14 @@ theme:
       toggle:
         icon: material/brightness-auto
         name: Switch to light mode
+
     # Palette toggle for light mode
     - media: "(prefers-color-scheme: light)"
       scheme: default
       toggle:
         icon: material/brightness-7
         name: Switch to dark mode
+
     # Palette toggle for dark mode
     - media: "(prefers-color-scheme: dark)"
       scheme: slate
@@ -47,7 +49,6 @@ markdown_extensions:
   - pymdownx.superfences
   - pymdownx.inlinehilite
   - pymdownx.snippets
-  - pymdownx.tilde
   - footnotes
   - pymdownx.superfences:
       custom_fences:
@@ -59,17 +60,17 @@ markdown_extensions:
       emoji_generator: !!python/name:material.extensions.emoji.to_svg
 strict: true
 nav:
-  - index.md
+    - index.md
-  - setup.md
+    - setup.md
-  - 'Basic Usage': usage.md
+    - 'Basic Usage': usage.md
-  - configuration.md
+    - configuration.md
-  - administration.md
+    - administration.md
-  - advanced_usage.md
+    - advanced_usage.md
-  - 'REST API': api.md
+    - 'REST API': api.md
-  - development.md
+    - development.md
-  - 'FAQs': faq.md
+    - 'FAQs': faq.md
-  - troubleshooting.md
+    - troubleshooting.md
-  - changelog.md
+    - changelog.md
 copyright: Copyright © 2016 - 2023 Daniel Quinn, Jonas Winkler, and the Paperless-ngx team
 extra:
   social:
@@ -82,5 +83,5 @@ extra:
 plugins:
   - search
   - glightbox:
-      skip_classes:
+       skip_classes:
-        - no-lightbox
+         - no-lightbox

paperless.conf.example

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

pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "paperless-ngx"
-version = "2.19.5"
+version = "2.14.7"
-description = "A community-supported supercharged document management system: scan, index and archive all your physical documents"
+description = "A community-supported supercharged version of paperless: scan, index and archive all your physical documents"
 readme = "README.md"
 requires-python = ">=3.10"
 classifiers = [
@@ -10,66 +10,62 @@ classifiers = [
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
-  "Programming Language :: Python :: 3.14",
 ]
 # TODO: Move certain things to groups and then utilize that further
 # This will allow testing to not install a webserver, mysql, etc
 
 dependencies = [
-  "babel>=2.17",
   "bleach~=6.2.0",
-  "celery[redis]~=5.5.1",
+  "celery[redis]~=5.4.0",
   "channels~=4.2",
   "channels-redis~=4.2",
   "concurrent-log-handler~=0.9.25",
   "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.6",
-  "django-allauth[mfa,socialaccount]~=65.4.0",
+  "django-allauth[socialaccount,mfa]~=65.4.0",
-  "django-auditlog~=3.2.1",
+  "django-auditlog~=3.0.0",
-  "django-cachalot~=2.8.0",
+  "django-celery-results~=2.5.1",
-  "django-celery-results~=2.6.0",
   "django-compression-middleware~=0.5.0",
-  "django-cors-headers~=4.9.0",
+  "django-cors-headers~=4.7.0",
-  "django-extensions~=4.1",
+  "django-extensions~=3.2.3",
   "django-filter~=25.1",
-  "django-guardian~=3.2.0",
+  "django-guardian~=2.4.0",
-  "django-multiselectfield~=1.0.1",
+  "django-multiselectfield~=0.1.13",
   "django-soft-delete~=1.0.18",
-  "django-treenode>=0.23.2",
+  "djangorestframework~=3.15",
-  "djangorestframework~=3.16",
+  "djangorestframework-guardian~=0.3.0",
-  "djangorestframework-guardian~=0.4.0",
   "drf-spectacular~=0.28",
-  "drf-spectacular-sidecar~=2025.9.1",
+  "drf-spectacular-sidecar~=2025.2.1",
   "drf-writable-nested~=0.7.1",
-  "filelock~=3.20.0",
+  "filelock~=3.17.0",
   "flower~=2.0.1",
-  "gotenberg-client~=0.12.0",
+  "gotenberg-client~=0.9.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.11.0",
+  "ocrmypdf~=16.9.0",
-  "pathvalidate~=3.3.1",
+  "pathvalidate~=3.2.3",
   "pdf2image~=1.17.0",
   "python-dateutil~=2.9.0",
-  "python-dotenv~=1.1.0",
+  "python-dotenv~=1.0.1",
   "python-gnupg~=0.5.4",
   "python-ipware~=3.0.0",
   "python-magic~=0.4.27",
   "pyzbar~=0.1.9",
-  "rapidfuzz~=3.14.0",
+  "rapidfuzz~=3.12.1",
   "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",
-  "whoosh-reloaded>=2.7.5",
+  "whoosh~=2.7",
   "zxing-cpp~=2.3.0",
 ]
 
@@ -77,13 +73,12 @@ optional-dependencies.mariadb = [
   "mysqlclient~=2.2.7",
 ]
 optional-dependencies.postgres = [
-  "psycopg[c,pool]==3.2.9",
+  "psycopg[c]==3.2.4",
   # Direct dependency for proper resolution of the pre-built wheels
-  "psycopg-c==3.2.9",
+  "psycopg-c==3.2.4",
-  "psycopg-pool==3.2.6",
 ]
 optional-dependencies.webserver = [
-  "granian[uvloop]~=2.5.1",
+  "granian~=1.7.6",
 ]
 
 [dependency-groups]
@@ -95,7 +90,7 @@ dev = [
 ]
 
 docs = [
-  "mkdocs-glightbox~=0.5.1",
+  "mkdocs-glightbox~=0.4.0",
   "mkdocs-material~=9.6.4",
 ]
 
@@ -103,9 +98,9 @@ testing = [
   "daphne",
   "factory-boy~=3.3.1",
   "imagehash",
-  "pytest~=8.4.1",
+  "pytest~=8.3.3",
-  "pytest-cov~=7.0.0",
+  "pytest-cov~=6.0.0",
-  "pytest-django~=4.11.1",
+  "pytest-django~=4.10.0",
   "pytest-env",
   "pytest-httpx",
   "pytest-mock",
@@ -115,9 +110,9 @@ testing = [
 ]
 
 lint = [
-  "pre-commit~=4.3.0",
+  "pre-commit~=4.1.0",
-  "pre-commit-uv~=4.2.0",
+  "pre-commit-uv~=4.1.3",
-  "ruff~=0.14.0",
+  "ruff~=0.9.9",
 ]
 
 typing = [
@@ -125,7 +120,6 @@ typing = [
   "django-filter-stubs",
   "django-stubs[compatible-mypy]",
   "djangorestframework-stubs[compatible-mypy]",
-  "lxml-stubs",
   "mypy",
   "types-bleach",
   "types-colorama",
@@ -133,31 +127,11 @@ typing = [
   "types-markdown",
   "types-pygments",
   "types-python-dateutil",
-  "types-pytz",
   "types-redis",
   "types-setuptools",
   "types-tqdm",
 ]
 
-[tool.uv]
-required-version = ">=0.5.14"
-package = false
-environments = [
-  "sys_platform == 'darwin'",
-  "sys_platform == 'linux'",
-]
-
-[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.9/psycopg_c-3.2.9-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'" },
-  { url = "https://github.com/paperless-ngx/builder/releases/download/zxing-2.3.0/zxing_cpp-2.3.0-cp312-cp312-linux_aarch64.whl", marker = "sys_platform == 'linux' and platform_machine == 'aarch64' and python_version == '3.12'" },
-]
-
 [tool.ruff]
 target-version = "py310"
 line-length = 88
@@ -198,7 +172,6 @@ lint.extend-select = [
 ]
 lint.ignore = [
   "DJ001",
-  "PLC0415",
   "RUF012",
   "SIM105",
 ]
@@ -227,19 +200,75 @@ 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
 lint.per-file-ignores."src/documents/models.py" = [
   "SIM115",
 ]
+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/documents/tests/test_consumer.py" = [
+  "PTH",
+] # TODO Enable & remove
+lint.per-file-ignores."src/documents/tests/test_file_handling.py" = [
+  "PTH",
+] # TODO Enable & remove
+lint.per-file-ignores."src/documents/tests/test_management.py" = [
+  "PTH",
+] # TODO Enable & remove
+lint.per-file-ignores."src/documents/tests/test_management_consumer.py" = [
+  "PTH",
+] # TODO Enable & remove
+lint.per-file-ignores."src/documents/tests/test_management_exporter.py" = [
+  "PTH",
+] # TODO Enable & remove
+lint.per-file-ignores."src/documents/tests/test_migration_archive_files.py" = [
+  "PTH",
+] # TODO Enable & remove
+lint.per-file-ignores."src/documents/tests/test_migration_document_pages_count.py" = [
+  "PTH",
+] # TODO Enable & remove
+lint.per-file-ignores."src/documents/tests/test_migration_mime_type.py" = [
+  "PTH",
+] # TODO Enable & remove
+lint.per-file-ignores."src/documents/tests/test_sanity_check.py" = [
+  "PTH",
+] # TODO Enable & remove
+lint.per-file-ignores."src/documents/views.py" = [
+  "PTH",
+] # TODO Enable & remove
+lint.per-file-ignores."src/paperless/checks.py" = [
+  "PTH",
+] # TODO Enable & remove
+lint.per-file-ignores."src/paperless/settings.py" = [
+  "PTH",
+] # TODO Enable & remove
+lint.per-file-ignores."src/paperless/views.py" = [
+  "PTH",
+] # TODO Enable & remove
+lint.per-file-ignores."src/paperless_mail/mail.py" = [
+  "PTH",
+] # TODO Enable & remove
 lint.per-file-ignores."src/paperless_tesseract/tests/test_parser.py" = [
+  "PTH",
   "RUF001",
-]
+] # TODO PTH Enable & remove
 lint.isort.force-single-line = true
 
-[tool.codespell]
-write-changes = true
-ignore-words-list = "criterias,afterall,valeu,ureue,equest,ure,assertIn,Oktober"
-skip = "src-ui/src/locale/*,src-ui/pnpm-lock.yaml,src-ui/e2e/*,src/paperless_mail/tests/samples/*,src/documents/tests/samples/*,*.po,*.json"
-
 [tool.pytest.ini_options]
 minversion = "8.0"
 pythonpath = [
@@ -251,7 +280,6 @@ testpaths = [
   "src/paperless_mail/tests/",
   "src/paperless_tesseract/tests/",
   "src/paperless_tika/tests",
-  "src/paperless_text/tests/",
 ]
 addopts = [
   "--pythonwarnings=all",
@@ -292,10 +320,10 @@ exclude_also = [
 ]
 
 [tool.mypy]
-mypy_path = "src"
 plugins = [
   "mypy_django_plugin.main",
   "mypy_drf_plugin.main",
+  "numpy.typing.mypy_plugin",
 ]
 check_untyped_defs = true
 disallow_any_generics = true
@@ -304,5 +332,24 @@ disallow_untyped_defs = true
 warn_redundant_casts = true
 warn_unused_ignores = true
 
+[tool.uv]
+required-version = ">=0.5.14"
+package = false
+environments = [
+  "sys_platform == 'darwin'",
+  "sys_platform == 'linux'",
+]
+
+[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.4/psycopg_c-3.2.4-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.4/psycopg_c-3.2.4-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'" },
+  { url = "https://github.com/paperless-ngx/builder/releases/download/zxing-2.3.0/zxing_cpp-2.3.0-cp312-cp312-linux_aarch64.whl", marker = "sys_platform == 'linux' and platform_machine == 'aarch64' and python_version == '3.12'" },
+]
+
 [tool.django-stubs]
 django_settings_module = "paperless.settings"

scripts/paperless-webserver.service

@@ -9,21 +9,7 @@ Requires=redis.service
 User=paperless
 Group=paperless
 WorkingDirectory=/opt/paperless/src
-
+ExecStart=python3 webserver.py
-Environment=GRANIAN_HOST=::
-Environment=GRANIAN_PORT=8000
-Environment=GRANIAN_WORKERS=1
-
-ExecStart=/bin/sh -c '\
-  # Host: GRANIAN_HOST -> PAPERLESS_BIND_ADDR -> default \
-  [ -n "$PAPERLESS_BIND_ADDR" ] && export GRANIAN_HOST=$PAPERLESS_BIND_ADDR; \
-  # Port: GRANIAN_PORT -> PAPERLESS_PORT -> default \
-  [ -n "$PAPERLESS_PORT" ] && export GRANIAN_PORT=$PAPERLESS_PORT; \
-  # Workers: GRANIAN_WORKERS -> PAPERLESS_WEBSERVER_WORKERS -> default \
-  [ -n "$PAPERLESS_WEBSERVER_WORKERS" ] && export GRANIAN_WORKERS=$PAPERLESS_WEBSERVER_WORKERS; \
-  # URL path prefix: only set if PAPERLESS_FORCE_SCRIPT_NAME exists \
-  [ -n "$PAPERLESS_FORCE_SCRIPT_NAME" ] && export GRANIAN_URL_PATH_PREFIX=$PAPERLESS_FORCE_SCRIPT_NAME; \
-  exec granian --interface asginl --ws "paperless.asgi:application"'
 
 [Install]
 WantedBy=multi-user.target

scripts/post-consumption-example.sh

@@ -6,7 +6,6 @@ A document with an id of ${DOCUMENT_ID} was just consumed.  I know the
 following additional information about it:
 
 * Generated File Name: ${DOCUMENT_FILE_NAME}
-* Document type: ${DOCUMENT_TYPE}
 * Archive Path: ${DOCUMENT_ARCHIVE_PATH}
 * Source Path: ${DOCUMENT_SOURCE_PATH}
 * Created: ${DOCUMENT_CREATED}

src-ui/.npmrc

@@ -1 +0,0 @@
-shamefully-hoist=true

src-ui/__mocks__/pdfjs-dist.ts

@@ -1,13 +0,0 @@
-export const getDocument = jest.fn(() => ({
-  promise: Promise.resolve({ numPages: 3 }),
-}))
-
-export const GlobalWorkerOptions = { workerSrc: '' }
-export const VerbosityLevel = { ERRORS: 0 }
-
-globalThis.pdfjsLib = {
-  getDocument,
-  GlobalWorkerOptions,
-  VerbosityLevel,
-  AbortException: class AbortException extends Error {},
-}

src-ui/angular.json

@@ -27,7 +27,6 @@
           "el-GR": "src/locale/messages.el_GR.xlf",
           "en-GB": "src/locale/messages.en_GB.xlf",
           "es-ES": "src/locale/messages.es_ES.xlf",
-          "fa-IR": "src/locale/messages.fa_IR.xlf",
           "fi-FI": "src/locale/messages.fi_FI.xlf",
           "fr-FR": "src/locale/messages.fr_FR.xlf",
           "hu-HU": "src/locale/messages.hu_HU.xlf",
@@ -48,7 +47,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 +59,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 +85,12 @@
               "file-saver",
               "utif"
             ],
+            "vendorChunk": true,
             "extractLicenses": false,
+            "buildOptimizer": false,
             "sourceMap": true,
             "optimization": false,
-            "namedChunks": true,
+            "namedChunks": true
-            "stylePreprocessorOptions": {
-              "includePaths": [
-                "."
-              ]
-            }
           },
           "configurations": {
             "production": {
@@ -113,6 +106,8 @@
               "sourceMap": false,
               "namedChunks": false,
               "extractLicenses": true,
+              "vendorChunk": false,
+              "buildOptimizer": true,
               "budgets": [
                 {
                   "type": "initial",
@@ -183,8 +178,7 @@
     "schematicCollections": [
       "@angular-eslint/schematics"
     ],
-    "analytics": false,
+    "analytics": false
-    "packageManager": "pnpm"
   },
   "schematics": {
     "@angular-eslint/schematics:application": {
@@ -192,30 +186,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/e2e/document-list/document-list.spec.ts

@@ -174,7 +174,7 @@ test('bulk edit', async ({ page }) => {
   await expect(page.locator('pngx-document-list')).toHaveText(
     /Selected 61 of 61 documents/i
   )
-  await page.getByRole('button', { name: 'None' }).click()
+  await page.getByRole('button', { name: 'Cancel' }).click()
 
   await page.locator('pngx-document-card-small').nth(1).click()
   await page.locator('pngx-document-card-small').nth(2).click()

src-ui/jest.config.js

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

src-ui/package.json

@@ -1,83 +1,75 @@
 {
-  "name": "paperless-ngx-ui",
+  "name": "paperless-ui",
-  "version": "2.19.5",
+  "version": "0.0.0",
   "scripts": {
-    "preinstall": "npx only-allow pnpm",
     "ng": "ng",
     "start": "ng serve",
     "build": "ng build",
     "test": "ng test --no-watch --coverage",
-    "lint": "ng lint"
+    "lint": "ng lint",
+    "postinstall": "patch-package"
   },
   "private": true,
   "dependencies": {
-    "@angular/cdk": "^20.2.6",
+    "@angular/cdk": "^19.2.1",
-    "@angular/common": "~20.3.2",
+    "@angular/common": "~19.2.0",
-    "@angular/compiler": "~20.3.2",
+    "@angular/compiler": "~19.2.0",
-    "@angular/core": "~20.3.2",
+    "@angular/core": "~19.2.0",
-    "@angular/forms": "~20.3.2",
+    "@angular/forms": "~19.2.0",
-    "@angular/localize": "~20.3.2",
+    "@angular/localize": "~19.2.0",
-    "@angular/platform-browser": "~20.3.2",
+    "@angular/platform-browser": "~19.2.0",
-    "@angular/platform-browser-dynamic": "~20.3.2",
+    "@angular/platform-browser-dynamic": "~19.2.0",
-    "@angular/router": "~20.3.2",
+    "@angular/router": "~19.2.0",
-    "@ng-bootstrap/ng-bootstrap": "^19.0.1",
+    "@ng-bootstrap/ng-bootstrap": "^18.0.0",
-    "@ng-select/ng-select": "^20.6.3",
+    "@ng-select/ng-select": "^14.2.2",
     "@ngneat/dirty-check-forms": "^3.0.3",
     "@popperjs/core": "^2.11.8",
-    "bootstrap": "^5.3.8",
+    "bootstrap": "^5.3.3",
     "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.1.0",
+    "ngx-color": "^10.0.0",
-    "ngx-cookie-service": "^20.1.0",
+    "ngx-cookie-service": "^19.1.2",
-    "ngx-device-detector": "^10.1.0",
+    "ngx-device-detector": "^9.0.0",
-    "ngx-ui-tour-ng-bootstrap": "^17.0.1",
+    "ngx-file-drop": "^16.0.0",
+    "ngx-ui-tour-ng-bootstrap": "^16.0.0",
     "rxjs": "^7.8.2",
     "tslib": "^2.8.1",
     "utif": "^3.1.0",
-    "uuid": "^13.0.0",
+    "uuid": "^11.1.0",
-    "zone.js": "^0.15.1"
+    "zone.js": "^0.15.0"
   },
   "devDependencies": {
-    "@angular-builders/custom-webpack": "^20.0.0",
+    "@angular-builders/custom-webpack": "^19.0.0",
-    "@angular-builders/jest": "^20.0.0",
+    "@angular-builders/jest": "^19.0.0",
-    "@angular-devkit/core": "^20.3.3",
+    "@angular-devkit/build-angular": "^19.0.4",
-    "@angular-devkit/schematics": "^20.3.3",
+    "@angular-devkit/core": "^19.2.0",
-    "@angular-eslint/builder": "20.3.0",
+    "@angular-devkit/schematics": "^19.2.0",
-    "@angular-eslint/eslint-plugin": "20.3.0",
+    "@angular-eslint/builder": "19.2.0",
-    "@angular-eslint/eslint-plugin-template": "20.3.0",
+    "@angular-eslint/eslint-plugin": "19.2.0",
-    "@angular-eslint/schematics": "20.3.0",
+    "@angular-eslint/eslint-plugin-template": "19.2.0",
-    "@angular-eslint/template-parser": "20.3.0",
+    "@angular-eslint/schematics": "19.2.0",
-    "@angular/build": "^20.3.3",
+    "@angular-eslint/template-parser": "19.2.0",
-    "@angular/cli": "~20.3.3",
+    "@angular/cli": "~19.2.0",
-    "@angular/compiler-cli": "~20.3.2",
+    "@angular/compiler-cli": "~19.2.0",
-    "@codecov/webpack-plugin": "^1.9.1",
+    "@codecov/webpack-plugin": "^1.9.0",
-    "@playwright/test": "^1.55.1",
+    "@playwright/test": "^1.50.1",
-    "@types/jest": "^30.0.0",
+    "@types/jest": "^29.5.14",
-    "@types/node": "^24.6.1",
+    "@types/node": "^22.13.9",
-    "@typescript-eslint/eslint-plugin": "^8.45.0",
+    "@typescript-eslint/eslint-plugin": "^8.26.0",
-    "@typescript-eslint/parser": "^8.45.0",
+    "@typescript-eslint/parser": "^8.26.0",
-    "@typescript-eslint/utils": "^8.45.0",
+    "@typescript-eslint/utils": "^8.0.0",
-    "eslint": "^9.36.0",
+    "eslint": "^9.21.0",
-    "jest": "30.2.0",
+    "jest": "29.7.0",
-    "jest-environment-jsdom": "^30.2.0",
+    "jest-environment-jsdom": "^29.7.0",
     "jest-junit": "^16.0.0",
-    "jest-preset-angular": "^15.0.2",
+    "jest-preset-angular": "^14.5.3",
     "jest-websocket-mock": "^2.5.0",
-    "prettier-plugin-organize-imports": "^4.3.0",
+    "patch-package": "^8.0.0",
+    "prettier-plugin-organize-imports": "^4.1.0",
     "ts-node": "~10.9.1",
-    "typescript": "^5.8.3",
+    "typescript": "^5.5.4"
-    "webpack": "^5.102.0"
   },
-  "packageManager": "pnpm@10.17.1",
+  "typings": "./src/typings.d.ts"
-  "pnpm": {
-    "onlyBuiltDependencies": [
-      "@parcel/watcher",
-      "canvas",
-      "esbuild",
-      "lmdb",
-      "msgpackr-extract"
-    ]
-  }
 }

src-ui/playwright.config.ts

@@ -21,7 +21,7 @@ export default defineConfig({
   /* Run your local dev server before starting the tests */
   webServer: {
     port,
-    command: 'pnpm run start',
+    command: 'npm run start',
     reuseExistingServer: !process.env.CI,
     timeout: 2 * 60 * 1000,
   },

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'
@@ -24,7 +20,6 @@ import localeDe from '@angular/common/locales/de'
 import localeEl from '@angular/common/locales/el'
 import localeEnGb from '@angular/common/locales/en-GB'
 import localeEs from '@angular/common/locales/es'
-import localeFa from '@angular/common/locales/fa'
 import localeFi from '@angular/common/locales/fi'
 import localeFr from '@angular/common/locales/fr'
 import localeHu from '@angular/common/locales/hu'
@@ -44,7 +39,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'
 
@@ -59,7 +53,6 @@ registerLocaleData(localeDe)
 registerLocaleData(localeEl)
 registerLocaleData(localeEnGb)
 registerLocaleData(localeEs)
-registerLocaleData(localeFa)
 registerLocaleData(localeFi)
 registerLocaleData(localeFr)
 registerLocaleData(localeHu)
@@ -80,7 +73,6 @@ registerLocaleData(localeSr)
 registerLocaleData(localeSv)
 registerLocaleData(localeTr)
 registerLocaleData(localeUk)
-registerLocaleData(localeVi)
 registerLocaleData(localeZh)
 registerLocaleData(localeZhHant)
 
@@ -120,39 +112,28 @@ if (!URL.revokeObjectURL) {
   Object.defineProperty(window.URL, 'revokeObjectURL', { value: jest.fn() })
 }
 Object.defineProperty(window, 'ResizeObserver', { value: mock() })
-
+Object.defineProperty(window, 'location', {
-if (typeof IntersectionObserver === 'undefined') {
+  configurable: true,
-  class MockIntersectionObserver {
+  value: { reload: jest.fn() },
-    constructor(
+})
-      public callback: IntersectionObserverCallback,
-      public options?: IntersectionObserverInit
-    ) {}
-
-    observe = jest.fn()
-    unobserve = jest.fn()
-    disconnect = jest.fn()
-    takeRecords = jest.fn()
-  }
-
-  Object.defineProperty(window, 'IntersectionObserver', {
-    writable: true,
-    configurable: true,
-    value: MockIntersectionObserver,
-  })
-}
 
 HTMLCanvasElement.prototype.getContext = <
   typeof HTMLCanvasElement.prototype.getContext
 >jest.fn()
 
-jest.mock('uuid', () => ({
+// pdfjs
-  v4: jest.fn(() =>
+jest.mock('pdfjs-dist', () => ({
-    'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (char: string) => {
+  getDocument: jest.fn(() => ({
-      const random = Math.floor(Math.random() * 16)
+    promise: Promise.resolve({ numPages: 3 }),
-      const value = char === 'x' ? random : (random & 0x3) | 0x8
+  })),
-      return value.toString(16)
+  GlobalWorkerOptions: { workerSrc: '' },
-    })
+  VerbosityLevel: { ERRORS: 0 },
-  ),
+  globalThis: {
+    pdfjsLib: {
+      GlobalWorkerOptions: {
+        workerSrc: '',
+      },
+    },
+  },
 }))
-
+jest.mock('pdfjs-dist/web/pdf_viewer', () => ({}))
-jest.mock('pdfjs-dist')

src-ui/src/app/app-routing.module.ts

@@ -36,13 +36,7 @@ export const routes: Routes = [
     component: AppFrameComponent,
     canDeactivate: [DirtyDocGuard],
     children: [
-      {
+      { path: 'dashboard', component: DashboardComponent },
-        path: 'dashboard',
-        component: DashboardComponent,
-        data: {
-          componentName: 'AppFrameComponent',
-        },
-      },
       {
         path: 'documents',
         component: DocumentListComponent,
@@ -53,7 +47,6 @@ export const routes: Routes = [
             action: PermissionAction.View,
             type: PermissionType.Document,
           },
-          componentName: 'DocumentListComponent',
         },
       },
       {
@@ -66,7 +59,6 @@ export const routes: Routes = [
             action: PermissionAction.View,
             type: PermissionType.SavedView,
           },
-          componentName: 'DocumentListComponent',
         },
       },
       {
@@ -78,7 +70,6 @@ export const routes: Routes = [
             action: PermissionAction.View,
             type: PermissionType.Document,
           },
-          componentName: 'DocumentDetailComponent',
         },
       },
       {
@@ -90,7 +81,6 @@ export const routes: Routes = [
             action: PermissionAction.View,
             type: PermissionType.Document,
           },
-          componentName: 'DocumentDetailComponent',
         },
       },
       {
@@ -102,7 +92,6 @@ export const routes: Routes = [
             action: PermissionAction.View,
             type: PermissionType.Document,
           },
-          componentName: 'DocumentAsnComponent',
         },
       },
       {
@@ -114,7 +103,6 @@ export const routes: Routes = [
             action: PermissionAction.View,
             type: PermissionType.Tag,
           },
-          componentName: 'TagListComponent',
         },
       },
       {
@@ -126,7 +114,6 @@ export const routes: Routes = [
             action: PermissionAction.View,
             type: PermissionType.DocumentType,
           },
-          componentName: 'DocumentTypeListComponent',
         },
       },
       {
@@ -138,7 +125,6 @@ export const routes: Routes = [
             action: PermissionAction.View,
             type: PermissionType.Correspondent,
           },
-          componentName: 'CorrespondentListComponent',
         },
       },
       {
@@ -150,7 +136,6 @@ export const routes: Routes = [
             action: PermissionAction.View,
             type: PermissionType.StoragePath,
           },
-          componentName: 'StoragePathListComponent',
         },
       },
       {
@@ -159,7 +144,6 @@ export const routes: Routes = [
         canActivate: [PermissionsGuard],
         data: {
           requireAdmin: true,
-          componentName: 'LogsComponent',
         },
       },
       {
@@ -171,7 +155,6 @@ export const routes: Routes = [
             action: PermissionAction.Delete,
             type: PermissionType.Document,
           },
-          componentName: 'TrashComponent',
         },
       },
       // redirect old paths
@@ -197,7 +180,6 @@ export const routes: Routes = [
             action: PermissionAction.Change,
             type: PermissionType.UISettings,
           },
-          componentName: 'SettingsComponent',
         },
       },
       {
@@ -210,7 +192,6 @@ export const routes: Routes = [
             action: PermissionAction.View,
             type: PermissionType.UISettings,
           },
-          componentName: 'SettingsComponent',
         },
       },
       {
@@ -222,7 +203,6 @@ export const routes: Routes = [
             action: PermissionAction.Change,
             type: PermissionType.AppConfig,
           },
-          componentName: 'ConfigComponent',
         },
       },
       {
@@ -234,7 +214,6 @@ export const routes: Routes = [
             action: PermissionAction.View,
             type: PermissionType.PaperlessTask,
           },
-          componentName: 'TasksComponent',
         },
       },
       {
@@ -246,7 +225,6 @@ export const routes: Routes = [
             action: PermissionAction.View,
             type: PermissionType.CustomField,
           },
-          componentName: 'CustomFieldsComponent',
         },
       },
       {
@@ -258,7 +236,6 @@ export const routes: Routes = [
             action: PermissionAction.View,
             type: PermissionType.Workflow,
           },
-          componentName: 'WorkflowsComponent',
         },
       },
       {
@@ -270,7 +247,6 @@ export const routes: Routes = [
             action: PermissionAction.View,
             type: PermissionType.MailAccount,
           },
-          componentName: 'MailComponent',
         },
       },
       {
@@ -282,7 +258,6 @@ export const routes: Routes = [
             action: PermissionAction.View,
             type: PermissionType.User,
           },
-          componentName: 'UsersAndGroupsComponent',
         },
       },
       {
@@ -294,7 +269,6 @@ export const routes: Routes = [
             action: PermissionAction.View,
             type: PermissionType.SavedView,
           },
-          componentName: 'SavedViewsComponent',
         },
       },
     ],

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

@@ -9,6 +9,7 @@ import {
 import { Router, RouterModule } from '@angular/router'
 import { NgbModalModule } from '@ng-bootstrap/ng-bootstrap'
 import { allIcons, NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
+import { NgxFileDropModule } from 'ngx-file-drop'
 import { TourNgBootstrapModule, TourService } from 'ngx-ui-tour-ng-bootstrap'
 import { Subject } from 'rxjs'
 import { routes } from './app-routing.module'
@@ -42,6 +43,7 @@ describe('AppComponent', () => {
       imports: [
         TourNgBootstrapModule,
         RouterModule.forRoot(routes),
+        NgxFileDropModule,
         NgbModalModule,
         AppComponent,
         ToastsComponent,

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

@@ -105,9 +105,9 @@ describe('ConfigComponent', () => {
 
   it('should support JSON validation for e.g. user_args', () => {
     component.configForm.patchValue({ user_args: '{ foo bar }' })
-    expect(component.errors['user_args']).toEqual('Invalid JSON')
+    expect(component.errors).toEqual({ user_args: 'Invalid JSON' })
     component.configForm.patchValue({ user_args: '{ "foo": "bar" }' })
-    expect(component.errors['user_args']).toBeNull()
+    expect(component.errors).toEqual({ user_args: null })
   })
 
   it('should upload file, show error if necessary', () => {

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

@@ -3,23 +3,9 @@
   i18n-title
   info="Review the log files for the application and for email checking."
   i18n-info>
-  <div class="input-group input-group-sm align-items-center">
+  <div class="form-check form-switch">
-    <div class="input-group input-group-sm me-3">
+    <input class="form-check-input" type="checkbox" role="switch" [(ngModel)]="autoRefreshEnabled">
-      <span class="input-group-text text-muted" i18n>Show</span>
+    <label class="form-check-label" for="autoRefreshSwitch" i18n>Auto refresh</label>
-      <input
-        class="form-control"
-        type="number"
-        min="100"
-        step="100"
-        [(ngModel)]="limit"
-        (ngModelChange)="onLimitChange($event)"
-        style="width: 100px;">
-      <span class="input-group-text text-muted" i18n>lines</span>
-    </div>
-    <div class="form-check form-switch mt-1">
-      <input class="form-check-input" type="checkbox" role="switch" [(ngModel)]="autoRefreshEnabled">
-      <label class="form-check-label" for="autoRefreshSwitch" i18n>Auto refresh</label>
-    </div>
   </div>
 </pngx-page-header>
 
@@ -43,19 +29,14 @@
 
 <div [ngbNavOutlet]="nav" class="mt-2"></div>
 
-<cdk-virtual-scroll-viewport
+<div class="bg-dark p-3 text-light font-monospace log-container" #logContainer>
-  itemSize="20"
+  @if (loading && logFiles.length) {
-  class="bg-dark p-3 text-light font-monospace log-container"
-  #logContainer>
-  @if (loading && !logFiles.length) {
     <div>
       <div class="spinner-border spinner-border-sm me-2" role="status"></div>
       <ng-container i18n>Loading...</ng-container>
     </div>
   }
-  <p *cdkVirtualFor="let log of logs"
+  @for (log of logs; track $index) {
-     class="m-0 p-0"
+    <p class="m-0 p-0 log-entry-{{getLogLevel(log)}}">{{log}}</p>
-     [ngClass]="'log-entry-' + log.level">
+  }
-    {{log.message}}
+</div>
-  </p>
-</cdk-virtual-scroll-viewport>

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

@@ -18,7 +18,7 @@
 .log-container {
   overflow-y: scroll;
   height: calc(100vh - 200px);
-  top: 0;
+  top: 70px;
 
   p {
     white-space: pre-wrap;

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

@@ -1,8 +1,3 @@
-import {
-  CdkVirtualScrollViewport,
-  ScrollingModule,
-} from '@angular/cdk/scrolling'
-import { CommonModule } from '@angular/common'
 import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
 import { provideHttpClientTesting } from '@angular/common/http/testing'
 import { ComponentFixture, TestBed } from '@angular/core/testing'
@@ -43,9 +38,6 @@ describe('LogsComponent', () => {
         NgxBootstrapIconsModule.pick(allIcons),
         LogsComponent,
         PageHeaderComponent,
-        CommonModule,
-        CdkVirtualScrollViewport,
-        ScrollingModule,
       ],
       providers: [
         provideHttpClient(withInterceptorsFromDi()),
@@ -62,12 +54,13 @@ describe('LogsComponent', () => {
     fixture = TestBed.createComponent(LogsComponent)
     component = fixture.componentInstance
     reloadSpy = jest.spyOn(component, 'reloadLogs')
+    window.HTMLElement.prototype.scroll = function () {} // mock scroll
     jest.useFakeTimers()
     fixture.detectChanges()
   })
 
   it('should display logs with first log initially', () => {
-    expect(logSpy).toHaveBeenCalledWith('paperless', 5000)
+    expect(logSpy).toHaveBeenCalledWith('paperless')
     fixture.detectChanges()
     expect(fixture.debugElement.nativeElement.textContent).toContain(
       paperless_logs[0]
@@ -78,7 +71,7 @@ describe('LogsComponent', () => {
     fixture.debugElement
       .queryAll(By.directive(NgbNavLink))[1]
       .nativeElement.dispatchEvent(new MouseEvent('click'))
-    expect(logSpy).toHaveBeenCalledWith('mail', 5000)
+    expect(logSpy).toHaveBeenCalledWith('mail')
   })
 
   it('should handle error with no logs', () => {
@@ -90,10 +83,6 @@ describe('LogsComponent', () => {
   })
 
   it('should auto refresh, allow toggle', () => {
-    jest
-      .spyOn(CdkVirtualScrollViewport.prototype, 'scrollToIndex')
-      .mockImplementation(() => undefined)
-
     jest.advanceTimersByTime(6000)
     expect(reloadSpy).toHaveBeenCalledTimes(2)
 
@@ -101,13 +90,4 @@ describe('LogsComponent', () => {
     jest.advanceTimersByTime(6000)
     expect(reloadSpy).toHaveBeenCalledTimes(2)
   })
-
-  it('should debounce limit changes before reloading logs', () => {
-    const initialCalls = reloadSpy.mock.calls.length
-    component.onLimitChange(6000)
-    jest.advanceTimersByTime(299)
-    expect(reloadSpy).toHaveBeenCalledTimes(initialCalls)
-    jest.advanceTimersByTime(1)
-    expect(reloadSpy).toHaveBeenCalledTimes(initialCalls + 1)
-  })
 })

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

@@ -1,19 +1,14 @@
-import {
-  CdkVirtualScrollViewport,
-  ScrollingModule,
-} from '@angular/cdk/scrolling'
-import { CommonModule } from '@angular/common'
 import {
   ChangeDetectorRef,
   Component,
+  ElementRef,
   OnDestroy,
   OnInit,
   ViewChild,
-  inject,
 } from '@angular/core'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap'
-import { Subject, debounceTime, filter, takeUntil, timer } from 'rxjs'
+import { filter, takeUntil, timer } from 'rxjs'
 import { LogService } from 'src/app/services/rest/log.service'
 import { PageHeaderComponent } from '../../common/page-header/page-header.component'
 import { LoadingComponentWithPermissions } from '../../loading-component/loading.component'
@@ -25,21 +20,22 @@ import { LoadingComponentWithPermissions } from '../../loading-component/loading
   imports: [
     PageHeaderComponent,
     NgbNavModule,
-    CommonModule,
     FormsModule,
     ReactiveFormsModule,
-    CdkVirtualScrollViewport,
-    ScrollingModule,
   ],
 })
 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: Array<{ message: string; level: number }> = []
+  public logs: string[] = []
 
   public logFiles: string[] = []
 
@@ -47,17 +43,9 @@ export class LogsComponent
 
   public autoRefreshEnabled: boolean = true
 
-  public limit: number = 5000
+  @ViewChild('logContainer') logContainer: ElementRef
-
-  private readonly limitChange$ = new Subject<number>()
-
-  @ViewChild('logContainer') logContainer: CdkVirtualScrollViewport
 
   ngOnInit(): void {
-    this.limitChange$
-      .pipe(debounceTime(300), takeUntil(this.unsubscribeNotifier))
-      .subscribe(() => this.reloadLogs())
-
     this.logService
       .list()
       .pipe(takeUntil(this.unsubscribeNotifier))
@@ -83,33 +71,16 @@ export class LogsComponent
     super.ngOnDestroy()
   }
 
-  onLimitChange(limit: number): void {
-    this.limitChange$.next(limit)
-  }
-
   reloadLogs() {
     this.loading = true
     this.logService
-      .get(this.activeLog, this.limit)
+      .get(this.activeLog)
       .pipe(takeUntil(this.unsubscribeNotifier))
       .subscribe({
         next: (result) => {
+          this.logs = result
           this.loading = false
-          const parsed = this.parseLogsWithLevel(result)
+          this.scrollToBottom()
-          const hasChanges =
-            parsed.length !== this.logs.length ||
-            parsed.some((log, idx) => {
-              const current = this.logs[idx]
-              return (
-                !current ||
-                current.message !== log.message ||
-                current.level !== log.level
-              )
-            })
-          if (hasChanges) {
-            this.logs = parsed
-            this.scrollToBottom()
-          }
         },
         error: () => {
           this.logs = []
@@ -132,19 +103,12 @@ export class LogsComponent
     }
   }
 
-  private parseLogsWithLevel(
-    logs: string[]
-  ): Array<{ message: string; level: number }> {
-    return logs.map((log) => ({
-      message: log,
-      level: this.getLogLevel(log),
-    }))
-  }
-
   scrollToBottom(): void {
     this.changedetectorRef.detectChanges()
-    if (this.logContainer) {
+    this.logContainer?.nativeElement.scroll({
-      this.logContainer.scrollToIndex(this.logs.length - 1)
+      top: this.logContainer.nativeElement.scrollHeight,
-    }
+      left: 0,
+      behavior: 'auto',
+    })
   }
 }

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'
@@ -61,40 +59,6 @@ const groups = [
   { id: 2, name: 'group2' },
 ]
 
-const status: SystemStatus = {
-  pngx_version: '2.4.3',
-  server_os: 'macOS-14.1.1-arm64-arm-64bit',
-  install_type: InstallType.BareMetal,
-  storage: { total: 494384795648, available: 13573525504 },
-  database: {
-    type: 'sqlite',
-    url: '/paperless-ngx/data/db.sqlite3',
-    status: SystemStatusItemStatus.ERROR,
-    error: null,
-    migration_status: {
-      latest_migration: 'socialaccount.0006_alter_socialaccount_extra_data',
-      unapplied_migrations: [],
-    },
-  },
-  tasks: {
-    redis_url: 'redis://localhost:6379',
-    redis_status: SystemStatusItemStatus.ERROR,
-    redis_error: 'Error 61 connecting to localhost:6379. Connection refused.',
-    celery_status: SystemStatusItemStatus.ERROR,
-    celery_url: 'celery@localhost',
-    celery_error: 'Error connecting to celery@localhost',
-    index_status: SystemStatusItemStatus.OK,
-    index_last_modified: new Date().toISOString(),
-    index_error: null,
-    classifier_status: SystemStatusItemStatus.OK,
-    classifier_last_trained: new Date().toISOString(),
-    classifier_error: null,
-    sanity_check_status: SystemStatusItemStatus.ERROR,
-    sanity_check_last_run: new Date().toISOString(),
-    sanity_check_error: 'Error running sanity check.',
-  },
-}
-
 describe('SettingsComponent', () => {
   let component: SettingsComponent
   let fixture: ComponentFixture<SettingsComponent>
@@ -108,7 +72,6 @@ describe('SettingsComponent', () => {
   let groupService: GroupService
   let modalService: NgbModal
   let systemStatusService: SystemStatusService
-  let savedViewsService: SavedViewService
 
   beforeEach(async () => {
     TestBed.configureTestingModule({
@@ -159,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')
@@ -250,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))
@@ -260,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]))
@@ -279,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', () => {
@@ -308,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', () => {
@@ -320,10 +278,44 @@ describe('SettingsComponent', () => {
       )
     completeSetup(groupService)
     fixture.detectChanges()
-    expect(toastErrorSpy).toHaveBeenCalled()
+    expect(toastErrorSpy).toBeCalled()
   })
 
   it('should load system status on initialize, show errors if needed', () => {
+    const status: SystemStatus = {
+      pngx_version: '2.4.3',
+      server_os: 'macOS-14.1.1-arm64-arm-64bit',
+      install_type: InstallType.BareMetal,
+      storage: { total: 494384795648, available: 13573525504 },
+      database: {
+        type: 'sqlite',
+        url: '/paperless-ngx/data/db.sqlite3',
+        status: SystemStatusItemStatus.ERROR,
+        error: null,
+        migration_status: {
+          latest_migration: 'socialaccount.0006_alter_socialaccount_extra_data',
+          unapplied_migrations: [],
+        },
+      },
+      tasks: {
+        redis_url: 'redis://localhost:6379',
+        redis_status: SystemStatusItemStatus.ERROR,
+        redis_error:
+          'Error 61 connecting to localhost:6379. Connection refused.',
+        celery_status: SystemStatusItemStatus.ERROR,
+        celery_url: 'celery@localhost',
+        celery_error: 'Error connecting to celery@localhost',
+        index_status: SystemStatusItemStatus.OK,
+        index_last_modified: new Date().toISOString(),
+        index_error: null,
+        classifier_status: SystemStatusItemStatus.OK,
+        classifier_last_trained: new Date().toISOString(),
+        classifier_error: null,
+        sanity_check_status: SystemStatusItemStatus.ERROR,
+        sanity_check_last_run: new Date().toISOString(),
+        sanity_check_error: 'Error running sanity check.',
+      },
+    }
     jest.spyOn(systemStatusService, 'get').mockReturnValue(of(status))
     jest.spyOn(permissionsService, 'isAdmin').mockReturnValue(true)
     completeSetup()
@@ -340,8 +332,6 @@ describe('SettingsComponent', () => {
 
   it('should open system status dialog', () => {
     const modalOpenSpy = jest.spyOn(modalService, 'open')
-    jest.spyOn(systemStatusService, 'get').mockReturnValue(of(status))
-    jest.spyOn(permissionsService, 'isAdmin').mockReturnValue(true)
     completeSetup()
     component.showSystemStatus()
     expect(modalOpenSpy).toHaveBeenCalledWith(SystemStatusDialogComponent, {
@@ -355,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
@@ -185,8 +167,7 @@ export class SettingsComponent
       this.systemStatus.tasks.classifier_status ===
         SystemStatusItemStatus.ERROR ||
       this.systemStatus.tasks.sanity_check_status ===
-        SystemStatusItemStatus.ERROR ||
+        SystemStatusItemStatus.ERROR
-      this.systemStatus.websocket_connected === SystemStatusItemStatus.ERROR
     )
   }
 
@@ -198,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()
     })
   }
 
@@ -314,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
@@ -494,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
@@ -552,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.spec.ts

@@ -16,7 +16,6 @@ import {
   NgbNavItem,
 } from '@ng-bootstrap/ng-bootstrap'
 import { allIcons, NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
-import { throwError } from 'rxjs'
 import { routes } from 'src/app/app-routing.module'
 import {
   PaperlessTask,
@@ -29,7 +28,6 @@ import { PermissionsGuard } from 'src/app/guards/permissions.guard'
 import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe'
 import { PermissionsService } from 'src/app/services/permissions.service'
 import { TasksService } from 'src/app/services/tasks.service'
-import { ToastService } from 'src/app/services/toast.service'
 import { environment } from 'src/environments/environment'
 import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dialog.component'
 import { PageHeaderComponent } from '../../common/page-header/page-header.component'
@@ -125,7 +123,6 @@ describe('TasksComponent', () => {
   let router: Router
   let httpTestingController: HttpTestingController
   let reloadSpy
-  let toastService: ToastService
 
   beforeEach(async () => {
     TestBed.configureTestingModule({
@@ -160,7 +157,6 @@ describe('TasksComponent', () => {
     httpTestingController = TestBed.inject(HttpTestingController)
     modalService = TestBed.inject(NgbModal)
     router = TestBed.inject(Router)
-    toastService = TestBed.inject(ToastService)
     fixture = TestBed.createComponent(TasksComponent)
     component = fixture.componentInstance
     jest.useFakeTimers()
@@ -253,42 +249,6 @@ describe('TasksComponent', () => {
     expect(dismissSpy).toHaveBeenCalledWith(selected)
   })
 
-  it('should show an error and re-enable modal buttons when dismissing multiple tasks fails', () => {
-    component.selectedTasks = new Set([tasks[0].id, tasks[1].id])
-    const error = new Error('dismiss failed')
-    const toastSpy = jest.spyOn(toastService, 'showError')
-    const dismissSpy = jest
-      .spyOn(tasksService, 'dismissTasks')
-      .mockReturnValue(throwError(() => error))
-
-    let modal: NgbModalRef
-    modalService.activeInstances.subscribe((m) => (modal = m[m.length - 1]))
-
-    component.dismissTasks()
-    expect(modal).not.toBeUndefined()
-
-    modal.componentInstance.confirmClicked.emit()
-
-    expect(dismissSpy).toHaveBeenCalledWith(new Set([tasks[0].id, tasks[1].id]))
-    expect(toastSpy).toHaveBeenCalledWith('Error dismissing tasks', error)
-    expect(modal.componentInstance.buttonsEnabled).toBe(true)
-    expect(component.selectedTasks.size).toBe(0)
-  })
-
-  it('should show an error when dismissing a single task fails', () => {
-    const error = new Error('dismiss failed')
-    const toastSpy = jest.spyOn(toastService, 'showError')
-    const dismissSpy = jest
-      .spyOn(tasksService, 'dismissTasks')
-      .mockReturnValue(throwError(() => error))
-
-    component.dismissTask(tasks[0])
-
-    expect(dismissSpy).toHaveBeenCalledWith(new Set([tasks[0].id]))
-    expect(toastSpy).toHaveBeenCalledWith('Error dismissing task', error)
-    expect(component.selectedTasks.size).toBe(0)
-  })
-
   it('should support dismiss all tasks', () => {
     let modal: NgbModalRef
     modalService.activeInstances.subscribe((m) => (modal = m[m.length - 1]))

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 {
@@ -24,7 +24,6 @@ import { PaperlessTask } from 'src/app/data/paperless-task'
 import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
 import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe'
 import { TasksService } from 'src/app/services/tasks.service'
-import { ToastService } from 'src/app/services/toast.service'
 import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dialog.component'
 import { PageHeaderComponent } from '../../common/page-header/page-header.component'
 import { LoadingComponentWithPermissions } from '../../loading-component/loading.component'
@@ -70,11 +69,6 @@ export class TasksComponent
   extends LoadingComponentWithPermissions
   implements OnInit, OnDestroy
 {
-  tasksService = inject(TasksService)
-  private modalService = inject(NgbModal)
-  private readonly router = inject(Router)
-  private readonly toastService = inject(ToastService)
-
   public activeTab: TaskTab
   public selectedTasks: Set<number> = new Set()
   public togggleAll: boolean = false
@@ -111,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)
@@ -156,19 +158,11 @@ export class TasksComponent
       modal.componentInstance.confirmClicked.pipe(first()).subscribe(() => {
         modal.componentInstance.buttonsEnabled = false
         modal.close()
-        this.tasksService.dismissTasks(tasks).subscribe({
+        this.tasksService.dismissTasks(tasks)
-          error: (e) => {
-            this.toastService.showError($localize`Error dismissing tasks`, e)
-            modal.componentInstance.buttonsEnabled = true
-          },
-        })
         this.clearSelection()
       })
     } else {
-      this.tasksService.dismissTasks(tasks).subscribe({
+      this.tasksService.dismissTasks(tasks)
-        error: (e) =>
-          this.toastService.showError($localize`Error dismissing task`, e),
-      })
       this.clearSelection()
     }
   }

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

@@ -7,7 +7,7 @@
   >
 </pngx-page-header>
 
-@if (canViewUsers && users) {
+@if (users) {
   <h4 class="d-flex">
     <ng-container i18n>Users</ng-container>
     <button type="button" class="btn btn-sm btn-outline-primary ms-4" (click)="editUser()" *pngxIfPermissions="{ action: PermissionAction.Add, type: PermissionType.User }">
@@ -45,7 +45,7 @@
   </ul>
 }
 
-@if (canViewGroups && groups) {
+@if (groups) {
   <h4 class="mt-4 d-flex">
     <ng-container i18n>Groups</ng-container>
     <button type="button" class="btn btn-sm btn-outline-primary ms-4" (click)="editGroup()" *pngxIfPermissions="{ action: PermissionAction.Add, type: PermissionType.Group }">
@@ -86,7 +86,7 @@
   </ul>
 }
 
-@if ((canViewUsers && !users) || (canViewGroups && !groups)) {
+@if (!users || !groups) {
   <div>
     <div class="spinner-border spinner-border-sm fw-normal ms-2 me-auto" role="status"></div>
     <div class="visually-hidden" i18n>Loading...</div>

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,20 +1,15 @@
-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'
 import { Group } from 'src/app/data/group'
 import { User } from 'src/app/data/user'
 import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
-import {
+import { PermissionsService } from 'src/app/services/permissions.service'
-  PermissionAction,
-  PermissionType,
-  PermissionsService,
-} from 'src/app/services/permissions.service'
 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'
@@ -36,60 +31,46 @@ 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()
 
-  public get canViewUsers(): boolean {
+  constructor(
-    return this.permissionsService.currentUserCan(
+    private usersService: UserService,
-      PermissionAction.View,
+    private groupsService: GroupService,
-      PermissionType.User
+    private toastService: ToastService,
-    )
+    private modalService: NgbModal,
-  }
+    public permissionsService: PermissionsService,
-
+    private settings: SettingsService
-  public get canViewGroups(): boolean {
+  ) {
-    return this.permissionsService.currentUserCan(
+    super()
-      PermissionAction.View,
-      PermissionType.Group
-    )
   }
 
   ngOnInit(): void {
-    if (this.canViewUsers) {
+    this.usersService
-      this.usersService
+      .listAll(null, null, { full_perms: true })
-        .listAll(null, null, { full_perms: true })
+      .pipe(first(), takeUntil(this.unsubscribeNotifier))
-        .pipe(first(), takeUntil(this.unsubscribeNotifier))
+      .subscribe({
-        .subscribe({
+        next: (r) => {
-          next: (r) => {
+          this.users = r.results
-            this.users = r.results
+        },
-          },
+        error: (e) => {
-          error: (e) => {
+          this.toastService.showError($localize`Error retrieving users`, e)
-            this.toastService.showError($localize`Error retrieving users`, e)
+        },
-          },
+      })
-        })
-    }
 
-    if (this.canViewGroups) {
+    this.groupsService
-      this.groupsService
+      .listAll(null, null, { full_perms: true })
-        .listAll(null, null, { full_perms: true })
+      .pipe(first(), takeUntil(this.unsubscribeNotifier))
-        .pipe(first(), takeUntil(this.unsubscribeNotifier))
+      .subscribe({
-        .subscribe({
+        next: (r) => {
-          next: (r) => {
+          this.groups = r.results
-            this.groups = r.results
+        },
-          },
+        error: (e) => {
-          error: (e) => {
+          this.toastService.showError($localize`Error retrieving groups`, e)
-            this.toastService.showError($localize`Error retrieving groups`, e)
+        },
-          },
+      })
-        })
-    }
   }
 
   ngOnDestroy() {
@@ -116,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

@@ -15,7 +15,7 @@
     </svg>
     <div class="ms-2 ms-md-3 d-inline-block" [class.d-md-none]="slimSidebarEnabled">
       @if (customAppTitle?.length) {
-        <div class="d-flex flex-column align-items-start custom-title">
+        <div class="d-flex flex-column align-items-start">
           <span class="title">{{customAppTitle}}</span>
           <span class="byline text-uppercase font-monospace" i18n>by Paperless-ngx</span>
         </div>
@@ -68,15 +68,13 @@
     <nav id="sidebarMenu" class="d-md-block bg-light sidebar collapse"
       [ngClass]="slimSidebarEnabled ? 'slim' : 'col-md-3 col-lg-2 col-xxxl-1'" [class.animating]="slimSidebarAnimating"
       [ngbCollapse]="isMenuCollapsed">
-      @if (canSaveSettings) {
+      <button class="btn btn-sm btn-dark sidebar-slim-toggler" (click)="toggleSlimSidebar()">
-        <button class="btn btn-sm btn-dark sidebar-slim-toggler" (click)="toggleSlimSidebar()">
+        @if (slimSidebarEnabled) {
-          @if (slimSidebarEnabled) {
+          <i-bs width="0.9em" height="0.9em" name="chevron-double-right"></i-bs>
-            <i-bs width="0.9em" height="0.9em" name="chevron-double-right"></i-bs>
+        } @else {
-          } @else {
+          <i-bs width="0.9em" height="0.9em" name="chevron-double-left"></i-bs>
-            <i-bs width="0.9em" height="0.9em" name="chevron-double-left"></i-bs>
+        }
-          }
+      </button>
-        </button>
-      }
       <div class="sidebar-sticky pt-3 d-flex flex-column justify-space-around">
         <ul class="nav flex-column">
           <li class="nav-item app-link">
@@ -110,19 +108,11 @@
                 <li class="nav-item w-100 app-link" cdkDrag [cdkDragDisabled]="!settingsService.organizingSidebarSavedViews"
                   cdkDragPreviewContainer="parent" cdkDragPreviewClass="navItemDrag" (cdkDragStarted)="onDragStart($event)"
                   (cdkDragEnded)="onDragEnd($event)">
-                  <a class="nav-link" routerLink="view/{{view.id}}"
+                  <a class="nav-link" [class.text-truncate]="!slimSidebarEnabled" routerLink="view/{{view.id}}"
                     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>
+                    <i-bs class="me-1" name="funnel"></i-bs><span>&nbsp;{{view.name}}</span>
-                      <span>&nbsp;<div class="d-inline-flex view-name"><span class="overflow-hidden" [class.text-wrap]="!slimSidebarEnabled">{{view.name}}</span></div>
-                        @if (showSidebarCounts && !slimSidebarEnabled) {
-                          <span class="badge bg-info text-dark ms-2 d-inline">{{ savedViewService.getDocumentCount(view) }}</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>
@@ -149,7 +139,7 @@
                   [disablePopover]="!slimSidebarEnabled" placement="end" container="body" triggers="mouseenter:mouseleave"
                   popoverClass="popover-slim">
                   <i-bs class="me-1" name="file-text"></i-bs><span>&nbsp;{{d.title | documentTitle}}</span>
-                  <span class="close flex-column justify-content-center" (click)="closeDocument(d); $event.preventDefault()">
+                  <span class="close" (click)="closeDocument(d); $event.preventDefault()">
                     <i-bs name="x"></i-bs>
                   </span>
                 </a>

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

@@ -19,10 +19,6 @@
     height: 0.8em;
   }
 
-  .view-name {
-    max-width: calc(100% - 50px)
-  }
-
   .nav-group:not(:has(.app-link)) .sidebar-heading {
     display: none !important;
   }
@@ -191,7 +187,7 @@ main {
   list-style-type: none;
 
   &:hover .close {
-    display: flex;
+    display: block;
   }
 
   .close {
@@ -248,7 +244,7 @@ main {
   }
 }
 
-@media screen and (min-width: 366px) and (max-width: 768px) {
+@media screen and (max-width: 768px) {
   .navbar-toggler {
     // compensate for 2 buttons on the right
     margin-right: 45px;
@@ -261,13 +257,6 @@ main {
   }
 }
 
-@media screen and (max-width: 345px) {
-  .custom-title {
-    max-width: 110px;
-    overflow: hidden;
-  }
-}
-
 :host ::ng-deep .dropdown.show .dropdown-toggle,
 :host ::ng-deep .dropdown-toggle:hover {
   opacity: 0.7;

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

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

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

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

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

@@ -89,7 +89,7 @@
                 @if (searchResults?.documents.length) {
                     <h6 class="dropdown-header" i18n="@@searchResults.documents">Documents</h6>
                     @for (document of searchResults.documents; track document.id) {
-                        <ng-container *ngTemplateOutlet="resultItemTemplate; context: {item: document, nameProp: 'title', type: DataType.Document, icon: 'file-text', date: document.created}"></ng-container>
+                        <ng-container *ngTemplateOutlet="resultItemTemplate; context: {item: document, nameProp: 'title', type: DataType.Document, icon: 'file-text', date: document.added}"></ng-container>
                     }
                 }
                 @if (searchResults?.saved_views.length) {

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

@@ -405,7 +405,7 @@ describe('GlobalSearchComponent', () => {
     expect(toastErrorSpy).toHaveBeenCalled()
 
     // succeed
-    editDialog.succeeded.emit(object as any)
+    editDialog.succeeded.emit(true)
     expect(toastInfoSpy).toHaveBeenCalled()
   })
 
@@ -456,7 +456,7 @@ describe('GlobalSearchComponent', () => {
     expect(toastErrorSpy).toHaveBeenCalled()
 
     // succeed
-    editDialog.succeeded.emit(searchResults.tags[0] as any)
+    editDialog.succeeded.emit(true)
     expect(toastInfoSpy).toHaveBeenCalled()
   })
 
@@ -529,17 +529,6 @@ describe('GlobalSearchComponent', () => {
     expect(dispatchSpy).toHaveBeenCalledTimes(2) // once for keydown, second for click
   })
 
-  it('should support using base href in navigateOrOpenInNewWindow', () => {
-    jest
-      .spyOn(component['locationStrategy'], 'getBaseHref')
-      .mockReturnValue('/base/')
-    const openSpy = jest.spyOn(window, 'open')
-    const event = new Event('click')
-    event['ctrlKey'] = true
-    component.primaryAction(DataType.Document, { id: 1 }, event as any)
-    expect(openSpy).toHaveBeenCalledWith('/base/documents/1', '_blank')
-  })
-
   it('should support title content search and advanced search', () => {
     const qfSpy = jest.spyOn(documentListViewService, 'quickFilter')
     component.query = 'test'

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

@@ -1,4 +1,4 @@
-import { LocationStrategy, NgTemplateOutlet } from '@angular/common'
+import { NgTemplateOutlet } from '@angular/common'
 import {
   Component,
   ElementRef,
@@ -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,17 @@ 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
+  ) {
     this.queryDebounce = new Subject<string>()
 
     this.queryDebounce
@@ -423,13 +421,10 @@ export class GlobalSearchComponent implements OnInit {
     extras: Object = {}
   ) {
     if (newWindow) {
-      const serializedUrl = this.router.serializeUrl(
+      const url = this.router.serializeUrl(
         this.router.createUrlTree(commands, extras)
       )
-      const baseHref = this.locationStrategy.getBaseHref()
+      window.open(url, '_blank')
-      const fullUrl =
-        baseHref.replace(/\/+$/, '') + '/' + serializedUrl.replace(/^\/+/, '')
-      window.open(fullUrl, '_blank')
     } else {
       this.router.navigate(commands, extras)
     }

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