Ready

[ci skip]

.devcontainer/README.md

@@ -89,18 +89,6 @@ Additional tasks are available for common maintenance operations:
 - **Migrate Database**: To apply database migrations.
 - **Create Superuser**: To create an admin user for the application.
 
-## Committing from the Host Machine
-
-The DevContainer automatically installs pre-commit hooks during setup. However, these hooks are configured for use inside the container.
-
-If you want to commit changes from your host machine (outside the DevContainer), you need to set up pre-commit on your host. This installs it as a standalone tool.
-
-```bash
-uv tool install pre-commit && pre-commit install
-```
-
-After this, you can commit either from inside the DevContainer or from your host machine.
-
 ## Let's Get Started!
 
 Follow the steps above to get your development environment up and running. Happy coding!

.devcontainer/devcontainer.json

@@ -3,30 +3,26 @@
     "dockerComposeFile": "docker-compose.devcontainer.sqlite-tika.yml",
     "service": "paperless-development",
     "workspaceFolder": "/usr/src/paperless/paperless-ngx",
-    "containerEnv": {
-        "UV_CACHE_DIR": "/usr/src/paperless/paperless-ngx/.uv-cache"
-    },
-    "postCreateCommand": "/bin/bash -c 'rm -rf .venv/.* && uv sync --group dev && uv run pre-commit install'",
+    "postCreateCommand": "/bin/bash -c 'rm -rf .venv/.*  && uv sync --group dev && uv run pre-commit install'",
     "customizations": {
         "vscode": {
-            "extensions": [
-                "mhutchie.git-graph",
-                "ms-python.python",
-                "ms-vscode.js-debug-nightly",
-                "eamodio.gitlens",
-                "yzhang.markdown-all-in-one",
-                "pnpm.pnpm"
-            ],
-            "settings": {
-                "python.defaultInterpreterPath": "/usr/src/paperless/paperless-ngx/.venv/bin/python",
-                "python.pythonPath": "/usr/src/paperless/paperless-ngx/.venv/bin/python",
-                "python.terminal.activateEnvInCurrentTerminal": true,
-                "editor.formatOnPaste": false,
-                "editor.formatOnSave": true,
-                "editor.formatOnType": true,
-                "files.trimTrailingWhitespace": true
-            }
+          "extensions": [
+            "mhutchie.git-graph",
+            "ms-python.python",
+            "ms-vscode.js-debug-nightly",
+            "eamodio.gitlens",
+            "yzhang.markdown-all-in-one"
+          ],
+          "settings": {
+            "python.defaultInterpreterPath": "/usr/src/paperless/paperless-ngx/.venv/bin/python",
+            "python.pythonPath": "/usr/src/paperless/paperless-ngx/.venv/bin/python",
+            "python.terminal.activateEnvInCurrentTerminal": true,
+            "editor.formatOnPaste": false,
+            "editor.formatOnSave": true,
+            "editor.formatOnType": true,
+            "files.trimTrailingWhitespace": true
+          }
         }
-    },
-    "remoteUser": "paperless"
-}
+      },
+      "remoteUser": "paperless"
+    }

.devcontainer/vscode/tasks.json

@@ -174,22 +174,12 @@
 		{
 			"label": "Maintenance: Install Frontend Dependencies",
 			"description": "Install frontend (pnpm) dependencies",
-			"type": "shell",
-			"command": "pnpm install",
+			"type": "pnpm",
+			"script": "install",
+			"path": "src-ui",
 			"group": "clean",
 			"problemMatcher": [],
-			"options": {
-				"cwd": "${workspaceFolder}/src-ui"
-			},
-			"presentation": {
-				"echo": true,
-				"reveal": "always",
-				"focus": true,
-				"panel": "shared",
-				"showReuseMessage": false,
-				"clear": true,
-				"revealProblems": "onProblem"
-			}
+			"detail": "install dependencies from package"
 		},
 		{
 			"description": "Clean install frontend dependencies and build the frontend for production",

.github/workflows/ci-backend.yml

@@ -75,6 +75,9 @@ jobs:
         env:
           NLTK_DATA: ${{ env.NLTK_DATA }}
           PAPERLESS_CI_TEST: 1
+          PAPERLESS_MAIL_TEST_HOST: ${{ secrets.TEST_MAIL_HOST }}
+          PAPERLESS_MAIL_TEST_USER: ${{ secrets.TEST_MAIL_USER }}
+          PAPERLESS_MAIL_TEST_PASSWD: ${{ secrets.TEST_MAIL_PASSWD }}
         run: |
           uv run \
             --python ${{ steps.setup-python.outputs.python-version }} \

.github/workflows/ci-docker.yml

@@ -46,13 +46,14 @@ jobs:
         id: ref
         run: |
           ref_name="${GITHUB_HEAD_REF:-$GITHUB_REF_NAME}"
-          # Sanitize by replacing / with - for use in tags and cache keys
-          sanitized_ref="${ref_name//\//-}"
+          # Sanitize by replacing / with - for cache keys
+          cache_ref="${ref_name//\//-}"
 
           echo "ref_name=${ref_name}"
-          echo "sanitized_ref=${sanitized_ref}"
+          echo "cache_ref=${cache_ref}"
 
-          echo "name=${sanitized_ref}" >> $GITHUB_OUTPUT
+          echo "name=${ref_name}" >> $GITHUB_OUTPUT
+          echo "cache-ref=${cache_ref}" >> $GITHUB_OUTPUT
       - name: Check push permissions
         id: check-push
         env:
@@ -61,14 +62,12 @@ jobs:
           # should-push: Should we push to GHCR?
           # True for:
           #   1. Pushes (tags/dev/beta) - filtered via the workflow triggers
-          #   2. Manual dispatch - always push to GHCR
-          #   3. Internal PRs where the branch name starts with 'feature-' or 'fix-'
+          #   2. Internal PRs where the branch name starts with 'feature-' - filtered here when a PR is synced
 
           should_push="false"
+
           if [[ "${{ github.event_name }}" == "push" ]]; then
             should_push="true"
-          elif [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
-            should_push="true"
           elif [[ "${{ github.event_name }}" == "pull_request" && "${{ github.event.pull_request.head.repo.full_name }}" == "${{ github.repository }}" ]]; then
             if [[ "${REF_NAME}" == feature-* || "${REF_NAME}" == fix-* ]]; then
               should_push="true"
@@ -140,9 +139,9 @@ jobs:
             PNGX_TAG_VERSION=${{ steps.docker-meta.outputs.version }}
           outputs: type=image,name=${{ env.REGISTRY }}/${{ steps.repo.outputs.name }},push-by-digest=true,name-canonical=true,push=${{ steps.check-push.outputs.should-push }}
           cache-from: |
-            type=registry,ref=${{ env.REGISTRY }}/${{ steps.repo.outputs.name }}/cache/app:${{ steps.ref.outputs.name }}-${{ matrix.arch }}
+            type=registry,ref=${{ env.REGISTRY }}/${{ steps.repo.outputs.name }}/cache/app:${{ steps.ref.outputs.cache-ref }}-${{ matrix.arch }}
             type=registry,ref=${{ env.REGISTRY }}/${{ steps.repo.outputs.name }}/cache/app:dev-${{ matrix.arch }}
-          cache-to: ${{ steps.check-push.outputs.should-push == 'true' && format('type=registry,mode=max,ref={0}/{1}/cache/app:{2}-{3}', env.REGISTRY, steps.repo.outputs.name, steps.ref.outputs.name, matrix.arch) || '' }}
+          cache-to: ${{ steps.check-push.outputs.should-push == 'true' && format('type=registry,mode=max,ref={0}/{1}/cache/app:{2}-{3}', env.REGISTRY, steps.repo.outputs.name, steps.ref.outputs.cache-ref, matrix.arch) || '' }}
       - name: Export digest
         if: steps.check-push.outputs.should-push == 'true'
         run: |

.gitignore

@@ -40,7 +40,6 @@ htmlcov/
 .coverage
 .coverage.*
 .cache
-.uv-cache
 nosetests.xml
 coverage.xml
 *,cover

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

@@ -23,24 +23,3 @@ services:
     container_name: tika
     network_mode: host
     restart: unless-stopped
-  greenmail:
-    image: greenmail/standalone:2.1.8
-    hostname: greenmail
-    container_name: greenmail
-    environment:
-      # Enable only IMAP for now (SMTP available via 3025 if needed later)
-      GREENMAIL_OPTS: >-
-        -Dgreenmail.setup.test.imap -Dgreenmail.users=test@localhost:test -Dgreenmail.users.login=test@localhost -Dgreenmail.verbose
-    ports:
-      - "3143:3143" # IMAP
-    restart: unless-stopped
-  nginx:
-    image: docker.io/nginx:1.29-alpine
-    hostname: nginx
-    container_name: nginx
-    ports:
-      - "8080:8080"
-    restart: unless-stopped
-    volumes:
-      - ../../docs/assets:/usr/share/nginx/html/assets:ro
-      - ./test-nginx.conf:/etc/nginx/conf.d/default.conf:ro

docker/compose/test-nginx.conf

@@ -1,14 +0,0 @@
-server {
-    listen 8080;
-    server_name localhost;
-
-    root /usr/share/nginx/html;
-
-    # Enable CORS for test requests
-    add_header 'Access-Control-Allow-Origin' '*' always;
-    add_header 'Access-Control-Allow-Methods' 'GET, HEAD, OPTIONS' always;
-
-    location / {
-        try_files $uri $uri/ =404;
-    }
-}

docker/install_management_commands.sh

@@ -4,7 +4,8 @@
 
 set -eu
 
-for command in document_archiver \
+for command in decrypt_documents \
+	document_archiver \
 	document_exporter \
 	document_importer \
 	mail_fetcher \

docker/management_script.sh

@@ -5,8 +5,10 @@ set -e
 
 cd "${PAPERLESS_SRC_DIR}"
 
-if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-	python3 manage.py management_command "$@"
-elif [[ $(id -un) == "paperless" ]]; then
+if [[ $(id -u) == 0 ]]; then
 	s6-setuidgid paperless python3 manage.py management_command "$@"
+elif [[ $(id -un) == "paperless" ]]; then
+	python3 manage.py management_command "$@"
+else
+	echo "Unknown user."
 fi

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

@@ -8,6 +8,11 @@ echo "${log_prefix} Apply database migrations..."
 
 cd "${PAPERLESS_SRC_DIR}"
 
+if [[ "${PAPERLESS_MIGRATION_MODE:-0}" == "1" ]]; then
+	echo "${log_prefix} Migration mode enabled, skipping migrations."
+	exit 0
+fi
+
 # The whole migrate, with flock, needs to run as the right user
 if [[ -n "${USER_IS_NON_ROOT}" ]]; then
 	exec s6-setlock -n "${data_dir}/migration_lock" python3 manage.py migrate --skip-checks --no-input

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

@@ -9,7 +9,15 @@ echo "${log_prefix} Running Django checks"
 cd "${PAPERLESS_SRC_DIR}"
 
 if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-	python3 manage.py check
+	if [[ "${PAPERLESS_MIGRATION_MODE:-0}" == "1" ]]; then
+		python3 manage_migration.py check
+	else
+		python3 manage.py check
+	fi
 else
-	s6-setuidgid paperless python3 manage.py check
+	if [[ "${PAPERLESS_MIGRATION_MODE:-0}" == "1" ]]; then
+		s6-setuidgid paperless python3 manage_migration.py check
+	else
+		s6-setuidgid paperless python3 manage.py check
+	fi
 fi

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

@@ -13,8 +13,14 @@ 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"
+if [[ "${PAPERLESS_MIGRATION_MODE:-0}" == "1" ]]; then
+	app_module="paperless.migration_asgi:application"
 else
-	exec s6-setuidgid paperless granian --interface asginl --ws --loop uvloop "paperless.asgi:application"
+	app_module="paperless.asgi:application"
+fi
+
+if [[ -n "${USER_IS_NON_ROOT}" ]]; then
+	exec granian --interface asginl --ws --loop uvloop "${app_module}"
+else
+	exec s6-setuidgid paperless granian --interface asginl --ws --loop uvloop "${app_module}"
 fi

docker/rootfs/usr/local/bin/convert_mariadb_uuid

@@ -5,8 +5,10 @@ set -e
 
 cd "${PAPERLESS_SRC_DIR}"
 
-if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-		python3 manage.py convert_mariadb_uuid "$@"
-elif [[ $(id -un) == "paperless" ]]; then
+if [[ $(id -u) == 0 ]]; then
 	s6-setuidgid paperless python3 manage.py convert_mariadb_uuid "$@"
+elif [[ $(id -un) == "paperless" ]]; then
+	python3 manage.py convert_mariadb_uuid "$@"
+else
+	echo "Unknown user."
 fi

docker/rootfs/usr/local/bin/createsuperuser

@@ -5,8 +5,10 @@ set -e
 
 cd "${PAPERLESS_SRC_DIR}"
 
-if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-		python3 manage.py createsuperuser "$@"
-elif [[ $(id -un) == "paperless" ]]; then
+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

docker/rootfs/usr/local/bin/decrypt_documents

@@ -0,0 +1,14 @@
+#!/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 decrypt_documents "$@"
+elif [[ $(id -un) == "paperless" ]]; then
+	python3 manage.py decrypt_documents "$@"
+else
+	echo "Unknown user."
+fi

docker/rootfs/usr/local/bin/document_archiver

@@ -5,8 +5,10 @@ set -e
 
 cd "${PAPERLESS_SRC_DIR}"
 
-if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-		python3 manage.py document_archiver "$@"
-elif [[ $(id -un) == "paperless" ]]; then
+if [[ $(id -u) == 0 ]]; then
 	s6-setuidgid paperless python3 manage.py document_archiver "$@"
+elif [[ $(id -un) == "paperless" ]]; then
+	python3 manage.py document_archiver "$@"
+else
+	echo "Unknown user."
 fi

docker/rootfs/usr/local/bin/document_create_classifier

@@ -5,8 +5,10 @@ set -e
 
 cd "${PAPERLESS_SRC_DIR}"
 
-if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-		python3 manage.py document_create_classifier "$@"
-elif [[ $(id -un) == "paperless" ]]; then
+if [[ $(id -u) == 0 ]]; then
 	s6-setuidgid paperless python3 manage.py document_create_classifier "$@"
+elif [[ $(id -un) == "paperless" ]]; then
+	python3 manage.py document_create_classifier "$@"
+else
+	echo "Unknown user."
 fi

docker/rootfs/usr/local/bin/document_exporter

@@ -5,8 +5,10 @@ set -e
 
 cd "${PAPERLESS_SRC_DIR}"
 
-if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-		python3 manage.py document_exporter "$@"
-elif [[ $(id -un) == "paperless" ]]; then
+if [[ $(id -u) == 0 ]]; then
 	s6-setuidgid paperless python3 manage.py document_exporter "$@"
+elif [[ $(id -un) == "paperless" ]]; then
+	python3 manage.py document_exporter "$@"
+else
+	echo "Unknown user."
 fi

docker/rootfs/usr/local/bin/document_fuzzy_match

@@ -5,8 +5,10 @@ set -e
 
 cd "${PAPERLESS_SRC_DIR}"
 
-if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-		python3 manage.py document_fuzzy_match "$@"
-elif [[ $(id -un) == "paperless" ]]; then
+if [[ $(id -u) == 0 ]]; then
 	s6-setuidgid paperless python3 manage.py document_fuzzy_match "$@"
+elif [[ $(id -un) == "paperless" ]]; then
+	python3 manage.py document_fuzzy_match "$@"
+else
+	echo "Unknown user."
 fi

docker/rootfs/usr/local/bin/document_importer

@@ -5,8 +5,10 @@ set -e
 
 cd "${PAPERLESS_SRC_DIR}"
 
-if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-		python3 manage.py document_importer "$@"
-elif [[ $(id -un) == "paperless" ]]; then
+if [[ $(id -u) == 0 ]]; then
 	s6-setuidgid paperless python3 manage.py document_importer "$@"
+elif [[ $(id -un) == "paperless" ]]; then
+	python3 manage.py document_importer "$@"
+else
+	echo "Unknown user."
 fi

docker/rootfs/usr/local/bin/document_index

@@ -5,8 +5,10 @@ set -e
 
 cd "${PAPERLESS_SRC_DIR}"
 
-if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-		python3 manage.py document_index "$@"
-elif [[ $(id -un) == "paperless" ]]; then
+if [[ $(id -u) == 0 ]]; then
 	s6-setuidgid paperless python3 manage.py document_index "$@"
+elif [[ $(id -un) == "paperless" ]]; then
+	python3 manage.py document_index "$@"
+else
+	echo "Unknown user."
 fi

docker/rootfs/usr/local/bin/document_renamer

@@ -5,8 +5,10 @@ set -e
 
 cd "${PAPERLESS_SRC_DIR}"
 
-if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-		python3 manage.py document_renamer "$@"
-elif [[ $(id -un) == "paperless" ]]; then
+if [[ $(id -u) == 0 ]]; then
 	s6-setuidgid paperless python3 manage.py document_renamer "$@"
+elif [[ $(id -un) == "paperless" ]]; then
+	python3 manage.py document_renamer "$@"
+else
+	echo "Unknown user."
 fi

docker/rootfs/usr/local/bin/document_retagger

@@ -5,8 +5,10 @@ set -e
 
 cd "${PAPERLESS_SRC_DIR}"
 
-if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-		python3 manage.py document_retagger "$@"
-elif [[ $(id -un) == "paperless" ]]; then
+if [[ $(id -u) == 0 ]]; then
 	s6-setuidgid paperless python3 manage.py document_retagger "$@"
+elif [[ $(id -un) == "paperless" ]]; then
+	python3 manage.py document_retagger "$@"
+else
+	echo "Unknown user."
 fi

docker/rootfs/usr/local/bin/document_sanity_checker

@@ -5,8 +5,10 @@ set -e
 
 cd "${PAPERLESS_SRC_DIR}"
 
-if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-		python3 manage.py document_sanity_checker "$@"
-elif [[ $(id -un) == "paperless" ]]; then
+if [[ $(id -u) == 0 ]]; then
 	s6-setuidgid paperless python3 manage.py document_sanity_checker "$@"
+elif [[ $(id -un) == "paperless" ]]; then
+	python3 manage.py document_sanity_checker "$@"
+else
+	echo "Unknown user."
 fi

docker/rootfs/usr/local/bin/document_thumbnails

@@ -5,8 +5,10 @@ set -e
 
 cd "${PAPERLESS_SRC_DIR}"
 
-if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-		python3 manage.py document_thumbnails "$@"
-elif [[ $(id -un) == "paperless" ]]; then
+if [[ $(id -u) == 0 ]]; then
 	s6-setuidgid paperless python3 manage.py document_thumbnails "$@"
+elif [[ $(id -un) == "paperless" ]]; then
+	python3 manage.py document_thumbnails "$@"
+else
+	echo "Unknown user."
 fi

docker/rootfs/usr/local/bin/mail_fetcher

@@ -5,8 +5,10 @@ set -e
 
 cd "${PAPERLESS_SRC_DIR}"
 
-if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-		python3 manage.py mail_fetcher "$@"
-elif [[ $(id -un) == "paperless" ]]; then
+if [[ $(id -u) == 0 ]]; then
 	s6-setuidgid paperless python3 manage.py mail_fetcher "$@"
+elif [[ $(id -un) == "paperless" ]]; then
+	python3 manage.py mail_fetcher "$@"
+else
+	echo "Unknown user."
 fi

docker/rootfs/usr/local/bin/manage_superuser

@@ -5,8 +5,10 @@ set -e
 
 cd "${PAPERLESS_SRC_DIR}"
 
-if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-		python3 manage.py manage_superuser "$@"
-elif [[ $(id -un) == "paperless" ]]; then
+if [[ $(id -u) == 0 ]]; then
 	s6-setuidgid paperless python3 manage.py manage_superuser "$@"
+elif [[ $(id -un) == "paperless" ]]; then
+	python3 manage.py manage_superuser "$@"
+else
+	echo "Unknown user."
 fi

docker/rootfs/usr/local/bin/prune_audit_logs

@@ -5,8 +5,10 @@ set -e
 
 cd "${PAPERLESS_SRC_DIR}"
 
-if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-		python3 manage.py prune_audit_logs "$@"
-elif [[ $(id -un) == "paperless" ]]; then
+if [[ $(id -u) == 0 ]]; then
 	s6-setuidgid paperless python3 manage.py prune_audit_logs "$@"
+elif [[ $(id -un) == "paperless" ]]; then
+	python3 manage.py prune_audit_logs "$@"
+else
+	echo "Unknown user."
 fi

docs/administration.md

@@ -580,9 +580,39 @@ document.
     documents, such as encrypted PDF documents. The archiver will skip over
     these documents each time it sees them.
 
+### Managing encryption {#encryption}
+
+!!! warning
+
+    Encryption was removed in [paperless-ng 0.9](changelog.md#paperless-ng-090)
+    because it did not really provide any additional security, the passphrase
+    was stored in a configuration file on the same system as the documents.
+    Furthermore, the entire text content of the documents is stored plain in
+    the database, even if your documents are encrypted. Filenames are not
+    encrypted as well. Finally, 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.
+
+#### Enabling encryption
+
+Enabling encryption is no longer supported.
+
+#### Disabling encryption
+
+Basic usage to disable encryption of your document store:
+
+(Note: If `PAPERLESS_PASSPHRASE` isn't set already, you need to specify
+it here)
+
+```
+decrypt_documents [--passphrase SECR3TP4SSPHRA$E]
+```
+
 ### Detecting duplicates {#fuzzy_duplicate}
 
-Paperless-ngx already catches and warns of exactly matching documents,
+Paperless already catches and prevents upload of exactly matching documents,
 however a new scan of an existing document may not produce an exact bit for bit
 duplicate. But the content should be exact or close, allowing detection.
 

docs/advanced_usage.md

@@ -501,7 +501,7 @@ The `datetime` filter formats a datetime string or datetime object using Python'
 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 {#date-localization}
+##### 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,
@@ -851,8 +851,8 @@ followed by the even pages.
 
 It's important that the scan files get consumed in the correct order, and one at a time.
 You therefore need to make sure that Paperless is running while you upload the files into
-the directory; and if you're using polling, make sure that
-`CONSUMER_POLLING_INTERVAL` is set to a value lower than it takes for the second scan to appear,
+the directory; and if you're using [polling](configuration.md#polling), make sure that
+`CONSUMER_POLLING` is set to a value lower than it takes for the second scan to appear,
 like 5-10 or even lower.
 
 Another thing that might happen is that you start a double sided scan, but then forget

docs/api.md

@@ -8,7 +8,7 @@ Further documentation is provided here for some endpoints and features.
 
 ## Authorization
 
-The REST api provides five different forms of authentication.
+The REST api provides four different forms of authentication.
 
 1.  Basic authentication
 
@@ -52,14 +52,6 @@ The REST api provides five different forms of authentication.
     [configuration](configuration.md#PAPERLESS_ENABLE_HTTP_REMOTE_USER_API)),
     you can authenticate against the API using Remote User auth.
 
-5.  Headless OIDC via [`django-allauth`](https://codeberg.org/allauth/django-allauth)
-
-    `django-allauth` exposes API endpoints under `api/auth/` which enable tools
-    like third-party apps to authenticate with social accounts that are
-    configured. See
-    [here](advanced_usage.md#openid-connect-and-social-authentication) for more
-    information on social accounts.
-
 ## Searching for documents
 
 Full text searching is available on the `/api/documents/` endpoint. Two

docs/configuration.md

@@ -659,7 +659,7 @@ system. See the corresponding
 
 : Sync groups from the third party authentication system (e.g. OIDC) to Paperless-ngx. When enabled, users will be added or removed from groups based on their group membership in the third party authentication system. Groups must already exist in Paperless-ngx and have the same name as in the third party authentication system. Groups are updated upon logging in via the third party authentication system, see the corresponding [django-allauth documentation](https://docs.allauth.org/en/dev/socialaccount/signals.html).
 
-: In order to pass groups from the authentication system you will need to update your [PAPERLESS_SOCIALACCOUNT_PROVIDERS](#PAPERLESS_SOCIALACCOUNT_PROVIDERS) setting by adding a top-level "SCOPES" setting which includes "groups", or the custom groups claim configured in [`PAPERLESS_SOCIAL_ACCOUNT_SYNC_GROUPS_CLAIM`](#PAPERLESS_SOCIAL_ACCOUNT_SYNC_GROUPS_CLAIM) e.g.:
+: In order to pass groups from the authentication system you will need to update your [PAPERLESS_SOCIALACCOUNT_PROVIDERS](#PAPERLESS_SOCIALACCOUNT_PROVIDERS) setting by adding a top-level "SCOPES" setting which includes "groups", e.g.:
 
     ```json
     {"openid_connect":{"SCOPE": ["openid","profile","email","groups"]...
@@ -667,12 +667,6 @@ system. See the corresponding
 
     Defaults to False
 
-#### [`PAPERLESS_SOCIAL_ACCOUNT_SYNC_GROUPS_CLAIM=<str>`](#PAPERLESS_SOCIAL_ACCOUNT_SYNC_GROUPS_CLAIM) {#PAPERLESS_SOCIAL_ACCOUNT_SYNC_GROUPS_CLAIM}
-
-: Allows you to define a custom groups claim. See [PAPERLESS_SOCIAL_ACCOUNT_SYNC_GROUPS](#PAPERLESS_SOCIAL_ACCOUNT_SYNC_GROUPS) which is required for this setting to take effect.
-
-    Defaults to "groups"
-
 #### [`PAPERLESS_SOCIAL_ACCOUNT_DEFAULT_GROUPS=<comma-separated-list>`](#PAPERLESS_SOCIAL_ACCOUNT_DEFAULT_GROUPS) {#PAPERLESS_SOCIAL_ACCOUNT_DEFAULT_GROUPS}
 
 : A list of group names that users who signup via social accounts will be added to upon signup. Groups listed here must already exist.
@@ -1152,9 +1146,8 @@ 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}
 
-: As of version 3.0 Paperless-ngx allows duplicate documents to be consumed by default, _except_ when
-this setting is enabled. When enabled, Paperless will check if a document with the same hash already
-exists in the system and delete the duplicate file from the consumption directory without consuming it.
+: When the consumer detects a duplicate document, it will not touch
+the original document. This default behavior can be changed here.
 
     Defaults to false.
 
@@ -1182,45 +1175,21 @@ don't exist yet.
 
 #### [`PAPERLESS_CONSUMER_IGNORE_PATTERNS=<json>`](#PAPERLESS_CONSUMER_IGNORE_PATTERNS) {#PAPERLESS_CONSUMER_IGNORE_PATTERNS}
 
-: Additional regex patterns for files to ignore in the consumption directory. Patterns are matched against filenames only (not full paths)
-using Python's `re.match()`, which anchors at the start of the filename.
+: By default, paperless ignores certain files and folders in the
+consumption directory, such as system files created by the Mac OS
+or hidden folders some tools use to store data.
 
-    See the [watchfiles documentation](https://watchfiles.helpmanual.io/api/filters/#watchfiles.BaseFilter.ignore_entity_patterns)
+    This can be adjusted by configuring a custom json array with
+    patterns to exclude.
 
-    This setting is for additional patterns beyond the built-in defaults. Common system files and directories are already ignored automatically.
-    The patterns will be compiled via Python's standard `re` module.
+    For example, `.DS_STORE/*` will ignore any files found in a folder
+    named `.DS_STORE`, including `.DS_STORE/bar.pdf` and `foo/.DS_STORE/bar.pdf`
 
-    Example custom patterns:
+    A pattern like `._*` will ignore anything starting with `._`, including:
+    `._foo.pdf` and `._bar/foo.pdf`
 
-    ```json
-    ["^temp_", "\\.bak$", "^~"]
-    ```
-
-    This would ignore:
-
-    - Files starting with `temp_` (e.g., `temp_scan.pdf`)
-    - Files ending with `.bak` (e.g., `document.pdf.bak`)
-    - Files starting with `~` (e.g., `~$document.docx`)
-
-    Defaults to `[]` (empty list, uses only built-in defaults).
-
-    The default ignores are `[.DS_Store, .DS_STORE, ._*, desktop.ini, Thumbs.db]` and cannot be overridden.
-
-#### [`PAPERLESS_CONSUMER_IGNORE_DIRS=<json>`](#PAPERLESS_CONSUMER_IGNORE_DIRS) {#PAPERLESS_CONSUMER_IGNORE_DIRS}
-
-: Additional directory names to ignore in the consumption directory. Directories matching these names (and all their contents) will be skipped.
-
-    This setting is for additional directories beyond the built-in defaults. Matching is done by directory name only, not full path.
-
-    Example:
-
-    ```json
-    ["temp", "incoming", ".hidden"]
-    ```
-
-    Defaults to `[]` (empty list, uses only built-in defaults).
-
-    The default ignores are `[.stfolder, .stversions, .localized, @eaDir, .Spotlight-V100, .Trashes, __MACOSX]` and cannot be overridden.
+    Defaults to
+    `[".DS_Store", ".DS_STORE", "._*", ".stfolder/*", ".stversions/*", ".localized/*", "desktop.ini", "@eaDir/*", "Thumbs.db"]`.
 
 #### [`PAPERLESS_CONSUMER_BARCODE_SCANNER=<string>`](#PAPERLESS_CONSUMER_BARCODE_SCANNER) {#PAPERLESS_CONSUMER_BARCODE_SCANNER}
 
@@ -1319,24 +1288,48 @@ within your documents.
 
     Defaults to false.
 
-#### [`PAPERLESS_CONSUMER_POLLING_INTERVAL=<num>`](#PAPERLESS_CONSUMER_POLLING_INTERVAL) {#PAPERLESS_CONSUMER_POLLING_INTERVAL}
+### Polling {#polling}
 
-: Configures how the consumer detects new files in the consumption directory.
+#### [`PAPERLESS_CONSUMER_POLLING=<num>`](#PAPERLESS_CONSUMER_POLLING) {#PAPERLESS_CONSUMER_POLLING}
 
-    When set to `0` (default), paperless uses native filesystem notifications for efficient, immediate detection of new files.
+: If paperless won't find documents added to your consume folder, it
+might not be able to automatically detect filesystem changes. In
+that case, specify a polling interval in seconds here, which will
+then cause paperless to periodically check your consumption
+directory for changes. This will also disable listening for file
+system changes with `inotify`.
 
-    When set to a positive number, paperless polls the consumption directory at that interval in seconds. Use polling for network filesystems (NFS, SMB/CIFS) where native notifications may not work reliably.
+    Defaults to 0, which disables polling and uses filesystem
+    notifications.
 
-    Defaults to 0.
+#### [`PAPERLESS_CONSUMER_POLLING_RETRY_COUNT=<num>`](#PAPERLESS_CONSUMER_POLLING_RETRY_COUNT) {#PAPERLESS_CONSUMER_POLLING_RETRY_COUNT}
 
-#### [`PAPERLESS_CONSUMER_STABILITY_DELAY=<num>`](#PAPERLESS_CONSUMER_STABILITY_DELAY) {#PAPERLESS_CONSUMER_STABILITY_DELAY}
+: If consumer polling is enabled, sets the maximum number of times
+paperless will check for a file to remain unmodified. If a file's
+modification time and size are identical for two consecutive checks, it
+will be consumed.
 
-: Sets the time in seconds that a file must remain unchanged (same size and modification time) before paperless will begin consuming it.
+    Defaults to 5.
 
-    Increase this value if you experience issues with files being consumed before they are fully written, particularly on slower network storage or
-    with certain scanner quirks
+#### [`PAPERLESS_CONSUMER_POLLING_DELAY=<num>`](#PAPERLESS_CONSUMER_POLLING_DELAY) {#PAPERLESS_CONSUMER_POLLING_DELAY}
 
-    Defaults to 5.0 seconds.
+: If consumer polling is enabled, sets the delay in seconds between
+each check (above) paperless will do while waiting for a file to
+remain unmodified.
+
+    Defaults to 5.
+
+### iNotify {#inotify}
+
+#### [`PAPERLESS_CONSUMER_INOTIFY_DELAY=<num>`](#PAPERLESS_CONSUMER_INOTIFY_DELAY) {#PAPERLESS_CONSUMER_INOTIFY_DELAY}
+
+: Sets the time in seconds the consumer will wait for additional
+events from inotify before the consumer will consider a file ready
+and begin consumption. Certain scanners or network setups may
+generate multiple events for a single file, leading to multiple
+consumers working on the same file. Configure this to prevent that.
+
+    Defaults to 0.5 seconds.
 
 ## Workflow webhooks
 
@@ -1617,16 +1610,6 @@ processing. This only has an effect if
 
     Defaults to `0 1 * * *`, once per day.
 
-## Share links
-
-#### [`PAPERLESS_SHARE_LINK_BUNDLE_CLEANUP_CRON=<cron expression>`](#PAPERLESS_SHARE_LINK_BUNDLE_CLEANUP_CRON) {#PAPERLESS_SHARE_LINK_BUNDLE_CLEANUP_CRON}
-
-: Controls how often Paperless-ngx removes expired share link bundles (and their generated ZIP archives).
-
-: If set to the string "disable", expired bundles are not cleaned up automatically.
-
-    Defaults to `0 2 * * *`, once per day at 02:00.
-
 ## Binaries
 
 There are a few external software packages that Paperless expects to

docs/migration.md

@@ -1,25 +0,0 @@
-# v3 Migration Guide
-
-## Consumer Settings Changes
-
-The v3 consumer command uses a [different library](https://watchfiles.helpmanual.io/) to unify
-the watching for new files in the consume directory. For the user, this removes several configuration options related to delays and retries
-and replaces with a single unified setting. It also adjusts how the consumer ignore filtering happens, replaced `fnmatch` with `regex` and
-separating the directory ignore from the file ignore.
-
-### Summary
-
-| Old Setting                    | New Setting                                                                         | Notes                                                                                |
-| ------------------------------ | ----------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------ |
-| `CONSUMER_POLLING`             | [`CONSUMER_POLLING_INTERVAL`](configuration.md#PAPERLESS_CONSUMER_POLLING_INTERVAL) | Renamed for clarity                                                                  |
-| `CONSUMER_INOTIFY_DELAY`       | [`CONSUMER_STABILITY_DELAY`](configuration.md#PAPERLESS_CONSUMER_STABILITY_DELAY)   | Unified for all modes                                                                |
-| `CONSUMER_POLLING_DELAY`       | _Removed_                                                                           | Use `CONSUMER_STABILITY_DELAY`                                                       |
-| `CONSUMER_POLLING_RETRY_COUNT` | _Removed_                                                                           | Automatic with stability tracking                                                    |
-| `CONSUMER_IGNORE_PATTERNS`     | [`CONSUMER_IGNORE_PATTERNS`](configuration.md#PAPERLESS_CONSUMER_IGNORE_PATTERNS)   | **Now regex, not fnmatch**; user patterns are added to (not replacing) default ones  |
-| _New_                          | [`CONSUMER_IGNORE_DIRS`](configuration.md#PAPERLESS_CONSUMER_IGNORE_DIRS)           | Additional directories to ignore; user entries are added to (not replacing) defaults |
-
-## Encryption Support
-
-Document and thumbnail encryption is no longer supported. This was previously deprecated in [paperless-ng 0.9.3](https://github.com/paperless-ngx/paperless-ngx/blob/dev/docs/changelog.md#paperless-ng-093)
-
-Users must decrypt their document using the `decrypt_documents` command before upgrading.

docs/setup.md

@@ -124,7 +124,8 @@ account. The script essentially automatically performs the steps described in [D
         system notifications with `inotify`. When storing the consumption
         directory on such a file system, paperless will not pick up new
         files with the default configuration. You will need to use
-        [`PAPERLESS_CONSUMER_POLLING_INTERVAL`](configuration.md#PAPERLESS_CONSUMER_POLLING_INTERVAL), which will disable inotify.
+        [`PAPERLESS_CONSUMER_POLLING`](configuration.md#PAPERLESS_CONSUMER_POLLING), which will disable inotify. See
+        [here](configuration.md#polling).
 
 5.  Run `docker compose pull`. This will pull the image from the GitHub container registry
     by default but you can change the image to pull from Docker Hub by changing the `image`

docs/troubleshooting.md

@@ -46,9 +46,9 @@ run:
 If you notice that the consumer will only pickup files in the
 consumption directory at startup, but won't find any other files added
 later, you will need to enable filesystem polling with the configuration
-option [`PAPERLESS_CONSUMER_POLLING_INTERVAL`](configuration.md#PAPERLESS_CONSUMER_POLLING_INTERVAL).
+option [`PAPERLESS_CONSUMER_POLLING`](configuration.md#PAPERLESS_CONSUMER_POLLING).
 
-This will disable automatic listening for filesystem changes and
+This will disable listening to filesystem changes with inotify and
 paperless will manually check the consumption directory for changes
 instead.
 
@@ -234,9 +234,47 @@ FileNotFoundError: [Errno 2] No such file or directory: '/tmp/ocrmypdf.io.yhk3zb
 
 This probably indicates paperless tried to consume the same file twice.
 This can happen for a number of reasons, depending on how documents are
-placed into the consume folder, such as how a scanner may modify a file multiple times as it scans.
-Try adjusting the
-[file stability delay](configuration.md#PAPERLESS_CONSUMER_STABILITY_DELAY) to a larger value.
+placed into the consume folder. If paperless is using inotify (the
+default) to check for documents, try adjusting the
+[inotify configuration](configuration.md#inotify). If polling is enabled, try adjusting the
+[polling configuration](configuration.md#polling).
+
+## Consumer fails waiting for file to remain unmodified.
+
+You might find messages like these in your log files:
+
+```
+[ERROR] [paperless.management.consumer] Timeout while waiting on file /usr/src/paperless/src/../consume/SCN_0001.pdf to remain unmodified.
+```
+
+This indicates paperless timed out while waiting for the file to be
+completely written to the consume folder. Adjusting
+[polling configuration](configuration.md#polling) values should resolve the issue.
+
+!!! note
+
+    The user will need to manually move the file out of the consume folder
+    and back in, for the initial failing file to be consumed.
+
+## Consumer fails reporting "OS reports file as busy still".
+
+You might find messages like these in your log files:
+
+```
+[WARNING] [paperless.management.consumer] Not consuming file /usr/src/paperless/src/../consume/SCN_0001.pdf: OS reports file as busy still
+```
+
+This indicates paperless was unable to open the file, as the OS reported
+the file as still being in use. To prevent a crash, paperless did not
+try to consume the file. If paperless is using inotify (the default) to
+check for documents, try adjusting the
+[inotify configuration](configuration.md#inotify). If polling is enabled, try adjusting the
+[polling configuration](configuration.md#polling).
+
+!!! note
+
+    The user will need to manually move the file out of the consume folder
+    and back in, for the initial failing file to be consumed.
 
 ## Log reports "Creating PaperlessTask failed".
 

docs/usage.md

@@ -308,14 +308,12 @@ or using [email](#workflow-action-email) or [webhook](#workflow-action-webhook)
 
 ### Share Links
 
-"Share links" are public links to files (or an archive of files) and can be created and managed under the 'Send' button on the document detail screen or from the bulk editor.
+"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 or bundled download.
+-   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.
--   From the document detail screen you can create a share link for that single document.
--   From the bulk editor you can create a **share link bundle** for any selection. Paperless-ngx prepares a ZIP archive in the background and exposes a single share link. You can revisit the "Manage share link bundles" dialog to monitor progress, retry failed bundles, or delete links.
 
 !!! tip
 
@@ -567,7 +565,7 @@ This allows for complex logic to be used to generate the title, including [logic
 and [filters](https://jinja.palletsprojects.com/en/3.1.x/templates/#id11).
 The template is provided as a string.
 
-Using Jinja2 Templates is also useful for [Date localization](advanced_usage.md#date-localization) in the title.
+Using Jinja2 Templates is also useful for [Date localization](advanced_usage.md#Date-Localization) in the title.
 
 The available inputs differ depending on the type of workflow trigger.
 This is because at the time of consumption (when the text is to be set), no automatic tags etc. have been
@@ -599,7 +597,6 @@ The following placeholders are only available for "added" or "updated" triggers
 -   `{{created_day}}`: created day
 -   `{{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_id}}`: Document ID
 
 ##### Examples
 

mkdocs.yml

@@ -69,9 +69,8 @@ nav:
   - development.md
   - 'FAQs': faq.md
   - troubleshooting.md
-  - 'Migration to v3': migration.md
   - changelog.md
-copyright: Copyright © 2016 - 2026 Daniel Quinn, Jonas Winkler, and the Paperless-ngx team
+copyright: Copyright © 2016 - 2023 Daniel Quinn, Jonas Winkler, and the Paperless-ngx team
 extra:
   social:
     - icon: fontawesome/brands/github

paperless.conf.example

@@ -55,10 +55,10 @@
 #PAPERLESS_TASK_WORKERS=1
 #PAPERLESS_THREADS_PER_WORKER=1
 #PAPERLESS_TIME_ZONE=UTC
-#PAPERLESS_CONSUMER_POLLING_INTERVAL=10
+#PAPERLESS_CONSUMER_POLLING=10
 #PAPERLESS_CONSUMER_DELETE_DUPLICATES=false
 #PAPERLESS_CONSUMER_RECURSIVE=false
-#PAPERLESS_CONSUMER_IGNORE_PATTERNS=[]  # Defaults are built in; add filename regexes, e.g. ["^\\.DS_Store$", "^desktop\\.ini$"]
+#PAPERLESS_CONSUMER_IGNORE_PATTERNS=[".DS_STORE/*", "._*", ".stfolder/*", ".stversions/*", ".localized/*", "desktop.ini"]
 #PAPERLESS_CONSUMER_SUBDIRS_AS_TAGS=false
 #PAPERLESS_CONSUMER_ENABLE_BARCODES=false
 #PAPERLESS_CONSUMER_BARCODE_STRING=PATCHT

pyproject.toml

@@ -16,7 +16,6 @@ classifiers = [
 # This will allow testing to not install a webserver, mysql, etc
 
 dependencies = [
-  "adrf~=0.1.12",
   "azure-ai-documentintelligence>=1.0.2",
   "babel>=2.17",
   "bleach~=6.3.0",
@@ -28,7 +27,7 @@ dependencies = [
   # WARNING: django does not use semver.
   #          Only patch versions are guaranteed to not introduce breaking changes.
   "django~=5.2.5",
-  "django-allauth[mfa,socialaccount]~=65.13.1",
+  "django-allauth[mfa,socialaccount]~=65.12.1",
   "django-auditlog~=3.4.1",
   "django-cachalot~=2.8.0",
   "django-celery-results~=2.6.0",
@@ -50,7 +49,9 @@ dependencies = [
   "flower~=2.0.1",
   "gotenberg-client~=0.13.1",
   "httpx-oauth~=0.16",
+  "ijson~=3.3",
   "imap-tools~=1.11.0",
+  "inotifyrecursive~=0.3",
   "jinja2~=3.1.5",
   "langdetect~=1.0.9",
   "llama-index-core>=0.14.12",
@@ -73,13 +74,15 @@ dependencies = [
   "rapidfuzz~=3.14.0",
   "redis[hiredis]~=5.2.1",
   "regex>=2025.9.18",
+  "rich~=14.1.0",
   "scikit-learn~=1.7.0",
   "sentence-transformers>=4.1",
   "setproctitle~=1.3.4",
   "tika-client~=0.10.0",
   "torch~=2.9.1",
   "tqdm~=4.67.1",
-  "watchfiles>=1.1.1",
+  "typer~=0.12",
+  "watchdog~=6.0",
   "whitenoise~=6.9",
   "whoosh-reloaded>=2.7.5",
   "zxing-cpp~=2.3.0",
@@ -115,16 +118,15 @@ testing = [
   "daphne",
   "factory-boy~=3.3.1",
   "imagehash",
-  "pytest~=9.0.0",
+  "pytest~=8.4.1",
   "pytest-cov~=7.0.0",
   "pytest-django~=4.11.1",
-  "pytest-env~=1.2.0",
+  "pytest-env",
   "pytest-httpx",
-  "pytest-mock~=3.15.1",
-  #"pytest-randomly~=4.0.1",
-  "pytest-rerunfailures~=16.1",
+  "pytest-mock",
+  "pytest-rerunfailures",
   "pytest-sugar",
-  "pytest-xdist~=3.8.0",
+  "pytest-xdist",
 ]
 
 lint = [
@@ -259,18 +261,14 @@ lint.isort.force-single-line = true
 
 [tool.codespell]
 write-changes = true
-ignore-words-list = "criterias,afterall,valeu,ureue,equest,ure,assertIn,Oktober,commitish"
+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]
-minversion = "9.0"
-pythonpath = [ "src" ]
-
-strict_config = true
-strict_markers = true
-strict_parametrization_ids = true
-strict_xfail = true
-
+[tool.pytest.ini_options]
+minversion = "8.0"
+pythonpath = [
+  "src",
+]
 testpaths = [
   "src/documents/tests/",
   "src/paperless/tests/",
@@ -281,7 +279,6 @@ testpaths = [
   "src/paperless_remote/tests/",
   "src/paperless_ai/tests",
 ]
-
 addopts = [
   "--pythonwarnings=all",
   "--cov",
@@ -289,26 +286,15 @@ addopts = [
   "--cov-report=xml",
   "--numprocesses=auto",
   "--maxprocesses=16",
-  "--dist=loadscope",
+  "--quiet",
   "--durations=50",
-  "--durations-min=0.5",
   "--junitxml=junit.xml",
-  "-o",
-  "junit_family=legacy",
+  "-o junit_family=legacy",
 ]
-
 norecursedirs = [ "src/locale/", ".venv/", "src-ui/" ]
 
 DJANGO_SETTINGS_MODULE = "paperless.settings"
 
-markers = [
-  "live: Integration tests requiring external services (Gotenberg, Tika, nginx, etc)",
-  "nginx: Tests that make HTTP requests to the local nginx service",
-  "gotenberg: Tests requiring Gotenberg service",
-  "tika: Tests requiring Tika service",
-  "greenmail: Tests requiring Greenmail service",
-]
-
 [tool.pytest_env]
 PAPERLESS_DISABLE_DBHANDLER = "true"
 PAPERLESS_CACHE_BACKEND = "django.core.cache.backends.locmem.LocMemCache"

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

@@ -103,6 +103,22 @@
             </div>
 
             <div class="row mb-3">
+              <div class="col-md-3 col-form-label pt-0">
+                <span i18n>Items per page</span>
+              </div>
+              <div class="col">
+
+                <select class="form-select" formControlName="documentListItemPerPage">
+                  <option [ngValue]="10">10</option>
+                  <option [ngValue]="25">25</option>
+                  <option [ngValue]="50">50</option>
+                  <option [ngValue]="100">100</option>
+                </select>
+
+              </div>
+            </div>
+
+            <div class="row">
               <div class="col-md-3 col-form-label pt-0">
                 <span i18n>Sidebar</span>
               </div>
@@ -137,28 +153,8 @@
                 </button>
               </div>
             </div>
-          </div>
-          <div class="col-xl-6 ps-xl-5">
-            <h5 class="mt-3 mt-md-0" i18n>Global search</h5>
-            <div class="row">
-              <div class="col">
-                <pngx-input-check i18n-title title="Do not include advanced search results" formControlName="searchDbOnly"></pngx-input-check>
-              </div>
-            </div>
 
-            <div class="row mb-3">
-              <div class="col-md-3 col-form-label pt-0">
-                <span i18n>Full search links to</span>
-              </div>
-              <div class="col mb-3">
-                <select class="form-select" formControlName="searchLink">
-                  <option [ngValue]="GlobalSearchType.TITLE_CONTENT" i18n>Title and content search</option>
-                  <option [ngValue]="GlobalSearchType.ADVANCED" i18n>Advanced search</option>
-                </select>
-              </div>
-            </div>
-
-            <h5 class="mt-3 mt-md-0" id="update-checking" i18n>Update checking</h5>
+            <h5 class="mt-3" id="update-checking" i18n>Update checking</h5>
             <div class="row mb-3">
               <div class="col d-flex flex-row align-items-start">
                 <pngx-input-check i18n-title title="Enable update checking" formControlName="updateCheckingEnabled"></pngx-input-check>
@@ -183,33 +179,11 @@
                 <pngx-input-check i18n-title title="Show document counts in sidebar saved views" formControlName="sidebarViewsShowCount"></pngx-input-check>
               </div>
             </div>
+
           </div>
-        </div>
+          <div class="col-xl-6 ps-xl-5">
+            <h5 class="mt-3 mt-md-0" i18n>Document editing</h5>
 
-      </ng-template>
-    </li>
-
-    <li [ngbNavItem]="SettingsNavIDs.Documents">
-      <a ngbNavLink i18n>Documents</a>
-      <ng-template ngbNavContent>
-        <div class="row">
-          <div class="col-xl-6 pe-xl-5">
-            <h5 i18n>Documents</h5>
-            <div class="row mb-3">
-              <div class="col-md-3 col-form-label pt-0">
-                <span i18n>Items per page</span>
-              </div>
-              <div class="col">
-                <select class="form-select" formControlName="documentListItemPerPage">
-                  <option [ngValue]="10">10</option>
-                  <option [ngValue]="25">25</option>
-                  <option [ngValue]="50">50</option>
-                  <option [ngValue]="100">100</option>
-                </select>
-              </div>
-            </div>
-
-            <h5 class="mt-3" i18n>Document editing</h5>
             <div class="row">
               <div class="col">
                 <pngx-input-check i18n-title title="Use PDF viewer provided by the browser" i18n-hint hint="This is usually faster for displaying large PDF documents, but it might not work on some browsers." formControlName="useNativePdfViewer"></pngx-input-check>
@@ -235,32 +209,31 @@
               </div>
             </div>
 
-            <div class="row">
+            <div class="row mb-3">
               <div class="col">
                 <pngx-input-check i18n-title title="Show document thumbnail during loading" formControlName="documentEditingOverlayThumbnail"></pngx-input-check>
               </div>
             </div>
 
-            <div class="row mb-3">
+            <h5 class="mt-3" i18n>Global search</h5>
+            <div class="row">
               <div class="col">
-                <p class="mb-2" i18n>Built-in fields to show:</p>
-                @for (option of documentDetailFieldOptions; track option.id) {
-                  <div class="form-check ms-3">
-                    <input class="form-check-input" type="checkbox"
-                      [id]="'documentDetailField-' + option.id"
-                      [checked]="isDocumentDetailFieldShown(option.id)"
-                      (change)="toggleDocumentDetailField(option.id, $event.target.checked)" />
-                    <label class="form-check-label" [for]="'documentDetailField-' + option.id">
-                      {{ option.label }}
-                    </label>
-                  </div>
-                }
-                <p class="small text-muted mt-1" i18n>Uncheck fields to hide them on the document details page.</p>
+                <pngx-input-check i18n-title title="Do not include advanced search results" formControlName="searchDbOnly"></pngx-input-check>
+              </div>
+            </div>
+
+            <div class="row mb-3">
+              <div class="col-md-3 col-form-label pt-0">
+                <span i18n>Full search links to</span>
+              </div>
+              <div class="col mb-3">
+                <select class="form-select" formControlName="searchLink">
+                  <option [ngValue]="GlobalSearchType.TITLE_CONTENT" i18n>Title and content search</option>
+                  <option [ngValue]="GlobalSearchType.ADVANCED" i18n>Advanced search</option>
+                </select>
               </div>
             </div>
-          </div>
 
-          <div class="col-xl-6 ps-xl-5">
             <h5 class="mt-3" i18n>Bulk editing</h5>
             <div class="row mb-3">
               <div class="col">
@@ -269,27 +242,16 @@
               </div>
             </div>
 
-            <h5 class="mt-3" i18n>PDF Editor</h5>
-            <div class="row">
-              <div class="col-md-3 col-form-label pt-0">
-                <span i18n>Default editing mode</span>
-              </div>
-              <div class="col">
-                <select class="form-select" formControlName="pdfEditorDefaultEditMode">
-                  <option [ngValue]="PdfEditorEditMode.Create" i18n>Create new document(s)</option>
-                  <option [ngValue]="PdfEditorEditMode.Update" i18n>Update existing document</option>
-                </select>
-              </div>
-            </div>
-
             <h5 class="mt-3" i18n>Notes</h5>
             <div class="row mb-3">
               <div class="col">
                 <pngx-input-check i18n-title title="Enable notes" formControlName="notesEnabled"></pngx-input-check>
               </div>
             </div>
+
           </div>
         </div>
+
       </ng-template>
     </li>
 

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

@@ -201,9 +201,9 @@ describe('SettingsComponent', () => {
     const navigateSpy = jest.spyOn(router, 'navigate')
     const tabButtons = fixture.debugElement.queryAll(By.directive(NgbNavLink))
     tabButtons[1].nativeElement.dispatchEvent(new MouseEvent('click'))
-    expect(navigateSpy).toHaveBeenCalledWith(['settings', 'documents'])
-    tabButtons[2].nativeElement.dispatchEvent(new MouseEvent('click'))
     expect(navigateSpy).toHaveBeenCalledWith(['settings', 'permissions'])
+    tabButtons[2].nativeElement.dispatchEvent(new MouseEvent('click'))
+    expect(navigateSpy).toHaveBeenCalledWith(['settings', 'notifications'])
 
     const initSpy = jest.spyOn(component, 'initialize')
     component.isDirty = true // mock dirty
@@ -213,8 +213,8 @@ describe('SettingsComponent', () => {
     expect(initSpy).not.toHaveBeenCalled()
 
     navigateSpy.mockResolvedValueOnce(true) // nav accepted even though dirty
-    tabButtons[2].nativeElement.dispatchEvent(new MouseEvent('click'))
-    expect(navigateSpy).toHaveBeenCalledWith(['settings', 'permissions'])
+    tabButtons[1].nativeElement.dispatchEvent(new MouseEvent('click'))
+    expect(navigateSpy).toHaveBeenCalledWith(['settings', 'notifications'])
     expect(initSpy).toHaveBeenCalled()
   })
 
@@ -226,7 +226,7 @@ describe('SettingsComponent', () => {
     activatedRoute.snapshot.fragment = '#notifications'
     const scrollSpy = jest.spyOn(viewportScroller, 'scrollToAnchor')
     component.ngOnInit()
-    expect(component.activeNavID).toEqual(4) // Notifications
+    expect(component.activeNavID).toEqual(3) // Notifications
     component.ngAfterViewInit()
     expect(scrollSpy).toHaveBeenCalledWith('#notifications')
   })
@@ -251,7 +251,7 @@ describe('SettingsComponent', () => {
     expect(toastErrorSpy).toHaveBeenCalled()
     expect(storeSpy).toHaveBeenCalled()
     expect(appearanceSettingsSpy).not.toHaveBeenCalled()
-    expect(setSpy).toHaveBeenCalledTimes(32)
+    expect(setSpy).toHaveBeenCalledTimes(30)
 
     // succeed
     storeSpy.mockReturnValueOnce(of(true))
@@ -366,22 +366,4 @@ describe('SettingsComponent', () => {
     settingsService.settingsSaved.emit(true)
     expect(maybeRefreshSpy).toHaveBeenCalled()
   })
-
-  it('should support toggling document detail fields', () => {
-    completeSetup()
-    const field = 'storage_path'
-    expect(
-      component.settingsForm.get('documentDetailsHiddenFields').value.length
-    ).toEqual(0)
-    component.toggleDocumentDetailField(field, false)
-    expect(
-      component.settingsForm.get('documentDetailsHiddenFields').value.length
-    ).toEqual(1)
-    expect(component.isDocumentDetailFieldShown(field)).toBeFalsy()
-    component.toggleDocumentDetailField(field, true)
-    expect(
-      component.settingsForm.get('documentDetailsHiddenFields').value.length
-    ).toEqual(0)
-    expect(component.isDocumentDetailFieldShown(field)).toBeTruthy()
-  })
 })

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

@@ -64,16 +64,15 @@ import { PermissionsGroupComponent } from '../../common/input/permissions/permis
 import { PermissionsUserComponent } from '../../common/input/permissions/permissions-user/permissions-user.component'
 import { SelectComponent } from '../../common/input/select/select.component'
 import { PageHeaderComponent } from '../../common/page-header/page-header.component'
-import { PdfEditorEditMode } from '../../common/pdf-editor/pdf-editor-edit-mode'
 import { SystemStatusDialogComponent } from '../../common/system-status-dialog/system-status-dialog.component'
-import { ZoomSetting } from '../../document-detail/zoom-setting'
+import { ZoomSetting } from '../../document-detail/document-detail.component'
 import { ComponentWithPermissions } from '../../with-permissions/with-permissions.component'
 
 enum SettingsNavIDs {
   General = 1,
-  Documents = 2,
-  Permissions = 3,
-  Notifications = 4,
+  Permissions = 2,
+  Notifications = 3,
+  SavedViews = 4,
 }
 
 const systemLanguage = { code: '', name: $localize`Use system language` }
@@ -82,25 +81,6 @@ const systemDateFormat = {
   name: $localize`Use date format of display language`,
 }
 
-export enum DocumentDetailFieldID {
-  ArchiveSerialNumber = 'archive_serial_number',
-  Correspondent = 'correspondent',
-  DocumentType = 'document_type',
-  StoragePath = 'storage_path',
-  Tags = 'tags',
-}
-
-const documentDetailFieldOptions = [
-  {
-    id: DocumentDetailFieldID.ArchiveSerialNumber,
-    label: $localize`Archive serial number`,
-  },
-  { id: DocumentDetailFieldID.Correspondent, label: $localize`Correspondent` },
-  { id: DocumentDetailFieldID.DocumentType, label: $localize`Document type` },
-  { id: DocumentDetailFieldID.StoragePath, label: $localize`Storage path` },
-  { id: DocumentDetailFieldID.Tags, label: $localize`Tags` },
-]
-
 @Component({
   selector: 'pngx-settings',
   templateUrl: './settings.component.html',
@@ -164,10 +144,8 @@ export class SettingsComponent
     defaultPermsEditGroups: new FormControl(null),
     useNativePdfViewer: new FormControl(null),
     pdfViewerDefaultZoom: new FormControl(null),
-    pdfEditorDefaultEditMode: new FormControl(null),
     documentEditingRemoveInboxTags: new FormControl(null),
     documentEditingOverlayThumbnail: new FormControl(null),
-    documentDetailsHiddenFields: new FormControl([]),
     searchDbOnly: new FormControl(null),
     searchLink: new FormControl(null),
 
@@ -198,10 +176,6 @@ export class SettingsComponent
 
   public readonly ZoomSetting = ZoomSetting
 
-  public readonly PdfEditorEditMode = PdfEditorEditMode
-
-  public readonly documentDetailFieldOptions = documentDetailFieldOptions
-
   get systemStatusHasErrors(): boolean {
     return (
       this.systemStatus.database.status === SystemStatusItemStatus.ERROR ||
@@ -318,9 +292,6 @@ export class SettingsComponent
       pdfViewerDefaultZoom: this.settings.get(
         SETTINGS_KEYS.PDF_VIEWER_ZOOM_SETTING
       ),
-      pdfEditorDefaultEditMode: this.settings.get(
-        SETTINGS_KEYS.PDF_EDITOR_DEFAULT_EDIT_MODE
-      ),
       displayLanguage: this.settings.getLanguage(),
       dateLocale: this.settings.get(SETTINGS_KEYS.DATE_LOCALE),
       dateFormat: this.settings.get(SETTINGS_KEYS.DATE_FORMAT),
@@ -365,9 +336,6 @@ export class SettingsComponent
       documentEditingOverlayThumbnail: this.settings.get(
         SETTINGS_KEYS.DOCUMENT_EDITING_OVERLAY_THUMBNAIL
       ),
-      documentDetailsHiddenFields: this.settings.get(
-        SETTINGS_KEYS.DOCUMENT_DETAILS_HIDDEN_FIELDS
-      ),
       searchDbOnly: this.settings.get(SETTINGS_KEYS.SEARCH_DB_ONLY),
       searchLink: this.settings.get(SETTINGS_KEYS.SEARCH_FULL_TYPE),
     }
@@ -490,10 +458,6 @@ export class SettingsComponent
       SETTINGS_KEYS.PDF_VIEWER_ZOOM_SETTING,
       this.settingsForm.value.pdfViewerDefaultZoom
     )
-    this.settings.set(
-      SETTINGS_KEYS.PDF_EDITOR_DEFAULT_EDIT_MODE,
-      this.settingsForm.value.pdfEditorDefaultEditMode
-    )
     this.settings.set(
       SETTINGS_KEYS.DATE_LOCALE,
       this.settingsForm.value.dateLocale
@@ -562,10 +526,6 @@ export class SettingsComponent
       SETTINGS_KEYS.DOCUMENT_EDITING_OVERLAY_THUMBNAIL,
       this.settingsForm.value.documentEditingOverlayThumbnail
     )
-    this.settings.set(
-      SETTINGS_KEYS.DOCUMENT_DETAILS_HIDDEN_FIELDS,
-      this.settingsForm.value.documentDetailsHiddenFields
-    )
     this.settings.set(
       SETTINGS_KEYS.SEARCH_DB_ONLY,
       this.settingsForm.value.searchDbOnly
@@ -627,26 +587,6 @@ export class SettingsComponent
     this.settingsForm.get('themeColor').patchValue('')
   }
 
-  isDocumentDetailFieldShown(fieldId: string): boolean {
-    const hiddenFields =
-      this.settingsForm.value.documentDetailsHiddenFields || []
-    return !hiddenFields.includes(fieldId)
-  }
-
-  toggleDocumentDetailField(fieldId: string, checked: boolean) {
-    const hiddenFields = new Set(
-      this.settingsForm.value.documentDetailsHiddenFields || []
-    )
-    if (checked) {
-      hiddenFields.delete(fieldId)
-    } else {
-      hiddenFields.add(fieldId)
-    }
-    this.settingsForm
-      .get('documentDetailsHiddenFields')
-      .setValue(Array.from(hiddenFields))
-  }
-
   showSystemStatus() {
     const modal: NgbModalRef = this.modalService.open(
       SystemStatusDialogComponent,

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

@@ -97,12 +97,6 @@
                   <br/><em>(<ng-container i18n>click for full output</ng-container>)</em>
                 }
               </ng-template>
-              @if (task.duplicate_documents?.length > 0) {
-                <div class="small text-warning-emphasis d-flex align-items-center gap-1">
-                  <i-bs class="lh-1" width="1em" height="1em" name="exclamation-triangle"></i-bs>
-                  <span i18n>Duplicate(s) detected</span>
-                </div>
-              }
             </td>
           }
           <td class="d-lg-none">

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

@@ -248,7 +248,7 @@ main {
   }
 }
 
-@media screen and (min-width: 376px) and (max-width: 768px) {
+@media screen and (min-width: 366px) and (max-width: 768px) {
   .navbar-toggler {
     // compensate for 2 buttons on the right
     margin-right: 45px;

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

@@ -164,11 +164,9 @@
     {{ item.name }}
     <span class="ms-auto text-muted small">
       @if (item.dateEnd) {
-        {{ item.date | customDate:'mediumDate' }} &ndash; {{ item.dateEnd | customDate:'mediumDate' }}
-      } @else if (item.dateTilNow) {
-        {{ item.dateTilNow | customDate:'mediumDate' }} &ndash; <ng-container i18n>now</ng-container>
+        {{ item.date | customDate:'MMM d' }} &ndash; {{ item.dateEnd | customDate:'mediumDate' }}
       } @else {
-        {{ item.date | customDate:'mediumDate' }}
+        {{ item.date | customDate:'mediumDate' }} &ndash; <ng-container i18n>now</ng-container>
       }
     </span>
   </div>

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

@@ -79,34 +79,32 @@ export class DatesDropdownComponent implements OnInit, OnDestroy {
     {
       id: RelativeDate.WITHIN_1_WEEK,
       name: $localize`Within 1 week`,
-      dateTilNow: new Date().setDate(new Date().getDate() - 7),
+      date: new Date().setDate(new Date().getDate() - 7),
     },
     {
       id: RelativeDate.WITHIN_1_MONTH,
       name: $localize`Within 1 month`,
-      dateTilNow: new Date().setMonth(new Date().getMonth() - 1),
+      date: new Date().setMonth(new Date().getMonth() - 1),
     },
     {
       id: RelativeDate.WITHIN_3_MONTHS,
       name: $localize`Within 3 months`,
-      dateTilNow: new Date().setMonth(new Date().getMonth() - 3),
+      date: new Date().setMonth(new Date().getMonth() - 3),
     },
     {
       id: RelativeDate.WITHIN_1_YEAR,
       name: $localize`Within 1 year`,
-      dateTilNow: new Date().setFullYear(new Date().getFullYear() - 1),
+      date: new Date().setFullYear(new Date().getFullYear() - 1),
     },
     {
       id: RelativeDate.THIS_YEAR,
       name: $localize`This year`,
       date: new Date('1/1/' + new Date().getFullYear()),
-      dateEnd: new Date('12/31/' + new Date().getFullYear()),
     },
     {
       id: RelativeDate.THIS_MONTH,
       name: $localize`This month`,
       date: new Date().setDate(1),
-      dateEnd: new Date(new Date().getFullYear(), new Date().getMonth() + 1, 0),
     },
     {
       id: RelativeDate.TODAY,

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

@@ -412,9 +412,6 @@ describe('WorkflowEditDialogComponent', () => {
       return newFilter
     }
 
-    const correspondentAny = addFilterOfType(TriggerFilterType.CorrespondentAny)
-    correspondentAny.get('values').setValue([11])
-
     const correspondentIs = addFilterOfType(TriggerFilterType.CorrespondentIs)
     correspondentIs.get('values').setValue(1)
 
@@ -424,18 +421,12 @@ describe('WorkflowEditDialogComponent', () => {
     const documentTypeIs = addFilterOfType(TriggerFilterType.DocumentTypeIs)
     documentTypeIs.get('values').setValue(1)
 
-    const documentTypeAny = addFilterOfType(TriggerFilterType.DocumentTypeAny)
-    documentTypeAny.get('values').setValue([12])
-
     const documentTypeNot = addFilterOfType(TriggerFilterType.DocumentTypeNot)
     documentTypeNot.get('values').setValue([1])
 
     const storagePathIs = addFilterOfType(TriggerFilterType.StoragePathIs)
     storagePathIs.get('values').setValue(1)
 
-    const storagePathAny = addFilterOfType(TriggerFilterType.StoragePathAny)
-    storagePathAny.get('values').setValue([13])
-
     const storagePathNot = addFilterOfType(TriggerFilterType.StoragePathNot)
     storagePathNot.get('values').setValue([1])
 
@@ -450,13 +441,10 @@ describe('WorkflowEditDialogComponent', () => {
     expect(formValues.triggers[0].filter_has_tags).toEqual([1])
     expect(formValues.triggers[0].filter_has_all_tags).toEqual([2, 3])
     expect(formValues.triggers[0].filter_has_not_tags).toEqual([4])
-    expect(formValues.triggers[0].filter_has_any_correspondents).toEqual([11])
     expect(formValues.triggers[0].filter_has_correspondent).toEqual(1)
     expect(formValues.triggers[0].filter_has_not_correspondents).toEqual([1])
-    expect(formValues.triggers[0].filter_has_any_document_types).toEqual([12])
     expect(formValues.triggers[0].filter_has_document_type).toEqual(1)
     expect(formValues.triggers[0].filter_has_not_document_types).toEqual([1])
-    expect(formValues.triggers[0].filter_has_any_storage_paths).toEqual([13])
     expect(formValues.triggers[0].filter_has_storage_path).toEqual(1)
     expect(formValues.triggers[0].filter_has_not_storage_paths).toEqual([1])
     expect(formValues.triggers[0].filter_custom_field_query).toEqual(
@@ -519,22 +507,16 @@ describe('WorkflowEditDialogComponent', () => {
 
     setFilter(TriggerFilterType.TagsAll, 11)
     setFilter(TriggerFilterType.TagsNone, 12)
-    setFilter(TriggerFilterType.CorrespondentAny, 16)
     setFilter(TriggerFilterType.CorrespondentNot, 13)
-    setFilter(TriggerFilterType.DocumentTypeAny, 17)
     setFilter(TriggerFilterType.DocumentTypeNot, 14)
-    setFilter(TriggerFilterType.StoragePathAny, 18)
     setFilter(TriggerFilterType.StoragePathNot, 15)
 
     const formValues = component['getFormValues']()
 
     expect(formValues.triggers[0].filter_has_all_tags).toEqual([11])
     expect(formValues.triggers[0].filter_has_not_tags).toEqual([12])
-    expect(formValues.triggers[0].filter_has_any_correspondents).toEqual([16])
     expect(formValues.triggers[0].filter_has_not_correspondents).toEqual([13])
-    expect(formValues.triggers[0].filter_has_any_document_types).toEqual([17])
     expect(formValues.triggers[0].filter_has_not_document_types).toEqual([14])
-    expect(formValues.triggers[0].filter_has_any_storage_paths).toEqual([18])
     expect(formValues.triggers[0].filter_has_not_storage_paths).toEqual([15])
   })
 
@@ -658,11 +640,8 @@ describe('WorkflowEditDialogComponent', () => {
       filter_has_tags: [],
       filter_has_all_tags: [],
       filter_has_not_tags: [],
-      filter_has_any_correspondents: [],
       filter_has_not_correspondents: [],
-      filter_has_any_document_types: [],
       filter_has_not_document_types: [],
-      filter_has_any_storage_paths: [],
       filter_has_not_storage_paths: [],
       filter_has_correspondent: null,
       filter_has_document_type: null,
@@ -720,14 +699,11 @@ describe('WorkflowEditDialogComponent', () => {
     trigger.filter_has_tags = [1]
     trigger.filter_has_all_tags = [2, 3]
     trigger.filter_has_not_tags = [4]
-    trigger.filter_has_any_correspondents = [10] as any
     trigger.filter_has_correspondent = 5 as any
     trigger.filter_has_not_correspondents = [6] as any
     trigger.filter_has_document_type = 7 as any
-    trigger.filter_has_any_document_types = [11] as any
     trigger.filter_has_not_document_types = [8] as any
     trigger.filter_has_storage_path = 9 as any
-    trigger.filter_has_any_storage_paths = [12] as any
     trigger.filter_has_not_storage_paths = [10] as any
     trigger.filter_custom_field_query = JSON.stringify([
       'AND',
@@ -738,8 +714,8 @@ describe('WorkflowEditDialogComponent', () => {
     component.ngOnInit()
     const triggerGroup = component.triggerFields.at(0) as FormGroup
     const filters = component.getFiltersFormArray(triggerGroup)
-    expect(filters.length).toBe(13)
-    const customFieldFilter = filters.at(12) as FormGroup
+    expect(filters.length).toBe(10)
+    const customFieldFilter = filters.at(9) as FormGroup
     expect(customFieldFilter.get('type').value).toBe(
       TriggerFilterType.CustomFieldQuery
     )
@@ -748,27 +724,12 @@ describe('WorkflowEditDialogComponent', () => {
   })
 
   it('should expose select metadata helpers', () => {
-    expect(component.isSelectMultiple(TriggerFilterType.CorrespondentAny)).toBe(
-      true
-    )
     expect(component.isSelectMultiple(TriggerFilterType.CorrespondentNot)).toBe(
       true
     )
     expect(component.isSelectMultiple(TriggerFilterType.CorrespondentIs)).toBe(
       false
     )
-    expect(component.isSelectMultiple(TriggerFilterType.DocumentTypeAny)).toBe(
-      true
-    )
-    expect(component.isSelectMultiple(TriggerFilterType.DocumentTypeIs)).toBe(
-      false
-    )
-    expect(component.isSelectMultiple(TriggerFilterType.StoragePathAny)).toBe(
-      true
-    )
-    expect(component.isSelectMultiple(TriggerFilterType.StoragePathIs)).toBe(
-      false
-    )
 
     component.correspondents = [{ id: 1, name: 'C1' } as any]
     component.documentTypes = [{ id: 2, name: 'DT' } as any]
@@ -780,15 +741,9 @@ describe('WorkflowEditDialogComponent', () => {
     expect(
       component.getFilterSelectItems(TriggerFilterType.DocumentTypeIs)
     ).toEqual(component.documentTypes)
-    expect(
-      component.getFilterSelectItems(TriggerFilterType.DocumentTypeAny)
-    ).toEqual(component.documentTypes)
     expect(
       component.getFilterSelectItems(TriggerFilterType.StoragePathIs)
     ).toEqual(component.storagePaths)
-    expect(
-      component.getFilterSelectItems(TriggerFilterType.StoragePathAny)
-    ).toEqual(component.storagePaths)
     expect(component.getFilterSelectItems(TriggerFilterType.TagsAll)).toEqual(
       []
     )

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

@@ -145,13 +145,10 @@ export enum TriggerFilterType {
   TagsAny = 'tags_any',
   TagsAll = 'tags_all',
   TagsNone = 'tags_none',
-  CorrespondentAny = 'correspondent_any',
   CorrespondentIs = 'correspondent_is',
   CorrespondentNot = 'correspondent_not',
-  DocumentTypeAny = 'document_type_any',
   DocumentTypeIs = 'document_type_is',
   DocumentTypeNot = 'document_type_not',
-  StoragePathAny = 'storage_path_any',
   StoragePathIs = 'storage_path_is',
   StoragePathNot = 'storage_path_not',
   CustomFieldQuery = 'custom_field_query',
@@ -175,11 +172,8 @@ type TriggerFilterAggregate = {
   filter_has_tags: number[]
   filter_has_all_tags: number[]
   filter_has_not_tags: number[]
-  filter_has_any_correspondents: number[]
   filter_has_not_correspondents: number[]
-  filter_has_any_document_types: number[]
   filter_has_not_document_types: number[]
-  filter_has_any_storage_paths: number[]
   filter_has_not_storage_paths: number[]
   filter_has_correspondent: number | null
   filter_has_document_type: number | null
@@ -225,14 +219,6 @@ const TRIGGER_FILTER_DEFINITIONS: TriggerFilterDefinition[] = [
     allowMultipleEntries: false,
     allowMultipleValues: true,
   },
-  {
-    id: TriggerFilterType.CorrespondentAny,
-    name: $localize`Has any of these correspondents`,
-    inputType: 'select',
-    allowMultipleEntries: false,
-    allowMultipleValues: true,
-    selectItems: 'correspondents',
-  },
   {
     id: TriggerFilterType.CorrespondentIs,
     name: $localize`Has correspondent`,
@@ -257,14 +243,6 @@ const TRIGGER_FILTER_DEFINITIONS: TriggerFilterDefinition[] = [
     allowMultipleValues: false,
     selectItems: 'documentTypes',
   },
-  {
-    id: TriggerFilterType.DocumentTypeAny,
-    name: $localize`Has any of these document types`,
-    inputType: 'select',
-    allowMultipleEntries: false,
-    allowMultipleValues: true,
-    selectItems: 'documentTypes',
-  },
   {
     id: TriggerFilterType.DocumentTypeNot,
     name: $localize`Does not have document types`,
@@ -281,14 +259,6 @@ const TRIGGER_FILTER_DEFINITIONS: TriggerFilterDefinition[] = [
     allowMultipleValues: false,
     selectItems: 'storagePaths',
   },
-  {
-    id: TriggerFilterType.StoragePathAny,
-    name: $localize`Has any of these storage paths`,
-    inputType: 'select',
-    allowMultipleEntries: false,
-    allowMultipleValues: true,
-    selectItems: 'storagePaths',
-  },
   {
     id: TriggerFilterType.StoragePathNot,
     name: $localize`Does not have storage paths`,
@@ -336,15 +306,6 @@ const FILTER_HANDLERS: Record<TriggerFilterType, FilterHandler> = {
     extract: (trigger) => trigger.filter_has_not_tags,
     hasValue: (value) => Array.isArray(value) && value.length > 0,
   },
-  [TriggerFilterType.CorrespondentAny]: {
-    apply: (aggregate, values) => {
-      aggregate.filter_has_any_correspondents = Array.isArray(values)
-        ? [...values]
-        : [values]
-    },
-    extract: (trigger) => trigger.filter_has_any_correspondents,
-    hasValue: (value) => Array.isArray(value) && value.length > 0,
-  },
   [TriggerFilterType.CorrespondentIs]: {
     apply: (aggregate, values) => {
       aggregate.filter_has_correspondent = Array.isArray(values)
@@ -372,15 +333,6 @@ const FILTER_HANDLERS: Record<TriggerFilterType, FilterHandler> = {
     extract: (trigger) => trigger.filter_has_document_type,
     hasValue: (value) => value !== null && value !== undefined,
   },
-  [TriggerFilterType.DocumentTypeAny]: {
-    apply: (aggregate, values) => {
-      aggregate.filter_has_any_document_types = Array.isArray(values)
-        ? [...values]
-        : [values]
-    },
-    extract: (trigger) => trigger.filter_has_any_document_types,
-    hasValue: (value) => Array.isArray(value) && value.length > 0,
-  },
   [TriggerFilterType.DocumentTypeNot]: {
     apply: (aggregate, values) => {
       aggregate.filter_has_not_document_types = Array.isArray(values)
@@ -399,15 +351,6 @@ const FILTER_HANDLERS: Record<TriggerFilterType, FilterHandler> = {
     extract: (trigger) => trigger.filter_has_storage_path,
     hasValue: (value) => value !== null && value !== undefined,
   },
-  [TriggerFilterType.StoragePathAny]: {
-    apply: (aggregate, values) => {
-      aggregate.filter_has_any_storage_paths = Array.isArray(values)
-        ? [...values]
-        : [values]
-    },
-    extract: (trigger) => trigger.filter_has_any_storage_paths,
-    hasValue: (value) => Array.isArray(value) && value.length > 0,
-  },
   [TriggerFilterType.StoragePathNot]: {
     apply: (aggregate, values) => {
       aggregate.filter_has_not_storage_paths = Array.isArray(values)
@@ -699,11 +642,8 @@ export class WorkflowEditDialogComponent
             filter_has_tags: [],
             filter_has_all_tags: [],
             filter_has_not_tags: [],
-            filter_has_any_correspondents: [],
             filter_has_not_correspondents: [],
-            filter_has_any_document_types: [],
             filter_has_not_document_types: [],
-            filter_has_any_storage_paths: [],
             filter_has_not_storage_paths: [],
             filter_has_correspondent: null,
             filter_has_document_type: null,
@@ -730,16 +670,10 @@ export class WorkflowEditDialogComponent
           trigger.filter_has_tags = aggregate.filter_has_tags
           trigger.filter_has_all_tags = aggregate.filter_has_all_tags
           trigger.filter_has_not_tags = aggregate.filter_has_not_tags
-          trigger.filter_has_any_correspondents =
-            aggregate.filter_has_any_correspondents
           trigger.filter_has_not_correspondents =
             aggregate.filter_has_not_correspondents
-          trigger.filter_has_any_document_types =
-            aggregate.filter_has_any_document_types
           trigger.filter_has_not_document_types =
             aggregate.filter_has_not_document_types
-          trigger.filter_has_any_storage_paths =
-            aggregate.filter_has_any_storage_paths
           trigger.filter_has_not_storage_paths =
             aggregate.filter_has_not_storage_paths
           trigger.filter_has_correspondent =
@@ -922,11 +856,8 @@ export class WorkflowEditDialogComponent
       case TriggerFilterType.TagsAny:
       case TriggerFilterType.TagsAll:
       case TriggerFilterType.TagsNone:
-      case TriggerFilterType.CorrespondentAny:
       case TriggerFilterType.CorrespondentNot:
-      case TriggerFilterType.DocumentTypeAny:
       case TriggerFilterType.DocumentTypeNot:
-      case TriggerFilterType.StoragePathAny:
       case TriggerFilterType.StoragePathNot:
         return true
       default:
@@ -1248,11 +1179,8 @@ export class WorkflowEditDialogComponent
       filter_has_tags: [],
       filter_has_all_tags: [],
       filter_has_not_tags: [],
-      filter_has_any_correspondents: [],
       filter_has_not_correspondents: [],
-      filter_has_any_document_types: [],
       filter_has_not_document_types: [],
-      filter_has_any_storage_paths: [],
       filter_has_not_storage_paths: [],
       filter_custom_field_query: null,
       filter_has_correspondent: null,

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

@@ -1,18 +1,9 @@
 <div class="row pt-3 pb-3 pb-md-2 align-items-center">
   <div class="col-md text-truncate">
-    <h3 class="d-flex align-items-center mb-1" style="line-height: 1.4">
-      <span class="text-truncate">{{title}}</span>
-      @if (id) {
-        <span class="badge bg-primary text-primary-text-contrast ms-3 small fs-normal cursor-pointer" (click)="copyID()">
-          @if (copied) {
-            <i-bs width="1em" height="1em" name="clipboard-check"></i-bs>&nbsp;<ng-container i18n>Copied!</ng-container>
-          } @else {
-            ID: {{id}}
-          }
-        </span>
-      }
+    <h3 class="text-truncate" style="line-height: 1.4">
+      {{title}}
       @if (subTitle) {
-        <span class="h6 mb-0 mt-1 d-block d-md-inline fw-normal ms-md-3 text-truncate" style="line-height: 1.4">{{subTitle}}</span>
+        <span class="h6 mb-0 d-block d-md-inline fw-normal ms-md-3 text-truncate" style="line-height: 1.4">{{subTitle}}</span>
       }
       @if (info) {
         <button class="btn btn-sm btn-link text-muted me-auto p-0 p-md-2" title="What's this?" i18n-title type="button" [ngbPopover]="infoPopover" [autoClose]="true">

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

@@ -1,10 +1,5 @@
 h3 {
     min-height: calc(1.325rem + 0.9vw);
-
-    .badge {
-        font-size: 0.65rem;
-        line-height: 1;
-    }
 }
 
 @media (min-width: 1200px) {

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

@@ -1,4 +1,3 @@
-import { Clipboard } from '@angular/cdk/clipboard'
 import { ComponentFixture, TestBed } from '@angular/core/testing'
 import { Title } from '@angular/platform-browser'
 import { environment } from 'src/environments/environment'
@@ -8,7 +7,6 @@ describe('PageHeaderComponent', () => {
   let component: PageHeaderComponent
   let fixture: ComponentFixture<PageHeaderComponent>
   let titleService: Title
-  let clipboard: Clipboard
 
   beforeEach(async () => {
     TestBed.configureTestingModule({
@@ -17,7 +15,6 @@ describe('PageHeaderComponent', () => {
     }).compileComponents()
 
     titleService = TestBed.inject(Title)
-    clipboard = TestBed.inject(Clipboard)
     fixture = TestBed.createComponent(PageHeaderComponent)
     component = fixture.componentInstance
     fixture.detectChanges()
@@ -27,8 +24,7 @@ describe('PageHeaderComponent', () => {
     component.title = 'Foo'
     component.subTitle = 'Bar'
     fixture.detectChanges()
-    expect(fixture.nativeElement.textContent).toContain('Foo')
-    expect(fixture.nativeElement.textContent).toContain('Bar')
+    expect(fixture.nativeElement.textContent).toContain('Foo Bar')
   })
 
   it('should set html title', () => {
@@ -36,16 +32,4 @@ describe('PageHeaderComponent', () => {
     component.title = 'Foo Bar'
     expect(titleSpy).toHaveBeenCalledWith(`Foo Bar - ${environment.appTitle}`)
   })
-
-  it('should copy id to clipboard, reset after 3 seconds', () => {
-    jest.useFakeTimers()
-    component.id = 42 as any
-    jest.spyOn(clipboard, 'copy').mockReturnValue(true)
-    component.copyID()
-    expect(clipboard.copy).toHaveBeenCalledWith('42')
-    expect(component.copied).toBe(true)
-
-    jest.advanceTimersByTime(3000)
-    expect(component.copied).toBe(false)
-  })
 })

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

@@ -1,4 +1,3 @@
-import { Clipboard } from '@angular/cdk/clipboard'
 import { Component, Input, inject } from '@angular/core'
 import { Title } from '@angular/platform-browser'
 import { NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap'
@@ -14,11 +13,8 @@ import { environment } from 'src/environments/environment'
 })
 export class PageHeaderComponent {
   private titleService = inject(Title)
-  private clipboard = inject(Clipboard)
 
-  private _title = ''
-  public copied: boolean = false
-  private copyTimeout: any
+  _title = ''
 
   @Input()
   set title(title: string) {
@@ -30,9 +26,6 @@ export class PageHeaderComponent {
     return this._title
   }
 
-  @Input()
-  id: number
-
   @Input()
   subTitle: string = ''
 
@@ -41,12 +34,4 @@ export class PageHeaderComponent {
 
   @Input()
   infoLink: string
-
-  public copyID() {
-    this.copied = this.clipboard.copy(this.id.toString())
-    clearTimeout(this.copyTimeout)
-    this.copyTimeout = setTimeout(() => {
-      this.copied = false
-    }, 3000)
-  }
 }

src-ui/src/app/components/common/pdf-editor/pdf-editor-edit-mode.ts

@@ -1,4 +0,0 @@
-export enum PdfEditorEditMode {
-  Update = 'update',
-  Create = 'create',
-}

src-ui/src/app/components/common/pdf-editor/pdf-editor.component.ts

@@ -8,11 +8,8 @@ import { FormsModule } from '@angular/forms'
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 import { PDFDocumentProxy, PdfViewerModule } from 'ng2-pdf-viewer'
 import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
-import { SETTINGS_KEYS } from 'src/app/data/ui-settings'
 import { DocumentService } from 'src/app/services/rest/document.service'
-import { SettingsService } from 'src/app/services/settings.service'
 import { ConfirmDialogComponent } from '../confirm-dialog/confirm-dialog.component'
-import { PdfEditorEditMode } from './pdf-editor-edit-mode'
 
 interface PageOperation {
   page: number
@@ -22,6 +19,11 @@ interface PageOperation {
   loaded?: boolean
 }
 
+export enum PdfEditorEditMode {
+  Update = 'update',
+  Create = 'create',
+}
+
 @Component({
   selector: 'pngx-pdf-editor',
   templateUrl: './pdf-editor.component.html',
@@ -37,15 +39,12 @@ export class PDFEditorComponent extends ConfirmDialogComponent {
   public PdfEditorEditMode = PdfEditorEditMode
 
   private documentService = inject(DocumentService)
-  private readonly settingsService = inject(SettingsService)
   activeModal: NgbActiveModal = inject(NgbActiveModal)
 
   documentID: number
   pages: PageOperation[] = []
   totalPages = 0
-  editMode: PdfEditorEditMode = this.settingsService.get(
-    SETTINGS_KEYS.PDF_EDITOR_DEFAULT_EDIT_MODE
-  )
+  editMode: PdfEditorEditMode = PdfEditorEditMode.Create
   deleteOriginal: boolean = false
   includeMetadata: boolean = true
 

src-ui/src/app/components/common/share-link-bundle-dialog/share-link-bundle-dialog.component.html

@@ -1,129 +0,0 @@
-<div class="modal-header">
-  <h4 class="modal-title">{{ title }}</h4>
-  <button type="button" class="btn-close" aria-label="Close" (click)="cancel()"></button>
-</div>
-<div class="modal-body">
-  @if (!createdBundle) {
-    <form [formGroup]="form" class="d-flex flex-column gap-3">
-      <div>
-        <p class="mb-1">
-          <ng-container i18n>Selected documents:</ng-container>
-          {{ selectionCount }}
-        </p>
-        @if (documentPreview.length > 0) {
-          <ul class="list-unstyled small mb-0">
-            @for (doc of documentPreview; track doc.id) {
-              <li>
-                <strong>{{ doc.title | documentTitle }}</strong>
-              </li>
-            }
-            @if (selectionCount > documentPreview.length) {
-              <li>
-                <ng-container i18n>+ {{ selectionCount - documentPreview.length }} more…</ng-container>
-              </li>
-            }
-          </ul>
-        }
-      </div>
-
-      <div class="d-flex align-items-center justify-content-between">
-        <div class="input-group">
-          <label class="input-group-text" for="expirationDays"><ng-container i18n>Expires</ng-container>:</label>
-          <select class="form-select" id="expirationDays" formControlName="expirationDays">
-            @for (option of expirationOptions; track option.value) {
-              <option [ngValue]="option.value">{{ option.label }}</option>
-            }
-          </select>
-        </div>
-        <div class="form-check form-switch w-100 ms-3">
-          <input
-            class="form-check-input"
-            type="checkbox"
-            role="switch"
-            id="shareArchiveSwitch"
-            formControlName="shareArchiveVersion"
-            aria-checked="{{ shareArchiveVersion }}"
-          />
-          <label class="form-check-label" for="shareArchiveSwitch" i18n>Share archive version (if available)</label>
-        </div>
-      </div>
-    </form>
-  } @else {
-    <div class="d-flex flex-column gap-3">
-      <div class="alert alert-success mb-0" role="status">
-        <h6 class="alert-heading mb-1" i18n>Share link bundle requested</h6>
-        <p class="mb-0 small" i18n>
-          You can copy the share link below or open the manager to monitor progress. The link will start working once the bundle is ready.
-        </p>
-      </div>
-      <dl class="row mb-0 small">
-        <dt class="col-sm-4" i18n>Status</dt>
-        <dd class="col-sm-8">
-          <span class="badge text-bg-secondary text-uppercase">{{ statusLabel(createdBundle.status) }}</span>
-        </dd>
-        <dt class="col-sm-4" i18n>Slug</dt>
-        <dd class="col-sm-8"><code>{{ createdBundle.slug }}</code></dd>
-        <dt class="col-sm-4" i18n>Link</dt>
-        <dd class="col-sm-8">
-          <div class="input-group input-group-sm">
-            <input class="form-control" type="text" [value]="getShareUrl(createdBundle)" readonly>
-            <button
-              class="btn btn-outline-primary"
-              type="button"
-              (click)="copy(createdBundle)"
-            >
-              @if (copied) {
-                <i-bs name="clipboard-check"></i-bs>
-              }
-              @if (!copied) {
-                <i-bs name="clipboard"></i-bs>
-              }
-              <span class="visually-hidden" i18n>Copy link</span>
-            </button>
-          </div>
-        </dd>
-        <dt class="col-sm-4" i18n>Documents</dt>
-        <dd class="col-sm-8">{{ createdBundle.document_count }}</dd>
-        <dt class="col-sm-4" i18n>Expires</dt>
-        <dd class="col-sm-8">
-          @if (createdBundle.expiration) {
-            {{ createdBundle.expiration | date: 'short' }}
-          }
-          @if (!createdBundle.expiration) {
-            <span i18n>Never</span>
-          }
-        </dd>
-        <dt class="col-sm-4" i18n>File version</dt>
-        <dd class="col-sm-8">{{ fileVersionLabel(createdBundle.file_version) }}</dd>
-        @if (createdBundle.size_bytes !== undefined && createdBundle.size_bytes !== null) {
-          <dt class="col-sm-4" i18n>Size</dt>
-          <dd class="col-sm-8">{{ createdBundle.size_bytes | fileSize }}</dd>
-        }
-      </dl>
-    </div>
-  }
-</div>
-<div class="modal-footer">
-  <div class="d-flex align-items-center gap-2 w-100">
-    <div class="text-light fst-italic small">
-      <ng-container i18n>A zip file containing the selected documents will be created for this share link bundle. This process happens in the background and may take some time, especially for large bundles.</ng-container>
-    </div>
-    <button type="button" class="btn btn-outline-secondary btn-sm ms-auto" (click)="cancel()">{{ cancelBtnCaption }}</button>
-    @if (createdBundle) {
-      <button type="button" class="btn btn-outline-secondary btn-sm text-nowrap" (click)="openManage()" i18n>Manage share link bundles</button>
-    }
-
-    @if (!createdBundle) {
-      <button
-        type="button"
-        class="btn btn-primary btn-sm d-inline-flex align-items-center gap-2 text-nowrap"
-        (click)="submit()"
-        [disabled]="loading || !buttonsEnabled">
-        @if (loading) {
-          <span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
-        }
-        {{ btnCaption }}
-      </button>
-    }
-  </div>
-</div>

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

@@ -1,161 +0,0 @@
-import { Clipboard } from '@angular/cdk/clipboard'
-import {
-  ComponentFixture,
-  TestBed,
-  fakeAsync,
-  tick,
-} from '@angular/core/testing'
-import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
-import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
-import { FileVersion } from 'src/app/data/share-link'
-import {
-  ShareLinkBundleStatus,
-  ShareLinkBundleSummary,
-} from 'src/app/data/share-link-bundle'
-import { ToastService } from 'src/app/services/toast.service'
-import { environment } from 'src/environments/environment'
-import { ShareLinkBundleDialogComponent } from './share-link-bundle-dialog.component'
-
-class MockToastService {
-  showInfo = jest.fn()
-  showError = jest.fn()
-}
-
-describe('ShareLinkBundleDialogComponent', () => {
-  let component: ShareLinkBundleDialogComponent
-  let fixture: ComponentFixture<ShareLinkBundleDialogComponent>
-  let clipboard: Clipboard
-  let toastService: MockToastService
-  let activeModal: NgbActiveModal
-  let originalApiBaseUrl: string
-
-  beforeEach(() => {
-    originalApiBaseUrl = environment.apiBaseUrl
-    toastService = new MockToastService()
-
-    TestBed.configureTestingModule({
-      imports: [
-        ShareLinkBundleDialogComponent,
-        NgxBootstrapIconsModule.pick(allIcons),
-      ],
-      providers: [
-        NgbActiveModal,
-        { provide: ToastService, useValue: toastService },
-      ],
-    })
-
-    fixture = TestBed.createComponent(ShareLinkBundleDialogComponent)
-    component = fixture.componentInstance
-    clipboard = TestBed.inject(Clipboard)
-    activeModal = TestBed.inject(NgbActiveModal)
-    fixture.detectChanges()
-  })
-
-  afterEach(() => {
-    jest.clearAllTimers()
-    environment.apiBaseUrl = originalApiBaseUrl
-  })
-
-  it('builds payload and emits confirm on submit', () => {
-    const confirmSpy = jest.spyOn(component.confirmClicked, 'emit')
-    component.documents = [
-      { id: 1, title: 'Doc 1' } as any,
-      { id: 2, title: 'Doc 2' } as any,
-    ]
-    component.form.setValue({
-      shareArchiveVersion: false,
-      expirationDays: 3,
-    })
-
-    component.submit()
-
-    expect(component.payload).toEqual({
-      document_ids: [1, 2],
-      file_version: FileVersion.Original,
-      expiration_days: 3,
-    })
-    expect(component.buttonsEnabled).toBe(false)
-    expect(confirmSpy).toHaveBeenCalled()
-
-    component.form.setValue({
-      shareArchiveVersion: true,
-      expirationDays: 7,
-    })
-    component.submit()
-
-    expect(component.payload).toEqual({
-      document_ids: [1, 2],
-      file_version: FileVersion.Archive,
-      expiration_days: 7,
-    })
-  })
-
-  it('ignores submit when bundle already created', () => {
-    component.createdBundle = { id: 1 } as ShareLinkBundleSummary
-    const confirmSpy = jest.spyOn(component, 'confirm')
-    component.submit()
-    expect(confirmSpy).not.toHaveBeenCalled()
-  })
-
-  it('limits preview to ten documents', () => {
-    const docs = Array.from({ length: 12 }).map((_, index) => ({
-      id: index + 1,
-    }))
-    component.documents = docs as any
-
-    expect(component.selectionCount).toBe(12)
-    expect(component.documentPreview).toHaveLength(10)
-    expect(component.documentPreview[0].id).toBe(1)
-  })
-
-  it('copies share link and resets state after timeout', fakeAsync(() => {
-    const copySpy = jest.spyOn(clipboard, 'copy').mockReturnValue(true)
-    const bundle = {
-      slug: 'bundle-slug',
-      status: ShareLinkBundleStatus.Ready,
-    } as ShareLinkBundleSummary
-
-    component.copy(bundle)
-
-    expect(copySpy).toHaveBeenCalledWith(component.getShareUrl(bundle))
-    expect(component.copied).toBe(true)
-    expect(toastService.showInfo).toHaveBeenCalled()
-
-    tick(3000)
-    expect(component.copied).toBe(false)
-  }))
-
-  it('generates share URLs based on API base URL', () => {
-    environment.apiBaseUrl = 'https://example.com/api/'
-    expect(
-      component.getShareUrl({ slug: 'abc' } as ShareLinkBundleSummary)
-    ).toBe('https://example.com/share/abc')
-  })
-
-  it('opens manage dialog when callback provided', () => {
-    const manageSpy = jest.fn()
-    component.onOpenManage = manageSpy
-    component.openManage()
-    expect(manageSpy).toHaveBeenCalled()
-  })
-
-  it('falls back to cancel when manage callback missing', () => {
-    const cancelSpy = jest.spyOn(component, 'cancel')
-    component.onOpenManage = undefined
-    component.openManage()
-    expect(cancelSpy).toHaveBeenCalled()
-  })
-
-  it('maps status and file version labels', () => {
-    expect(component.statusLabel(ShareLinkBundleStatus.Processing)).toContain(
-      'Processing'
-    )
-    expect(component.fileVersionLabel(FileVersion.Archive)).toContain('Archive')
-  })
-
-  it('closes dialog when cancel invoked', () => {
-    const closeSpy = jest.spyOn(activeModal, 'close')
-    component.cancel()
-    expect(closeSpy).toHaveBeenCalled()
-  })
-})

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

@@ -1,118 +0,0 @@
-import { Clipboard } from '@angular/cdk/clipboard'
-import { CommonModule } from '@angular/common'
-import { Component, Input, inject } from '@angular/core'
-import { FormBuilder, FormGroup, ReactiveFormsModule } from '@angular/forms'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
-import { Document } from 'src/app/data/document'
-import {
-  FileVersion,
-  SHARE_LINK_EXPIRATION_OPTIONS,
-} from 'src/app/data/share-link'
-import {
-  SHARE_LINK_BUNDLE_FILE_VERSION_LABELS,
-  SHARE_LINK_BUNDLE_STATUS_LABELS,
-  ShareLinkBundleCreatePayload,
-  ShareLinkBundleStatus,
-  ShareLinkBundleSummary,
-} from 'src/app/data/share-link-bundle'
-import { DocumentTitlePipe } from 'src/app/pipes/document-title.pipe'
-import { FileSizePipe } from 'src/app/pipes/file-size.pipe'
-import { ToastService } from 'src/app/services/toast.service'
-import { environment } from 'src/environments/environment'
-import { ConfirmDialogComponent } from '../confirm-dialog/confirm-dialog.component'
-
-@Component({
-  selector: 'pngx-share-link-bundle-dialog',
-  templateUrl: './share-link-bundle-dialog.component.html',
-  imports: [
-    CommonModule,
-    ReactiveFormsModule,
-    NgxBootstrapIconsModule,
-    FileSizePipe,
-    DocumentTitlePipe,
-  ],
-  providers: [],
-})
-export class ShareLinkBundleDialogComponent extends ConfirmDialogComponent {
-  private readonly formBuilder = inject(FormBuilder)
-  private readonly clipboard = inject(Clipboard)
-  private readonly toastService = inject(ToastService)
-
-  private _documents: Document[] = []
-
-  selectionCount = 0
-  documentPreview: Document[] = []
-  form: FormGroup = this.formBuilder.group({
-    shareArchiveVersion: true,
-    expirationDays: [7],
-  })
-  payload: ShareLinkBundleCreatePayload | null = null
-
-  readonly expirationOptions = SHARE_LINK_EXPIRATION_OPTIONS
-
-  createdBundle: ShareLinkBundleSummary | null = null
-  copied = false
-  onOpenManage?: () => void
-  readonly statuses = ShareLinkBundleStatus
-
-  constructor() {
-    super()
-    this.loading = false
-    this.title = $localize`Create share link bundle`
-    this.btnCaption = $localize`Create link`
-  }
-
-  @Input()
-  set documents(docs: Document[]) {
-    this._documents = docs.concat()
-    this.selectionCount = this._documents.length
-    this.documentPreview = this._documents.slice(0, 10)
-  }
-
-  submit() {
-    if (this.createdBundle) return
-    this.payload = {
-      document_ids: this._documents.map((doc) => doc.id),
-      file_version: this.form.value.shareArchiveVersion
-        ? FileVersion.Archive
-        : FileVersion.Original,
-      expiration_days: this.form.value.expirationDays,
-    }
-    this.buttonsEnabled = false
-    super.confirm()
-  }
-
-  getShareUrl(bundle: ShareLinkBundleSummary): string {
-    const apiURL = new URL(environment.apiBaseUrl)
-    return `${apiURL.origin}${apiURL.pathname.replace(/\/api\/$/, '/share/')}${
-      bundle.slug
-    }`
-  }
-
-  copy(bundle: ShareLinkBundleSummary): void {
-    const success = this.clipboard.copy(this.getShareUrl(bundle))
-    if (success) {
-      this.copied = true
-      this.toastService.showInfo($localize`Share link copied to clipboard.`)
-      setTimeout(() => {
-        this.copied = false
-      }, 3000)
-    }
-  }
-
-  openManage(): void {
-    if (this.onOpenManage) {
-      this.onOpenManage()
-    } else {
-      this.cancel()
-    }
-  }
-
-  statusLabel(status: ShareLinkBundleSummary['status']): string {
-    return SHARE_LINK_BUNDLE_STATUS_LABELS[status] ?? status
-  }
-
-  fileVersionLabel(version: FileVersion): string {
-    return SHARE_LINK_BUNDLE_FILE_VERSION_LABELS[version] ?? version
-  }
-}

src-ui/src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.html

@@ -1,156 +0,0 @@
-<div class="modal-header">
-  <h4 class="modal-title">{{ title }}</h4>
-  <button type="button" class="btn-close" aria-label="Close" (click)="close()"></button>
-</div>
-
-<div class="modal-body">
-  @if (loading) {
-    <div class="d-flex align-items-center gap-2">
-      <div class="spinner-border spinner-border-sm" role="status"></div>
-      <span i18n>Loading share link bundles…</span>
-    </div>
-  }
-  @if (!loading && error) {
-    <div class="alert alert-danger mb-0" role="alert">
-      {{ error }}
-    </div>
-  }
-  @if (!loading && !error) {
-    <div class="d-flex justify-content-between align-items-center mb-2">
-      <p class="mb-0 text-muted small">
-        <ng-container i18n>Status updates every few seconds while bundles are being prepared.</ng-container>
-      </p>
-    </div>
-    @if (bundles.length === 0) {
-      <p class="mb-0 text-muted fst-italic" i18n>No share link bundles currently exist.</p>
-    }
-    @if (bundles.length > 0) {
-      <div class="table-responsive">
-        <table class="table table-sm align-middle mb-0">
-          <thead>
-            <tr>
-              <th scope="col" i18n>Created</th>
-              <th scope="col" i18n>Status</th>
-              <th scope="col" i18n>Size</th>
-              <th scope="col" i18n>Expires</th>
-              <th scope="col" i18n>Documents</th>
-              <th scope="col" i18n>File version</th>
-              <th scope="col" class="text-end" i18n>Actions</th>
-            </tr>
-          </thead>
-          <tbody>
-            @for (bundle of bundles; track bundle.id) {
-              <tr>
-                <td>
-                  <div>{{ bundle.created | date: 'short' }}</div>
-                  @if (bundle.built_at) {
-                    <div class="small text-muted">
-                      <ng-container i18n>Built:</ng-container> {{ bundle.built_at | date: 'short' }}
-                    </div>
-                  }
-                </td>
-                <td>
-                  <div class="d-flex align-items-center gap-2">
-                    @if (bundle.status === statuses.Failed && bundle.last_error) {
-                      <button
-                        type="button"
-                        class="btn btn-link p-0 text-danger"
-                        [ngbPopover]="errorDetail"
-                        popoverClass="popover-sm"
-                        triggers="mouseover:mouseleave"
-                        placement="auto"
-                        aria-label="View error details"
-                        i18n-aria-label
-                      >
-                        <span class="badge text-bg-warning text-uppercase me-2">{{ statusLabel(bundle.status) }}</span>
-                        <i-bs name="exclamation-triangle-fill" class="text-warning"></i-bs>
-                      </button>
-                      <ng-template #errorDetail>
-                        @if (bundle.last_error.timestamp) {
-                          <div class="text-muted small mb-1">
-                            {{ bundle.last_error.timestamp | date: 'short' }}
-                          </div>
-                        }
-                        <h6>{{ bundle.last_error.exception_type || ($localize`Unknown error`) }}</h6>
-                        @if (bundle.last_error.message) {
-                          <pre class="text-muted small"><code>{{ bundle.last_error.message }}</code></pre>
-                        }
-                      </ng-template>
-                    }
-                    @if (bundle.status === statuses.Processing || bundle.status === statuses.Pending) {
-                      <span class="spinner-border spinner-border-sm" role="status"></span>
-                    }
-                    @if (bundle.status !== statuses.Failed) {
-                      <span class="badge text-bg-secondary text-uppercase">{{ statusLabel(bundle.status) }}</span>
-                    }
-                  </div>
-                </td>
-                <td>
-                  @if (bundle.size_bytes !== undefined && bundle.size_bytes !== null) {
-                    {{ bundle.size_bytes | fileSize }}
-                  }
-                  @if (bundle.size_bytes === undefined || bundle.size_bytes === null) {
-                    <span class="text-muted">&mdash;</span>
-                  }
-                </td>
-                <td>
-                  @if (bundle.expiration) {
-                    {{ bundle.expiration | date: 'short' }}
-                  }
-                  @if (!bundle.expiration) {
-                    <span i18n>Never</span>
-                  }
-                </td>
-                <td>{{ bundle.document_count }}</td>
-                <td>{{ fileVersionLabel(bundle.file_version) }}</td>
-                <td class="text-end">
-                  <div class="btn-group btn-group-sm">
-                    <button
-                      type="button"
-                      class="btn btn-outline-primary"
-                      [disabled]="bundle.status !== statuses.Ready"
-                      (click)="copy(bundle)"
-                      title="Copy share link"
-                      i18n-title
-                    >
-                      @if (copiedSlug === bundle.slug) {
-                        <i-bs name="clipboard-check"></i-bs>
-                      }
-                      @if (copiedSlug !== bundle.slug) {
-                        <i-bs name="clipboard"></i-bs>
-                      }
-                      <span class="visually-hidden" i18n>Copy share link</span>
-                    </button>
-                    @if (bundle.status === statuses.Failed) {
-                      <button
-                        type="button"
-                        class="btn btn-outline-warning"
-                        [disabled]="loading"
-                        (click)="retry(bundle)"
-                      >
-                        <i-bs name="arrow-clockwise"></i-bs>
-                        <span class="visually-hidden" i18n>Retry</span>
-                      </button>
-                    }
-                    <pngx-confirm-button
-                      buttonClasses="btn btn-sm btn-outline-danger"
-                      [disabled]="loading"
-                      (confirm)="delete(bundle)"
-                      iconName="trash"
-                    >
-                      <span class="visually-hidden" i18n>Delete share link bundle</span>
-                    </pngx-confirm-button>
-                  </div>
-                </td>
-              </tr>
-            }
-          </tbody>
-        </table>
-      </div>
-    }
-  }
-</div>
-
-<div class="modal-footer">
-  <button type="button" class="btn btn-outline-secondary btn-sm" (click)="close()" i18n>Close</button>
-</div>

src-ui/src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.scss

@@ -1,4 +0,0 @@
-:host ::ng-deep .popover {
-  min-width: 300px;
-  max-width: 400px;
- }

src-ui/src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.spec.ts

@@ -1,251 +0,0 @@
-import { Clipboard } from '@angular/cdk/clipboard'
-import {
-  ComponentFixture,
-  TestBed,
-  fakeAsync,
-  tick,
-} from '@angular/core/testing'
-import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
-import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
-import { of, throwError } from 'rxjs'
-import { FileVersion } from 'src/app/data/share-link'
-import {
-  ShareLinkBundleStatus,
-  ShareLinkBundleSummary,
-} from 'src/app/data/share-link-bundle'
-import { ShareLinkBundleService } from 'src/app/services/rest/share-link-bundle.service'
-import { ToastService } from 'src/app/services/toast.service'
-import { environment } from 'src/environments/environment'
-import { ShareLinkBundleManageDialogComponent } from './share-link-bundle-manage-dialog.component'
-
-class MockShareLinkBundleService {
-  listAllBundles = jest.fn()
-  delete = jest.fn()
-  rebuildBundle = jest.fn()
-}
-
-class MockToastService {
-  showInfo = jest.fn()
-  showError = jest.fn()
-}
-
-describe('ShareLinkBundleManageDialogComponent', () => {
-  let component: ShareLinkBundleManageDialogComponent
-  let fixture: ComponentFixture<ShareLinkBundleManageDialogComponent>
-  let service: MockShareLinkBundleService
-  let toastService: MockToastService
-  let clipboard: Clipboard
-  let activeModal: NgbActiveModal
-  let originalApiBaseUrl: string
-
-  beforeEach(() => {
-    service = new MockShareLinkBundleService()
-    toastService = new MockToastService()
-    originalApiBaseUrl = environment.apiBaseUrl
-
-    service.listAllBundles.mockReturnValue(of([]))
-    service.delete.mockReturnValue(of(true))
-    service.rebuildBundle.mockReturnValue(of(sampleBundle()))
-
-    TestBed.configureTestingModule({
-      imports: [
-        ShareLinkBundleManageDialogComponent,
-        NgxBootstrapIconsModule.pick(allIcons),
-      ],
-      providers: [
-        NgbActiveModal,
-        { provide: ShareLinkBundleService, useValue: service },
-        { provide: ToastService, useValue: toastService },
-      ],
-    })
-
-    fixture = TestBed.createComponent(ShareLinkBundleManageDialogComponent)
-    component = fixture.componentInstance
-    clipboard = TestBed.inject(Clipboard)
-    activeModal = TestBed.inject(NgbActiveModal)
-  })
-
-  afterEach(() => {
-    component.ngOnDestroy()
-    fixture.destroy()
-    environment.apiBaseUrl = originalApiBaseUrl
-    jest.clearAllMocks()
-  })
-
-  const sampleBundle = (overrides: Partial<ShareLinkBundleSummary> = {}) =>
-    ({
-      id: 1,
-      slug: 'bundle-slug',
-      created: new Date().toISOString(),
-      document_count: 1,
-      documents: [1],
-      status: ShareLinkBundleStatus.Pending,
-      file_version: FileVersion.Archive,
-      last_error: undefined,
-      ...overrides,
-    }) as ShareLinkBundleSummary
-
-  it('loads bundles on init and polls periodically', fakeAsync(() => {
-    const bundles = [sampleBundle({ status: ShareLinkBundleStatus.Ready })]
-    service.listAllBundles.mockReset()
-    service.listAllBundles
-      .mockReturnValueOnce(of(bundles))
-      .mockReturnValue(of(bundles))
-
-    fixture.detectChanges()
-    tick()
-
-    expect(service.listAllBundles).toHaveBeenCalledTimes(1)
-    expect(component.bundles).toEqual(bundles)
-    expect(component.loading).toBe(false)
-    expect(component.error).toBeNull()
-
-    tick(5000)
-    expect(service.listAllBundles).toHaveBeenCalledTimes(2)
-  }))
-
-  it('handles errors when loading bundles', fakeAsync(() => {
-    service.listAllBundles.mockReset()
-    service.listAllBundles
-      .mockReturnValueOnce(throwError(() => new Error('load fail')))
-      .mockReturnValue(of([]))
-
-    fixture.detectChanges()
-    tick()
-
-    expect(component.error).toContain('Failed to load share link bundles.')
-    expect(toastService.showError).toHaveBeenCalled()
-    expect(component.loading).toBe(false)
-
-    tick(5000)
-    expect(service.listAllBundles).toHaveBeenCalledTimes(2)
-  }))
-
-  it('copies bundle links when ready', fakeAsync(() => {
-    jest.spyOn(clipboard, 'copy').mockReturnValue(true)
-    fixture.detectChanges()
-    tick()
-
-    const readyBundle = sampleBundle({
-      slug: 'ready-slug',
-      status: ShareLinkBundleStatus.Ready,
-    })
-    component.copy(readyBundle)
-
-    expect(clipboard.copy).toHaveBeenCalledWith(
-      component.getShareUrl(readyBundle)
-    )
-    expect(component.copiedSlug).toBe('ready-slug')
-    expect(toastService.showInfo).toHaveBeenCalled()
-
-    tick(3000)
-    expect(component.copiedSlug).toBeNull()
-  }))
-
-  it('ignores copy requests for non-ready bundles', fakeAsync(() => {
-    const copySpy = jest.spyOn(clipboard, 'copy')
-    fixture.detectChanges()
-    tick()
-    component.copy(sampleBundle({ status: ShareLinkBundleStatus.Pending }))
-    expect(copySpy).not.toHaveBeenCalled()
-  }))
-
-  it('deletes bundles and refreshes list', fakeAsync(() => {
-    service.listAllBundles.mockReturnValue(of([]))
-    service.delete.mockReturnValue(of(true))
-
-    fixture.detectChanges()
-    tick()
-
-    component.delete(sampleBundle())
-    tick()
-
-    expect(service.delete).toHaveBeenCalled()
-    expect(toastService.showInfo).toHaveBeenCalledWith(
-      expect.stringContaining('deleted.')
-    )
-    expect(service.listAllBundles).toHaveBeenCalledTimes(2)
-    expect(component.loading).toBe(false)
-  }))
-
-  it('handles delete errors gracefully', fakeAsync(() => {
-    service.listAllBundles.mockReturnValue(of([]))
-    service.delete.mockReturnValue(throwError(() => new Error('delete fail')))
-
-    fixture.detectChanges()
-    tick()
-
-    component.delete(sampleBundle())
-    tick()
-
-    expect(toastService.showError).toHaveBeenCalled()
-    expect(component.loading).toBe(false)
-  }))
-
-  it('retries bundle build and replaces existing entry', fakeAsync(() => {
-    service.listAllBundles.mockReturnValue(of([]))
-    const updated = sampleBundle({ status: ShareLinkBundleStatus.Ready })
-    service.rebuildBundle.mockReturnValue(of(updated))
-
-    fixture.detectChanges()
-    tick()
-
-    component.bundles = [sampleBundle()]
-    component.retry(component.bundles[0])
-    tick()
-
-    expect(service.rebuildBundle).toHaveBeenCalledWith(updated.id)
-    expect(component.bundles[0].status).toBe(ShareLinkBundleStatus.Ready)
-    expect(toastService.showInfo).toHaveBeenCalled()
-  }))
-
-  it('adds new bundle when retry returns unknown entry', fakeAsync(() => {
-    service.listAllBundles.mockReturnValue(of([]))
-    service.rebuildBundle.mockReturnValue(
-      of(sampleBundle({ id: 99, slug: 'new-slug' }))
-    )
-
-    fixture.detectChanges()
-    tick()
-
-    component.bundles = [sampleBundle()]
-    component.retry({ id: 99 } as ShareLinkBundleSummary)
-    tick()
-
-    expect(component.bundles.find((bundle) => bundle.id === 99)).toBeTruthy()
-  }))
-
-  it('handles retry errors', fakeAsync(() => {
-    service.listAllBundles.mockReturnValue(of([]))
-    service.rebuildBundle.mockReturnValue(throwError(() => new Error('fail')))
-
-    fixture.detectChanges()
-    tick()
-
-    component.retry(sampleBundle())
-    tick()
-
-    expect(toastService.showError).toHaveBeenCalled()
-  }))
-
-  it('maps helpers and closes dialog', fakeAsync(() => {
-    service.listAllBundles.mockReturnValue(of([]))
-    fixture.detectChanges()
-    tick()
-
-    expect(component.statusLabel(ShareLinkBundleStatus.Processing)).toContain(
-      'Processing'
-    )
-    expect(component.fileVersionLabel(FileVersion.Original)).toContain(
-      'Original'
-    )
-
-    environment.apiBaseUrl = 'https://example.com/api/'
-    const url = component.getShareUrl(sampleBundle({ slug: 'sluggy' }))
-    expect(url).toBe('https://example.com/share/sluggy')
-
-    const closeSpy = jest.spyOn(activeModal, 'close')
-    component.close()
-    expect(closeSpy).toHaveBeenCalled()
-  }))
-})

src-ui/src/app/components/common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component.ts

@@ -1,177 +0,0 @@
-import { Clipboard } from '@angular/cdk/clipboard'
-import { CommonModule } from '@angular/common'
-import { Component, OnDestroy, OnInit, inject } from '@angular/core'
-import { NgbActiveModal, NgbPopoverModule } from '@ng-bootstrap/ng-bootstrap'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
-import { Subject, catchError, of, switchMap, takeUntil, timer } from 'rxjs'
-import { FileVersion } from 'src/app/data/share-link'
-import {
-  SHARE_LINK_BUNDLE_FILE_VERSION_LABELS,
-  SHARE_LINK_BUNDLE_STATUS_LABELS,
-  ShareLinkBundleStatus,
-  ShareLinkBundleSummary,
-} from 'src/app/data/share-link-bundle'
-import { FileSizePipe } from 'src/app/pipes/file-size.pipe'
-import { ShareLinkBundleService } from 'src/app/services/rest/share-link-bundle.service'
-import { ToastService } from 'src/app/services/toast.service'
-import { environment } from 'src/environments/environment'
-import { LoadingComponentWithPermissions } from '../../loading-component/loading.component'
-import { ConfirmButtonComponent } from '../confirm-button/confirm-button.component'
-
-@Component({
-  selector: 'pngx-share-link-bundle-manage-dialog',
-  templateUrl: './share-link-bundle-manage-dialog.component.html',
-  styleUrls: ['./share-link-bundle-manage-dialog.component.scss'],
-  imports: [
-    ConfirmButtonComponent,
-    CommonModule,
-    NgbPopoverModule,
-    NgxBootstrapIconsModule,
-    FileSizePipe,
-  ],
-})
-export class ShareLinkBundleManageDialogComponent
-  extends LoadingComponentWithPermissions
-  implements OnInit, OnDestroy
-{
-  private readonly activeModal = inject(NgbActiveModal)
-  private readonly shareLinkBundleService = inject(ShareLinkBundleService)
-  private readonly toastService = inject(ToastService)
-  private readonly clipboard = inject(Clipboard)
-
-  title = $localize`Share link bundles`
-
-  bundles: ShareLinkBundleSummary[] = []
-  error: string | null = null
-  copiedSlug: string | null = null
-
-  readonly statuses = ShareLinkBundleStatus
-  readonly fileVersions = FileVersion
-
-  private readonly refresh$ = new Subject<boolean>()
-
-  ngOnInit(): void {
-    this.refresh$
-      .pipe(
-        switchMap((silent) => {
-          if (!silent) {
-            this.loading = true
-          }
-          this.error = null
-          return this.shareLinkBundleService.listAllBundles().pipe(
-            catchError((error) => {
-              if (!silent) {
-                this.loading = false
-              }
-              this.error = $localize`Failed to load share link bundles.`
-              this.toastService.showError(
-                $localize`Error retrieving share link bundles.`,
-                error
-              )
-              return of(null)
-            })
-          )
-        }),
-        takeUntil(this.unsubscribeNotifier)
-      )
-      .subscribe((results) => {
-        if (results) {
-          this.bundles = results
-          this.copiedSlug = null
-        }
-        this.loading = false
-      })
-
-    this.triggerRefresh(false)
-    timer(5000, 5000)
-      .pipe(takeUntil(this.unsubscribeNotifier))
-      .subscribe(() => this.triggerRefresh(true))
-  }
-
-  ngOnDestroy(): void {
-    super.ngOnDestroy()
-  }
-
-  getShareUrl(bundle: ShareLinkBundleSummary): string {
-    const apiURL = new URL(environment.apiBaseUrl)
-    return `${apiURL.origin}${apiURL.pathname.replace(/\/api\/$/, '/share/')}${
-      bundle.slug
-    }`
-  }
-
-  copy(bundle: ShareLinkBundleSummary): void {
-    if (bundle.status !== ShareLinkBundleStatus.Ready) {
-      return
-    }
-    const success = this.clipboard.copy(this.getShareUrl(bundle))
-    if (success) {
-      this.copiedSlug = bundle.slug
-      setTimeout(() => {
-        this.copiedSlug = null
-      }, 3000)
-      this.toastService.showInfo($localize`Share link copied to clipboard.`)
-    }
-  }
-
-  delete(bundle: ShareLinkBundleSummary): void {
-    this.error = null
-    this.loading = true
-    this.shareLinkBundleService.delete(bundle).subscribe({
-      next: () => {
-        this.toastService.showInfo($localize`Share link bundle deleted.`)
-        this.triggerRefresh(false)
-      },
-      error: (e) => {
-        this.loading = false
-        this.toastService.showError(
-          $localize`Error deleting share link bundle.`,
-          e
-        )
-      },
-    })
-  }
-
-  retry(bundle: ShareLinkBundleSummary): void {
-    this.error = null
-    this.shareLinkBundleService.rebuildBundle(bundle.id).subscribe({
-      next: (updated) => {
-        this.toastService.showInfo(
-          $localize`Share link bundle rebuild requested.`
-        )
-        this.replaceBundle(updated)
-      },
-      error: (e) => {
-        this.toastService.showError($localize`Error requesting rebuild.`, e)
-      },
-    })
-  }
-
-  statusLabel(status: ShareLinkBundleStatus): string {
-    return SHARE_LINK_BUNDLE_STATUS_LABELS[status] ?? status
-  }
-
-  fileVersionLabel(version: FileVersion): string {
-    return SHARE_LINK_BUNDLE_FILE_VERSION_LABELS[version] ?? version
-  }
-
-  close(): void {
-    this.activeModal.close()
-  }
-
-  private replaceBundle(updated: ShareLinkBundleSummary): void {
-    const index = this.bundles.findIndex((bundle) => bundle.id === updated.id)
-    if (index >= 0) {
-      this.bundles = [
-        ...this.bundles.slice(0, index),
-        updated,
-        ...this.bundles.slice(index + 1),
-      ]
-    } else {
-      this.bundles = [updated, ...this.bundles]
-    }
-  }
-
-  private triggerRefresh(silent: boolean): void {
-    this.refresh$.next(silent)
-  }
-}

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

@@ -51,7 +51,7 @@
   <div class="input-group w-100 mt-2">
     <label class="input-group-text" for="addLink"><ng-container i18n>Expires</ng-container>:</label>
     <select class="form-select fs-6" [(ngModel)]="expirationDays">
-      @for (option of expirationOptions; track option) {
+      @for (option of EXPIRATION_OPTIONS; track option) {
         <option [ngValue]="option.value">{{ option.label }}</option>
       }
     </select>

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

@@ -4,11 +4,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { first } from 'rxjs'
-import {
-  FileVersion,
-  SHARE_LINK_EXPIRATION_OPTIONS,
-  ShareLink,
-} from 'src/app/data/share-link'
+import { FileVersion, ShareLink } from 'src/app/data/share-link'
 import { ShareLinkService } from 'src/app/services/rest/share-link.service'
 import { ToastService } from 'src/app/services/toast.service'
 import { environment } from 'src/environments/environment'
@@ -25,7 +21,12 @@ export class ShareLinksDialogComponent implements OnInit {
   private toastService = inject(ToastService)
   private clipboard = inject(Clipboard)
 
-  readonly expirationOptions = SHARE_LINK_EXPIRATION_OPTIONS
+  EXPIRATION_OPTIONS = [
+    { label: $localize`1 day`, value: 1 },
+    { label: $localize`7 days`, value: 7 },
+    { label: $localize`30 days`, value: 30 },
+    { label: $localize`Never`, value: null },
+  ]
 
   @Input()
   title = $localize`Share Links`

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

@@ -1,4 +1,4 @@
-<pngx-page-header [(title)]="title" [id]="documentId">
+<pngx-page-header [(title)]="title">
   @if (archiveContentRenderType === ContentRenderType.PDF && !useNativePdfViewer) {
     @if (previewNumPages) {
       <div class="input-group input-group-sm d-none d-md-flex">
@@ -146,26 +146,16 @@
           <ng-template ngbNavContent>
             <div>
               <pngx-input-text #inputTitle i18n-title title="Title" formControlName="title" [horizontal]="true" [suggestion]="suggestions?.title" (keyup)="titleKeyUp($event)" [error]="error?.title"></pngx-input-text>
-              @if (!isFieldHidden(DocumentDetailFieldID.ArchiveSerialNumber)) {
-                <pngx-input-number i18n-title title="Archive serial number" [error]="error?.archive_serial_number" [horizontal]="true" formControlName='archive_serial_number'></pngx-input-number>
-              }
+              <pngx-input-number i18n-title title="Archive serial number" [error]="error?.archive_serial_number" [horizontal]="true" formControlName='archive_serial_number'></pngx-input-number>
               <pngx-input-date i18n-title title="Date created" formControlName="created" [suggestions]="suggestions?.dates" [showFilter]="true" [horizontal]="true" (filterDocuments)="filterDocuments($event)"
               [error]="error?.created"></pngx-input-date>
-              @if (!isFieldHidden(DocumentDetailFieldID.Correspondent)) {
-                <pngx-input-select [items]="correspondents" i18n-title title="Correspondent" formControlName="correspondent" [allowNull]="true" [showFilter]="true" [horizontal]="true" (filterDocuments)="filterDocuments($event, DataType.Correspondent)"
-                (createNew)="createCorrespondent($event)" [hideAddButton]="createDisabled(DataType.Correspondent)" [suggestions]="suggestions?.correspondents" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.Correspondent }"></pngx-input-select>
-              }
-              @if (!isFieldHidden(DocumentDetailFieldID.DocumentType)) {
-                <pngx-input-select [items]="documentTypes" i18n-title title="Document type" formControlName="document_type" [allowNull]="true" [showFilter]="true" [horizontal]="true" (filterDocuments)="filterDocuments($event, DataType.DocumentType)"
-                (createNew)="createDocumentType($event)" [hideAddButton]="createDisabled(DataType.DocumentType)" [suggestions]="suggestions?.document_types" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.DocumentType }"></pngx-input-select>
-              }
-              @if (!isFieldHidden(DocumentDetailFieldID.StoragePath)) {
-                <pngx-input-select [items]="storagePaths" i18n-title title="Storage path" formControlName="storage_path" [allowNull]="true" [showFilter]="true" [horizontal]="true" (filterDocuments)="filterDocuments($event, DataType.StoragePath)"
-                (createNew)="createStoragePath($event)" [hideAddButton]="createDisabled(DataType.StoragePath)" [suggestions]="suggestions?.storage_paths" i18n-placeholder placeholder="Default" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.StoragePath }"></pngx-input-select>
-              }
-              @if (!isFieldHidden(DocumentDetailFieldID.Tags)) {
-                <pngx-input-tags #tagsInput formControlName="tags" [suggestions]="suggestions?.tags" [showFilter]="true" [horizontal]="true" (filterDocuments)="filterDocuments($event, DataType.Tag)" [hideAddButton]="createDisabled(DataType.Tag)" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.Tag }"></pngx-input-tags>
-              }
+              <pngx-input-select [items]="correspondents" i18n-title title="Correspondent" formControlName="correspondent" [allowNull]="true" [showFilter]="true" [horizontal]="true" (filterDocuments)="filterDocuments($event, DataType.Correspondent)"
+              (createNew)="createCorrespondent($event)" [hideAddButton]="createDisabled(DataType.Correspondent)" [suggestions]="suggestions?.correspondents" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.Correspondent }"></pngx-input-select>
+              <pngx-input-select [items]="documentTypes" i18n-title title="Document type" formControlName="document_type" [allowNull]="true" [showFilter]="true" [horizontal]="true" (filterDocuments)="filterDocuments($event, DataType.DocumentType)"
+              (createNew)="createDocumentType($event)" [hideAddButton]="createDisabled(DataType.DocumentType)" [suggestions]="suggestions?.document_types" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.DocumentType }"></pngx-input-select>
+              <pngx-input-select [items]="storagePaths" i18n-title title="Storage path" formControlName="storage_path" [allowNull]="true" [showFilter]="true" [horizontal]="true" (filterDocuments)="filterDocuments($event, DataType.StoragePath)"
+              (createNew)="createStoragePath($event)" [hideAddButton]="createDisabled(DataType.StoragePath)" [suggestions]="suggestions?.storage_paths" i18n-placeholder placeholder="Default" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.StoragePath }"></pngx-input-select>
+              <pngx-input-tags #tagsInput formControlName="tags" [suggestions]="suggestions?.tags" [showFilter]="true" [horizontal]="true" (filterDocuments)="filterDocuments($event, DataType.Tag)" [hideAddButton]="createDisabled(DataType.Tag)" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.Tag }"></pngx-input-tags>
               @for (fieldInstance of document?.custom_fields; track fieldInstance.field; let i = $index) {
                 <div [formGroup]="customFieldFormFields.controls[i]">
                   @switch (getCustomFieldFromInstance(fieldInstance)?.data_type) {
@@ -380,37 +370,6 @@
             </ng-template>
           </li>
         }
-
-        @if (document?.duplicate_documents?.length) {
-          <li [ngbNavItem]="DocumentDetailNavIDs.Duplicates">
-            <a class="text-nowrap" ngbNavLink i18n>
-              Duplicates
-              <span class="badge text-bg-secondary ms-1">{{ document.duplicate_documents.length }}</span>
-            </a>
-            <ng-template ngbNavContent>
-              <div class="d-flex flex-column gap-2">
-                <div class="fst-italic" i18n>Duplicate documents detected:</div>
-                <div class="list-group">
-                  @for (duplicate of document.duplicate_documents; track duplicate.id) {
-                    <a
-                      class="list-group-item list-group-item-action d-flex justify-content-between align-items-center"
-                      [routerLink]="['/documents', duplicate.id, 'details']"
-                      [class.disabled]="duplicate.deleted_at"
-                    >
-                      <span class="d-flex align-items-center gap-2">
-                        <span>{{ duplicate.title || ('#' + duplicate.id) }}</span>
-                        @if (duplicate.deleted_at) {
-                          <span class="badge text-bg-secondary" i18n>In trash</span>
-                        }
-                      </span>
-                      <span class="text-secondary">#{{ duplicate.id }}</span>
-                    </a>
-                  }
-                </div>
-              </div>
-            </ng-template>
-          </li>
-        }
       </ul>
 
       <div [ngbNavOutlet]="nav" class="mt-3"></div>

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

@@ -48,7 +48,6 @@ import {
 } from 'src/app/data/filter-rule-type'
 import { StoragePath } from 'src/app/data/storage-path'
 import { Tag } from 'src/app/data/tag'
-import { SETTINGS_KEYS } from 'src/app/data/ui-settings'
 import { PermissionsGuard } from 'src/app/guards/permissions.guard'
 import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe'
 import { DocumentTitlePipe } from 'src/app/pipes/document-title.pipe'
@@ -69,8 +68,10 @@ import { environment } from 'src/environments/environment'
 import { ConfirmDialogComponent } from '../common/confirm-dialog/confirm-dialog.component'
 import { PasswordRemovalConfirmDialogComponent } from '../common/confirm-dialog/password-removal-confirm-dialog/password-removal-confirm-dialog.component'
 import { CustomFieldsDropdownComponent } from '../common/custom-fields-dropdown/custom-fields-dropdown.component'
-import { DocumentDetailComponent } from './document-detail.component'
-import { ZoomSetting } from './zoom-setting'
+import {
+  DocumentDetailComponent,
+  ZoomSetting,
+} from './document-detail.component'
 
 const doc: Document = {
   id: 3,
@@ -300,16 +301,16 @@ describe('DocumentDetailComponent', () => {
       .spyOn(openDocumentsService, 'openDocument')
       .mockReturnValueOnce(of(true))
     fixture.detectChanges()
-    expect(component.activeNavID).toEqual(component.DocumentDetailNavIDs.Notes)
+    expect(component.activeNavID).toEqual(5) // DocumentDetailNavIDs.Notes
   })
 
   it('should change url on tab switch', () => {
     initNormally()
     const navigateSpy = jest.spyOn(router, 'navigate')
-    component.nav.select(component.DocumentDetailNavIDs.Notes)
+    component.nav.select(5)
     component.nav.navChange.next({
       activeId: 1,
-      nextId: component.DocumentDetailNavIDs.Notes,
+      nextId: 5,
       preventDefault: () => {},
     })
     fixture.detectChanges()
@@ -351,18 +352,6 @@ describe('DocumentDetailComponent', () => {
     expect(component.document).toEqual(doc)
   })
 
-  it('should fall back to details tab when duplicates tab is active but no duplicates', () => {
-    initNormally()
-    component.activeNavID = component.DocumentDetailNavIDs.Duplicates
-    const noDupDoc = { ...doc, duplicate_documents: [] }
-
-    component.updateComponent(noDupDoc)
-
-    expect(component.activeNavID).toEqual(
-      component.DocumentDetailNavIDs.Details
-    )
-  })
-
   it('should load already-opened document via param', () => {
     initNormally()
     jest.spyOn(documentService, 'get').mockReturnValueOnce(of(doc))
@@ -378,38 +367,6 @@ describe('DocumentDetailComponent', () => {
     expect(component.document).toEqual(doc)
   })
 
-  it('should update cached open document duplicates when reloading an open doc', () => {
-    const openDoc = { ...doc, duplicate_documents: [{ id: 1, title: 'Old' }] }
-    const updatedDuplicates = [
-      { id: 2, title: 'Newer duplicate', deleted_at: null },
-    ]
-    jest
-      .spyOn(activatedRoute, 'paramMap', 'get')
-      .mockReturnValue(of(convertToParamMap({ id: 3, section: 'details' })))
-    jest.spyOn(documentService, 'get').mockReturnValue(
-      of({
-        ...doc,
-        modified: new Date('2024-01-02T00:00:00Z'),
-        duplicate_documents: updatedDuplicates,
-      })
-    )
-    jest.spyOn(openDocumentsService, 'getOpenDocument').mockReturnValue(openDoc)
-    const saveSpy = jest.spyOn(openDocumentsService, 'save')
-    jest.spyOn(openDocumentsService, 'openDocument').mockReturnValue(of(true))
-    jest.spyOn(customFieldsService, 'listAll').mockReturnValue(
-      of({
-        count: customFields.length,
-        all: customFields.map((f) => f.id),
-        results: customFields,
-      })
-    )
-
-    fixture.detectChanges()
-
-    expect(openDoc.duplicate_documents).toEqual(updatedDuplicates)
-    expect(saveSpy).toHaveBeenCalled()
-  })
-
   it('should disable form if user cannot edit', () => {
     currentUserHasObjectPermissions = false
     initNormally()
@@ -1014,7 +971,7 @@ describe('DocumentDetailComponent', () => {
   it('should display built-in pdf viewer if not disabled', () => {
     initNormally()
     component.document.archived_file_name = 'file.pdf'
-    settingsService.set(SETTINGS_KEYS.USE_NATIVE_PDF_VIEWER, false)
+    jest.spyOn(settingsService, 'get').mockReturnValue(false)
     expect(component.useNativePdfViewer).toBeFalsy()
     fixture.detectChanges()
     expect(fixture.debugElement.query(By.css('pdf-viewer'))).not.toBeNull()
@@ -1023,7 +980,7 @@ describe('DocumentDetailComponent', () => {
   it('should display native pdf viewer if enabled', () => {
     initNormally()
     component.document.archived_file_name = 'file.pdf'
-    settingsService.set(SETTINGS_KEYS.USE_NATIVE_PDF_VIEWER, true)
+    jest.spyOn(settingsService, 'get').mockReturnValue(true)
     expect(component.useNativePdfViewer).toBeTruthy()
     fixture.detectChanges()
     expect(fixture.debugElement.query(By.css('object'))).not.toBeNull()

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

@@ -8,7 +8,7 @@ import {
   FormsModule,
   ReactiveFormsModule,
 } from '@angular/forms'
-import { ActivatedRoute, Router, RouterModule } from '@angular/router'
+import { ActivatedRoute, Router } from '@angular/router'
 import {
   NgbDateStruct,
   NgbDropdownModule,
@@ -84,7 +84,6 @@ import { ToastService } from 'src/app/services/toast.service'
 import { getFilenameFromContentDisposition } from 'src/app/utils/http'
 import { ISODateAdapter } from 'src/app/utils/ngb-iso-date-adapter'
 import * as UTIF from 'utif'
-import { DocumentDetailFieldID } from '../admin/settings/settings.component'
 import { ConfirmDialogComponent } from '../common/confirm-dialog/confirm-dialog.component'
 import { PasswordRemovalConfirmDialogComponent } from '../common/confirm-dialog/password-removal-confirm-dialog/password-removal-confirm-dialog.component'
 import { CustomFieldsDropdownComponent } from '../common/custom-fields-dropdown/custom-fields-dropdown.component'
@@ -106,15 +105,16 @@ import { TextComponent } from '../common/input/text/text.component'
 import { TextAreaComponent } from '../common/input/textarea/textarea.component'
 import { UrlComponent } from '../common/input/url/url.component'
 import { PageHeaderComponent } from '../common/page-header/page-header.component'
-import { PdfEditorEditMode } from '../common/pdf-editor/pdf-editor-edit-mode'
-import { PDFEditorComponent } from '../common/pdf-editor/pdf-editor.component'
+import {
+  PDFEditorComponent,
+  PdfEditorEditMode,
+} from '../common/pdf-editor/pdf-editor.component'
 import { ShareLinksDialogComponent } from '../common/share-links-dialog/share-links-dialog.component'
 import { SuggestionsDropdownComponent } from '../common/suggestions-dropdown/suggestions-dropdown.component'
 import { DocumentHistoryComponent } from '../document-history/document-history.component'
 import { DocumentNotesComponent } from '../document-notes/document-notes.component'
 import { ComponentWithPermissions } from '../with-permissions/with-permissions.component'
 import { MetadataCollapseComponent } from './metadata-collapse/metadata-collapse.component'
-import { ZoomSetting } from './zoom-setting'
 
 enum DocumentDetailNavIDs {
   Details = 1,
@@ -124,7 +124,6 @@ enum DocumentDetailNavIDs {
   Notes = 5,
   Permissions = 6,
   History = 7,
-  Duplicates = 8,
 }
 
 enum ContentRenderType {
@@ -136,6 +135,18 @@ enum ContentRenderType {
   TIFF = 'tiff',
 }
 
+export enum ZoomSetting {
+  PageFit = 'page-fit',
+  PageWidth = 'page-width',
+  Quarter = '.25',
+  Half = '.5',
+  ThreeQuarters = '.75',
+  One = '1',
+  OneAndHalf = '1.5',
+  Two = '2',
+  Three = '3',
+}
+
 @Component({
   selector: 'pngx-document-detail',
   templateUrl: './document-detail.component.html',
@@ -170,7 +181,6 @@ enum ContentRenderType {
     NgxBootstrapIconsModule,
     PdfViewerModule,
     TextAreaComponent,
-    RouterModule,
   ],
 })
 export class DocumentDetailComponent
@@ -269,8 +279,6 @@ export class DocumentDetailComponent
 
   public readonly DataType = DataType
 
-  public readonly DocumentDetailFieldID = DocumentDetailFieldID
-
   @ViewChild('nav') nav: NgbNav
   @ViewChild('pdfPreview') set pdfPreview(element) {
     // this gets called when component added or removed from DOM
@@ -317,12 +325,6 @@ export class DocumentDetailComponent
     return this.settings.get(SETTINGS_KEYS.DOCUMENT_EDITING_OVERLAY_THUMBNAIL)
   }
 
-  isFieldHidden(fieldId: DocumentDetailFieldID): boolean {
-    return this.settings
-      .get(SETTINGS_KEYS.DOCUMENT_DETAILS_HIDDEN_FIELDS)
-      .includes(fieldId)
-  }
-
   private getRenderType(mimeType: string): ContentRenderType {
     if (!mimeType) return ContentRenderType.Unknown
     if (mimeType === 'application/pdf') {
@@ -452,11 +454,6 @@ export class DocumentDetailComponent
           const openDocument = this.openDocumentService.getOpenDocument(
             this.documentId
           )
-          // update duplicate documents if present
-          if (openDocument && doc?.duplicate_documents) {
-            openDocument.duplicate_documents = doc.duplicate_documents
-            this.openDocumentService.save()
-          }
           const useDoc = openDocument || doc
           if (openDocument) {
             if (
@@ -707,13 +704,6 @@ export class DocumentDetailComponent
     }
     this.title = this.documentTitlePipe.transform(doc.title)
     this.prepareForm(doc)
-
-    if (
-      this.activeNavID === DocumentDetailNavIDs.Duplicates &&
-      !doc?.duplicate_documents?.length
-    ) {
-      this.activeNavID = DocumentDetailNavIDs.Details
-    }
   }
 
   get customFieldFormFields(): FormArray {

src-ui/src/app/components/document-detail/zoom-setting.ts

@@ -1,11 +0,0 @@
-export enum ZoomSetting {
-  PageFit = 'page-fit',
-  PageWidth = 'page-width',
-  Quarter = '.25',
-  Half = '.5',
-  ThreeQuarters = '.75',
-  One = '1',
-  OneAndHalf = '1.5',
-  Two = '2',
-  Three = '3',
-}

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

@@ -96,36 +96,14 @@
           <button ngbDropdownItem (click)="mergeSelected()" [disabled]="!userCanAdd || list.selected.size < 2">
             <i-bs name="journals"></i-bs>&nbsp;<ng-container i18n>Merge</ng-container>
           </button>
+          @if (emailEnabled) {
+            <button ngbDropdownItem (click)="emailSelected()">
+              <i-bs name="envelope"></i-bs>&nbsp;<ng-container i18n>Email</ng-container>
+            </button>
+          }
         </div>
       </div>
     </div>
-    <div class="btn-toolbar" ngbDropdown>
-      <button
-        class="btn btn-sm btn-outline-primary"
-        id="dropdownSend"
-        ngbDropdownToggle
-        [disabled]="disabled || list.selected.size === 0"
-      >
-        <i-bs name="send"></i-bs>
-        <div class="d-none d-sm-inline">
-          &nbsp;<ng-container i18n>Send</ng-container>
-        </div>
-      </button>
-      <div ngbDropdownMenu aria-labelledby="dropdownSend" class="shadow">
-        <button ngbDropdownItem (click)="createShareLinkBundle()">
-          <i-bs name="link"></i-bs>&nbsp;<ng-container i18n>Create a share link bundle</ng-container>
-        </button>
-        <button ngbDropdownItem (click)="manageShareLinkBundles()">
-          <i-bs name="list-ul"></i-bs>&nbsp;<ng-container i18n>Manage share link bundles</ng-container>
-        </button>
-        <div class="dropdown-divider"></div>
-        @if (emailEnabled) {
-          <button ngbDropdownItem (click)="emailSelected()">
-            <i-bs name="envelope"></i-bs>&nbsp;<ng-container i18n>Email</ng-container>
-          </button>
-        }
-      </div>
-    </div>
     <div class="btn-group btn-group-sm">
       <button class="btn btn-sm btn-outline-primary" [disabled]="awaitingDownload" (click)="downloadSelected()">
         @if (!awaitingDownload) {

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

@@ -3,7 +3,6 @@ import {
   HttpTestingController,
   provideHttpClientTesting,
 } from '@angular/common/http/testing'
-import { EventEmitter } from '@angular/core'
 import { ComponentFixture, TestBed } from '@angular/core/testing'
 import { By } from '@angular/platform-browser'
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'
@@ -26,7 +25,6 @@ import {
   SelectionData,
 } from 'src/app/services/rest/document.service'
 import { GroupService } from 'src/app/services/rest/group.service'
-import { ShareLinkBundleService } from 'src/app/services/rest/share-link-bundle.service'
 import { StoragePathService } from 'src/app/services/rest/storage-path.service'
 import { TagService } from 'src/app/services/rest/tag.service'
 import { UserService } from 'src/app/services/rest/user.service'
@@ -40,8 +38,6 @@ import { EditDialogMode } from '../../common/edit-dialog/edit-dialog.component'
 import { StoragePathEditDialogComponent } from '../../common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component'
 import { TagEditDialogComponent } from '../../common/edit-dialog/tag-edit-dialog/tag-edit-dialog.component'
 import { FilterableDropdownComponent } from '../../common/filterable-dropdown/filterable-dropdown.component'
-import { ShareLinkBundleDialogComponent } from '../../common/share-link-bundle-dialog/share-link-bundle-dialog.component'
-import { ShareLinkBundleManageDialogComponent } from '../../common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component'
 import { BulkEditorComponent } from './bulk-editor.component'
 
 const selectionData: SelectionData = {
@@ -76,7 +72,6 @@ describe('BulkEditorComponent', () => {
   let storagePathService: StoragePathService
   let customFieldsService: CustomFieldsService
   let httpTestingController: HttpTestingController
-  let shareLinkBundleService: ShareLinkBundleService
 
   beforeEach(async () => {
     TestBed.configureTestingModule({
@@ -157,15 +152,6 @@ describe('BulkEditorComponent', () => {
               }),
           },
         },
-        {
-          provide: ShareLinkBundleService,
-          useValue: {
-            createBundle: jest.fn(),
-            listAllBundles: jest.fn(),
-            rebuildBundle: jest.fn(),
-            delete: jest.fn(),
-          },
-        },
         provideHttpClient(withInterceptorsFromDi()),
         provideHttpClientTesting(),
       ],
@@ -182,7 +168,6 @@ describe('BulkEditorComponent', () => {
     storagePathService = TestBed.inject(StoragePathService)
     customFieldsService = TestBed.inject(CustomFieldsService)
     httpTestingController = TestBed.inject(HttpTestingController)
-    shareLinkBundleService = TestBed.inject(ShareLinkBundleService)
 
     fixture = TestBed.createComponent(BulkEditorComponent)
     component = fixture.componentInstance
@@ -1469,130 +1454,4 @@ describe('BulkEditorComponent', () => {
       `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
     ) // listAllFilteredIds
   })
-
-  it('should create share link bundle and enable manage callback', () => {
-    jest.spyOn(permissionsService, 'currentUserCan').mockReturnValue(true)
-    jest
-      .spyOn(documentListViewService, 'documents', 'get')
-      .mockReturnValue([{ id: 5 }, { id: 7 }] as any)
-    jest
-      .spyOn(documentListViewService, 'selected', 'get')
-      .mockReturnValue(new Set([5, 7]))
-
-    const confirmClicked = new EventEmitter<void>()
-    const modalRef: Partial<NgbModalRef> = {
-      close: jest.fn(),
-      componentInstance: {
-        documents: [],
-        confirmClicked,
-        payload: {
-          document_ids: [5, 7],
-          file_version: 'archive',
-          expiration_days: 7,
-        },
-        loading: false,
-        buttonsEnabled: true,
-        copied: false,
-      },
-    }
-
-    const openSpy = jest.spyOn(modalService, 'open')
-    openSpy.mockReturnValueOnce(modalRef as NgbModalRef)
-    openSpy.mockReturnValueOnce({} as NgbModalRef)
-    ;(shareLinkBundleService.createBundle as jest.Mock).mockReturnValueOnce(
-      of({ id: 42 })
-    )
-    const toastInfoSpy = jest.spyOn(toastService, 'showInfo')
-
-    component.createShareLinkBundle()
-
-    expect(openSpy).toHaveBeenNthCalledWith(
-      1,
-      ShareLinkBundleDialogComponent,
-      expect.objectContaining({ backdrop: 'static', size: 'lg' })
-    )
-
-    const dialogInstance = modalRef.componentInstance as any
-    expect(dialogInstance.documents).toEqual([{ id: 5 }, { id: 7 }])
-
-    confirmClicked.emit()
-
-    expect(shareLinkBundleService.createBundle).toHaveBeenCalledWith({
-      document_ids: [5, 7],
-      file_version: 'archive',
-      expiration_days: 7,
-    })
-    expect(dialogInstance.loading).toBe(false)
-    expect(dialogInstance.buttonsEnabled).toBe(false)
-    expect(dialogInstance.createdBundle).toEqual({ id: 42 })
-    expect(typeof dialogInstance.onOpenManage).toBe('function')
-    expect(toastInfoSpy).toHaveBeenCalledWith(
-      $localize`Share link bundle creation requested.`
-    )
-
-    dialogInstance.onOpenManage()
-    expect(modalRef.close).toHaveBeenCalled()
-    expect(openSpy).toHaveBeenNthCalledWith(
-      2,
-      ShareLinkBundleManageDialogComponent,
-      expect.objectContaining({ backdrop: 'static', size: 'lg' })
-    )
-    openSpy.mockRestore()
-  })
-
-  it('should handle share link bundle creation errors', () => {
-    jest.spyOn(permissionsService, 'currentUserCan').mockReturnValue(true)
-    jest
-      .spyOn(documentListViewService, 'documents', 'get')
-      .mockReturnValue([{ id: 9 }] as any)
-    jest
-      .spyOn(documentListViewService, 'selected', 'get')
-      .mockReturnValue(new Set([9]))
-
-    const confirmClicked = new EventEmitter<void>()
-    const modalRef: Partial<NgbModalRef> = {
-      componentInstance: {
-        documents: [],
-        confirmClicked,
-        payload: {
-          document_ids: [9],
-          file_version: 'original',
-          expiration_days: null,
-        },
-        loading: false,
-        buttonsEnabled: true,
-      },
-    }
-
-    const openSpy = jest
-      .spyOn(modalService, 'open')
-      .mockReturnValue(modalRef as NgbModalRef)
-    ;(shareLinkBundleService.createBundle as jest.Mock).mockReturnValueOnce(
-      throwError(() => new Error('bundle failure'))
-    )
-    const toastErrorSpy = jest.spyOn(toastService, 'showError')
-
-    component.createShareLinkBundle()
-
-    const dialogInstance = modalRef.componentInstance as any
-    confirmClicked.emit()
-
-    expect(toastErrorSpy).toHaveBeenCalledWith(
-      $localize`Share link bundle creation is not available yet.`,
-      expect.any(Error)
-    )
-    expect(dialogInstance.loading).toBe(false)
-    expect(dialogInstance.buttonsEnabled).toBe(true)
-    openSpy.mockRestore()
-  })
-
-  it('should open share link bundle management dialog', () => {
-    const openSpy = jest.spyOn(modalService, 'open')
-    component.manageShareLinkBundles()
-    expect(openSpy).toHaveBeenCalledWith(
-      ShareLinkBundleManageDialogComponent,
-      expect.objectContaining({ backdrop: 'static', size: 'lg' })
-    )
-    openSpy.mockRestore()
-  })
 })

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

@@ -33,7 +33,6 @@ import {
   SelectionDataItem,
 } from 'src/app/services/rest/document.service'
 import { SavedViewService } from 'src/app/services/rest/saved-view.service'
-import { ShareLinkBundleService } from 'src/app/services/rest/share-link-bundle.service'
 import { StoragePathService } from 'src/app/services/rest/storage-path.service'
 import { TagService } from 'src/app/services/rest/tag.service'
 import { SettingsService } from 'src/app/services/settings.service'
@@ -55,8 +54,6 @@ import {
 } from '../../common/filterable-dropdown/filterable-dropdown.component'
 import { ToggleableItemState } from '../../common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component'
 import { PermissionsDialogComponent } from '../../common/permissions-dialog/permissions-dialog.component'
-import { ShareLinkBundleDialogComponent } from '../../common/share-link-bundle-dialog/share-link-bundle-dialog.component'
-import { ShareLinkBundleManageDialogComponent } from '../../common/share-link-bundle-manage-dialog/share-link-bundle-manage-dialog.component'
 import { ComponentWithPermissions } from '../../with-permissions/with-permissions.component'
 import { CustomFieldsBulkEditDialogComponent } from './custom-fields-bulk-edit-dialog/custom-fields-bulk-edit-dialog.component'
 
@@ -90,7 +87,6 @@ export class BulkEditorComponent
   private customFieldService = inject(CustomFieldsService)
   private permissionService = inject(PermissionsService)
   private savedViewService = inject(SavedViewService)
-  private readonly shareLinkBundleService = inject(ShareLinkBundleService)
 
   tagSelectionModel = new FilterableDropdownSelectionModel(true)
   correspondentSelectionModel = new FilterableDropdownSelectionModel()
@@ -912,58 +908,6 @@ export class BulkEditorComponent
     return this.settings.get(SETTINGS_KEYS.EMAIL_ENABLED)
   }
 
-  createShareLinkBundle() {
-    const modal = this.modalService.open(ShareLinkBundleDialogComponent, {
-      backdrop: 'static',
-      size: 'lg',
-    })
-    const dialog = modal.componentInstance as ShareLinkBundleDialogComponent
-    const selectedDocuments = this.list.documents.filter((d) =>
-      this.list.selected.has(d.id)
-    )
-    dialog.documents = selectedDocuments
-    dialog.confirmClicked
-      .pipe(takeUntil(this.unsubscribeNotifier))
-      .subscribe(() => {
-        dialog.loading = true
-        dialog.buttonsEnabled = false
-        this.shareLinkBundleService
-          .createBundle(dialog.payload)
-          .pipe(first())
-          .subscribe({
-            next: (result) => {
-              dialog.loading = false
-              dialog.buttonsEnabled = false
-              dialog.createdBundle = result
-              dialog.copied = false
-              dialog.payload = null
-              dialog.onOpenManage = () => {
-                modal.close()
-                this.manageShareLinkBundles()
-              }
-              this.toastService.showInfo(
-                $localize`Share link bundle creation requested.`
-              )
-            },
-            error: (error) => {
-              dialog.loading = false
-              dialog.buttonsEnabled = true
-              this.toastService.showError(
-                $localize`Share link bundle creation is not available yet.`,
-                error
-              )
-            },
-          })
-      })
-  }
-
-  manageShareLinkBundles() {
-    this.modalService.open(ShareLinkBundleManageDialogComponent, {
-      backdrop: 'static',
-      size: 'lg',
-    })
-  }
-
   emailSelected() {
     const allHaveArchiveVersion = this.list.documents
       .filter((d) => this.list.selected.has(d.id))

src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts

@@ -14,7 +14,6 @@ import { SortableDirective } from 'src/app/directives/sortable.directive'
 import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe'
 import { PermissionType } from 'src/app/services/permissions.service'
 import { CorrespondentService } from 'src/app/services/rest/correspondent.service'
-import { ClearableBadgeComponent } from '../../common/clearable-badge/clearable-badge.component'
 import { CorrespondentEditDialogComponent } from '../../common/edit-dialog/correspondent-edit-dialog/correspondent-edit-dialog.component'
 import { PageHeaderComponent } from '../../common/page-header/page-header.component'
 import { ManagementListComponent } from '../management-list/management-list.component'
@@ -37,7 +36,6 @@ import { ManagementListComponent } from '../management-list/management-list.comp
     NgbDropdownModule,
     NgbPaginationModule,
     NgxBootstrapIconsModule,
-    ClearableBadgeComponent,
   ],
 })
 export class CorrespondentListComponent extends ManagementListComponent<Correspondent> {

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

@@ -13,7 +13,6 @@ import { IfPermissionsDirective } from 'src/app/directives/if-permissions.direct
 import { SortableDirective } from 'src/app/directives/sortable.directive'
 import { PermissionType } from 'src/app/services/permissions.service'
 import { DocumentTypeService } from 'src/app/services/rest/document-type.service'
-import { ClearableBadgeComponent } from '../../common/clearable-badge/clearable-badge.component'
 import { DocumentTypeEditDialogComponent } from '../../common/edit-dialog/document-type-edit-dialog/document-type-edit-dialog.component'
 import { PageHeaderComponent } from '../../common/page-header/page-header.component'
 import { ManagementListComponent } from '../management-list/management-list.component'
@@ -35,7 +34,6 @@ import { ManagementListComponent } from '../management-list/management-list.comp
     NgbDropdownModule,
     NgbPaginationModule,
     NgxBootstrapIconsModule,
-    ClearableBadgeComponent,
   ],
 })
 export class DocumentTypeListComponent extends ManagementListComponent<DocumentType> {

src-ui/src/app/components/manage/management-list/management-list.component.html

@@ -1,48 +1,17 @@
 <pngx-page-header title="{{ typeNamePlural | titlecase }}" info="View, add, edit and delete {{ typeNamePlural }}." infoLink="usage/#terms-and-definitions">
 
-  <div ngbDropdown class="btn-group flex-fill d-sm-none">
-    <button class="btn btn-sm btn-outline-primary" id="dropdownSelectMobile" ngbDropdownToggle>
-      <i-bs name="text-indent-left"></i-bs>
-      <div class="d-none d-sm-inline">&nbsp;<ng-container i18n>Select</ng-container></div>
-      @if (selectedObjects.size > 0) {
-        <pngx-clearable-badge [selected]="selectedObjects.size > 0" [number]="selectedObjects.size" (cleared)="selectNone()"></pngx-clearable-badge><span class="visually-hidden">selected</span>
-      }
+  <button class="btn btn-sm btn-outline-secondary" (click)="clearSelection()" [hidden]="selectedObjects.size === 0">
+    <i-bs  name="x"></i-bs>&nbsp;<ng-container i18n>Clear selection</ng-container>
+    </button>
+    <button type="button" class="btn btn-sm btn-outline-primary" (click)="setPermissions()" [disabled]="!userCanBulkEdit(PermissionAction.Change) || selectedObjects.size === 0">
+      <i-bs name="person-fill-lock"></i-bs>&nbsp;<ng-container i18n>Permissions</ng-container>
+    </button>
+    <button type="button" class="btn btn-sm btn-outline-danger" (click)="delete()" [disabled]="!userCanBulkEdit(PermissionAction.Delete) || selectedObjects.size === 0">
+      <i-bs name="trash"></i-bs>&nbsp;<ng-container i18n>Delete</ng-container>
+    </button>
+    <button type="button" class="btn btn-sm btn-outline-primary ms-md-5" (click)="openCreateDialog()" *pngxIfPermissions="{ action: PermissionAction.Add, type: permissionType }">
+      <i-bs name="plus-circle"></i-bs>&nbsp;<ng-container i18n>Create</ng-container>
     </button>
-    <div ngbDropdownMenu aria-labelledby="dropdownSelectMobile" class="shadow">
-      <button ngbDropdownItem (click)="selectNone()" i18n>Select none</button>
-      <button ngbDropdownItem (click)="selectPage(true)" i18n>Select page</button>
-      <button ngbDropdownItem (click)="selectAll()" i18n>Select all</button>
-    </div>
-  </div>
-
-  <div class="d-none d-sm-flex flex-fill me-3">
-    <div class="input-group input-group-sm">
-      <span class="input-group-text border-0" i18n>Select:</span>
-    </div>
-    <div class="btn-group btn-group-sm flex-nowrap">
-      @if (selectedObjects.size > 0) {
-        <button class="btn btn-sm btn-outline-secondary" (click)="selectNone()">
-          <i-bs name="slash-circle"></i-bs>&nbsp;<ng-container i18n>None</ng-container>
-        </button>
-      }
-      <button class="btn btn-sm btn-outline-primary" (click)="selectPage(true)">
-        <i-bs name="file-earmark-check"></i-bs>&nbsp;<ng-container i18n>Page</ng-container>
-      </button>
-      <button class="btn btn-sm btn-outline-primary" (click)="selectAll()">
-        <i-bs name="check-all"></i-bs>&nbsp;<ng-container i18n>All</ng-container>
-      </button>
-    </div>
-  </div>
-
-  <button type="button" class="btn btn-sm btn-outline-primary" (click)="setPermissions()" [disabled]="!userCanBulkEdit(PermissionAction.Change) || selectedObjects.size === 0">
-    <i-bs name="person-fill-lock"></i-bs>&nbsp;<ng-container i18n>Permissions</ng-container>
-  </button>
-  <button type="button" class="btn btn-sm btn-outline-danger" (click)="delete()" [disabled]="!userCanBulkEdit(PermissionAction.Delete) || selectedObjects.size === 0">
-    <i-bs name="trash"></i-bs>&nbsp;<ng-container i18n>Delete</ng-container>
-  </button>
-  <button type="button" class="btn btn-sm btn-outline-primary ms-md-5" (click)="openCreateDialog()" *pngxIfPermissions="{ action: PermissionAction.Add, type: permissionType }">
-    <i-bs name="plus-circle"></i-bs>&nbsp;<ng-container i18n>Create</ng-container>
-  </button>
 </pngx-page-header>
 
 <div class="row mb-3">
@@ -62,7 +31,7 @@
       <tr>
         <th scope="col">
           <div class="form-check m-0 ms-2 me-n2">
-            <input type="checkbox" class="form-check-input" id="all-objects" [(ngModel)]="togggleAll" [disabled]="data.length === 0" (change)="selectPage($event.target.checked); $event.stopPropagation();">
+            <input type="checkbox" class="form-check-input" id="all-objects" [(ngModel)]="togggleAll" [disabled]="data.length === 0" (click)="toggleAll($event); $event.stopPropagation();">
             <label class="form-check-label" for="all-objects"></label>
           </div>
         </th>

src-ui/src/app/components/manage/management-list/management-list.component.spec.ts

@@ -163,7 +163,8 @@ describe('ManagementListComponent', () => {
     const toastInfoSpy = jest.spyOn(toastService, 'showInfo')
     const reloadSpy = jest.spyOn(component, 'reloadData')
 
-    component.openCreateDialog()
+    const createButton = fixture.debugElement.queryAll(By.css('button'))[4]
+    createButton.triggerEventHandler('click')
 
     expect(modal).not.toBeUndefined()
     const editDialog = modal.componentInstance as EditDialogComponent<Tag>
@@ -186,7 +187,8 @@ describe('ManagementListComponent', () => {
     const toastInfoSpy = jest.spyOn(toastService, 'showInfo')
     const reloadSpy = jest.spyOn(component, 'reloadData')
 
-    component.openEditDialog(tags[0])
+    const editButton = fixture.debugElement.queryAll(By.css('button'))[7]
+    editButton.triggerEventHandler('click')
 
     expect(modal).not.toBeUndefined()
     const editDialog = modal.componentInstance as EditDialogComponent<Tag>
@@ -210,7 +212,8 @@ describe('ManagementListComponent', () => {
     const deleteSpy = jest.spyOn(tagService, 'delete')
     const reloadSpy = jest.spyOn(component, 'reloadData')
 
-    component.openDeleteDialog(tags[0])
+    const deleteButton = fixture.debugElement.queryAll(By.css('button'))[8]
+    deleteButton.triggerEventHandler('click')
 
     expect(modal).not.toBeUndefined()
     const editDialog = modal.componentInstance as ConfirmDialogComponent
@@ -227,21 +230,6 @@ describe('ManagementListComponent', () => {
     expect(reloadSpy).toHaveBeenCalled()
   })
 
-  it('should use the all list length for collection size when provided', fakeAsync(() => {
-    jest.spyOn(tagService, 'listFiltered').mockReturnValueOnce(
-      of({
-        count: 1,
-        all: [1, 2, 3],
-        results: tags.slice(0, 1),
-      })
-    )
-
-    component.reloadData()
-    tick(100)
-
-    expect(component.collectionSize).toBe(3)
-  }))
-
   it('should support quick filter for objects', () => {
     const expectedUrl = documentListViewService.getQuickFilterUrl([
       { rule_type: FILTER_HAS_TAGS_ALL, value: tags[0].id.toString() },
@@ -276,84 +264,19 @@ describe('ManagementListComponent', () => {
     expect(component.page).toEqual(1)
   })
 
-  it('should support toggle select page in vew', () => {
+  it('should support toggle all items in view', () => {
     expect(component.selectedObjects.size).toEqual(0)
-    const selectPageSpy = jest.spyOn(component, 'selectPage')
+    const toggleAllSpy = jest.spyOn(component, 'toggleAll')
     const checkButton = fixture.debugElement.queryAll(
       By.css('input.form-check-input')
     )[0]
-    checkButton.nativeElement.dispatchEvent(new Event('change'))
+    checkButton.nativeElement.dispatchEvent(new Event('click'))
     checkButton.nativeElement.checked = true
-    checkButton.nativeElement.dispatchEvent(new Event('change'))
-    expect(selectPageSpy).toHaveBeenCalled()
+    checkButton.nativeElement.dispatchEvent(new Event('click'))
+    expect(toggleAllSpy).toHaveBeenCalled()
     expect(component.selectedObjects.size).toEqual(tags.length)
   })
 
-  it('selectNone should clear selection and reset toggle flag', () => {
-    component.selectedObjects = new Set([tags[0].id, tags[1].id])
-    component.togggleAll = true
-
-    component.selectNone()
-
-    expect(component.selectedObjects.size).toBe(0)
-    expect(component.togggleAll).toBe(false)
-  })
-
-  it('selectPage should select current page items or clear selection', () => {
-    component.selectPage(true)
-    expect(component.selectedObjects).toEqual(new Set(tags.map((t) => t.id)))
-    expect(component.togggleAll).toBe(true)
-
-    component.togggleAll = true
-    component.selectPage(false)
-    expect(component.selectedObjects.size).toBe(0)
-    expect(component.togggleAll).toBe(false)
-  })
-
-  it('selectAll should use all IDs when collection size exists', () => {
-    ;(component as any).allIDs = [1, 2, 3, 4]
-    component.collectionSize = 4
-
-    component.selectAll()
-
-    expect(component.selectedObjects).toEqual(new Set([1, 2, 3, 4]))
-    expect(component.togggleAll).toBe(true)
-  })
-
-  it('selectAll should clear selection when collection size is zero', () => {
-    component.selectedObjects = new Set([1])
-    component.collectionSize = 0
-    component.togggleAll = true
-
-    component.selectAll()
-
-    expect(component.selectedObjects.size).toBe(0)
-    expect(component.togggleAll).toBe(false)
-  })
-
-  it('toggleSelected should toggle object selection and update toggle state', () => {
-    component.toggleSelected(tags[0])
-    expect(component.selectedObjects.has(tags[0].id)).toBe(true)
-    expect(component.togggleAll).toBe(false)
-
-    component.toggleSelected(tags[1])
-    component.toggleSelected(tags[2])
-    expect(component.togggleAll).toBe(true)
-
-    component.toggleSelected(tags[1])
-    expect(component.selectedObjects.has(tags[1].id)).toBe(false)
-    expect(component.togggleAll).toBe(false)
-  })
-
-  it('areAllPageItemsSelected should return false when page has no selectable items', () => {
-    component.data = []
-    component.selectedObjects.clear()
-
-    expect((component as any).areAllPageItemsSelected()).toBe(false)
-
-    component.data = tags
-  })
-
   it('should support bulk edit permissions', () => {
     const bulkEditPermsSpy = jest.spyOn(tagService, 'bulk_edit_objects')
     component.toggleSelected(tags[0])

src-ui/src/app/components/manage/management-list/management-list.component.ts

@@ -84,7 +84,6 @@ export abstract class ManagementListComponent<T extends MatchingModel>
 
   public data: T[] = []
   private unfilteredData: T[] = []
-  private allIDs: number[] = []
 
   public page = 1
 
@@ -172,8 +171,7 @@ export abstract class ManagementListComponent<T extends MatchingModel>
         tap((c) => {
           this.unfilteredData = c.results
           this.data = this.filterData(c.results)
-          this.collectionSize = c.all?.length ?? c.count
-          this.allIDs = c.all
+          this.collectionSize = c.count
         }),
         delay(100)
       )
@@ -302,6 +300,16 @@ export abstract class ManagementListComponent<T extends MatchingModel>
     return ownsAll
   }
 
+  toggleAll(event: PointerEvent) {
+    const checked = (event.target as HTMLInputElement).checked
+    this.togggleAll = checked
+    if (checked) {
+      this.selectedObjects = new Set(this.getSelectableIDs(this.data))
+    } else {
+      this.clearSelection()
+    }
+  }
+
   protected getSelectableIDs(objects: T[]): number[] {
     return objects.map((o) => o.id)
   }
@@ -311,38 +319,10 @@ export abstract class ManagementListComponent<T extends MatchingModel>
     this.selectedObjects.clear()
   }
 
-  selectNone() {
-    this.clearSelection()
-  }
-
-  selectPage(select: boolean) {
-    if (select) {
-      this.selectedObjects = new Set(this.getSelectableIDs(this.data))
-      this.togggleAll = this.areAllPageItemsSelected()
-    } else {
-      this.clearSelection()
-    }
-  }
-
-  selectAll() {
-    if (!this.collectionSize) {
-      this.clearSelection()
-      return
-    }
-    this.selectedObjects = new Set(this.allIDs)
-    this.togggleAll = this.areAllPageItemsSelected()
-  }
-
   toggleSelected(object) {
     this.selectedObjects.has(object.id)
       ? this.selectedObjects.delete(object.id)
       : this.selectedObjects.add(object.id)
-    this.togggleAll = this.areAllPageItemsSelected()
-  }
-
-  protected areAllPageItemsSelected(): boolean {
-    const ids = this.getSelectableIDs(this.data)
-    return ids.length > 0 && ids.every((id) => this.selectedObjects.has(id))
   }
 
   setPermissions() {

src-ui/src/app/components/manage/storage-path-list/storage-path-list.component.ts

@@ -13,7 +13,6 @@ import { IfPermissionsDirective } from 'src/app/directives/if-permissions.direct
 import { SortableDirective } from 'src/app/directives/sortable.directive'
 import { PermissionType } from 'src/app/services/permissions.service'
 import { StoragePathService } from 'src/app/services/rest/storage-path.service'
-import { ClearableBadgeComponent } from '../../common/clearable-badge/clearable-badge.component'
 import { StoragePathEditDialogComponent } from '../../common/edit-dialog/storage-path-edit-dialog/storage-path-edit-dialog.component'
 import { PageHeaderComponent } from '../../common/page-header/page-header.component'
 import { ManagementListComponent } from '../management-list/management-list.component'
@@ -35,7 +34,6 @@ import { ManagementListComponent } from '../management-list/management-list.comp
     NgbDropdownModule,
     NgbPaginationModule,
     NgxBootstrapIconsModule,
-    ClearableBadgeComponent,
   ],
 })
 export class StoragePathListComponent extends ManagementListComponent<StoragePath> {

src-ui/src/app/components/manage/tag-list/tag-list.component.spec.ts

@@ -138,12 +138,16 @@ describe('TagListComponent', () => {
     }
 
     component.data = [parent as any]
-    component.selectPage(true)
+    const selectEvent = { target: { checked: true } } as unknown as PointerEvent
+    component.toggleAll(selectEvent)
 
     expect(component.selectedObjects.has(10)).toBe(true)
     expect(component.selectedObjects.has(11)).toBe(true)
 
-    component.selectPage(false)
+    const deselectEvent = {
+      target: { checked: false },
+    } as unknown as PointerEvent
+    component.toggleAll(deselectEvent)
     expect(component.selectedObjects.size).toBe(0)
   })
 })

src-ui/src/app/components/manage/tag-list/tag-list.component.ts

@@ -13,7 +13,6 @@ import { IfPermissionsDirective } from 'src/app/directives/if-permissions.direct
 import { SortableDirective } from 'src/app/directives/sortable.directive'
 import { PermissionType } from 'src/app/services/permissions.service'
 import { TagService } from 'src/app/services/rest/tag.service'
-import { ClearableBadgeComponent } from '../../common/clearable-badge/clearable-badge.component'
 import { TagEditDialogComponent } from '../../common/edit-dialog/tag-edit-dialog/tag-edit-dialog.component'
 import { PageHeaderComponent } from '../../common/page-header/page-header.component'
 import { ManagementListComponent } from '../management-list/management-list.component'
@@ -35,7 +34,6 @@ import { ManagementListComponent } from '../management-list/management-list.comp
     NgbDropdownModule,
     NgbPaginationModule,
     NgxBootstrapIconsModule,
-    ClearableBadgeComponent,
   ],
 })
 export class TagListComponent extends ManagementListComponent<Tag> {

src-ui/src/app/data/document.ts

@@ -159,8 +159,6 @@ export interface Document extends ObjectWithPermissions {
 
   page_count?: number
 
-  duplicate_documents?: Document[]
-
   // Frontend only
   __changedFields?: string[]
 }

src-ui/src/app/data/paperless-task.ts

@@ -1,4 +1,3 @@
-import { Document } from './document'
 import { ObjectWithId } from './object-with-id'
 
 export enum PaperlessTaskType {
@@ -43,7 +42,5 @@ export interface PaperlessTask extends ObjectWithId {
 
   related_document?: number
 
-  duplicate_documents?: Document[]
-
   owner?: number
 }

src-ui/src/app/data/share-link-bundle.ts

@@ -1,53 +0,0 @@
-import { FileVersion } from './share-link'
-
-export enum ShareLinkBundleStatus {
-  Pending = 'pending',
-  Processing = 'processing',
-  Ready = 'ready',
-  Failed = 'failed',
-}
-
-export type ShareLinkBundleError = {
-  bundle_id: number
-  message?: string
-  exception_type?: string
-  timestamp?: string
-}
-
-export interface ShareLinkBundleSummary {
-  id: number
-  slug: string
-  created: string // Date
-  expiration?: string // Date
-  documents: number[]
-  document_count: number
-  file_version: FileVersion
-  status: ShareLinkBundleStatus
-  built_at?: string
-  size_bytes?: number
-  last_error?: ShareLinkBundleError
-}
-
-export interface ShareLinkBundleCreatePayload {
-  document_ids: number[]
-  file_version: FileVersion
-  expiration_days: number | null
-}
-
-export const SHARE_LINK_BUNDLE_STATUS_LABELS: Record<
-  ShareLinkBundleStatus,
-  string
-> = {
-  [ShareLinkBundleStatus.Pending]: $localize`Pending`,
-  [ShareLinkBundleStatus.Processing]: $localize`Processing`,
-  [ShareLinkBundleStatus.Ready]: $localize`Ready`,
-  [ShareLinkBundleStatus.Failed]: $localize`Failed`,
-}
-
-export const SHARE_LINK_BUNDLE_FILE_VERSION_LABELS: Record<
-  FileVersion,
-  string
-> = {
-  [FileVersion.Archive]: $localize`Archive`,
-  [FileVersion.Original]: $localize`Original`,
-}

src-ui/src/app/data/share-link.ts

@@ -5,18 +5,6 @@ export enum FileVersion {
   Original = 'original',
 }
 
-export interface ShareLinkExpirationOption {
-  label: string
-  value: number | null
-}
-
-export const SHARE_LINK_EXPIRATION_OPTIONS: ShareLinkExpirationOption[] = [
-  { label: $localize`1 day`, value: 1 },
-  { label: $localize`7 days`, value: 7 },
-  { label: $localize`30 days`, value: 30 },
-  { label: $localize`Never`, value: null },
-]
-
 export interface ShareLink extends ObjectWithPermissions {
   created: string // Date
 

src-ui/src/app/data/ui-settings.ts

@@ -1,5 +1,3 @@
-import { PdfEditorEditMode } from '../components/common/pdf-editor/pdf-editor-edit-mode'
-import { ZoomSetting } from '../components/document-detail/zoom-setting'
 import { User } from './user'
 
 export interface UiSettings {
@@ -72,12 +70,8 @@ export const SETTINGS_KEYS = {
     'general-settings:document-editing:remove-inbox-tags',
   DOCUMENT_EDITING_OVERLAY_THUMBNAIL:
     'general-settings:document-editing:overlay-thumbnail',
-  DOCUMENT_DETAILS_HIDDEN_FIELDS:
-    'general-settings:document-details:hidden-fields',
   SEARCH_DB_ONLY: 'general-settings:search:db-only',
   SEARCH_FULL_TYPE: 'general-settings:search:more-link',
-  PDF_EDITOR_DEFAULT_EDIT_MODE:
-    'general-settings:document-editing:default-edit-mode',
   EMPTY_TRASH_DELAY: 'trash_delay',
   GMAIL_OAUTH_URL: 'gmail_oauth_url',
   OUTLOOK_OAUTH_URL: 'outlook_oauth_url',
@@ -261,11 +255,6 @@ export const SETTINGS: UiSetting[] = [
     type: 'boolean',
     default: true,
   },
-  {
-    key: SETTINGS_KEYS.DOCUMENT_DETAILS_HIDDEN_FIELDS,
-    type: 'array',
-    default: [],
-  },
   {
     key: SETTINGS_KEYS.SEARCH_DB_ONLY,
     type: 'boolean',
@@ -299,16 +288,11 @@ export const SETTINGS: UiSetting[] = [
   {
     key: SETTINGS_KEYS.PDF_VIEWER_ZOOM_SETTING,
     type: 'string',
-    default: ZoomSetting.PageWidth,
+    default: 'page-width', // ZoomSetting from 'document-detail.component'
   },
   {
     key: SETTINGS_KEYS.AI_ENABLED,
     type: 'boolean',
     default: false,
   },
-  {
-    key: SETTINGS_KEYS.PDF_EDITOR_DEFAULT_EDIT_MODE,
-    type: 'string',
-    default: PdfEditorEditMode.Create,
-  },
 ]

src-ui/src/app/data/workflow-trigger.ts

@@ -44,16 +44,10 @@ export interface WorkflowTrigger extends ObjectWithId {
 
   filter_has_not_tags?: number[] // Tag.id[]
 
-  filter_has_any_correspondents?: number[] // Correspondent.id[]
-
   filter_has_not_correspondents?: number[] // Correspondent.id[]
 
-  filter_has_any_document_types?: number[] // DocumentType.id[]
-
   filter_has_not_document_types?: number[] // DocumentType.id[]
 
-  filter_has_any_storage_paths?: number[] // StoragePath.id[]
-
   filter_has_not_storage_paths?: number[] // StoragePath.id[]
 
   filter_custom_field_query?: string

src-ui/src/app/interceptors/api-version.interceptor.spec.ts

@@ -1,41 +1,30 @@
-import {
-  HttpClient,
-  provideHttpClient,
-  withInterceptors,
-} from '@angular/common/http'
-import {
-  HttpTestingController,
-  provideHttpClientTesting,
-} from '@angular/common/http/testing'
+import { HttpEvent, HttpRequest } from '@angular/common/http'
 import { TestBed } from '@angular/core/testing'
+import { of } from 'rxjs'
 import { environment } from 'src/environments/environment'
-import { withApiVersionInterceptor } from './api-version.interceptor'
+import { ApiVersionInterceptor } from './api-version.interceptor'
 
 describe('ApiVersionInterceptor', () => {
-  let httpClient: HttpClient
-  let httpMock: HttpTestingController
+  let interceptor: ApiVersionInterceptor
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      providers: [
-        provideHttpClient(withInterceptors([withApiVersionInterceptor])),
-        provideHttpClientTesting(),
-      ],
+      providers: [ApiVersionInterceptor],
     })
 
-    httpClient = TestBed.inject(HttpClient)
-    httpMock = TestBed.inject(HttpTestingController)
+    interceptor = TestBed.inject(ApiVersionInterceptor)
   })
 
   it('should add api version to headers', () => {
-    httpClient.get('https://example.com').subscribe()
-    const request = httpMock.expectOne('https://example.com')
-    const header = request.request.headers['lazyUpdate'][0]
-
-    expect(header.name).toEqual('Accept')
-    expect(header.value).toEqual(
-      `application/json; version=${environment.apiVersion}`
-    )
-    request.flush({})
+    interceptor.intercept(new HttpRequest('GET', 'https://example.com'), {
+      handle: (request) => {
+        const header = request.headers['lazyUpdate'][0]
+        expect(header.name).toEqual('Accept')
+        expect(header.value).toEqual(
+          `application/json; version=${environment.apiVersion}`
+        )
+        return of({} as HttpEvent<any>)
+      },
+    })
   })
 })

src-ui/src/app/interceptors/api-version.interceptor.ts

@@ -1,20 +1,27 @@
 import {
   HttpEvent,
-  HttpHandlerFn,
-  HttpInterceptorFn,
+  HttpHandler,
+  HttpInterceptor,
   HttpRequest,
 } from '@angular/common/http'
+import { Injectable } from '@angular/core'
 import { Observable } from 'rxjs'
 import { environment } from 'src/environments/environment'
 
-export const withApiVersionInterceptor: HttpInterceptorFn = (
-  request: HttpRequest<unknown>,
-  next: HttpHandlerFn
-): Observable<HttpEvent<unknown>> => {
-  request = request.clone({
-    setHeaders: {
-      Accept: `application/json; version=${environment.apiVersion}`,
-    },
-  })
-  return next(request)
+@Injectable()
+export class ApiVersionInterceptor implements HttpInterceptor {
+  constructor() {}
+
+  intercept(
+    request: HttpRequest<unknown>,
+    next: HttpHandler
+  ): Observable<HttpEvent<unknown>> {
+    request = request.clone({
+      setHeaders: {
+        Accept: `application/json; version=${environment.apiVersion}`,
+      },
+    })
+
+    return next.handle(request)
+  }
 }

src-ui/src/app/interceptors/csrf.interceptor.spec.ts

@@ -1,52 +1,35 @@
-import {
-  HttpClient,
-  provideHttpClient,
-  withInterceptors,
-} from '@angular/common/http'
-import {
-  HttpTestingController,
-  provideHttpClientTesting,
-} from '@angular/common/http/testing'
+import { HttpEvent, HttpRequest } from '@angular/common/http'
 import { TestBed } from '@angular/core/testing'
 import { Meta } from '@angular/platform-browser'
 import { CookieService } from 'ngx-cookie-service'
-import { withCsrfInterceptor } from './csrf.interceptor'
+import { of } from 'rxjs'
+import { CsrfInterceptor } from './csrf.interceptor'
 
 describe('CsrfInterceptor', () => {
+  let interceptor: CsrfInterceptor
   let meta: Meta
   let cookieService: CookieService
-  let httpClient: HttpClient
-  let httpMock: HttpTestingController
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      providers: [
-        Meta,
-        CookieService,
-        provideHttpClient(withInterceptors([withCsrfInterceptor])),
-        provideHttpClientTesting(),
-      ],
+      providers: [CsrfInterceptor, Meta, CookieService],
     })
 
     meta = TestBed.inject(Meta)
     cookieService = TestBed.inject(CookieService)
-    httpClient = TestBed.inject(HttpClient)
-    httpMock = TestBed.inject(HttpTestingController)
+    interceptor = TestBed.inject(CsrfInterceptor)
   })
 
   it('should get csrf token', () => {
     meta.addTag({ name: 'cookie_prefix', content: 'ngx-' }, true)
-
     const cookieServiceSpy = jest.spyOn(cookieService, 'get')
     cookieServiceSpy.mockReturnValue('csrftoken')
-
-    httpClient.get('https://example.com').subscribe()
-    const request = httpMock.expectOne('https://example.com')
-
-    expect(request.request.headers['lazyUpdate'][0]['name']).toEqual(
-      'X-CSRFToken'
-    )
+    interceptor.intercept(new HttpRequest('GET', 'https://example.com'), {
+      handle: (request) => {
+        expect(request.headers['lazyUpdate'][0]['name']).toEqual('X-CSRFToken')
+        return of({} as HttpEvent<any>)
+      },
+    })
     expect(cookieServiceSpy).toHaveBeenCalled()
-    request.flush({})
   })
 })

src-ui/src/app/interceptors/csrf.interceptor.ts

@@ -1,32 +1,36 @@
 import {
   HttpEvent,
-  HttpHandlerFn,
-  HttpInterceptorFn,
+  HttpHandler,
+  HttpInterceptor,
   HttpRequest,
 } from '@angular/common/http'
-import { inject } from '@angular/core'
+import { inject, Injectable } from '@angular/core'
 import { Meta } from '@angular/platform-browser'
 import { CookieService } from 'ngx-cookie-service'
 import { Observable } from 'rxjs'
 
-export const withCsrfInterceptor: HttpInterceptorFn = (
-  request: HttpRequest<unknown>,
-  next: HttpHandlerFn
-): Observable<HttpEvent<unknown>> => {
-  const cookieService: CookieService = inject(CookieService)
-  const meta: Meta = inject(Meta)
+@Injectable()
+export class CsrfInterceptor implements HttpInterceptor {
+  private cookieService: CookieService = inject(CookieService)
+  private meta: Meta = inject(Meta)
 
-  let prefix = ''
-  if (meta.getTag('name=cookie_prefix')) {
-    prefix = meta.getTag('name=cookie_prefix').content
+  intercept(
+    request: HttpRequest<unknown>,
+    next: HttpHandler
+  ): Observable<HttpEvent<unknown>> {
+    let prefix = ''
+    if (this.meta.getTag('name=cookie_prefix')) {
+      prefix = this.meta.getTag('name=cookie_prefix').content
+    }
+    let csrfToken = this.cookieService.get(`${prefix}csrftoken`)
+    if (csrfToken) {
+      request = request.clone({
+        setHeaders: {
+          'X-CSRFToken': csrfToken,
+        },
+      })
+    }
+
+    return next.handle(request)
   }
-  let csrfToken = cookieService.get(`${prefix}csrftoken`)
-  if (csrfToken) {
-    request = request.clone({
-      setHeaders: {
-        'X-CSRFToken': csrfToken,
-      },
-    })
-  }
-  return next(request)
 }

src-ui/src/app/services/rest/share-link-bundle.service.spec.ts

@@ -1,60 +0,0 @@
-import { HttpTestingController } from '@angular/common/http/testing'
-import { TestBed } from '@angular/core/testing'
-import { Subscription } from 'rxjs'
-import { environment } from 'src/environments/environment'
-import { commonAbstractPaperlessServiceTests } from './abstract-paperless-service.spec'
-import { ShareLinkBundleService } from './share-link-bundle.service'
-
-const endpoint = 'share_link_bundles'
-
-commonAbstractPaperlessServiceTests(endpoint, ShareLinkBundleService)
-
-describe('ShareLinkBundleService', () => {
-  let httpTestingController: HttpTestingController
-  let service: ShareLinkBundleService
-  let subscription: Subscription | undefined
-
-  beforeEach(() => {
-    httpTestingController = TestBed.inject(HttpTestingController)
-    service = TestBed.inject(ShareLinkBundleService)
-  })
-
-  afterEach(() => {
-    subscription?.unsubscribe()
-    httpTestingController.verify()
-  })
-
-  it('creates bundled share links', () => {
-    const payload = {
-      document_ids: [1, 2],
-      file_version: 'archive',
-      expiration_days: 7,
-    }
-    subscription = service.createBundle(payload as any).subscribe()
-    const req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}${endpoint}/`
-    )
-    expect(req.request.method).toBe('POST')
-    expect(req.request.body).toEqual(payload)
-    req.flush({})
-  })
-
-  it('rebuilds bundles', () => {
-    subscription = service.rebuildBundle(12).subscribe()
-    const req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}${endpoint}/12/rebuild/`
-    )
-    expect(req.request.method).toBe('POST')
-    expect(req.request.body).toEqual({})
-    req.flush({})
-  })
-
-  it('lists bundles with expected parameters', () => {
-    subscription = service.listAllBundles().subscribe()
-    const req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}${endpoint}/?page=1&page_size=1000&ordering=-created`
-    )
-    expect(req.request.method).toBe('GET')
-    req.flush({ results: [] })
-  })
-})

src-ui/src/app/services/rest/share-link-bundle.service.ts

@@ -1,41 +0,0 @@
-import { Injectable } from '@angular/core'
-import { Observable } from 'rxjs'
-import { map } from 'rxjs/operators'
-import {
-  ShareLinkBundleCreatePayload,
-  ShareLinkBundleSummary,
-} from 'src/app/data/share-link-bundle'
-import { AbstractNameFilterService } from './abstract-name-filter-service'
-
-@Injectable({
-  providedIn: 'root',
-})
-export class ShareLinkBundleService extends AbstractNameFilterService<ShareLinkBundleSummary> {
-  constructor() {
-    super()
-    this.resourceName = 'share_link_bundles'
-  }
-
-  createBundle(
-    payload: ShareLinkBundleCreatePayload
-  ): Observable<ShareLinkBundleSummary> {
-    this.clearCache()
-    return this.http.post<ShareLinkBundleSummary>(
-      this.getResourceUrl(),
-      payload
-    )
-  }
-  rebuildBundle(bundleId: number): Observable<ShareLinkBundleSummary> {
-    this.clearCache()
-    return this.http.post<ShareLinkBundleSummary>(
-      this.getResourceUrl(bundleId, 'rebuild'),
-      {}
-    )
-  }
-
-  listAllBundles(): Observable<ShareLinkBundleSummary[]> {
-    return this.list(1, 1000, 'created', true).pipe(
-      map((response) => response.results)
-    )
-  }
-}

src-ui/src/main.ts

@@ -1,16 +1,16 @@
 import {
+  APP_INITIALIZER,
+  enableProdMode,
   importProvidersFrom,
-  inject,
-  provideAppInitializer,
   provideZoneChangeDetection,
 } from '@angular/core'
 
 import { DragDropModule } from '@angular/cdk/drag-drop'
 import { DatePipe, registerLocaleData } from '@angular/common'
 import {
+  HTTP_INTERCEPTORS,
   provideHttpClient,
   withFetch,
-  withInterceptors,
   withInterceptorsFromDi,
 } from '@angular/common/http'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
@@ -151,14 +151,15 @@ import { AppComponent } from './app/app.component'
 import { DirtyDocGuard } from './app/guards/dirty-doc.guard'
 import { DirtySavedViewGuard } from './app/guards/dirty-saved-view.guard'
 import { PermissionsGuard } from './app/guards/permissions.guard'
-import { withApiVersionInterceptor } from './app/interceptors/api-version.interceptor'
-import { withCsrfInterceptor } from './app/interceptors/csrf.interceptor'
+import { ApiVersionInterceptor } from './app/interceptors/api-version.interceptor'
+import { CsrfInterceptor } from './app/interceptors/csrf.interceptor'
 import { DocumentTitlePipe } from './app/pipes/document-title.pipe'
 import { FilterPipe } from './app/pipes/filter.pipe'
 import { UsernamePipe } from './app/pipes/username.pipe'
 import { SettingsService } from './app/services/settings.service'
 import { LocalizedDateParserFormatter } from './app/utils/ngb-date-parser-formatter'
 import { ISODateAdapter } from './app/utils/ngb-iso-date-adapter'
+import { environment } from './environments/environment'
 
 import localeAf from '@angular/common/locales/af'
 import localeAr from '@angular/common/locales/ar'
@@ -236,11 +237,11 @@ registerLocaleData(localeUk)
 registerLocaleData(localeZh)
 registerLocaleData(localeZhHant)
 
-function initializeApp() {
-  const settings = inject(SettingsService)
-  return settings.initializeSettings()
+function initializeApp(settings: SettingsService) {
+  return () => {
+    return settings.initializeSettings()
+  }
 }
-
 const icons = {
   airplane,
   archive,
@@ -362,6 +363,10 @@ const icons = {
   xLg,
 }
 
+if (environment.production) {
+  enableProdMode()
+}
+
 bootstrapApplication(AppComponent, {
   providers: [
     provideZoneChangeDetection(),
@@ -378,9 +383,24 @@ bootstrapApplication(AppComponent, {
       DragDropModule,
       NgxBootstrapIconsModule.pick(icons)
     ),
-    provideAppInitializer(initializeApp),
+    {
+      provide: APP_INITIALIZER,
+      useFactory: initializeApp,
+      deps: [SettingsService],
+      multi: true,
+    },
     DatePipe,
     CookieService,
+    {
+      provide: HTTP_INTERCEPTORS,
+      useClass: CsrfInterceptor,
+      multi: true,
+    },
+    {
+      provide: HTTP_INTERCEPTORS,
+      useClass: ApiVersionInterceptor,
+      multi: true,
+    },
     FilterPipe,
     DocumentTitlePipe,
     { provide: NgbDateAdapter, useClass: ISODateAdapter },
@@ -392,10 +412,6 @@ bootstrapApplication(AppComponent, {
     CorrespondentNamePipe,
     DocumentTypeNamePipe,
     StoragePathNamePipe,
-    provideHttpClient(
-      withInterceptorsFromDi(),
-      withInterceptors([withCsrfInterceptor, withApiVersionInterceptor]),
-      withFetch()
-    ),
+    provideHttpClient(withInterceptorsFromDi(), withFetch()),
   ],
 }).catch((err) => console.error(err))

src-ui/src/theme.scss

@@ -73,7 +73,6 @@ $form-check-radio-checked-bg-image-dark: url("data:image/svg+xml,<svg xmlns='htt
 }
 
 @mixin dark-mode {
-  color-scheme: dark;
   --pngx-body-color-accent: #{$text-color-dark-bg-accent};
   --pngx-bg-alt: #242529;
   --pngx-bg-alt2: #232323;

src/documents/__init__.py

@@ -1,4 +1,5 @@
 # this is here so that django finds the checks.
+from documents.checks import changed_password_check
 from documents.checks import parser_check
 
-__all__ = ["parser_check"]
+__all__ = ["changed_password_check", "parser_check"]

src/documents/admin.py

@@ -13,7 +13,6 @@ from documents.models import PaperlessTask
 from documents.models import SavedView
 from documents.models import SavedViewFilterRule
 from documents.models import ShareLink
-from documents.models import ShareLinkBundle
 from documents.models import StoragePath
 from documents.models import Tag
 from documents.tasks import update_document_parent_tags
@@ -61,6 +60,7 @@ class DocumentAdmin(GuardedModelAdmin):
         "added",
         "modified",
         "mime_type",
+        "storage_type",
         "filename",
         "checksum",
         "archive_filename",
@@ -185,22 +185,6 @@ class ShareLinksAdmin(GuardedModelAdmin):
         return super().get_queryset(request).select_related("document__correspondent")
 
 
-class ShareLinkBundleAdmin(GuardedModelAdmin):
-    list_display = ("created", "status", "expiration", "owner", "slug")
-    list_filter = ("status", "created", "expiration", "owner")
-    search_fields = ("slug",)
-
-    def get_queryset(self, request):  # pragma: no cover
-        return (
-            super()
-            .get_queryset(request)
-            .select_related("owner")
-            .prefetch_related(
-                "documents",
-            )
-        )
-
-
 class CustomFieldsAdmin(GuardedModelAdmin):
     fields = ("name", "created", "data_type")
     readonly_fields = ("created", "data_type")
@@ -232,7 +216,6 @@ admin.site.register(StoragePath, StoragePathAdmin)
 admin.site.register(PaperlessTask, TaskAdmin)
 admin.site.register(Note, NotesAdmin)
 admin.site.register(ShareLink, ShareLinksAdmin)
-admin.site.register(ShareLinkBundle, ShareLinkBundleAdmin)
 admin.site.register(CustomField, CustomFieldsAdmin)
 admin.site.register(CustomFieldInstance, CustomFieldInstancesAdmin)
 

src/documents/checks.py

@@ -1,12 +1,60 @@
+import textwrap
+
 from django.conf import settings
 from django.core.checks import Error
 from django.core.checks import Warning
 from django.core.checks import register
+from django.core.exceptions import FieldError
+from django.db.utils import OperationalError
+from django.db.utils import ProgrammingError
 
 from documents.signals import document_consumer_declaration
 from documents.templating.utils import convert_format_str_to_template_format
 
 
+@register()
+def changed_password_check(app_configs, **kwargs):
+    from documents.models import Document
+    from paperless.db import GnuPG
+
+    try:
+        encrypted_doc = (
+            Document.objects.filter(
+                storage_type=Document.STORAGE_TYPE_GPG,
+            )
+            .only("pk", "storage_type")
+            .first()
+        )
+    except (OperationalError, ProgrammingError, FieldError):
+        return []  # No documents table yet
+
+    if encrypted_doc:
+        if not settings.PASSPHRASE:
+            return [
+                Error(
+                    "The database contains encrypted documents but no password is set.",
+                ),
+            ]
+
+        if not GnuPG.decrypted(encrypted_doc.source_file):
+            return [
+                Error(
+                    textwrap.dedent(
+                        """
+                The current password doesn't match the password of the
+                existing documents.
+
+                If you intend to change your password, you must first export
+                all of the old documents, start fresh with the new password
+                and then re-import them."
+                """,
+                    ),
+                ),
+            ]
+
+    return []
+
+
 @register()
 def parser_check(app_configs, **kwargs):
     parsers = []

src/documents/conditionals.py

@@ -128,7 +128,7 @@ def thumbnail_last_modified(request, pk: int) -> datetime | None:
     Cache should be (slightly?) faster than filesystem
     """
     try:
-        doc = Document.objects.only("pk").get(pk=pk)
+        doc = Document.objects.only("storage_type").get(pk=pk)
         if not doc.thumbnail_path.exists():
             return None
         doc_key = get_thumbnail_modified_key(pk)

src/documents/consumer.py

@@ -497,6 +497,7 @@ class ConsumerPlugin(
                     create_source_path_directory(document.source_path)
 
                     self._write(
+                        document.storage_type,
                         self.unmodified_original
                         if self.unmodified_original is not None
                         else self.working_copy,
@@ -504,6 +505,7 @@ class ConsumerPlugin(
                     )
 
                     self._write(
+                        document.storage_type,
                         thumbnail,
                         document.thumbnail_path,
                     )
@@ -515,6 +517,7 @@ class ConsumerPlugin(
                         )
                         create_source_path_directory(document.archive_path)
                         self._write(
+                            document.storage_type,
                             archive_path,
                             document.archive_path,
                         )
@@ -634,6 +637,8 @@ class ConsumerPlugin(
             )
             self.log.debug(f"Creation date from st_mtime: {create_date}")
 
+        storage_type = Document.STORAGE_TYPE_UNENCRYPTED
+
         if self.metadata.filename:
             title = Path(self.metadata.filename).stem
         else:
@@ -660,6 +665,7 @@ class ConsumerPlugin(
             checksum=hashlib.md5(file_for_checksum.read_bytes()).hexdigest(),
             created=create_date,
             modified=create_date,
+            storage_type=storage_type,
             page_count=page_count,
             original_filename=self.filename,
         )
@@ -730,7 +736,7 @@ class ConsumerPlugin(
                 }
                 CustomFieldInstance.objects.create(**args)  # adds to document
 
-    def _write(self, source, target):
+    def _write(self, storage_type, source, target):
         with (
             Path(source).open("rb") as read_file,
             Path(target).open("wb") as write_file,
@@ -779,45 +785,19 @@ class ConsumerPreflightPlugin(
             Q(checksum=checksum) | Q(archive_checksum=checksum),
         )
         if existing_doc.exists():
-            existing_doc = existing_doc.order_by("-created")
-            duplicates_in_trash = existing_doc.filter(deleted_at__isnull=False)
-            log_msg = (
-                f"Consuming duplicate {self.filename}: "
-                f"{existing_doc.count()} existing document(s) share the same content."
-            )
+            msg = ConsumerStatusShortMessage.DOCUMENT_ALREADY_EXISTS
+            log_msg = f"Not consuming {self.filename}: It is a duplicate of {existing_doc.get().title} (#{existing_doc.get().pk})."
 
-            if duplicates_in_trash.exists():
-                log_msg += " Note: at least one existing document is in the trash."
-
-            self.log.warning(log_msg)
+            if existing_doc.first().deleted_at is not None:
+                msg = ConsumerStatusShortMessage.DOCUMENT_ALREADY_EXISTS_IN_TRASH
+                log_msg += " Note: existing document is in the trash."
 
             if settings.CONSUMER_DELETE_DUPLICATES:
-                duplicate = existing_doc.first()
-                duplicate_label = (
-                    duplicate.title
-                    or duplicate.original_filename
-                    or (Path(duplicate.filename).name if duplicate.filename else None)
-                    or str(duplicate.pk)
-                )
-
                 Path(self.input_doc.original_file).unlink()
-
-                failure_msg = (
-                    f"Not consuming {self.filename}: "
-                    f"It is a duplicate of {duplicate_label} (#{duplicate.pk})"
-                )
-                status_msg = ConsumerStatusShortMessage.DOCUMENT_ALREADY_EXISTS
-
-                if duplicates_in_trash.exists():
-                    status_msg = (
-                        ConsumerStatusShortMessage.DOCUMENT_ALREADY_EXISTS_IN_TRASH
-                    )
-                    failure_msg += " Note: existing document is in the trash."
-
-                self._fail(
-                    status_msg,
-                    failure_msg,
-                )
+            self._fail(
+                msg,
+                log_msg,
+            )
 
     def pre_check_directories(self):
         """

src/documents/data_models.py

@@ -118,7 +118,7 @@ class DocumentMetadataOverrides:
             ).values_list("id", flat=True),
         )
         overrides.custom_fields = {
-            custom_field.field.id: custom_field.value
+            custom_field.id: custom_field.value
             for custom_field in doc.custom_fields.all()
         }