Fix: handle versioned PaperlessTasks response

2025-03-08 16:38:12 -08:00
161 changed files with 79511 additions and 103599 deletions
@@ -149,7 +149,7 @@ RUN --mount=type=cache,target=/root/.cache/uv,id=pip-cache \
    && apt-get install --yes --quiet ${BUILD_PACKAGES}

 RUN set -eux \
-  && npm update -g pnpm
+  && npm update npm -g

 # add users, setup scripts
 # Mount the compiled frontend to expected location
@@ -33,7 +33,7 @@
 			"label": "Start: Frontend Angular",
 			"description": "Start the Frontend Angular Dev Server",
 			"type": "shell",
-			"command": "pnpm start",
+			"command": "npm start",
 			"isBackground": true,
 			"options": {
 				"cwd": "${workspaceFolder}/src-ui"
@@ -173,8 +173,8 @@
 		},
 		{
 			"label": "Maintenance: Install Frontend Dependencies",
-			"description": "Install frontend (pnpm) dependencies",
-			"type": "pnpm",
+			"description": "Install frontend (npm) dependencies",
+			"type": "npm",
 			"script": "install",
 			"path": "src-ui",
 			"group": "clean",
@@ -185,7 +185,7 @@
 			"description": "Clean install frontend dependencies and build the frontend for production",
 			"label": "Maintenance: Compile frontend for production",
 			"type": "shell",
-			"command": "pnpm install && ./node_modules/.bin/ng build --configuration production",
+			"command": "npm ci && ./node_modules/.bin/ng build --configuration production",
 			"group": "none",
 			"presentation": {
 				"echo": true,
@@ -1,15 +1,14 @@
-# Please see the documentation for all configuration options:
-# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+# https://docs.github.com/en/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/configuration-options-for-dependency-updates#package-ecosystem

 version: 2
 # Required for uv support for now
 enable-beta-ecosystems: true
 updates:

-  # Enable version updates for pnpm
+  # Enable version updates for npm
  - package-ecosystem: "npm"
    target-branch: "dev"
-    # Look for `pnpm-lock.yaml` file in the `/src-ui` directory
+    # Look for `package.json` and `lock` files in the `/src-ui` directory
    directory: "/src-ui"
    open-pull-requests-limit: 10
    schedule:
@@ -90,50 +89,3 @@ updates:
          - "major"
          - "minor"
          - "patch"
-
-  # Update Dockerfile in root directory
-  - package-ecosystem: "docker"
-    directory: "/"
-    schedule:
-      interval: "weekly"
-    open-pull-requests-limit: 5
-    reviewers:
-      - "paperless-ngx/ci-cd"
-    labels:
-      - "ci-cd"
-      - "dependencies"
-    commit-message:
-      prefix: "docker"
-      include: "scope"
-
-  # Update Docker Compose files in docker/compose directory
-  - package-ecosystem: "docker-compose"
-    directory: "/docker/compose/"
-    schedule:
-      interval: "weekly"
-    open-pull-requests-limit: 5
-    reviewers:
-      - "paperless-ngx/ci-cd"
-    labels:
-      - "ci-cd"
-      - "dependencies"
-    commit-message:
-      prefix: "docker-compose"
-      include: "scope"
-    groups:
-      # Individual groups for each image
-      gotenberg:
-        patterns:
-          - "docker.io/gotenberg/gotenberg*"
-      tika:
-        patterns:
-          - "docker.io/apache/tika*"
-      redis:
-        patterns:
-          - "docker.io/library/redis*"
-      mariadb:
-        patterns:
-          - "docker.io/library/mariadb*"
-      postgres:
-        patterns:
-          - "docker.io/library/postgres*"
@@ -190,33 +190,29 @@ jobs:
      - pre-commit
    steps:
      - uses: actions/checkout@v4
-      - name: Install pnpm
-        uses: pnpm/action-setup@v4
-        with:
-          version: 10
      -
        name: Use Node.js 20
        uses: actions/setup-node@v4
        with:
          node-version: 20.x
-          cache: 'pnpm'
-          cache-dependency-path: 'src-ui/pnpm-lock.yaml'
+          cache: 'npm'
+          cache-dependency-path: 'src-ui/package-lock.json'
      - name: Cache frontend dependencies
        id: cache-frontend-deps
        uses: actions/cache@v4
        with:
          path: |
-            ~/.pnpm-store
+            ~/.npm
            ~/.cache
-          key: ${{ runner.os }}-frontenddeps-${{ hashFiles('src-ui/pnpm-lock.yaml') }}
+          key: ${{ runner.os }}-frontenddeps-${{ hashFiles('src-ui/package-lock.json') }}
      -
        name: Install dependencies
        if: steps.cache-frontend-deps.outputs.cache-hit != 'true'
-        run: cd src-ui && pnpm install
+        run: cd src-ui && npm ci
      -
        name: Install Playwright
        if: steps.cache-frontend-deps.outputs.cache-hit != 'true'
-        run: cd src-ui && pnpm playwright install --with-deps
+        run: cd src-ui && npx playwright install --with-deps

  tests-frontend:
    name: "Frontend Tests (Node ${{ matrix.node-version }} - ${{ matrix.shard-index }}/${{ matrix.shard-count }})"
@@ -231,36 +227,32 @@ jobs:
        shard-count: [4]
    steps:
      - uses: actions/checkout@v4
-      - name: Install pnpm
-        uses: pnpm/action-setup@v4
-        with:
-          version: 10
      -
        name: Use Node.js 20
        uses: actions/setup-node@v4
        with:
          node-version: 20.x
-          cache: 'pnpm'
-          cache-dependency-path: 'src-ui/pnpm-lock.yaml'
+          cache: 'npm'
+          cache-dependency-path: 'src-ui/package-lock.json'
      - name: Cache frontend dependencies
        id: cache-frontend-deps
        uses: actions/cache@v4
        with:
          path: |
-            ~/.pnpm-store
+            ~/.npm
            ~/.cache
-          key: ${{ runner.os }}-frontenddeps-${{ hashFiles('src-ui/pnpm-lock.yaml') }}
+          key: ${{ runner.os }}-frontenddeps-${{ hashFiles('src-ui/package-lock.json') }}
      - name: Re-link Angular cli
-        run: cd src-ui && pnpm link @angular/cli
+        run: cd src-ui && npm link @angular/cli
      -
        name: Linting checks
-        run: cd src-ui && pnpm run lint
+        run: cd src-ui && npm run lint
      -
        name: Run Jest unit tests
-        run: cd src-ui && pnpm run test --max-workers=2 --shard=${{ matrix.shard-index }}/${{ matrix.shard-count }}
+        run: cd src-ui && npm run test -- --max-workers=2 --shard=${{ matrix.shard-index }}/${{ matrix.shard-count }}
      -
        name: Run Playwright e2e tests
-        run: cd src-ui && pnpm exec playwright test --shard ${{ matrix.shard-index }}/${{ matrix.shard-count }}
+        run: cd src-ui && npx playwright test --shard ${{ matrix.shard-index }}/${{ matrix.shard-count }}
      -
        name: Upload frontend test results to Codecov
        uses: codecov/test-results-action@v1
@@ -284,35 +276,30 @@ jobs:
      - tests-frontend
    steps:
      - uses: actions/checkout@v4
-      -
-        name: Install pnpm
-        uses: pnpm/action-setup@v4
-        with:
-          version: 10
      -
        name: Use Node.js 20
        uses: actions/setup-node@v4
        with:
          node-version: 20.x
-          cache: 'pnpm'
-          cache-dependency-path: 'src-ui/pnpm-lock.yaml'
+          cache: 'npm'
+          cache-dependency-path: 'src-ui/package-lock.json'
      -
        name: Cache frontend dependencies
        id: cache-frontend-deps
        uses: actions/cache@v4
        with:
          path: |
-            ~/.pnpm-store
+            ~/.npm
            ~/.cache
          key: ${{ runner.os }}-frontenddeps-${{ hashFiles('src-ui/package-lock.json') }}
      -
        name: Re-link Angular cli
-        run: cd src-ui && pnpm link @angular/cli
+        run: cd src-ui && npm link @angular/cli
      -
        name: Build frontend and upload analysis
        env:
          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
-        run: cd src-ui && pnpm run build --configuration=production
+        run: cd src-ui && ng build --configuration=production

  build-docker-image:
    name: Build Docker image for ${{ github.ref_name }}
@@ -521,7 +508,8 @@ jobs:
                          requirements.txt \
                          LICENSE \
                          README.md \
-                          paperless.conf.example
+                          paperless.conf.example \
+                          webserver.py
          do
            cp --verbose ${file_name} dist/paperless-ngx/
          done
@@ -32,7 +32,7 @@ repos:
    rev: v2.4.0
    hooks:
      - id: codespell
-        exclude: "(^src-ui/src/locale/)|(^src-ui/pnpm-lock.yaml)|(^src-ui/e2e/)|(^src/paperless_mail/tests/samples/)"
+        exclude: "(^src-ui/src/locale/)|(^src-ui/e2e/)|(^src/paperless_mail/tests/samples/)"
        exclude_types:
          - pofile
          - json
@@ -4,17 +4,15 @@
 # Stage: compile-frontend
 # Purpose: Compiles the frontend
 # Notes:
-#  - Does PNPM stuff with Typescript and such
+#  - Does NPM stuff with Typescript and such
 FROM --platform=$BUILDPLATFORM docker.io/node:20-bookworm-slim AS compile-frontend

 COPY ./src-ui /src/src-ui

 WORKDIR /src/src-ui
 RUN set -eux \
-  && npm update -g pnpm \
-  && npm install -g corepack@latest \
-  && corepack enable \
-  && pnpm install
+  && npm update npm -g \
+  && npm ci

 ARG PNGX_TAG_VERSION=
 # Add the tag to the environment file if its a tagged dev build
@@ -32,7 +30,7 @@ RUN set -eux \
 # Purpose: Installs s6-overlay and rootfs
 # Comments:
 #  - Don't leave anything extra in here either
-FROM ghcr.io/astral-sh/uv:0.6.5-python3.12-bookworm-slim AS s6-overlay-base
+FROM ghcr.io/astral-sh/uv:0.6.3-python3.12-bookworm-slim AS s6-overlay-base

 WORKDIR /usr/src/s6

@@ -192,6 +190,11 @@ RUN set -eux \
        && rm --force --verbose *.deb \
    && rm --recursive --force --verbose /var/lib/apt/lists/*

+# Copy webserver config
+# Changes very infrequently
+WORKDIR /usr/src/paperless/
+COPY --chown=1000:1000 webserver.py /usr/src/paperless/webserver.py
+
 WORKDIR /usr/src/paperless/src/

 # Python dependencies
@@ -38,7 +38,7 @@ services:
      - redisdata:/data

  db:
-    image: docker.io/library/postgres:17
+    image: docker.io/library/postgres:16
    restart: unless-stopped
    volumes:
      - pgdata:/var/lib/postgresql/data
@@ -38,7 +38,7 @@ services:
      - redisdata:/data

  db:
-    image: docker.io/library/postgres:17
+    image: docker.io/library/postgres:16
    restart: unless-stopped
    volumes:
      - pgdata:/var/lib/postgresql/data
@@ -34,7 +34,7 @@ services:
      - redisdata:/data

  db:
-    image: docker.io/library/postgres:17
+    image: docker.io/library/postgres:16
    restart: unless-stopped
    volumes:
      - pgdata:/var/lib/postgresql/data
@@ -3,18 +3,8 @@

 cd ${PAPERLESS_SRC_DIR}

-# Translate between things, preferring GRANIAN_
-export GRANIAN_HOST=${GRANIAN_HOST:-${PAPERLESS_BIND_ADDR:-"::"}}
-export GRANIAN_PORT=${GRANIAN_PORT:-${PAPERLESS_PORT:-8000}}
-export GRANIAN_WORKERS=${GRANIAN_WORKERS:-${PAPERLESS_WEBSERVER_WORKERS:-1}}
-
-# Only set GRANIAN_URL_PATH_PREFIX if PAPERLESS_FORCE_SCRIPT_NAME is set
-if [[ -n "${PAPERLESS_FORCE_SCRIPT_NAME}" ]]; then
-  export GRANIAN_URL_PATH_PREFIX=${PAPERLESS_FORCE_SCRIPT_NAME}
-fi
-
 if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-  exec granian --interface asginl --ws "paperless.asgi:application"
+	exec python3 /usr/src/paperless/webserver.py
 else
-  exec s6-setuidgid paperless granian --interface asginl --ws "paperless.asgi:application"
+	exec s6-setuidgid paperless python3 /usr/src/paperless/webserver.py
 fi
@@ -372,19 +372,17 @@ currently-imported docs. This problem is common enough that there are
 tools for it.

 ```
-document_retagger [-h] [-c] [-T] [-t] [-cf] [-i] [--id-range] [--use-first] [-f] [--suggest]
+document_retagger [-h] [-c] [-T] [-t] [-i] [--id-range] [--use-first] [-f]

 optional arguments:
 -c, --correspondent
 -T, --tags
 -t, --document_type
 -s, --storage_path
-cf, --custom_fields
 -i, --inbox-only
 --id-range
 --use-first
 -f, --overwrite
--suggest
 ```

 Run this after changing or adding matching rules. It'll loop over all
@@ -410,8 +408,6 @@ to override this behavior and just use the first correspondent or type
 it finds. This option does not apply to tags, since any amount of tags
 can be applied to a document.

-If you want to suggest changes but not apply them, specify `--suggest`.
-
 Finally, `-f` specifies that you wish to overwrite already assigned
 correspondents, types and/or tags. The default behavior is to not assign
 correspondents and types to documents that have this data already
@@ -413,3 +413,11 @@ Initial API version.
    list of strings. When creating or updating a custom field value of a
    document for a select type custom field, the value should be the `id` of
    the option whereas previously was the index of the option.
+
+#### Version 8
+
+-   PaperlessTask objects now have a `task_name` field which replaces the old
+    `type` field. The `type` field is now used to represent the way the task
+    was created. Additionally, the tasks endpoint now returns different types
+    of tasks other than simply 'file' tasks. See the API schema for more
+    information.
@@ -140,7 +140,7 @@ To build the front end once use this command:
 ```bash
 # src-ui/

-$ pnpm install
+$ npm install
 $ ng build --configuration production
 ```

@@ -176,7 +176,7 @@ To add a new development package `uv add --dev <package>`
 ## Front end development

 The front end is built using AngularJS. In order to get started, you need Node.js (version 14.15+) and
-`pnpm`.
+`npm`.

 !!! note

@@ -185,7 +185,7 @@ The front end is built using AngularJS. In order to get started, you need Node.j
 1.  Install the Angular CLI. You might need sudo privileges to perform this command:

    ```bash
-    pnpm install -g @angular/cli
+    npm install -g @angular/cli
    ```

 2.  Make sure that it's on your path.
@@ -193,7 +193,7 @@ The front end is built using AngularJS. In order to get started, you need Node.j
 3.  Install all necessary modules:

    ```bash
-    pnpm install
+    npm install
    ```

 4.  You can launch a development server by running:
@@ -207,7 +207,7 @@ The front end is built using AngularJS. In order to get started, you need Node.j
    restart it.

    By default, the development server is available on `http://localhost:4200/` and is configured to access the API at
-    `http://localhost:8000/api/`, which is the default of the backend. If you enabled `DEBUG` on the back end, several security overrides for allowed hosts and CORS are in place so that the front end behaves exactly as in production.
+    `http://localhost:8000/api/`, which is the default of the backend. If you enabled `DEBUG` on the back end, several security overrides for allowed hosts, CORS and X-Frame-Options are in place so that the front end behaves exactly as in production.

 ### Testing and code style

@@ -837,7 +837,7 @@ Paperless-ngx consists of the following components:

    ```shell-session
    cd /path/to/paperless/src/
-    granian --interface asginl --ws "paperless.asgi:application"
+    python3 webserver.py
    ```

    or by any other means such as Apache `mod_wsgi`.
@@ -37,7 +37,7 @@ dependencies = [
  "djangorestframework~=3.15",
  "djangorestframework-guardian~=0.3.0",
  "drf-spectacular~=0.28",
-  "drf-spectacular-sidecar~=2025.3.1",
+  "drf-spectacular-sidecar~=2025.2.1",
  "drf-writable-nested~=0.7.1",
  "filelock~=3.17.0",
  "flower~=2.0.1",
@@ -48,7 +48,7 @@ dependencies = [
  "jinja2~=3.1.5",
  "langdetect~=1.0.9",
  "nltk~=3.9.1",
-  "ocrmypdf~=16.10.0",
+  "ocrmypdf~=16.9.0",
  "pathvalidate~=3.2.3",
  "pdf2image~=1.17.0",
  "python-dateutil~=2.9.0",
@@ -73,12 +73,12 @@ optional-dependencies.mariadb = [
  "mysqlclient~=2.2.7",
 ]
 optional-dependencies.postgres = [
-  "psycopg[c]==3.2.5",
+  "psycopg[c]==3.2.4",
  # Direct dependency for proper resolution of the pre-built wheels
-  "psycopg-c==3.2.5",
+  "psycopg-c==3.2.4",
 ]
 optional-dependencies.webserver = [
-  "granian~=2.0.1",
+  "granian~=1.7.6",
 ]

 [dependency-groups]
@@ -343,8 +343,8 @@ environments = [
 [tool.uv.sources]
 # Markers are chosen to select these almost exclusively when building the Docker image
 psycopg-c = [
-  { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-3.2.5/psycopg_c-3.2.5-cp312-cp312-linux_x86_64.whl", marker = "sys_platform == 'linux' and platform_machine == 'x86_64' and python_version == '3.12'" },
-  { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-3.2.5/psycopg_c-3.2.5-cp312-cp312-linux_aarch64.whl", marker = "sys_platform == 'linux' and platform_machine == 'aarch64' and python_version == '3.12'" },
+  { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-3.2.4/psycopg_c-3.2.4-cp312-cp312-linux_x86_64.whl", marker = "sys_platform == 'linux' and platform_machine == 'x86_64' and python_version == '3.12'" },
+  { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-3.2.4/psycopg_c-3.2.4-cp312-cp312-linux_aarch64.whl", marker = "sys_platform == 'linux' and platform_machine == 'aarch64' and python_version == '3.12'" },
 ]
 zxing-cpp = [
  { url = "https://github.com/paperless-ngx/builder/releases/download/zxing-2.3.0/zxing_cpp-2.3.0-cp312-cp312-linux_x86_64.whl", marker = "sys_platform == 'linux' and platform_machine == 'x86_64' and python_version == '3.12'" },
@@ -9,21 +9,7 @@ Requires=redis.service
 User=paperless
 Group=paperless
 WorkingDirectory=/opt/paperless/src
-
-Environment=GRANIAN_HOST=::
-Environment=GRANIAN_PORT=8000
-Environment=GRANIAN_WORKERS=1
-
-ExecStart=/bin/sh -c '\
-  # Host: GRANIAN_HOST -> PAPERLESS_BIND_ADDR -> default \
-  [ -n "$PAPERLESS_BIND_ADDR" ] && export GRANIAN_HOST=$PAPERLESS_BIND_ADDR; \
-  # Port: GRANIAN_PORT -> PAPERLESS_PORT -> default \
-  [ -n "$PAPERLESS_PORT" ] && export GRANIAN_PORT=$PAPERLESS_PORT; \
-  # Workers: GRANIAN_WORKERS -> PAPERLESS_WEBSERVER_WORKERS -> default \
-  [ -n "$PAPERLESS_WEBSERVER_WORKERS" ] && export GRANIAN_WORKERS=$PAPERLESS_WEBSERVER_WORKERS; \
-  # URL path prefix: only set if PAPERLESS_FORCE_SCRIPT_NAME exists \
-  [ -n "$PAPERLESS_FORCE_SCRIPT_NAME" ] && export GRANIAN_URL_PATH_PREFIX=$PAPERLESS_FORCE_SCRIPT_NAME; \
-  exec granian --interface asginl --ws "paperless.asgi:application"'
+ExecStart=python3 webserver.py

 [Install]
 WantedBy=multi-user.target
@@ -1 +0,0 @@
-shamefully-hoist=true
@@ -178,8 +178,7 @@
    "schematicCollections": [
      "@angular-eslint/schematics"
    ],
-    "analytics": false,
-    "packageManager": "pnpm"
+    "analytics": false
  },
  "schematics": {
    "@angular-eslint/schematics:application": {
@@ -7,9 +7,7 @@ module.exports = {
    'abstract-name-filter-service',
    'abstract-paperless-service',
  ],
-  transformIgnorePatterns: [
-    `<rootDir>/node_modules/.pnpm/(?!.*\\.mjs$|lodash-es)`,
-  ],
+  transformIgnorePatterns: [`<rootDir>/node_modules/(?!.*\\.mjs$|lodash-es)`],
  moduleNameMapper: {
    '^src/(.*)': '<rootDir>/src/$1',
  },
@@ -1120,7 +1120,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">190</context>
+          <context context-type="linenumber">193</context>
        </context-group>
      </trans-unit>
      <trans-unit id="8508424367627989968" datatype="html">
@@ -1194,11 +1194,11 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
-          <context context-type="linenumber">97</context>
+          <context context-type="linenumber">104</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">101</context>
+          <context context-type="linenumber">106</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/manage/mail/mail.component.html</context>
@@ -1793,7 +1793,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
-          <context context-type="linenumber">103</context>
+          <context context-type="linenumber">110</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/manage/custom-fields/custom-fields.component.html</context>
@@ -2086,7 +2086,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
-          <context context-type="linenumber">157</context>
+          <context context-type="linenumber">164</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/manage/custom-fields/custom-fields.component.html</context>
@@ -2553,15 +2553,15 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">794</context>
+          <context context-type="linenumber">796</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">827</context>
+          <context context-type="linenumber">829</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">846</context>
+          <context context-type="linenumber">848</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/manage/custom-fields/custom-fields.component.ts</context>
@@ -2986,7 +2986,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
-          <context context-type="linenumber">129</context>
+          <context context-type="linenumber">136</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/document-card-large/document-card-large.component.html</context>
@@ -3161,27 +3161,27 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">437</context>
+          <context context-type="linenumber">439</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">477</context>
+          <context context-type="linenumber">479</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">515</context>
+          <context context-type="linenumber">517</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">553</context>
+          <context context-type="linenumber">555</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">615</context>
+          <context context-type="linenumber">617</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">748</context>
+          <context context-type="linenumber">750</context>
        </context-group>
      </trans-unit>
      <trans-unit id="1407560924967345762" datatype="html">
@@ -5177,14 +5177,14 @@
        <source>Email sent</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/common/email-document-dialog/email-document-dialog.component.ts</context>
-          <context context-type="linenumber">66</context>
+          <context context-type="linenumber">65</context>
        </context-group>
      </trans-unit>
      <trans-unit id="3742745894977668908" datatype="html">
        <source>Error emailing document</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/common/email-document-dialog/email-document-dialog.component.ts</context>
-          <context context-type="linenumber">70</context>
+          <context context-type="linenumber">69</context>
        </context-group>
      </trans-unit>
      <trans-unit id="6381578200008167206" datatype="html">
@@ -5246,7 +5246,7 @@
        <source>Not assigned</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts</context>
-          <context context-type="linenumber">81</context>
+          <context context-type="linenumber">392</context>
        </context-group>
        <note priority="1" from="description">Filter drop down element to filter for documents with no correspondent/type/tag assigned</note>
      </trans-unit>
@@ -5254,7 +5254,7 @@
        <source>Open <x id="PH" equiv-text="this.title"/> filter</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts</context>
-          <context context-type="linenumber">554</context>
+          <context context-type="linenumber">513</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7005745151564974365" datatype="html">
@@ -6185,39 +6185,32 @@
          <context context-type="linenumber">43</context>
        </context-group>
      </trans-unit>
-      <trans-unit id="4524189418954028091" datatype="html">
-        <source>Hint: saved views can be created from the <x id="START_LINK" ctype="x-a" equiv-text="&lt;a routerLink=&quot;/documents&quot;&gt;"/>documents list<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/></source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.html</context>
-          <context context-type="linenumber">42</context>
-        </context-group>
-      </trans-unit>
      <trans-unit id="6581372518205328477" datatype="html">
        <source>Hello <x id="PH" equiv-text="this.settingsService.displayName"/>, welcome to <x id="PH_1" equiv-text="environment.appTitle"/></source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context>
-          <context context-type="linenumber">61</context>
+          <context context-type="linenumber">57</context>
        </context-group>
      </trans-unit>
      <trans-unit id="2901300640157872718" datatype="html">
        <source>Welcome to <x id="PH" equiv-text="environment.appTitle"/></source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context>
-          <context context-type="linenumber">63</context>
+          <context context-type="linenumber">59</context>
        </context-group>
      </trans-unit>
      <trans-unit id="1325877348738783391" datatype="html">
        <source>Dashboard updated</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context>
-          <context context-type="linenumber">94</context>
+          <context context-type="linenumber">90</context>
        </context-group>
      </trans-unit>
      <trans-unit id="3214475953924351473" datatype="html">
        <source>Error updating dashboard</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context>
-          <context context-type="linenumber">97</context>
+          <context context-type="linenumber">93</context>
        </context-group>
      </trans-unit>
      <trans-unit id="2946624699882754313" datatype="html">
@@ -6415,7 +6408,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">382</context>
+          <context context-type="linenumber">384</context>
        </context-group>
        <note priority="1" from="description">this string is used to separate processing, failed and added on the file upload widget</note>
      </trans-unit>
@@ -6490,7 +6483,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
-          <context context-type="linenumber">107</context>
+          <context context-type="linenumber">114</context>
        </context-group>
      </trans-unit>
      <trans-unit id="1418444397960583910" datatype="html">
@@ -6519,7 +6512,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
-          <context context-type="linenumber">110</context>
+          <context context-type="linenumber">117</context>
        </context-group>
      </trans-unit>
      <trans-unit id="4399672576012609374" datatype="html">
@@ -6562,7 +6555,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">177</context>
+          <context context-type="linenumber">180</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/data/document.ts</context>
@@ -6595,7 +6588,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
-          <context context-type="linenumber">35</context>
+          <context context-type="linenumber">37</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
@@ -6603,7 +6596,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">50</context>
+          <context context-type="linenumber">52</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/data/document.ts</context>
@@ -6622,7 +6615,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
-          <context context-type="linenumber">49</context>
+          <context context-type="linenumber">52</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
@@ -6630,7 +6623,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">61</context>
+          <context context-type="linenumber">64</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/data/document.ts</context>
@@ -6649,7 +6642,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
-          <context context-type="linenumber">63</context>
+          <context context-type="linenumber">67</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/document-list.component.html</context>
@@ -6657,7 +6650,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">72</context>
+          <context context-type="linenumber">76</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/data/document.ts</context>
@@ -6940,7 +6933,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">750</context>
+          <context context-type="linenumber">752</context>
        </context-group>
      </trans-unit>
      <trans-unit id="2048798344356757326" datatype="html">
@@ -6951,7 +6944,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">752</context>
+          <context context-type="linenumber">754</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7295637485862454066" datatype="html">
@@ -6969,7 +6962,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">790</context>
+          <context context-type="linenumber">792</context>
        </context-group>
      </trans-unit>
      <trans-unit id="2951161989614003846" datatype="html">
@@ -7050,7 +7043,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">824</context>
+          <context context-type="linenumber">826</context>
        </context-group>
      </trans-unit>
      <trans-unit id="857641176955257111" datatype="html">
@@ -7149,122 +7142,122 @@
        <source>Filter correspondents</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
-          <context context-type="linenumber">36</context>
+          <context context-type="linenumber">38</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">51</context>
+          <context context-type="linenumber">53</context>
        </context-group>
      </trans-unit>
      <trans-unit id="2947613869920454977" datatype="html">
        <source>Filter document types</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
-          <context context-type="linenumber">50</context>
+          <context context-type="linenumber">53</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">62</context>
+          <context context-type="linenumber">65</context>
        </context-group>
      </trans-unit>
      <trans-unit id="8816999377397522522" datatype="html">
        <source>Filter storage paths</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
-          <context context-type="linenumber">64</context>
+          <context context-type="linenumber">68</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">73</context>
+          <context context-type="linenumber">77</context>
        </context-group>
      </trans-unit>
      <trans-unit id="9149498548977462220" datatype="html">
        <source>Custom fields</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
-          <context context-type="linenumber">77</context>
+          <context context-type="linenumber">82</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">84</context>
+          <context context-type="linenumber">89</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">185</context>
+          <context context-type="linenumber">188</context>
        </context-group>
      </trans-unit>
      <trans-unit id="6475890479659129881" datatype="html">
        <source>Filter custom fields</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
-          <context context-type="linenumber">78</context>
+          <context context-type="linenumber">83</context>
        </context-group>
      </trans-unit>
      <trans-unit id="5139192806922838657" datatype="html">
        <source>Set values</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
-          <context context-type="linenumber">86</context>
+          <context context-type="linenumber">93</context>
        </context-group>
      </trans-unit>
      <trans-unit id="3206542606001340679" datatype="html">
        <source>Merge</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
-          <context context-type="linenumber">113</context>
+          <context context-type="linenumber">120</context>
        </context-group>
      </trans-unit>
      <trans-unit id="1015374532025907183" datatype="html">
        <source>Include:</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
-          <context context-type="linenumber">135</context>
+          <context context-type="linenumber">142</context>
        </context-group>
      </trans-unit>
      <trans-unit id="1537670659786159738" datatype="html">
        <source>Archived files</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
-          <context context-type="linenumber">139</context>
+          <context context-type="linenumber">146</context>
        </context-group>
      </trans-unit>
      <trans-unit id="2520291319362448498" datatype="html">
        <source>Original files</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
-          <context context-type="linenumber">143</context>
+          <context context-type="linenumber">150</context>
        </context-group>
      </trans-unit>
      <trans-unit id="8009862506882713059" datatype="html">
        <source>Use formatted filename</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.html</context>
-          <context context-type="linenumber">148</context>
+          <context context-type="linenumber">155</context>
        </context-group>
      </trans-unit>
      <trans-unit id="1215215387232313677" datatype="html">
        <source>Error executing bulk operation</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">286</context>
+          <context context-type="linenumber">288</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7894972847287473517" datatype="html">
        <source>&quot;<x id="PH" equiv-text="items[0].name"/>&quot;</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">374</context>
+          <context context-type="linenumber">376</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">380</context>
+          <context context-type="linenumber">382</context>
        </context-group>
      </trans-unit>
      <trans-unit id="8639884465898458690" datatype="html">
        <source>&quot;<x id="PH" equiv-text="items[0].name"/>&quot; and &quot;<x id="PH_1" equiv-text="items[1].name"/>&quot;</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">376</context>
+          <context context-type="linenumber">378</context>
        </context-group>
        <note priority="1" from="description">This is for messages like &apos;modify &quot;tag1&quot; and &quot;tag2&quot;&apos;</note>
      </trans-unit>
@@ -7272,7 +7265,7 @@
        <source><x id="PH" equiv-text="list"/> and &quot;<x id="PH_1" equiv-text="items[items.length - 1].name"/>&quot;</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">384,386</context>
+          <context context-type="linenumber">386,388</context>
        </context-group>
        <note priority="1" from="description">this is for messages like &apos;modify &quot;tag1&quot;, &quot;tag2&quot; and &quot;tag3&quot;&apos;</note>
      </trans-unit>
@@ -7280,14 +7273,14 @@
        <source>Confirm tags assignment</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">401</context>
+          <context context-type="linenumber">403</context>
        </context-group>
      </trans-unit>
      <trans-unit id="6619516195038467207" datatype="html">
        <source>This operation will add the tag &quot;<x id="PH" equiv-text="tag.name"/>&quot; to <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">407</context>
+          <context context-type="linenumber">409</context>
        </context-group>
      </trans-unit>
      <trans-unit id="1894412783609570695" datatype="html">
@@ -7296,14 +7289,14 @@
        )"/> to <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">412,414</context>
+          <context context-type="linenumber">414,416</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7181166515756808573" datatype="html">
        <source>This operation will remove the tag &quot;<x id="PH" equiv-text="tag.name"/>&quot; from <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">420</context>
+          <context context-type="linenumber">422</context>
        </context-group>
      </trans-unit>
      <trans-unit id="3819792277998068944" datatype="html">
@@ -7312,7 +7305,7 @@
        )"/> from <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">425,427</context>
+          <context context-type="linenumber">427,429</context>
        </context-group>
      </trans-unit>
      <trans-unit id="2739066218579571288" datatype="html">
@@ -7323,84 +7316,84 @@
        )"/> on <x id="PH_2" equiv-text="this.list.selected.size"/> selected document(s).</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">429,433</context>
+          <context context-type="linenumber">431,435</context>
        </context-group>
      </trans-unit>
      <trans-unit id="2996713129519325161" datatype="html">
        <source>Confirm correspondent assignment</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">470</context>
+          <context context-type="linenumber">472</context>
        </context-group>
      </trans-unit>
      <trans-unit id="6900893559485781849" datatype="html">
        <source>This operation will assign the correspondent &quot;<x id="PH" equiv-text="correspondent.name"/>&quot; to <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">472</context>
+          <context context-type="linenumber">474</context>
        </context-group>
      </trans-unit>
      <trans-unit id="1257522660364398440" datatype="html">
        <source>This operation will remove the correspondent from <x id="PH" equiv-text="this.list.selected.size"/> selected document(s).</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">474</context>
+          <context context-type="linenumber">476</context>
        </context-group>
      </trans-unit>
      <trans-unit id="5393409374423140648" datatype="html">
        <source>Confirm document type assignment</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">508</context>
+          <context context-type="linenumber">510</context>
        </context-group>
      </trans-unit>
      <trans-unit id="332180123895325027" datatype="html">
        <source>This operation will assign the document type &quot;<x id="PH" equiv-text="documentType.name"/>&quot; to <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">510</context>
+          <context context-type="linenumber">512</context>
        </context-group>
      </trans-unit>
      <trans-unit id="2236642492594872779" datatype="html">
        <source>This operation will remove the document type from <x id="PH" equiv-text="this.list.selected.size"/> selected document(s).</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">512</context>
+          <context context-type="linenumber">514</context>
        </context-group>
      </trans-unit>
      <trans-unit id="6386555513013840736" datatype="html">
        <source>Confirm storage path assignment</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">546</context>
+          <context context-type="linenumber">548</context>
        </context-group>
      </trans-unit>
      <trans-unit id="8750527458618415924" datatype="html">
        <source>This operation will assign the storage path &quot;<x id="PH" equiv-text="storagePath.name"/>&quot; to <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">548</context>
+          <context context-type="linenumber">550</context>
        </context-group>
      </trans-unit>
      <trans-unit id="60728365335056946" datatype="html">
        <source>This operation will remove the storage path from <x id="PH" equiv-text="this.list.selected.size"/> selected document(s).</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">550</context>
+          <context context-type="linenumber">552</context>
        </context-group>
      </trans-unit>
      <trans-unit id="4187352575310415704" datatype="html">
        <source>Confirm custom field assignment</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">579</context>
+          <context context-type="linenumber">581</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7966494636326273856" datatype="html">
        <source>This operation will assign the custom field &quot;<x id="PH" equiv-text="customField.name"/>&quot; to <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">585</context>
+          <context context-type="linenumber">587</context>
        </context-group>
      </trans-unit>
      <trans-unit id="5789455969634598553" datatype="html">
@@ -7409,14 +7402,14 @@
        )"/> to <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">590,592</context>
+          <context context-type="linenumber">592,594</context>
        </context-group>
      </trans-unit>
      <trans-unit id="5648572354333199245" datatype="html">
        <source>This operation will remove the custom field &quot;<x id="PH" equiv-text="customField.name"/>&quot; from <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">598</context>
+          <context context-type="linenumber">600</context>
        </context-group>
      </trans-unit>
      <trans-unit id="6666899594015948817" datatype="html">
@@ -7425,7 +7418,7 @@
        )"/> from <x id="PH_1" equiv-text="this.list.selected.size"/> selected document(s).</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">603,605</context>
+          <context context-type="linenumber">605,607</context>
        </context-group>
      </trans-unit>
      <trans-unit id="8050047262594964176" datatype="html">
@@ -7436,56 +7429,56 @@
        )"/> on <x id="PH_2" equiv-text="this.list.selected.size"/> selected document(s).</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">607,611</context>
+          <context context-type="linenumber">609,613</context>
        </context-group>
      </trans-unit>
      <trans-unit id="8615059324209654051" datatype="html">
        <source>Move <x id="PH" equiv-text="this.list.selected.size"/> selected document(s) to the trash?</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">749</context>
+          <context context-type="linenumber">751</context>
        </context-group>
      </trans-unit>
      <trans-unit id="8585195717323764335" datatype="html">
        <source>This operation will permanently recreate the archive files for <x id="PH" equiv-text="this.list.selected.size"/> selected document(s).</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">791</context>
+          <context context-type="linenumber">793</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7366623494074776040" datatype="html">
        <source>The archive files will be re-generated with the current settings.</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">792</context>
+          <context context-type="linenumber">794</context>
        </context-group>
      </trans-unit>
      <trans-unit id="6390006284731990222" datatype="html">
        <source>This operation will permanently rotate the original version of <x id="PH" equiv-text="this.list.selected.size"/> document(s).</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">825</context>
+          <context context-type="linenumber">827</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7910756456450124185" datatype="html">
        <source>Merge confirm</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">844</context>
+          <context context-type="linenumber">846</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7643543647233874431" datatype="html">
        <source>This operation will merge <x id="PH" equiv-text="this.list.selected.size"/> selected documents into a new document.</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">845</context>
+          <context context-type="linenumber">847</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7869008840945899895" datatype="html">
        <source>Merged document will be queued for consumption.</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/bulk-editor/bulk-editor.component.ts</context>
-          <context context-type="linenumber">864</context>
+          <context context-type="linenumber">866</context>
        </context-group>
      </trans-unit>
      <trans-unit id="476913782630693351" datatype="html">
@@ -7767,7 +7760,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">107</context>
+          <context context-type="linenumber">112</context>
        </context-group>
      </trans-unit>
      <trans-unit id="1559883523769732271" datatype="html">
@@ -7792,7 +7785,7 @@
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">182</context>
+          <context context-type="linenumber">185</context>
        </context-group>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/data/document.ts</context>
@@ -7981,167 +7974,161 @@
        <source>Dates</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.html</context>
-          <context context-type="linenumber">90</context>
+          <context context-type="linenumber">95</context>
        </context-group>
      </trans-unit>
      <trans-unit id="3100631071441658964" datatype="html">
        <source>Title &amp; content</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">180</context>
+          <context context-type="linenumber">183</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7408932238599462499" datatype="html">
        <source>File type</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">187</context>
+          <context context-type="linenumber">190</context>
        </context-group>
      </trans-unit>
      <trans-unit id="2649431021108393503" datatype="html">
        <source>More like</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">196</context>
+          <context context-type="linenumber">199</context>
        </context-group>
      </trans-unit>
      <trans-unit id="3697582909018473071" datatype="html">
        <source>equals</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">202</context>
+          <context context-type="linenumber">205</context>
        </context-group>
      </trans-unit>
      <trans-unit id="5325481293405718739" datatype="html">
        <source>is empty</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">206</context>
+          <context context-type="linenumber">209</context>
        </context-group>
      </trans-unit>
      <trans-unit id="6166785695326182482" datatype="html">
        <source>is not empty</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">210</context>
+          <context context-type="linenumber">213</context>
        </context-group>
      </trans-unit>
      <trans-unit id="4686622206659266699" datatype="html">
        <source>greater than</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">214</context>
+          <context context-type="linenumber">217</context>
        </context-group>
      </trans-unit>
      <trans-unit id="8014012170270529279" datatype="html">
        <source>less than</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">218</context>
+          <context context-type="linenumber">221</context>
        </context-group>
      </trans-unit>
      <trans-unit id="5195932016807797291" datatype="html">
-        <source>Correspondent: <x id="PH" equiv-text="this.correspondentSelectionModel.items.find(
-                (c) =&gt; c.id == +rule.value
-              )?.name"/></source>
+        <source>Correspondent: <x id="PH" equiv-text="this.correspondents.find((c) =&gt; c.id == +rule.value)?.name"/></source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">250,254</context>
+          <context context-type="linenumber">253,255</context>
        </context-group>
      </trans-unit>
      <trans-unit id="8170755470576301659" datatype="html">
        <source>Without correspondent</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">256</context>
+          <context context-type="linenumber">257</context>
        </context-group>
      </trans-unit>
      <trans-unit id="317796810569008208" datatype="html">
-        <source>Document type: <x id="PH" equiv-text="this.documentTypeSelectionModel.items.find(
-                (dt) =&gt; dt.id == +rule.value
-              )?.name"/></source>
+        <source>Document type: <x id="PH" equiv-text="this.documentTypes.find((dt) =&gt; dt.id == +rule.value)?.name"/></source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">262,266</context>
+          <context context-type="linenumber">263,265</context>
        </context-group>
      </trans-unit>
      <trans-unit id="4362173610367509215" datatype="html">
        <source>Without document type</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">268</context>
+          <context context-type="linenumber">267</context>
        </context-group>
      </trans-unit>
      <trans-unit id="232202047340644471" datatype="html">
-        <source>Storage path: <x id="PH" equiv-text="this.storagePathSelectionModel.items.find(
-                (sp) =&gt; sp.id == +rule.value
-              )?.name"/></source>
+        <source>Storage path: <x id="PH" equiv-text="this.storagePaths.find((sp) =&gt; sp.id == +rule.value)?.name"/></source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">274,278</context>
+          <context context-type="linenumber">273,275</context>
        </context-group>
      </trans-unit>
      <trans-unit id="1562820715074533164" datatype="html">
        <source>Without storage path</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">280</context>
+          <context context-type="linenumber">277</context>
        </context-group>
      </trans-unit>
      <trans-unit id="8180755793012580465" datatype="html">
-        <source>Tag: <x id="PH" equiv-text="this.tagSelectionModel.items.find((t) =&gt; t.id == +rule.value)?.name"/></source>
+        <source>Tag: <x id="PH" equiv-text="this.tags.find((t) =&gt; t.id == +rule.value)?.name"/></source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">284,286</context>
+          <context context-type="linenumber">281,283</context>
        </context-group>
      </trans-unit>
      <trans-unit id="6494566478302448576" datatype="html">
        <source>Without any tag</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">290</context>
+          <context context-type="linenumber">287</context>
        </context-group>
      </trans-unit>
      <trans-unit id="8644099678903817943" datatype="html">
        <source>Custom fields query</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">294</context>
+          <context context-type="linenumber">291</context>
        </context-group>
      </trans-unit>
      <trans-unit id="6523384805359286307" datatype="html">
        <source>Title: <x id="PH" equiv-text="rule.value"/></source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">297</context>
+          <context context-type="linenumber">294</context>
        </context-group>
      </trans-unit>
      <trans-unit id="1872523635812236432" datatype="html">
        <source>ASN: <x id="PH" equiv-text="rule.value"/></source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">300</context>
+          <context context-type="linenumber">297</context>
        </context-group>
      </trans-unit>
      <trans-unit id="102674688969746976" datatype="html">
        <source>Owner: <x id="PH" equiv-text="rule.value"/></source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">303</context>
+          <context context-type="linenumber">300</context>
        </context-group>
      </trans-unit>
      <trans-unit id="3550877650686009106" datatype="html">
        <source>Owner not in: <x id="PH" equiv-text="rule.value"/></source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">306</context>
+          <context context-type="linenumber">303</context>
        </context-group>
      </trans-unit>
      <trans-unit id="1082034558646673343" datatype="html">
        <source>Without an owner</source>
        <context-group purpose="location">
          <context context-type="sourcefile">src/app/components/document-list/filter-editor/filter-editor.component.ts</context>
-          <context context-type="linenumber">309</context>
+          <context context-type="linenumber">306</context>
        </context-group>
      </trans-unit>
      <trans-unit id="7210076240260527720" datatype="html">
@@ -2,7 +2,6 @@
  "name": "paperless-ui",
  "version": "0.0.0",
  "scripts": {
-    "preinstall": "npx only-allow pnpm",
    "ng": "ng",
    "start": "ng serve",
    "build": "ng build",
@@ -12,17 +11,17 @@
  },
  "private": true,
  "dependencies": {
-    "@angular/cdk": "^19.2.2",
-    "@angular/common": "~19.2.1",
-    "@angular/compiler": "~19.2.1",
-    "@angular/core": "~19.2.1",
-    "@angular/forms": "~19.2.1",
-    "@angular/localize": "~19.2.1",
-    "@angular/platform-browser": "~19.2.1",
-    "@angular/platform-browser-dynamic": "~19.2.1",
-    "@angular/router": "~19.2.1",
+    "@angular/cdk": "^19.2.1",
+    "@angular/common": "~19.2.0",
+    "@angular/compiler": "~19.2.0",
+    "@angular/core": "~19.2.0",
+    "@angular/forms": "~19.2.0",
+    "@angular/localize": "~19.2.0",
+    "@angular/platform-browser": "~19.2.0",
+    "@angular/platform-browser-dynamic": "~19.2.0",
+    "@angular/router": "~19.2.0",
    "@ng-bootstrap/ng-bootstrap": "^18.0.0",
-    "@ng-select/ng-select": "^14.2.3",
+    "@ng-select/ng-select": "^14.2.2",
    "@ngneat/dirty-check-forms": "^3.0.3",
    "@popperjs/core": "^2.11.8",
    "bootstrap": "^5.3.3",
@@ -44,24 +43,24 @@
  "devDependencies": {
    "@angular-builders/custom-webpack": "^19.0.0",
    "@angular-builders/jest": "^19.0.0",
-    "@angular-devkit/build-angular": "^19.2.1",
-    "@angular-devkit/core": "^19.2.1",
-    "@angular-devkit/schematics": "^19.2.1",
-    "@angular-eslint/builder": "19.2.1",
-    "@angular-eslint/eslint-plugin": "19.2.1",
-    "@angular-eslint/eslint-plugin-template": "19.2.1",
-    "@angular-eslint/schematics": "19.2.1",
-    "@angular-eslint/template-parser": "19.2.1",
-    "@angular/cli": "~19.2.1",
-    "@angular/compiler-cli": "~19.2.1",
+    "@angular-devkit/build-angular": "^19.0.4",
+    "@angular-devkit/core": "^19.2.0",
+    "@angular-devkit/schematics": "^19.2.0",
+    "@angular-eslint/builder": "19.2.0",
+    "@angular-eslint/eslint-plugin": "19.2.0",
+    "@angular-eslint/eslint-plugin-template": "19.2.0",
+    "@angular-eslint/schematics": "19.2.0",
+    "@angular-eslint/template-parser": "19.2.0",
+    "@angular/cli": "~19.2.0",
+    "@angular/compiler-cli": "~19.2.0",
    "@codecov/webpack-plugin": "^1.9.0",
    "@playwright/test": "^1.50.1",
    "@types/jest": "^29.5.14",
    "@types/node": "^22.13.9",
-    "@typescript-eslint/eslint-plugin": "^8.26.1",
-    "@typescript-eslint/parser": "^8.26.1",
-    "@typescript-eslint/utils": "^8.26.1",
-    "eslint": "^9.22.0",
+    "@typescript-eslint/eslint-plugin": "^8.26.0",
+    "@typescript-eslint/parser": "^8.26.0",
+    "@typescript-eslint/utils": "^8.0.0",
+    "eslint": "^9.21.0",
    "jest": "29.7.0",
    "jest-environment-jsdom": "^29.7.0",
    "jest-junit": "^16.0.0",
@@ -72,14 +71,5 @@
    "ts-node": "~10.9.1",
    "typescript": "^5.5.4"
  },
-  "pnpm": {
-    "onlyBuiltDependencies": [
-      "@parcel/watcher",
-      "canvas",
-      "esbuild",
-      "lmdb",
-      "msgpackr-extract"
-    ]
-  },
  "typings": "./src/typings.d.ts"
 }
@@ -21,7 +21,7 @@ export default defineConfig({
  /* Run your local dev server before starting the tests */
  webServer: {
    port,
-    command: 'pnpm run start',
+    command: 'npm run start',
    reuseExistingServer: !process.env.CI,
    timeout: 2 * 60 * 1000,
  },
@@ -12,7 +12,7 @@ import { DocumentAsnComponent } from './components/document-asn/document-asn.com
 import { DocumentDetailComponent } from './components/document-detail/document-detail.component'
 import { DocumentListComponent } from './components/document-list/document-list.component'
 import { CorrespondentListComponent } from './components/manage/correspondent-list/correspondent-list.component'
-import { CustomFieldsListComponent } from './components/manage/custom-fields-list/custom-fields-list.component'
+import { CustomFieldsComponent } from './components/manage/custom-fields/custom-fields.component'
 import { DocumentTypeListComponent } from './components/manage/document-type-list/document-type-list.component'
 import { MailComponent } from './components/manage/mail/mail.component'
 import { SavedViewsComponent } from './components/manage/saved-views/saved-views.component'
@@ -36,13 +36,7 @@ export const routes: Routes = [
    component: AppFrameComponent,
    canDeactivate: [DirtyDocGuard],
    children: [
-      {
-        path: 'dashboard',
-        component: DashboardComponent,
-        data: {
-          componentName: 'AppFrameComponent',
-        },
-      },
+      { path: 'dashboard', component: DashboardComponent },
      {
        path: 'documents',
        component: DocumentListComponent,
@@ -53,7 +47,6 @@ export const routes: Routes = [
            action: PermissionAction.View,
            type: PermissionType.Document,
          },
-          componentName: 'DocumentListComponent',
        },
      },
      {
@@ -66,7 +59,6 @@ export const routes: Routes = [
            action: PermissionAction.View,
            type: PermissionType.SavedView,
          },
-          componentName: 'DocumentListComponent',
        },
      },
      {
@@ -78,7 +70,6 @@ export const routes: Routes = [
            action: PermissionAction.View,
            type: PermissionType.Document,
          },
-          componentName: 'DocumentDetailComponent',
        },
      },
      {
@@ -90,7 +81,6 @@ export const routes: Routes = [
            action: PermissionAction.View,
            type: PermissionType.Document,
          },
-          componentName: 'DocumentDetailComponent',
        },
      },
      {
@@ -102,7 +92,6 @@ export const routes: Routes = [
            action: PermissionAction.View,
            type: PermissionType.Document,
          },
-          componentName: 'DocumentAsnComponent',
        },
      },
      {
@@ -114,7 +103,6 @@ export const routes: Routes = [
            action: PermissionAction.View,
            type: PermissionType.Tag,
          },
-          componentName: 'TagListComponent',
        },
      },
      {
@@ -126,7 +114,6 @@ export const routes: Routes = [
            action: PermissionAction.View,
            type: PermissionType.DocumentType,
          },
-          componentName: 'DocumentTypeListComponent',
        },
      },
      {
@@ -138,7 +125,6 @@ export const routes: Routes = [
            action: PermissionAction.View,
            type: PermissionType.Correspondent,
          },
-          componentName: 'CorrespondentListComponent',
        },
      },
      {
@@ -150,7 +136,6 @@ export const routes: Routes = [
            action: PermissionAction.View,
            type: PermissionType.StoragePath,
          },
-          componentName: 'StoragePathListComponent',
        },
      },
      {
@@ -159,7 +144,6 @@ export const routes: Routes = [
        canActivate: [PermissionsGuard],
        data: {
          requireAdmin: true,
-          componentName: 'LogsComponent',
        },
      },
      {
@@ -171,7 +155,6 @@ export const routes: Routes = [
            action: PermissionAction.Delete,
            type: PermissionType.Document,
          },
-          componentName: 'TrashComponent',
        },
      },
      // redirect old paths
@@ -197,7 +180,6 @@ export const routes: Routes = [
            action: PermissionAction.Change,
            type: PermissionType.UISettings,
          },
-          componentName: 'SettingsComponent',
        },
      },
      {
@@ -210,7 +192,6 @@ export const routes: Routes = [
            action: PermissionAction.View,
            type: PermissionType.UISettings,
          },
-          componentName: 'SettingsComponent',
        },
      },
      {
@@ -222,7 +203,6 @@ export const routes: Routes = [
            action: PermissionAction.Change,
            type: PermissionType.AppConfig,
          },
-          componentName: 'ConfigComponent',
        },
      },
      {
@@ -234,19 +214,17 @@ export const routes: Routes = [
            action: PermissionAction.View,
            type: PermissionType.PaperlessTask,
          },
-          componentName: 'TasksComponent',
        },
      },
      {
        path: 'customfields',
-        component: CustomFieldsListComponent,
+        component: CustomFieldsComponent,
        canActivate: [PermissionsGuard],
        data: {
          requiredPermission: {
            action: PermissionAction.View,
            type: PermissionType.CustomField,
          },
-          componentName: 'CustomFieldsComponent',
        },
      },
      {
@@ -258,7 +236,6 @@ export const routes: Routes = [
            action: PermissionAction.View,
            type: PermissionType.Workflow,
          },
-          componentName: 'WorkflowsComponent',
        },
      },
      {
@@ -270,7 +247,6 @@ export const routes: Routes = [
            action: PermissionAction.View,
            type: PermissionType.MailAccount,
          },
-          componentName: 'MailComponent',
        },
      },
      {
@@ -282,7 +258,6 @@ export const routes: Routes = [
            action: PermissionAction.View,
            type: PermissionType.User,
          },
-          componentName: 'UsersAndGroupsComponent',
        },
      },
      {
@@ -294,7 +269,6 @@ export const routes: Routes = [
            action: PermissionAction.View,
            type: PermissionType.SavedView,
          },
-          componentName: 'SavedViewsComponent',
        },
      },
    ],
@@ -11,7 +11,7 @@
    <pngx-input-text i18n-title title="Name" formControlName="name" [error]="error?.name" autocomplete="off"></pngx-input-text>
    <pngx-input-select i18n-title title="Data type" [items]="getDataTypes()" formControlName="data_type"></pngx-input-select>
    @if (typeFieldDisabled) {
-      <small class="d-block mt-n2 fst-italic text-muted" i18n>Data type cannot be changed after a field is created</small>
+      <small class="d-block mt-n2" i18n>Data type cannot be changed after a field is created</small>
    }
    <div [formGroup]="objectForm.controls.extra_data">
      @switch (objectForm.get('data_type').value) {
@@ -39,14 +39,6 @@
        }
      }
    </div>
-    <hr/>
-    <pngx-input-select i18n-title title="Matching algorithm" [items]="getMatchingAlgorithms()" formControlName="matching_algorithm"></pngx-input-select>
-    @if (patternRequired) {
-      <pngx-input-text i18n-title title="Matching pattern" formControlName="match" [error]="error?.match"></pngx-input-text>
-    }
-    @if (patternRequired) {
-      <pngx-input-check i18n-title title="Case insensitive" formControlName="is_insensitive" novalidate></pngx-input-check>
-    }
  </div>
  <div class="modal-footer">
    <button type="button" class="btn btn-outline-secondary" (click)="cancel()" i18n [disabled]="networkActive">Cancel</button>
@@ -21,7 +21,6 @@ import {
  CustomFieldDataType,
  DATA_TYPE_LABELS,
 } from 'src/app/data/custom-field'
-import { MATCH_NONE, MATCHING_ALGORITHMS } from 'src/app/data/matching-model'
 import { CustomFieldsService } from 'src/app/services/rest/custom-fields.service'
 import { UserService } from 'src/app/services/rest/user.service'
 import { SettingsService } from 'src/app/services/settings.service'
@@ -29,27 +28,6 @@ import { SelectComponent } from '../../input/select/select.component'
 import { TextComponent } from '../../input/text/text.component'
 import { EditDialogComponent, EditDialogMode } from '../edit-dialog.component'

-const FIELDS_WITH_DISCRETE_MATCHING = [
-  CustomFieldDataType.Boolean,
-  CustomFieldDataType.Select,
-]
-
-const MATCHING_ALGORITHMS_FOR_ALL_FIELDS = [
-  // MATCH_NONE
-  MATCHING_ALGORITHMS[6],
-  // MATCH_REGEX
-  MATCHING_ALGORITHMS[4],
-]
-
-const MATCHING_ALGORITHMS_FOR_DISCRETE_FIELDS = [
-  // MATCH_NONE
-  MATCHING_ALGORITHMS[6],
-  // MATCH_AUTO
-  MATCHING_ALGORITHMS[0],
-  // MATCH_REGEX
-  MATCHING_ALGORITHMS[4],
-]
-
@Component({
  selector: 'pngx-custom-field-edit-dialog',
  templateUrl: './custom-field-edit-dialog.component.html',
@@ -129,9 +107,6 @@ export class CustomFieldEditDialogComponent
        select_options: new FormArray([]),
        default_currency: new FormControl(null),
      }),
-      matching_algorithm: new FormControl(MATCH_NONE),
-      match: new FormControl(''),
-      is_insensitive: new FormControl(true),
    })
  }

@@ -152,15 +127,4 @@ export class CustomFieldEditDialogComponent
  public removeSelectOption(index: number) {
    this.selectOptions.removeAt(index)
  }
-
-  public getMatchingAlgorithms() {
-    if (
-      FIELDS_WITH_DISCRETE_MATCHING.includes(this.getForm().value.data_type) ||
-      FIELDS_WITH_DISCRETE_MATCHING.includes(this.object?.data_type)
-    ) {
-      return MATCHING_ALGORITHMS_FOR_DISCRETE_FIELDS
-    } else {
-      return MATCHING_ALGORITHMS_FOR_ALL_FIELDS
-    }
-  }
 }
@@ -62,7 +62,6 @@ export class EmailDocumentDialogComponent extends LoadingComponentWithPermission
          this.emailAddress = ''
          this.emailSubject = ''
          this.emailMessage = ''
-          this.close()
          this.toastService.showInfo($localize`Email sent`)
        },
        error: (e) => {
@@ -7,7 +7,6 @@ import {
  tick,
 } from '@angular/core/testing'
 import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
-import { NEGATIVE_NULL_FILTER_VALUE } from 'src/app/data/filter-rule-type'
 import {
  DEFAULT_MATCHING_ALGORITHM,
  MATCH_ALL,
@@ -45,11 +44,6 @@ const nullItem = {
  name: 'Not assigned',
 }

-const negativeNullItem = {
-  id: NEGATIVE_NULL_FILTER_VALUE,
-  name: 'Not assigned',
-}
-
 let selectionModel: FilterableDropdownSelectionModel

 describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () => {
@@ -70,7 +64,6 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
    hotkeyService = TestBed.inject(HotKeyService)
    fixture = TestBed.createComponent(FilterableDropdownComponent)
    component = fixture.componentInstance
-    component.selectionModel = new FilterableDropdownSelectionModel()
    selectionModel = new FilterableDropdownSelectionModel()
  })

@@ -81,7 +74,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
  })

  it('should support reset', () => {
-    component.selectionModel.items = items
+    component.items = items
    component.selectionModel = selectionModel
    selectionModel.set(items[0].id, ToggleableItemState.Selected)
    expect(selectionModel.getSelectedItems()).toHaveLength(1)
@@ -103,7 +96,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
  })

  it('should emit change when items selected', () => {
-    component.selectionModel.items = items
+    component.items = items
    component.selectionModel = selectionModel
    let newModel: FilterableDropdownSelectionModel
    component.selectionModelChange.subscribe((model) => (newModel = model))
@@ -117,11 +110,11 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
    selectionModel.set(items[0].id, ToggleableItemState.NotSelected)
    expect(newModel.getSelectedItems()).toEqual([])

-    expect(component.selectionModel.items).toEqual([nullItem, ...items])
+    expect(component.items).toEqual([nullItem, ...items])
  })

  it('should emit change when items excluded', () => {
-    component.selectionModel.items = items
+    component.items = items
    component.selectionModel = selectionModel
    let newModel: FilterableDropdownSelectionModel
    component.selectionModelChange.subscribe((model) => (newModel = model))
@@ -131,7 +124,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
  })

  it('should emit change when items excluded', () => {
-    component.selectionModel.items = items
+    component.items = items
    component.selectionModel = selectionModel
    let newModel: FilterableDropdownSelectionModel
    component.selectionModelChange.subscribe((model) => (newModel = model))
@@ -146,8 +139,8 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
  })

  it('should exclude items when excluded and not editing', () => {
-    component.selectionModel.items = items
-    component.selectionModel.manyToOne = true
+    component.items = items
+    component.manyToOne = true
    component.selectionModel = selectionModel
    selectionModel.set(items[0].id, ToggleableItemState.Selected)
    component.excludeClicked(items[0].id)
@@ -156,8 +149,8 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
  })

  it('should toggle when items excluded and editing', () => {
-    component.selectionModel.items = items
-    component.selectionModel.manyToOne = true
+    component.items = items
+    component.manyToOne = true
    component.editing = true
    component.selectionModel = selectionModel
    selectionModel.set(items[0].id, ToggleableItemState.NotSelected)
@@ -167,8 +160,8 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
  })

  it('should hide count for item if adding will increase size of set', () => {
-    component.selectionModel.items = items
-    component.selectionModel.manyToOne = true
+    component.items = items
+    component.manyToOne = true
    component.selectionModel = selectionModel
    expect(component.hideCount(items[0])).toBeFalsy()
    selectionModel.logicalOperator = LogicalOperator.Or
@@ -177,7 +170,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>

  it('should enforce single select when editing', () => {
    component.editing = true
-    component.selectionModel.items = items
+    component.items = items
    component.selectionModel = selectionModel
    let newModel: FilterableDropdownSelectionModel
    component.selectionModelChange.subscribe((model) => (newModel = model))
@@ -189,11 +182,11 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
  })

  it('should support manyToOne selecting', () => {
-    component.selectionModel.items = items
+    component.items = items
    selectionModel.manyToOne = false
    component.selectionModel = selectionModel
-    component.selectionModel.manyToOne = true
-    expect(component.selectionModel.manyToOne).toBeTruthy()
+    component.manyToOne = true
+    expect(component.manyToOne).toBeTruthy()
    let newModel: FilterableDropdownSelectionModel
    component.selectionModelChange.subscribe((model) => (newModel = model))

@@ -204,10 +197,12 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
  })

  it('should dynamically enable / disable modifier toggle', () => {
-    component.selectionModel.items = items
+    component.items = items
    component.selectionModel = selectionModel
    expect(component.modifierToggleEnabled).toBeTruthy()
-    component.selectionModel.manyToOne = true
+    selectionModel.toggle(null)
+    expect(component.modifierToggleEnabled).toBeFalsy()
+    component.manyToOne = true
    expect(component.modifierToggleEnabled).toBeFalsy()
    selectionModel.toggle(items[0].id)
    selectionModel.toggle(items[1].id)
@@ -215,7 +210,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
  })

  it('should apply changes and close when apply button clicked', () => {
-    component.selectionModel.items = items
+    component.items = items
    component.icon = 'tag-fill'
    component.editing = true
    component.selectionModel = selectionModel
@@ -237,7 +232,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
  })

  it('should apply on close if enabled', () => {
-    component.selectionModel.items = items
+    component.items = items
    component.icon = 'tag-fill'
    component.editing = true
    component.applyOnClose = true
@@ -255,7 +250,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
  })

  it('should focus text filter on open, support filtering, clear on close', fakeAsync(() => {
-    component.selectionModel.items = items
+    component.items = items
    component.icon = 'tag-fill'
    fixture.nativeElement
      .querySelector('button')
@@ -282,7 +277,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
  }))

  it('should toggle & close on enter inside filter field if 1 item remains', fakeAsync(() => {
-    component.selectionModel.items = items
+    component.items = items
    component.icon = 'tag-fill'
    expect(component.selectionModel.getSelectedItems()).toEqual([])
    fixture.nativeElement
@@ -302,7 +297,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
  }))

  it('should apply & close on enter inside filter field if 1 item remains if editing', fakeAsync(() => {
-    component.selectionModel.items = items
+    component.items = items
    component.icon = 'tag-fill'
    component.editing = true
    let applyResult: ChangedItems
@@ -324,7 +319,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
  }))

  it('should support arrow keyboard navigation', fakeAsync(() => {
-    component.selectionModel.items = items
+    component.items = items
    component.icon = 'tag-fill'
    fixture.nativeElement
      .querySelector('button')
@@ -369,7 +364,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
  }))

  it('should support arrow keyboard navigation after tab keyboard navigation', fakeAsync(() => {
-    component.selectionModel.items = items
+    component.items = items
    component.icon = 'tag-fill'
    fixture.nativeElement
      .querySelector('button')
@@ -405,7 +400,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
  }))

  it('should support arrow keyboard navigation after click', fakeAsync(() => {
-    component.selectionModel.items = items
+    component.items = items
    component.icon = 'tag-fill'
    fixture.nativeElement
      .querySelector('button')
@@ -430,9 +425,9 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
  }))

  it('should toggle logical operator', fakeAsync(() => {
-    component.selectionModel.items = items
+    component.items = items
    component.icon = 'tag-fill'
-    component.selectionModel.manyToOne = true
+    component.manyToOne = true
    selectionModel.set(items[0].id, ToggleableItemState.Selected)
    selectionModel.set(items[1].id, ToggleableItemState.Selected)
    component.selectionModel = selectionModel
@@ -459,7 +454,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
  }))

  it('should toggle intersection include / exclude', fakeAsync(() => {
-    component.selectionModel.items = items
+    component.items = items
    component.icon = 'tag-fill'
    selectionModel.set(items[0].id, ToggleableItemState.Selected)
    selectionModel.set(items[1].id, ToggleableItemState.Selected)
@@ -488,55 +483,22 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
    expect(changedResult.getExcludedItems()).toEqual(items)
  }))

-  it('should update null item selection on toggleIntersection', () => {
-    component.selectionModel.items = items
-    component.selectionModel = selectionModel
-    component.selectionModel.intersection = Intersection.Include
-    console.log(component.selectionModel.items[0])
-    component.selectionModel.set(null, ToggleableItemState.Selected)
-    component.selectionModel.intersection = Intersection.Exclude
-    component.selectionModel.toggleIntersection()
-    console.log(component.selectionModel)
-    expect(component.selectionModel.getExcludedItems()).toEqual([
-      negativeNullItem,
-    ])
-
-    component.selectionModel.intersection = Intersection.Include
-    component.selectionModel.toggleIntersection()
-    expect(component.selectionModel.getSelectedItems()).toEqual([nullItem])
-  })
-
  it('selection model should sort items by state', () => {
+    component.items = items.concat([{ id: null, name: 'Null B' }])
    component.selectionModel = selectionModel
-    component.selectionModel.items = items.concat([{ id: 3, name: 'Item3' }])
    selectionModel.toggle(items[1].id)
    selectionModel.apply()
-    expect(selectionModel.items.length).toEqual(4)
    expect(selectionModel.items).toEqual([
      nullItem,
+      { id: null, name: 'Null B' },
      items[1],
-      { id: 3, name: 'Item3' },
      items[0],
    ])
-
-    selectionModel.intersection = Intersection.Exclude
-    selectionModel.toggleIntersection()
-    selectionModel.apply()
-    expect(selectionModel.items).toEqual([
-      negativeNullItem,
-      items[1],
-      { id: 3, name: 'Item3' },
-      items[0],
-    ])
-
-    // coverage
-    selectionModel.items = selectionModel.items.reverse()
-    selectionModel.apply()
  })

  it('selection model should sort items by state and document counts = 0, if set', () => {
    const tagA = { id: 4, name: 'Tag A' }
-    component.selectionModel.items = items.concat([tagA])
+    component.items = items.concat([tagA])
    component.selectionModel = selectionModel
    component.documentCounts = [
      { id: 1, document_count: 0 }, // Tag1
@@ -567,7 +529,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
  })

  it('should set support create, keep open model and call createRef method', fakeAsync(() => {
-    component.selectionModel.items = items
+    component.items = items
    component.icon = 'tag-fill'
    component.selectionModel = selectionModel
    fixture.nativeElement
@@ -587,7 +549,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
  }))

  it('should call create on enter inside filter field if 0 items remain while editing', fakeAsync(() => {
-    component.selectionModel.items = items
+    component.items = items
    component.icon = 'tag-fill'
    component.editing = true
    component.createRef = jest.fn()
@@ -607,7 +569,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
    const id = 1
    const state = ToggleableItemState.Selected
    component.selectionModel = selectionModel
-    component.selectionModel.manyToOne = true
+    component.manyToOne = true
    component.selectionModel.singleSelect = true
    component.selectionModel.intersection = Intersection.Include
    component.selectionModel['temporarySelectionStates'].set(id, state)
@@ -634,7 +596,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
  })

  it('should support shortcut keys', () => {
-    component.selectionModel.items = items
+    component.items = items
    component.icon = 'tag-fill'
    component.shortcutKey = 't'
    fixture.detectChanges()
@@ -644,7 +606,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
  })

  it('should support an extra button and not apply changes when clicked', () => {
-    component.selectionModel.items = items
+    component.items = items
    component.icon = 'tag-fill'
    component.extraButtonTitle = 'Extra'
    component.selectionModel = selectionModel
@@ -12,7 +12,6 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import { NgbDropdown, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'
 import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { Subject, filter, takeUntil } from 'rxjs'
-import { NEGATIVE_NULL_FILTER_VALUE } from 'src/app/data/filter-rule-type'
 import { MatchingModel } from 'src/app/data/matching-model'
 import { ObjectWithPermissions } from 'src/app/data/object-with-permissions'
 import { FilterPipe } from 'src/app/pipes/filter.pipe'
@@ -62,56 +61,15 @@ export class FilterableDropdownSelectionModel {
  }

  set items(items: MatchingModel[]) {
-    if (items) {
-      this._items = Array.from(items)
-      this.sortItems()
-      this.setNullItem()
-    }
-  }
-
-  private setNullItem() {
-    if (this.manyToOne && this.logicalOperator === LogicalOperator.Or) {
-      if (this._items[0]?.id === null) {
-        this._items.shift()
-      }
-      return
-    }
-
-    const item = {
-      name: $localize`:Filter drop down element to filter for documents with no correspondent/type/tag assigned:Not assigned`,
-      id:
-        this.manyToOne || this.intersection === Intersection.Include
-          ? null
-          : NEGATIVE_NULL_FILTER_VALUE,
-    }
-
-    if (
-      this._items[0]?.id === null ||
-      this._items[0]?.id === NEGATIVE_NULL_FILTER_VALUE
-    ) {
-      this._items[0] = item
-    } else if (this._items) {
-      this._items.unshift(item)
-    }
-  }
-
-  constructor(manyToOne: boolean = false) {
-    this.manyToOne = manyToOne
+    this._items = items
+    this.sortItems()
  }

  private sortItems() {
    this._items.sort((a, b) => {
-      if (
-        (a.id == null && b.id != null) ||
-        (a.id == NEGATIVE_NULL_FILTER_VALUE &&
-          b.id != NEGATIVE_NULL_FILTER_VALUE)
-      ) {
+      if (a.id == null && b.id != null) {
        return -1
-      } else if (
-        (a.id != null && b.id == null) ||
-        (a.id != NEGATIVE_NULL_FILTER_VALUE &&
-          b.id == NEGATIVE_NULL_FILTER_VALUE)
-      ) {
+      } else if (a.id != null && b.id == null) {
        return 1
      } else if (
        this.getNonTemporary(a.id) == ToggleableItemState.NotSelected &&
@@ -272,7 +230,6 @@ export class FilterableDropdownSelectionModel {

  set logicalOperator(operator: LogicalOperator) {
    this.temporaryLogicalOperator = operator
-    this.setNullItem()
  }

  toggleOperator() {
@@ -285,7 +242,6 @@ export class FilterableDropdownSelectionModel {

  set intersection(intersection: Intersection) {
    this.temporaryIntersection = intersection
-    this.setNullItem()
  }

  toggleIntersection() {
@@ -294,20 +250,9 @@ export class FilterableDropdownSelectionModel {
      this.intersection == Intersection.Include
        ? ToggleableItemState.Selected
        : ToggleableItemState.Excluded
-
    this.temporarySelectionStates.forEach((state, key) => {
-      if (key === null && this.intersection === Intersection.Exclude) {
-        this.temporarySelectionStates.set(NEGATIVE_NULL_FILTER_VALUE, newState)
-      } else if (
-        key === NEGATIVE_NULL_FILTER_VALUE &&
-        this.intersection === Intersection.Include
-      ) {
-        this.temporarySelectionStates.set(null, newState)
-      } else {
-        this.temporarySelectionStates.set(key, newState)
-      }
+      this.temporarySelectionStates.set(key, newState)
    })
-
    this.changed.next(this)
  }

@@ -329,7 +274,6 @@ export class FilterableDropdownSelectionModel {
    this.temporarySelectionStates.clear()
    this.temporaryLogicalOperator = this._logicalOperator = LogicalOperator.And
    this.temporaryIntersection = this._intersection = Intersection.Include
-    this.setNullItem()
    if (fireEvent) {
      this.changed.next(this)
    }
@@ -361,10 +305,8 @@ export class FilterableDropdownSelectionModel {

  isNoneSelected() {
    return (
-      (this.selectionSize() == 1 &&
-        this.get(null) == ToggleableItemState.Selected) ||
-      (this.intersection == Intersection.Exclude &&
-        this.get(NEGATIVE_NULL_FILTER_VALUE) == ToggleableItemState.Excluded)
+      this.selectionSize() == 1 &&
+      this.get(null) == ToggleableItemState.Selected
    )
  }

@@ -442,13 +384,25 @@ export class FilterableDropdownComponent

  filterText: string

-  _selectionModel: FilterableDropdownSelectionModel
+  @Input()
+  set items(items: MatchingModel[]) {
+    if (items) {
+      this._selectionModel.items = Array.from(items)
+      this._selectionModel.items.unshift({
+        name: $localize`:Filter drop down element to filter for documents with no correspondent/type/tag assigned:Not assigned`,
+        id: null,
+      })
+    }
+  }

  get items(): MatchingModel[] {
    return this._selectionModel.items
  }

-  @Input({ required: true })
+  _selectionModel: FilterableDropdownSelectionModel =
+    new FilterableDropdownSelectionModel()
+
+  @Input()
  set selectionModel(model: FilterableDropdownSelectionModel) {
    if (this.selectionModel) {
      this.selectionModel.changed.complete()
@@ -469,6 +423,11 @@ export class FilterableDropdownComponent
  @Output()
  selectionModelChange = new EventEmitter<FilterableDropdownSelectionModel>()

+  @Input()
+  set manyToOne(manyToOne: boolean) {
+    this.selectionModel.manyToOne = manyToOne
+  }
+
  get manyToOne() {
    return this.selectionModel.manyToOne
  }
@@ -525,7 +484,7 @@ export class FilterableDropdownComponent
    return this.manyToOne
      ? this.selectionModel.selectionSize() > 1 &&
          this.selectionModel.getExcludedItems().length == 0
-      : true
+      : !this.selectionModel.isNoneSelected()
  }

  get name(): string {
@@ -34,17 +34,6 @@
      }

      <ng-container *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.SavedView }">
-        @if (!settingsService.offerTour() && savedViewService.allViews.length === 0) {
-          <div class="col">
-            <div class="card shadow-sm bg-light opacity-50">
-              <div class="card-body">
-                <div class="text-center">
-                  <p class="mb-0 fst-italic"><i-bs name="info-circle" class="me-2"></i-bs><ng-container i18n>Hint: saved views can be created from the <a routerLink="/documents">documents list</a></ng-container></p>
-                </div>
-              </div>
-            </div>
-          </div>
-        }
        @for (v of dashboardViews; track v.id) {
          <div class="col">
            <pngx-saved-view-widget
@@ -105,7 +105,6 @@ describe('DashboardComponent', () => {
                results: saved_views,
              }),
            dashboardViews: saved_views.filter((v) => v.show_on_dashboard),
-            allViews: saved_views,
          },
        },
        provideHttpClient(withInterceptorsFromDi()),
@@ -6,8 +6,6 @@ import {
  moveItemInArray,
 } from '@angular/cdk/drag-drop'
 import { Component } from '@angular/core'
-import { RouterModule } from '@angular/router'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { TourNgBootstrapModule, TourService } from 'ngx-ui-tour-ng-bootstrap'
 import { SavedView } from 'src/app/data/saved-view'
 import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
@@ -37,8 +35,6 @@ import { WelcomeWidgetComponent } from './widgets/welcome-widget/welcome-widget.
    IfPermissionsDirective,
    DragDropModule,
    TourNgBootstrapModule,
-    NgxBootstrapIconsModule,
-    RouterModule,
  ],
 })
 export class DashboardComponent extends ComponentWithPermissions {
@@ -55,7 +55,7 @@
                    }
                    @case (DisplayField.TAGS) {
                      @for (tagID of doc.tags; track tagID) {
-                        <pngx-tag [tagID]="tagID" class="ms-1 fs-6" (click)="clickTag(tagID, $event)" [clickable]="true" linkTitle="Filter by tag" i18n-title></pngx-tag>
+                        <pngx-tag [tagID]="tagID" class="ms-1" (click)="clickTag(tagID, $event)" [clickable]="true" linkTitle="Filter by tag" i18n-title></pngx-tag>
                      }
                    }
                    @case (DisplayField.DOCUMENT_TYPE) {
@@ -20,8 +20,10 @@
          @if (permissionService.currentUserCan(PermissionAction.View, PermissionType.Tag)) {
            <pngx-filterable-dropdown title="Tags" icon="tag-fill" i18n-title
              filterPlaceholder="Filter tags" i18n-filterPlaceholder
+              [items]="tags"
              [disabled]="!userCanEditAll || disabled"
              [editing]="true"
+              [manyToOne]="true"
              [applyOnClose]="applyOnClose"
              [createRef]="createTag.bind(this)"
              (opened)="openTagsDropdown()"
@@ -34,6 +36,7 @@
          @if (permissionService.currentUserCan(PermissionAction.View, PermissionType.Correspondent)) {
            <pngx-filterable-dropdown title="Correspondent" icon="person-fill" i18n-title
              filterPlaceholder="Filter correspondents" i18n-filterPlaceholder
+              [items]="correspondents"
              [disabled]="!userCanEditAll || disabled"
              [editing]="true"
              [applyOnClose]="applyOnClose"
@@ -48,6 +51,7 @@
          @if (permissionService.currentUserCan(PermissionAction.View, PermissionType.DocumentType)) {
            <pngx-filterable-dropdown title="Document type" icon="file-earmark-fill" i18n-title
              filterPlaceholder="Filter document types" i18n-filterPlaceholder
+              [items]="documentTypes"
              [disabled]="!userCanEditAll || disabled"
              [editing]="true"
              [applyOnClose]="applyOnClose"
@@ -62,6 +66,7 @@
          @if (permissionService.currentUserCan(PermissionAction.View, PermissionType.StoragePath)) {
            <pngx-filterable-dropdown title="Storage path" icon="folder-fill" i18n-title
              filterPlaceholder="Filter storage paths" i18n-filterPlaceholder
+              [items]="storagePaths"
              [disabled]="!userCanEditAll || disabled"
              [editing]="true"
              [applyOnClose]="applyOnClose"
@@ -76,8 +81,10 @@
          @if (permissionService.currentUserCan(PermissionAction.View, PermissionType.CustomField)) {
            <pngx-filterable-dropdown title="Custom fields" icon="ui-radios" i18n-title
              filterPlaceholder="Filter custom fields" i18n-filterPlaceholder
+              [items]="customFields"
              [disabled]="!userCanEditAll"
              [editing]="true"
+              [manyToOne]="true"
              [applyOnClose]="applyOnClose"
              [createRef]="createCustomField.bind(this)"
              (opened)="openCustomFieldsDropdown()"
@@ -1150,10 +1150,10 @@ describe('BulkEditorComponent', () => {

  it('should not attempt to retrieve objects if user does not have permissions', () => {
    jest.spyOn(permissionsService, 'currentUserCan').mockReturnValue(true)
-    expect(component.tagSelectionModel.items.length).toEqual(0)
-    expect(component.correspondentSelectionModel.items.length).toEqual(0)
-    expect(component.documentTypeSelectionModel.items.length).toEqual(0)
-    expect(component.storagePathsSelectionModel.items.length).toEqual(0)
+    expect(component.tags).toBeUndefined()
+    expect(component.correspondents).toBeUndefined()
+    expect(component.documentTypes).toBeUndefined()
+    expect(component.storagePaths).toBeUndefined()
    httpTestingController.expectNone(`${environment.apiBaseUrl}documents/tags/`)
    httpTestingController.expectNone(
      `${environment.apiBaseUrl}documents/correspondents/`
@@ -1204,9 +1204,7 @@ describe('BulkEditorComponent', () => {
    expect(tagListAllSpy).toHaveBeenCalled()

    expect(tagSelectionModelToggleSpy).toHaveBeenCalledWith(newTag.id)
-    expect(component.tagSelectionModel.items).toEqual(
-      [{ id: null, name: 'Not assigned' }].concat(tags.results as any)
-    )
+    expect(component.tags).toEqual(tags.results)
  })

  it('should support create new correspondent', () => {
@@ -1253,9 +1251,7 @@ describe('BulkEditorComponent', () => {
    expect(correspondentSelectionModelToggleSpy).toHaveBeenCalledWith(
      newCorrespondent.id
    )
-    expect(component.correspondentSelectionModel.items).toEqual(
-      [{ id: null, name: 'Not assigned' }].concat(correspondents.results as any)
-    )
+    expect(component.correspondents).toEqual(correspondents.results)
  })

  it('should support create new document type', () => {
@@ -1299,9 +1295,7 @@ describe('BulkEditorComponent', () => {
    expect(documentTypeSelectionModelToggleSpy).toHaveBeenCalledWith(
      newDocumentType.id
    )
-    expect(component.documentTypeSelectionModel.items).toEqual(
-      [{ id: null, name: 'Not assigned' }].concat(documentTypes.results as any)
-    )
+    expect(component.documentTypes).toEqual(documentTypes.results)
  })

  it('should support create new storage path', () => {
@@ -1345,9 +1339,7 @@ describe('BulkEditorComponent', () => {
    expect(storagePathsSelectionModelToggleSpy).toHaveBeenCalledWith(
      newStoragePath.id
    )
-    expect(component.storagePathsSelectionModel.items).toEqual(
-      [{ id: null, name: 'Not assigned' }].concat(storagePaths.results as any)
-    )
+    expect(component.storagePaths).toEqual(storagePaths.results)
  })

  it('should support create new custom field', () => {
@@ -1399,9 +1391,7 @@ describe('BulkEditorComponent', () => {
    expect(customFieldsSelectionModelToggleSpy).toHaveBeenCalledWith(
      newCustomField.id
    )
-    expect(component.customFieldsSelectionModel.items).toEqual(
-      [{ id: null, name: 'Not assigned' }].concat(customFields.results as any)
-    )
+    expect(component.customFields).toEqual(customFields.results)
  })

  it('should open the bulk edit custom field values dialog with correct parameters', () => {
@@ -1426,17 +1416,17 @@ describe('BulkEditorComponent', () => {
    const toastServiceShowErrorSpy = jest.spyOn(toastService, 'showError')
    const listReloadSpy = jest.spyOn(documentListViewService, 'reload')

-    component.customFieldsSelectionModel.items = [
+    component.customFields = [
      { id: 1, name: 'Custom Field 1', data_type: CustomFieldDataType.String },
      { id: 2, name: 'Custom Field 2', data_type: CustomFieldDataType.String },
-    ] as any
+    ]

    component.setCustomFieldValues({
      itemsToAdd: [{ id: 1 }, { id: 2 }],
      itemsToRemove: [1],
    } as any)

-    expect(modal.componentInstance.customFields.length).toEqual(2)
+    expect(modal.componentInstance.customFields).toEqual(component.customFields)
    expect(modal.componentInstance.fieldsToAddIds).toEqual([1, 2])
    expect(modal.componentInstance.documents).toEqual([3, 4])

@@ -14,8 +14,12 @@ import { saveAs } from 'file-saver'
 import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { first, map, Subject, switchMap, takeUntil } from 'rxjs'
 import { ConfirmDialogComponent } from 'src/app/components/common/confirm-dialog/confirm-dialog.component'
+import { Correspondent } from 'src/app/data/correspondent'
 import { CustomField } from 'src/app/data/custom-field'
+import { DocumentType } from 'src/app/data/document-type'
 import { MatchingModel } from 'src/app/data/matching-model'
+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 { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
 import { DocumentListViewService } from 'src/app/services/document-list-view.service'
@@ -71,11 +75,17 @@ export class BulkEditorComponent
  extends ComponentWithPermissions
  implements OnInit, OnDestroy
 {
-  tagSelectionModel = new FilterableDropdownSelectionModel(true)
+  tags: Tag[]
+  correspondents: Correspondent[]
+  documentTypes: DocumentType[]
+  storagePaths: StoragePath[]
+  customFields: CustomField[]
+
+  tagSelectionModel = new FilterableDropdownSelectionModel()
  correspondentSelectionModel = new FilterableDropdownSelectionModel()
  documentTypeSelectionModel = new FilterableDropdownSelectionModel()
  storagePathsSelectionModel = new FilterableDropdownSelectionModel()
-  customFieldsSelectionModel = new FilterableDropdownSelectionModel(true)
+  customFieldsSelectionModel = new FilterableDropdownSelectionModel()
  tagDocumentCounts: SelectionDataItem[]
  correspondentDocumentCounts: SelectionDataItem[]
  documentTypeDocumentCounts: SelectionDataItem[]
@@ -166,7 +176,7 @@ export class BulkEditorComponent
      this.tagService
        .listAll()
        .pipe(first())
-        .subscribe((result) => (this.tagSelectionModel.items = result.results))
+        .subscribe((result) => (this.tags = result.results))
    }
    if (
      this.permissionService.currentUserCan(
@@ -177,9 +187,7 @@ export class BulkEditorComponent
      this.correspondentService
        .listAll()
        .pipe(first())
-        .subscribe(
-          (result) => (this.correspondentSelectionModel.items = result.results)
-        )
+        .subscribe((result) => (this.correspondents = result.results))
    }
    if (
      this.permissionService.currentUserCan(
@@ -190,9 +198,7 @@ export class BulkEditorComponent
      this.documentTypeService
        .listAll()
        .pipe(first())
-        .subscribe(
-          (result) => (this.documentTypeSelectionModel.items = result.results)
-        )
+        .subscribe((result) => (this.documentTypes = result.results))
    }
    if (
      this.permissionService.currentUserCan(
@@ -203,9 +209,7 @@ export class BulkEditorComponent
      this.storagePathService
        .listAll()
        .pipe(first())
-        .subscribe(
-          (result) => (this.storagePathsSelectionModel.items = result.results)
-        )
+        .subscribe((result) => (this.storagePaths = result.results))
    }
    if (
      this.permissionService.currentUserCan(
@@ -216,9 +220,7 @@ export class BulkEditorComponent
      this.customFieldService
        .listAll()
        .pipe(first())
-        .subscribe(
-          (result) => (this.customFieldsSelectionModel.items = result.results)
-        )
+        .subscribe((result) => (this.customFields = result.results))
    }

    this.downloadForm
@@ -649,7 +651,7 @@ export class BulkEditorComponent
      )
      .pipe(takeUntil(this.unsubscribeNotifier))
      .subscribe(({ newTag, tags }) => {
-        this.tagSelectionModel.items = tags.results
+        this.tags = tags.results
        this.tagSelectionModel.toggle(newTag.id)
      })
  }
@@ -672,7 +674,7 @@ export class BulkEditorComponent
      )
      .pipe(takeUntil(this.unsubscribeNotifier))
      .subscribe(({ newCorrespondent, correspondents }) => {
-        this.correspondentSelectionModel.items = correspondents.results
+        this.correspondents = correspondents.results
        this.correspondentSelectionModel.toggle(newCorrespondent.id)
      })
  }
@@ -693,7 +695,7 @@ export class BulkEditorComponent
      )
      .pipe(takeUntil(this.unsubscribeNotifier))
      .subscribe(({ newDocumentType, documentTypes }) => {
-        this.documentTypeSelectionModel.items = documentTypes.results
+        this.documentTypes = documentTypes.results
        this.documentTypeSelectionModel.toggle(newDocumentType.id)
      })
  }
@@ -714,7 +716,7 @@ export class BulkEditorComponent
      )
      .pipe(takeUntil(this.unsubscribeNotifier))
      .subscribe(({ newStoragePath, storagePaths }) => {
-        this.storagePathsSelectionModel.items = storagePaths.results
+        this.storagePaths = storagePaths.results
        this.storagePathsSelectionModel.toggle(newStoragePath.id)
      })
  }
@@ -735,7 +737,7 @@ export class BulkEditorComponent
      )
      .pipe(takeUntil(this.unsubscribeNotifier))
      .subscribe(({ newCustomField, customFields }) => {
-        this.customFieldsSelectionModel.items = customFields.results
+        this.customFields = customFields.results
        this.customFieldsSelectionModel.toggle(newCustomField.id)
      })
  }
@@ -873,9 +875,7 @@ export class BulkEditorComponent
    })
    const dialog =
      modal.componentInstance as CustomFieldsBulkEditDialogComponent
-    dialog.customFields = (
-      this.customFieldsSelectionModel.items as CustomField[]
-    ).filter((f) => f.id !== null)
+    dialog.customFields = this.customFields
    dialog.fieldsToAddIds = changedCustomFields.itemsToAdd.map(
      (item) => item.id
    )
@@ -310,8 +310,8 @@
                      </div>
                    }
                    @if (activeDisplayFields.includes(DisplayField.TAGS)) {
-                      @for (tagID of d.tags; track tagID) {
-                        <pngx-tag [tagID]="tagID" class="ms-1 fs-6" clickable="true" linkTitle="Filter by tag" i18n-linkTitle (click)="clickTag(tagID);$event.stopPropagation()"></pngx-tag>
+                      @for (tagID of d.tags; track t) {
+                        <pngx-tag [tagID]="tagID" class="ms-1" clickable="true" linkTitle="Filter by tag" i18n-linkTitle (click)="clickTag(tagID);$event.stopPropagation()"></pngx-tag>
                      }
                    }
                  </td>
@@ -35,9 +35,11 @@
  <div class="col-auto">
    <div class="d-flex flex-wrap gap-3">
      <div class="d-flex flex-wrap gap-2">
-        @if (permissionsService.currentUserCan(PermissionAction.View, PermissionType.Tag) && tagSelectionModel.items.length > 0) {
+        @if (permissionsService.currentUserCan(PermissionAction.View, PermissionType.Tag) && tags.length > 0) {
          <pngx-filterable-dropdown class="flex-fill fade" [class.show]="show" title="Tags" icon="tag-fill" i18n-title
          filterPlaceholder="Filter tags" i18n-filterPlaceholder
+          [items]="tags"
+          [manyToOne]="true"
          [(selectionModel)]="tagSelectionModel"
          (selectionModelChange)="updateRules()"
          (opened)="onTagsDropdownOpen()"
@@ -46,9 +48,10 @@
          [disabled]="disabled"
          shortcutKey="t"></pngx-filterable-dropdown>
        }
-        @if (permissionsService.currentUserCan(PermissionAction.View, PermissionType.Correspondent) && correspondentSelectionModel.items.length > 0) {
+        @if (permissionsService.currentUserCan(PermissionAction.View, PermissionType.Correspondent) && correspondents.length > 0) {
          <pngx-filterable-dropdown class="flex-fill fade" [class.show]="show" title="Correspondent" icon="person-fill" i18n-title
          filterPlaceholder="Filter correspondents" i18n-filterPlaceholder
+          [items]="correspondents"
          [(selectionModel)]="correspondentSelectionModel"
          (selectionModelChange)="updateRules()"
          (opened)="onCorrespondentDropdownOpen()"
@@ -57,9 +60,10 @@
          [disabled]="disabled"
          shortcutKey="y"></pngx-filterable-dropdown>
        }
-        @if (permissionsService.currentUserCan(PermissionAction.View, PermissionType.DocumentType) && documentTypeSelectionModel.items.length > 0) {
+        @if (permissionsService.currentUserCan(PermissionAction.View, PermissionType.DocumentType) && documentTypes.length > 0) {
            <pngx-filterable-dropdown class="flex-fill fade" [class.show]="show" title="Document type" icon="file-earmark-fill" i18n-title
            filterPlaceholder="Filter document types" i18n-filterPlaceholder
+            [items]="documentTypes"
            [(selectionModel)]="documentTypeSelectionModel"
            (selectionModelChange)="updateRules()"
            (opened)="onDocumentTypeDropdownOpen()"
@@ -68,9 +72,10 @@
            [disabled]="disabled"
            shortcutKey="u"></pngx-filterable-dropdown>
        }
-        @if (permissionsService.currentUserCan(PermissionAction.View, PermissionType.StoragePath) && storagePathSelectionModel.items.length > 0) {
+        @if (permissionsService.currentUserCan(PermissionAction.View, PermissionType.StoragePath) && storagePaths.length > 0) {
          <pngx-filterable-dropdown class="flex-fill fade" [class.show]="show" title="Storage path" icon="folder-fill" i18n-title
          filterPlaceholder="Filter storage paths" i18n-filterPlaceholder
+          [items]="storagePaths"
          [(selectionModel)]="storagePathSelectionModel"
          (selectionModelChange)="updateRules()"
          (opened)="onStoragePathDropdownOpen()"
@@ -69,7 +69,6 @@ import {
  FILTER_STORAGE_PATH,
  FILTER_TITLE,
  FILTER_TITLE_CONTENT,
-  NEGATIVE_NULL_FILTER_VALUE,
 } from 'src/app/data/filter-rule-type'
 import { StoragePath } from 'src/app/data/storage-path'
 import { Tag } from 'src/app/data/tag'
@@ -672,6 +671,9 @@ describe('FilterEditorComponent', () => {
        value: '12',
      },
    ]
+    expect(component.correspondentSelectionModel.logicalOperator).toEqual(
+      LogicalOperator.Or
+    )
    expect(component.correspondentSelectionModel.intersection).toEqual(
      Intersection.Include
    )
@@ -679,19 +681,6 @@ describe('FilterEditorComponent', () => {
      correspondents[0],
    ])
    component.toggleCorrespondent(12) // coverage
-
-    component.filterRules = [
-      {
-        rule_type: FILTER_CORRESPONDENT,
-        value: NEGATIVE_NULL_FILTER_VALUE.toString(),
-      },
-    ]
-    expect(component.correspondentSelectionModel.intersection).toEqual(
-      Intersection.Exclude
-    )
-    expect(component.correspondentSelectionModel.getExcludedItems()).toEqual([
-      { id: NEGATIVE_NULL_FILTER_VALUE, name: 'Not assigned' },
-    ])
  }))

  it('should ingest filter rules for has any of correspondents', fakeAsync(() => {
@@ -765,6 +754,9 @@ describe('FilterEditorComponent', () => {
        value: '22',
      },
    ]
+    expect(component.documentTypeSelectionModel.logicalOperator).toEqual(
+      LogicalOperator.Or
+    )
    expect(component.documentTypeSelectionModel.intersection).toEqual(
      Intersection.Include
    )
@@ -772,19 +764,6 @@ describe('FilterEditorComponent', () => {
      document_types[0],
    ])
    component.toggleDocumentType(22) // coverage
-
-    component.filterRules = [
-      {
-        rule_type: FILTER_DOCUMENT_TYPE,
-        value: NEGATIVE_NULL_FILTER_VALUE.toString(),
-      },
-    ]
-    expect(component.documentTypeSelectionModel.intersection).toEqual(
-      Intersection.Exclude
-    )
-    expect(component.documentTypeSelectionModel.getExcludedItems()).toEqual([
-      { id: NEGATIVE_NULL_FILTER_VALUE, name: 'Not assigned' },
-    ])
  }))

  it('should ingest filter rules for has any of document types', fakeAsync(() => {
@@ -801,6 +780,9 @@ describe('FilterEditorComponent', () => {
        value: '23',
      },
    ]
+    expect(component.documentTypeSelectionModel.logicalOperator).toEqual(
+      LogicalOperator.Or
+    )
    expect(component.documentTypeSelectionModel.intersection).toEqual(
      Intersection.Include
    )
@@ -855,6 +837,9 @@ describe('FilterEditorComponent', () => {
        value: '32',
      },
    ]
+    expect(component.storagePathSelectionModel.logicalOperator).toEqual(
+      LogicalOperator.Or
+    )
    expect(component.storagePathSelectionModel.intersection).toEqual(
      Intersection.Include
    )
@@ -862,19 +847,6 @@ describe('FilterEditorComponent', () => {
      storage_paths[0],
    ])
    component.toggleStoragePath(32) // coverage
-
-    component.filterRules = [
-      {
-        rule_type: FILTER_STORAGE_PATH,
-        value: NEGATIVE_NULL_FILTER_VALUE.toString(),
-      },
-    ]
-    expect(component.storagePathSelectionModel.intersection).toEqual(
-      Intersection.Exclude
-    )
-    expect(component.storagePathSelectionModel.getExcludedItems()).toEqual([
-      { id: NEGATIVE_NULL_FILTER_VALUE, name: 'Not assigned' },
-    ])
  }))

  it('should ingest filter rules for has any of storage paths', fakeAsync(() => {
@@ -1426,19 +1398,6 @@ describe('FilterEditorComponent', () => {
        value: null,
      },
    ])
-
-    const excludeButton = correspondentsFilterableDropdown.queryAll(
-      By.css('input[value=exclude]')
-    )[0]
-    excludeButton.nativeElement.checked = true
-    excludeButton.triggerEventHandler('change')
-    fixture.detectChanges()
-    expect(component.filterRules).toEqual([
-      {
-        rule_type: FILTER_CORRESPONDENT,
-        value: NEGATIVE_NULL_FILTER_VALUE.toString(),
-      },
-    ])
  }))

  it('should convert user input to correct filter rules on document type selections', fakeAsync(() => {
@@ -1496,19 +1455,6 @@ describe('FilterEditorComponent', () => {
        value: null,
      },
    ])
-
-    const excludeButton = docTypesFilterableDropdown.queryAll(
-      By.css('input[value=exclude]')
-    )[0]
-    excludeButton.nativeElement.checked = true
-    excludeButton.triggerEventHandler('change')
-    fixture.detectChanges()
-    expect(component.filterRules).toEqual([
-      {
-        rule_type: FILTER_DOCUMENT_TYPE,
-        value: NEGATIVE_NULL_FILTER_VALUE.toString(),
-      },
-    ])
  }))

  it('should convert user input to correct filter rules on storage path selections', fakeAsync(() => {
@@ -1566,19 +1512,6 @@ describe('FilterEditorComponent', () => {
        value: null,
      },
    ])
-
-    const excludeButton = storagePathsFilterableDropdown.queryAll(
-      By.css('input[value=exclude]')
-    )[0]
-    excludeButton.nativeElement.checked = true
-    excludeButton.triggerEventHandler('change')
-    fixture.detectChanges()
-    expect(component.filterRules).toEqual([
-      {
-        rule_type: FILTER_STORAGE_PATH,
-        value: NEGATIVE_NULL_FILTER_VALUE.toString(),
-      },
-    ])
  }))

  it('should convert user input to correct filter rules on custom field selections', fakeAsync(() => {
@@ -26,12 +26,14 @@ import {
  switchMap,
  takeUntil,
 } from 'rxjs/operators'
+import { Correspondent } from 'src/app/data/correspondent'
 import { CustomField } from 'src/app/data/custom-field'
 import {
  CustomFieldQueryLogicalOperator,
  CustomFieldQueryOperator,
 } from 'src/app/data/custom-field-query'
 import { Document } from 'src/app/data/document'
+import { DocumentType } from 'src/app/data/document-type'
 import { FilterRule } from 'src/app/data/filter-rule'
 import {
  FILTER_ADDED_AFTER,
@@ -73,8 +75,9 @@ import {
  FILTER_STORAGE_PATH,
  FILTER_TITLE,
  FILTER_TITLE_CONTENT,
-  NEGATIVE_NULL_FILTER_VALUE,
 } from 'src/app/data/filter-rule-type'
+import { StoragePath } from 'src/app/data/storage-path'
+import { Tag } from 'src/app/data/tag'
 import {
  PermissionAction,
  PermissionType,
@@ -248,9 +251,7 @@ export class FilterEditorComponent
        case FILTER_HAS_CORRESPONDENT_ANY:
          if (rule.value) {
            return $localize`Correspondent: ${
-              this.correspondentSelectionModel.items.find(
-                (c) => c.id == +rule.value
-              )?.name
+              this.correspondents.find((c) => c.id == +rule.value)?.name
            }`
          } else {
            return $localize`Without correspondent`
@@ -260,9 +261,7 @@ export class FilterEditorComponent
        case FILTER_HAS_DOCUMENT_TYPE_ANY:
          if (rule.value) {
            return $localize`Document type: ${
-              this.documentTypeSelectionModel.items.find(
-                (dt) => dt.id == +rule.value
-              )?.name
+              this.documentTypes.find((dt) => dt.id == +rule.value)?.name
            }`
          } else {
            return $localize`Without document type`
@@ -272,9 +271,7 @@ export class FilterEditorComponent
        case FILTER_HAS_STORAGE_PATH_ANY:
          if (rule.value) {
            return $localize`Storage path: ${
-              this.storagePathSelectionModel.items.find(
-                (sp) => sp.id == +rule.value
-              )?.name
+              this.storagePaths.find((sp) => sp.id == +rule.value)?.name
            }`
          } else {
            return $localize`Without storage path`
@@ -282,7 +279,7 @@ export class FilterEditorComponent

        case FILTER_HAS_TAGS_ALL:
          return $localize`Tag: ${
-            this.tagSelectionModel.items.find((t) => t.id == +rule.value)?.name
+            this.tags.find((t) => t.id == +rule.value)?.name
          }`

        case FILTER_HAS_ANY_TAG:
@@ -329,6 +326,10 @@ export class FilterEditorComponent
  @ViewChild('textFilterInput')
  textFilterInput: ElementRef

+  tags: Tag[] = []
+  correspondents: Correspondent[] = []
+  documentTypes: DocumentType[] = []
+  storagePaths: StoragePath[] = []
  customFields: CustomField[] = []

  tagDocumentCounts: SelectionDataItem[]
@@ -369,7 +370,7 @@ export class FilterEditorComponent
    )
  }

-  tagSelectionModel = new FilterableDropdownSelectionModel(true)
+  tagSelectionModel = new FilterableDropdownSelectionModel()
  correspondentSelectionModel = new FilterableDropdownSelectionModel()
  documentTypeSelectionModel = new FilterableDropdownSelectionModel()
  storagePathSelectionModel = new FilterableDropdownSelectionModel()
@@ -550,19 +551,6 @@ export class FilterEditorComponent
          )
          break
        case FILTER_CORRESPONDENT:
-          this.correspondentSelectionModel.intersection =
-            rule.value == NEGATIVE_NULL_FILTER_VALUE.toString()
-              ? Intersection.Exclude
-              : Intersection.Include
-          this.correspondentSelectionModel.set(
-            rule.value ? +rule.value : null,
-            this.correspondentSelectionModel.intersection ==
-              Intersection.Include
-              ? ToggleableItemState.Selected
-              : ToggleableItemState.Excluded,
-            false
-          )
-          break
        case FILTER_HAS_CORRESPONDENT_ANY:
          this.correspondentSelectionModel.logicalOperator = LogicalOperator.Or
          this.correspondentSelectionModel.intersection = Intersection.Include
@@ -581,18 +569,6 @@ export class FilterEditorComponent
          )
          break
        case FILTER_DOCUMENT_TYPE:
-          this.documentTypeSelectionModel.intersection =
-            rule.value == NEGATIVE_NULL_FILTER_VALUE.toString()
-              ? Intersection.Exclude
-              : Intersection.Include
-          this.documentTypeSelectionModel.set(
-            rule.value ? +rule.value : null,
-            this.documentTypeSelectionModel.intersection == Intersection.Include
-              ? ToggleableItemState.Selected
-              : ToggleableItemState.Excluded,
-            false
-          )
-          break
        case FILTER_HAS_DOCUMENT_TYPE_ANY:
          this.documentTypeSelectionModel.logicalOperator = LogicalOperator.Or
          this.documentTypeSelectionModel.intersection = Intersection.Include
@@ -611,18 +587,6 @@ export class FilterEditorComponent
          )
          break
        case FILTER_STORAGE_PATH:
-          this.storagePathSelectionModel.intersection =
-            rule.value == NEGATIVE_NULL_FILTER_VALUE.toString()
-              ? Intersection.Exclude
-              : Intersection.Include
-          this.storagePathSelectionModel.set(
-            rule.value ? +rule.value : null,
-            this.storagePathSelectionModel.intersection == Intersection.Include
-              ? ToggleableItemState.Selected
-              : ToggleableItemState.Excluded,
-            false
-          )
-          break
        case FILTER_HAS_STORAGE_PATH_ANY:
          this.storagePathSelectionModel.logicalOperator = LogicalOperator.Or
          this.storagePathSelectionModel.intersection = Intersection.Include
@@ -845,21 +809,9 @@ export class FilterEditorComponent
          })
        })
    }
-    if (
-      this.correspondentSelectionModel.isNoneSelected() &&
-      this.correspondentSelectionModel.intersection == Intersection.Include
-    ) {
+    if (this.correspondentSelectionModel.isNoneSelected()) {
      filterRules.push({ rule_type: FILTER_CORRESPONDENT, value: null })
    } else {
-      if (
-        this.correspondentSelectionModel.isNoneSelected() &&
-        this.correspondentSelectionModel.intersection == Intersection.Exclude
-      ) {
-        filterRules.push({
-          rule_type: FILTER_CORRESPONDENT,
-          value: NEGATIVE_NULL_FILTER_VALUE.toString(),
-        })
-      }
      this.correspondentSelectionModel
        .getSelectedItems()
        .forEach((correspondent) => {
@@ -870,7 +822,6 @@ export class FilterEditorComponent
        })
      this.correspondentSelectionModel
        .getExcludedItems()
-        .filter((correspondent) => correspondent.id > 0)
        .forEach((correspondent) => {
          filterRules.push({
            rule_type: FILTER_DOES_NOT_HAVE_CORRESPONDENT,
@@ -878,21 +829,9 @@ export class FilterEditorComponent
          })
        })
    }
-    if (
-      this.documentTypeSelectionModel.isNoneSelected() &&
-      this.documentTypeSelectionModel.intersection === Intersection.Include
-    ) {
+    if (this.documentTypeSelectionModel.isNoneSelected()) {
      filterRules.push({ rule_type: FILTER_DOCUMENT_TYPE, value: null })
    } else {
-      if (
-        this.documentTypeSelectionModel.isNoneSelected() &&
-        this.documentTypeSelectionModel.intersection == Intersection.Exclude
-      ) {
-        filterRules.push({
-          rule_type: FILTER_DOCUMENT_TYPE,
-          value: NEGATIVE_NULL_FILTER_VALUE.toString(),
-        })
-      }
      this.documentTypeSelectionModel
        .getSelectedItems()
        .forEach((documentType) => {
@@ -903,7 +842,6 @@ export class FilterEditorComponent
        })
      this.documentTypeSelectionModel
        .getExcludedItems()
-        .filter((documentType) => documentType.id > 0)
        .forEach((documentType) => {
          filterRules.push({
            rule_type: FILTER_DOES_NOT_HAVE_DOCUMENT_TYPE,
@@ -911,21 +849,9 @@ export class FilterEditorComponent
          })
        })
    }
-    if (
-      this.storagePathSelectionModel.isNoneSelected() &&
-      this.storagePathSelectionModel.intersection == Intersection.Include
-    ) {
+    if (this.storagePathSelectionModel.isNoneSelected()) {
      filterRules.push({ rule_type: FILTER_STORAGE_PATH, value: null })
    } else {
-      if (
-        this.storagePathSelectionModel.isNoneSelected() &&
-        this.storagePathSelectionModel.intersection == Intersection.Exclude
-      ) {
-        filterRules.push({
-          rule_type: FILTER_STORAGE_PATH,
-          value: NEGATIVE_NULL_FILTER_VALUE.toString(),
-        })
-      }
      this.storagePathSelectionModel
        .getSelectedItems()
        .forEach((storagePath) => {
@@ -936,7 +862,6 @@ export class FilterEditorComponent
        })
      this.storagePathSelectionModel
        .getExcludedItems()
-        .filter((storagePath) => storagePath.id > 0)
        .forEach((storagePath) => {
          filterRules.push({
            rule_type: FILTER_DOES_NOT_HAVE_STORAGE_PATH,
@@ -947,7 +872,7 @@ export class FilterEditorComponent
    let queries = this.customFieldQueriesModel.queries.map((query) =>
      query.serialize()
    )
-    if (queries.length > 0 && this.customFieldQueriesModel.isValid()) {
+    if (queries.length > 0) {
      filterRules.push({
        rule_type: FILTER_CUSTOM_FIELDS_QUERY,
        value: JSON.stringify(queries[0]),
@@ -1137,7 +1062,7 @@ export class FilterEditorComponent
    ) {
      this.loadingCountTotal++
      this.tagService.listAll().subscribe((result) => {
-        this.tagSelectionModel.items = result.results
+        this.tags = result.results
        this.maybeCompleteLoading()
      })
    }
@@ -1149,7 +1074,7 @@ export class FilterEditorComponent
    ) {
      this.loadingCountTotal++
      this.correspondentService.listAll().subscribe((result) => {
-        this.correspondentSelectionModel.items = result.results
+        this.correspondents = result.results
        this.maybeCompleteLoading()
      })
    }
@@ -1161,7 +1086,7 @@ export class FilterEditorComponent
    ) {
      this.loadingCountTotal++
      this.documentTypeService.listAll().subscribe((result) => {
-        this.documentTypeSelectionModel.items = result.results
+        this.documentTypes = result.results
        this.maybeCompleteLoading()
      })
    }
@@ -1173,7 +1098,7 @@ export class FilterEditorComponent
    ) {
      this.loadingCountTotal++
      this.storagePathService.listAll().subscribe((result) => {
-        this.storagePathSelectionModel.items = result.results
+        this.storagePaths = result.results
        this.maybeCompleteLoading()
      })
    }
@@ -1,96 +0,0 @@
-import { NgClass, TitleCasePipe } from '@angular/common'
-import { Component } from '@angular/core'
-import { FormsModule, ReactiveFormsModule } from '@angular/forms'
-import {
-  NgbDropdownModule,
-  NgbModal,
-  NgbPaginationModule,
-} from '@ng-bootstrap/ng-bootstrap'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
-import { CustomField, DATA_TYPE_LABELS } from 'src/app/data/custom-field'
-import {
-  CustomFieldQueryLogicalOperator,
-  CustomFieldQueryOperator,
-} from 'src/app/data/custom-field-query'
-import { FILTER_CUSTOM_FIELDS_QUERY } from 'src/app/data/filter-rule-type'
-import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
-import { SortableDirective } from 'src/app/directives/sortable.directive'
-import { SafeHtmlPipe } from 'src/app/pipes/safehtml.pipe'
-import { DocumentListViewService } from 'src/app/services/document-list-view.service'
-import {
-  PermissionsService,
-  PermissionType,
-} from 'src/app/services/permissions.service'
-import { CustomFieldsService } from 'src/app/services/rest/custom-fields.service'
-import { ToastService } from 'src/app/services/toast.service'
-import { CustomFieldEditDialogComponent } from '../../common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component'
-import { PageHeaderComponent } from '../../common/page-header/page-header.component'
-import { ManagementListComponent } from '../management-list/management-list.component'
-
-@Component({
-  selector: 'pngx-custom-fields-list',
-  templateUrl: './../management-list/management-list.component.html',
-  styleUrls: ['./../management-list/management-list.component.scss'],
-  imports: [
-    SortableDirective,
-    PageHeaderComponent,
-    TitleCasePipe,
-    IfPermissionsDirective,
-    SafeHtmlPipe,
-    FormsModule,
-    ReactiveFormsModule,
-    NgClass,
-    NgbDropdownModule,
-    NgbPaginationModule,
-    NgxBootstrapIconsModule,
-  ],
-})
-export class CustomFieldsListComponent extends ManagementListComponent<CustomField> {
-  permissionsDisabled = true
-
-  constructor(
-    customFieldsService: CustomFieldsService,
-    modalService: NgbModal,
-    toastService: ToastService,
-    documentListViewService: DocumentListViewService,
-    permissionsService: PermissionsService
-  ) {
-    super(
-      customFieldsService,
-      modalService,
-      CustomFieldEditDialogComponent,
-      toastService,
-      documentListViewService,
-      permissionsService,
-      0, // see filterDocuments override below
-      $localize`custom field`,
-      $localize`custom fields`,
-      PermissionType.CustomField,
-      [
-        {
-          key: 'data_type',
-          name: $localize`Data Type`,
-          valueFn: (field: CustomField) => {
-            return DATA_TYPE_LABELS.find((l) => l.id === field.data_type).name
-          },
-        },
-      ]
-    )
-  }
-
-  filterDocuments(field: CustomField) {
-    this.documentListViewService.quickFilter([
-      {
-        rule_type: FILTER_CUSTOM_FIELDS_QUERY,
-        value: JSON.stringify([
-          CustomFieldQueryLogicalOperator.Or,
-          [[field.id, CustomFieldQueryOperator.Exists, true]],
-        ]),
-      },
-    ])
-  }
-
-  getDeleteMessage(object: CustomField) {
-    return $localize`Do you really want to delete the field "${object.name}"?`
-  }
-}
@@ -0,0 +1,72 @@
+<pngx-page-header
+  title="Custom Fields"
+  i18n-title
+  info="Customize the data fields that can be attached to documents."
+  i18n-info
+  infoLink="usage/#custom-fields"
+  >
+  <button type="button" class="btn btn-sm btn-outline-primary" (click)="editField()" *pngxIfPermissions="{ action: PermissionAction.Add, type: PermissionType.CustomField }">
+    <i-bs name="plus-circle"></i-bs>&nbsp;<ng-container i18n>Add Field</ng-container>
+  </button>
+</pngx-page-header>
+
+<ul class="list-group">
+
+  <li class="list-group-item">
+    <div class="row">
+      <div class="col" i18n>Name</div>
+      <div class="col" i18n>Data Type</div>
+      <div class="col" i18n>Actions</div>
+    </div>
+  </li>
+
+  @if (loading) {
+    <li class="list-group-item">
+      <div class="spinner-border spinner-border-sm me-2" role="status"></div>
+      <ng-container i18n>Loading...</ng-container>
+    </li>
+  }
+
+  @for (field of fields; track field) {
+    <li class="list-group-item">
+      <div class="row fade" [class.show]="show">
+        <div class="col d-flex align-items-center"><button class="btn btn-link p-0 text-start" type="button" (click)="editField(field)" [disabled]="!permissionsService.currentUserCan(PermissionAction.Change, PermissionType.CustomField)">{{field.name}}</button></div>
+        <div class="col d-flex align-items-center">{{getDataType(field)}}</div>
+        <div class="col">
+          <div class="btn-group d-block d-sm-none">
+            <div ngbDropdown container="body" class="d-inline-block">
+              <button type="button" class="btn btn-link" id="actionsMenuMobile" (click)="$event.stopPropagation()" ngbDropdownToggle>
+                <i-bs name="three-dots-vertical"></i-bs>
+              </button>
+              <div ngbDropdownMenu aria-labelledby="actionsMenuMobile">
+                <button (click)="editField(field)" *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.CustomField }" ngbDropdownItem i18n>Edit</button>
+                <button class="text-danger" (click)="deleteField(field)" *pngxIfPermissions="{ action: PermissionAction.Delete, type: PermissionType.CustomField }" ngbDropdownItem i18n>Delete</button>
+                @if (field.document_count > 0) {
+                  <button (click)="filterDocuments(field)" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.Document }" ngbDropdownItem i18n>Filter Documents ({{ field.document_count }})</button>
+                }
+              </div>
+            </div>
+          </div>
+          <div class="btn-group d-none d-sm-inline-block">
+            <button *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.CustomField }" class="btn btn-sm btn-outline-secondary" type="button" (click)="editField(field)">
+              <i-bs width="1em" height="1em" name="pencil"></i-bs>&nbsp;<ng-container i18n>Edit</ng-container>
+            </button>
+            <button *pngxIfPermissions="{ action: PermissionAction.Delete, type: PermissionType.CustomField }" class="btn btn-sm btn-outline-danger" type="button" (click)="deleteField(field)">
+              <i-bs width="1em" height="1em" name="trash"></i-bs>&nbsp;<ng-container i18n>Delete</ng-container>
+            </button>
+          </div>
+          @if (field.document_count > 0) {
+            <div class="btn-group d-none d-sm-inline-block ms-2">
+              <button class="btn btn-sm btn-outline-secondary" type="button" (click)="filterDocuments(field)">
+                <i-bs width="1em" height="1em" name="filter"></i-bs>&nbsp;<ng-container i18n>Documents</ng-container><span class="badge bg-light text-secondary ms-2">{{ field.document_count }}</span>
+              </button>
+            </div>
+          }
+        </div>
+      </div>
+    </li>
+  }
+  @if (!loading && fields.length === 0) {
+    <li class="list-group-item" i18n>No fields defined.</li>
+  }
+</ul>
@@ -0,0 +1,4 @@
+// hide caret on mobile dropdown
+.d-block.d-sm-none .dropdown-toggle::after {
+    display: none;
+}
@@ -28,7 +28,7 @@ import { ToastService } from 'src/app/services/toast.service'
 import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dialog.component'
 import { CustomFieldEditDialogComponent } from '../../common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component'
 import { PageHeaderComponent } from '../../common/page-header/page-header.component'
-import { CustomFieldsListComponent } from './custom-fields-list.component'
+import { CustomFieldsComponent } from './custom-fields.component'

 const fields: CustomField[] = [
  {
@@ -43,9 +43,9 @@ const fields: CustomField[] = [
  },
 ]

-describe('CustomFieldsListComponent', () => {
-  let component: CustomFieldsListComponent
-  let fixture: ComponentFixture<CustomFieldsListComponent>
+describe('CustomFieldsComponent', () => {
+  let component: CustomFieldsComponent
+  let fixture: ComponentFixture<CustomFieldsComponent>
  let customFieldsService: CustomFieldsService
  let modalService: NgbModal
  let toastService: ToastService
@@ -61,7 +61,7 @@ describe('CustomFieldsListComponent', () => {
        NgbModalModule,
        NgbPopoverModule,
        NgxBootstrapIconsModule.pick(allIcons),
-        CustomFieldsListComponent,
+        CustomFieldsComponent,
        IfPermissionsDirective,
        PageHeaderComponent,
        ConfirmDialogComponent,
@@ -94,7 +94,7 @@ describe('CustomFieldsListComponent', () => {
    settingsService = TestBed.inject(SettingsService)
    settingsService.currentUser = { id: 0, username: 'test' }

-    fixture = TestBed.createComponent(CustomFieldsListComponent)
+    fixture = TestBed.createComponent(CustomFieldsComponent)
    component = fixture.componentInstance
    fixture.detectChanges()
    jest.useFakeTimers()
@@ -106,7 +106,7 @@ describe('CustomFieldsListComponent', () => {
    modalService.activeInstances.subscribe((m) => (modal = m[m.length - 1]))
    const toastErrorSpy = jest.spyOn(toastService, 'showError')
    const toastInfoSpy = jest.spyOn(toastService, 'showInfo')
-    const reloadSpy = jest.spyOn(component, 'reloadData')
+    const reloadSpy = jest.spyOn(component, 'reload')

    const createButton = fixture.debugElement.queryAll(By.css('button'))[1]
    createButton.triggerEventHandler('click')
@@ -131,7 +131,7 @@ describe('CustomFieldsListComponent', () => {
    modalService.activeInstances.subscribe((m) => (modal = m[m.length - 1]))
    const toastErrorSpy = jest.spyOn(toastService, 'showError')
    const toastInfoSpy = jest.spyOn(toastService, 'showInfo')
-    const reloadSpy = jest.spyOn(component, 'reloadData')
+    const reloadSpy = jest.spyOn(component, 'reload')

    const editButton = fixture.debugElement.queryAll(By.css('button'))[2]
    editButton.triggerEventHandler('click')
@@ -156,7 +156,7 @@ describe('CustomFieldsListComponent', () => {
    modalService.activeInstances.subscribe((m) => (modal = m[m.length - 1]))
    const toastErrorSpy = jest.spyOn(toastService, 'showError')
    const deleteSpy = jest.spyOn(customFieldsService, 'delete')
-    const reloadSpy = jest.spyOn(component, 'reloadData')
+    const reloadSpy = jest.spyOn(component, 'reload')

    const deleteButton = fixture.debugElement.queryAll(By.css('button'))[5]
    deleteButton.triggerEventHandler('click')
@@ -0,0 +1,148 @@
+import { Component, OnInit } from '@angular/core'
+import {
+  NgbDropdownModule,
+  NgbModal,
+  NgbPaginationModule,
+} from '@ng-bootstrap/ng-bootstrap'
+import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
+import { delay, takeUntil, tap } from 'rxjs'
+import { CustomField, DATA_TYPE_LABELS } from 'src/app/data/custom-field'
+import {
+  CustomFieldQueryLogicalOperator,
+  CustomFieldQueryOperator,
+} from 'src/app/data/custom-field-query'
+import { FILTER_CUSTOM_FIELDS_QUERY } from 'src/app/data/filter-rule-type'
+import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
+import { DocumentListViewService } from 'src/app/services/document-list-view.service'
+import { PermissionsService } from 'src/app/services/permissions.service'
+import { CustomFieldsService } from 'src/app/services/rest/custom-fields.service'
+import { DocumentService } from 'src/app/services/rest/document.service'
+import { SavedViewService } from 'src/app/services/rest/saved-view.service'
+import { SettingsService } from 'src/app/services/settings.service'
+import { ToastService } from 'src/app/services/toast.service'
+import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dialog.component'
+import { CustomFieldEditDialogComponent } from '../../common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component'
+import { EditDialogMode } from '../../common/edit-dialog/edit-dialog.component'
+import { PageHeaderComponent } from '../../common/page-header/page-header.component'
+import { LoadingComponentWithPermissions } from '../../loading-component/loading.component'
+
+@Component({
+  selector: 'pngx-custom-fields',
+  templateUrl: './custom-fields.component.html',
+  styleUrls: ['./custom-fields.component.scss'],
+  imports: [
+    PageHeaderComponent,
+    IfPermissionsDirective,
+    NgbDropdownModule,
+    NgbPaginationModule,
+    NgxBootstrapIconsModule,
+  ],
+})
+export class CustomFieldsComponent
+  extends LoadingComponentWithPermissions
+  implements OnInit
+{
+  public fields: CustomField[] = []
+
+  constructor(
+    private customFieldsService: CustomFieldsService,
+    public permissionsService: PermissionsService,
+    private modalService: NgbModal,
+    private toastService: ToastService,
+    private documentListViewService: DocumentListViewService,
+    private settingsService: SettingsService,
+    private documentService: DocumentService,
+    private savedViewService: SavedViewService
+  ) {
+    super()
+  }
+
+  ngOnInit() {
+    this.reload()
+  }
+
+  reload() {
+    this.customFieldsService
+      .listAll()
+      .pipe(
+        takeUntil(this.unsubscribeNotifier),
+        tap((r) => {
+          this.fields = r.results
+        }),
+        delay(100)
+      )
+      .subscribe(() => {
+        this.show = true
+        this.loading = false
+      })
+  }
+
+  editField(field: CustomField) {
+    const modal = this.modalService.open(CustomFieldEditDialogComponent)
+    modal.componentInstance.dialogMode = field
+      ? EditDialogMode.EDIT
+      : EditDialogMode.CREATE
+    modal.componentInstance.object = field
+    modal.componentInstance.succeeded
+      .pipe(takeUntil(this.unsubscribeNotifier))
+      .subscribe((newField) => {
+        this.toastService.showInfo($localize`Saved field "${newField.name}".`)
+        this.customFieldsService.clearCache()
+        this.settingsService.initializeDisplayFields()
+        this.documentService.reload()
+        this.reload()
+      })
+    modal.componentInstance.failed
+      .pipe(takeUntil(this.unsubscribeNotifier))
+      .subscribe((e) => {
+        this.toastService.showError($localize`Error saving field.`, e)
+      })
+  }
+
+  deleteField(field: CustomField) {
+    const modal = this.modalService.open(ConfirmDialogComponent, {
+      backdrop: 'static',
+    })
+    modal.componentInstance.title = $localize`Confirm delete field`
+    modal.componentInstance.messageBold = $localize`This operation will permanently delete this field.`
+    modal.componentInstance.message = $localize`This operation cannot be undone.`
+    modal.componentInstance.btnClass = 'btn-danger'
+    modal.componentInstance.btnCaption = $localize`Proceed`
+    modal.componentInstance.confirmClicked.subscribe(() => {
+      modal.componentInstance.buttonsEnabled = false
+      this.customFieldsService.delete(field).subscribe({
+        next: () => {
+          modal.close()
+          this.toastService.showInfo($localize`Deleted field "${field.name}"`)
+          this.customFieldsService.clearCache()
+          this.settingsService.initializeDisplayFields()
+          this.documentService.reload()
+          this.savedViewService.reload()
+          this.reload()
+        },
+        error: (e) => {
+          this.toastService.showError(
+            $localize`Error deleting field "${field.name}".`,
+            e
+          )
+        },
+      })
+    })
+  }
+
+  getDataType(field: CustomField): string {
+    return DATA_TYPE_LABELS.find((l) => l.id === field.data_type).name
+  }
+
+  filterDocuments(field: CustomField) {
+    this.documentListViewService.quickFilter([
+      {
+        rule_type: FILTER_CUSTOM_FIELDS_QUERY,
+        value: JSON.stringify([
+          CustomFieldQueryLogicalOperator.Or,
+          [[field.id, CustomFieldQueryOperator.Exists, true]],
+        ]),
+      },
+    ])
+  }
+}
@@ -2,7 +2,7 @@
  <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 *ngIf="!permissionsDisabled" type="button" class="btn btn-sm btn-outline-primary" (click)="setPermissions()" [disabled]="!userCanBulkEdit(PermissionAction.Change) || selectedObjects.size === 0">
+    <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">
@@ -64,7 +64,7 @@ export abstract class ManagementListComponent<T extends MatchingModel>
    private modalService: NgbModal,
    private editDialogComponent: any,
    private toastService: ToastService,
-    protected documentListViewService: DocumentListViewService,
+    private documentListViewService: DocumentListViewService,
    private permissionsService: PermissionsService,
    protected filterRuleType: number,
    public typeName: string,
@@ -93,8 +93,6 @@ export abstract class ManagementListComponent<T extends MatchingModel>
  public selectedObjects: Set<number> = new Set()
  public togggleAll: boolean = false

-  protected permissionsDisabled: boolean = false
-
  ngOnInit(): void {
    this.reloadData()

@@ -1,4 +1,4 @@
-import { MatchingModel } from './matching-model'
+import { ObjectWithId } from './object-with-id'

 export enum CustomFieldDataType {
  String = 'string',
@@ -51,11 +51,13 @@ export const DATA_TYPE_LABELS = [
  },
 ]

-export interface CustomField extends MatchingModel {
+export interface CustomField extends ObjectWithId {
  data_type: CustomFieldDataType
+  name: string
  created?: Date
  extra_data?: {
    select_options?: Array<{ label: string; id: string }>
    default_currency?: string
  }
+  document_count?: number
 }
@@ -1,7 +1,5 @@
 import { DataType } from './datatype'

-export const NEGATIVE_NULL_FILTER_VALUE = -1
-
 // These correspond to src/documents/models.py and changes here require a DB migration (and vice versa)
 export const FILTER_TITLE = 0
 export const FILTER_CONTENT = 1
@@ -45,8 +45,7 @@ describe('CustomDatePipe', () => {
    if (now.getMonth() === 0) {
      notNow.setFullYear(now.getFullYear() - 1)
    }
-    // weird options are for february...
-    expect(['Last month', '4 weeks ago', '3 weeks ago']).toContain(
+    expect(['Last month', '4 weeks ago']).toContain(
      datePipe.transform(notNow, 'relative')
    )
    expect(datePipe.transform(now, 'relative')).toEqual('Just now')
@@ -29,7 +29,7 @@ describe('ComponentRouterService', () => {
    eventsSubject.next(
      new ActivationStart({
        url: 'test-url',
-        data: { componentName: 'TestComponent' },
+        component: { name: 'TestComponent' },
      } as any)
    )

@@ -41,13 +41,13 @@ describe('ComponentRouterService', () => {
    eventsSubject.next(
      new ActivationStart({
        url: 'test-url-1',
-        data: { componentName: 'TestComponent' },
+        component: { name: 'TestComponent' },
      } as any)
    )
    eventsSubject.next(
      new ActivationStart({
        url: 'test-url-2',
-        data: { componentName: 'TestComponent' },
+        component: { name: 'TestComponent' },
      } as any)
    )

@@ -59,13 +59,13 @@ describe('ComponentRouterService', () => {
    eventsSubject.next(
      new ActivationStart({
        url: 'test-url-1',
-        data: { componentName: 'TestComponent1' },
+        component: { name: 'TestComponent1' },
      } as any)
    )
    eventsSubject.next(
      new ActivationStart({
        url: 'test-url-2',
-        data: { componentName: 'TestComponent2' },
+        component: { name: 'TestComponent2' },
      } as any)
    )

@@ -76,13 +76,13 @@ describe('ComponentRouterService', () => {
    eventsSubject.next(
      new ActivationStart({
        url: 'test-url-1',
-        data: { componentName: 'TestComponent' },
+        component: { name: 'TestComponent' },
      } as any)
    )
    eventsSubject.next(
      new ActivationStart({
        url: 'test-url-2',
-        data: { componentName: 'TestComponent' },
+        component: { name: 'TestComponent' },
      } as any)
    )

@@ -93,7 +93,7 @@ describe('ComponentRouterService', () => {
    eventsSubject.next(
      new ActivationStart({
        url: 'test-url',
-        data: { componentName: 'TestComponent' },
+        component: { name: 'TestComponent' },
      } as any)
    )

@@ -17,11 +17,11 @@ export class ComponentRouterService {
      .subscribe((event: ActivationStart) => {
        if (
          this.componentHistory[this.componentHistory.length - 1] !==
-            event.snapshot.data.componentName &&
-          !EXCLUDE_COMPONENTS.includes(event.snapshot.data.componentName)
+            event.snapshot.component.name &&
+          !EXCLUDE_COMPONENTS.includes(event.snapshot.component.name)
        ) {
          this.history.push(event.snapshot.url.toString())
-          this.componentHistory.push(event.snapshot.data.componentName)
+          this.componentHistory.push(event.snapshot.component.name)
        } else {
          // Update the URL of the current component in case the same component was loaded via a different URL
          this.history[this.history.length - 1] = event.snapshot.url.toString()
@@ -1,12 +1,12 @@
 import { HttpClient } from '@angular/common/http'
 import { Injectable } from '@angular/core'
 import { CustomField } from 'src/app/data/custom-field'
-import { AbstractNameFilterService } from './abstract-name-filter-service'
+import { AbstractPaperlessService } from './abstract-paperless-service'

@Injectable({
  providedIn: 'root',
 })
-export class CustomFieldsService extends AbstractNameFilterService<CustomField> {
+export class CustomFieldsService extends AbstractPaperlessService<CustomField> {
  constructor(http: HttpClient) {
    super(http, 'custom_fields')
  }
@@ -8,7 +8,6 @@ import {
  FILTER_HAS_CUSTOM_FIELDS_ALL,
  FILTER_HAS_CUSTOM_FIELDS_ANY,
  FILTER_HAS_TAGS_ALL,
-  NEGATIVE_NULL_FILTER_VALUE,
 } from '../data/filter-rule-type'
 import {
  filterRulesFromQueryParams,
@@ -98,16 +97,6 @@ describe('QueryParams Utils', () => {
      correspondent__isnull: 1,
    })

-    params = queryParamsFromFilterRules([
-      {
-        rule_type: FILTER_CORRESPONDENT,
-        value: NEGATIVE_NULL_FILTER_VALUE.toString(),
-      },
-    ])
-    expect(params).toEqual({
-      correspondent__isnull: 0,
-    })
-
    params = queryParamsFromFilterRules([
      {
        rule_type: FILTER_HAS_ANY_TAG,
@@ -10,7 +10,6 @@ import {
  FILTER_HAS_CUSTOM_FIELDS_ANY,
  FILTER_RULE_TYPES,
  FilterRuleType,
-  NEGATIVE_NULL_FILTER_VALUE,
 } from '../data/filter-rule-type'
 import { ListViewState } from '../services/document-list-view.service'

@@ -114,10 +113,6 @@ export function filterRulesFromQueryParams(
          rt.isnull_filtervar == filterQueryParamName
      )
      const isNullRuleType = rule_type.isnull_filtervar == filterQueryParamName
-      const nullRuleValue =
-        queryParams.get(filterQueryParamName) == '1'
-          ? null
-          : NEGATIVE_NULL_FILTER_VALUE.toString()
      const valueURIComponent: string = queryParams.get(filterQueryParamName)
      const filterQueryParamValues: string[] = rule_type.multi
        ? valueURIComponent.split(',')
@@ -130,7 +125,7 @@ export function filterRulesFromQueryParams(
            val = val.replace('1', 'true').replace('0', 'false')
          return {
            rule_type: rule_type.id,
-            value: isNullRuleType ? nullRuleValue : val,
+            value: isNullRuleType ? null : val,
          }
        })
      )
@@ -148,11 +143,6 @@ export function queryParamsFromFilterRules(filterRules: FilterRule[]): Params {
      let ruleType = FILTER_RULE_TYPES.find((t) => t.id == rule.rule_type)
      if (ruleType.isnull_filtervar && rule.value == null) {
        params[ruleType.isnull_filtervar] = 1
-      } else if (
-        ruleType.isnull_filtervar &&
-        rule.value == NEGATIVE_NULL_FILTER_VALUE.toString()
-      ) {
-        params[ruleType.isnull_filtervar] = 0
      } else if (ruleType.multi) {
        params[ruleType.filtervar] = params[ruleType.filtervar]
          ? params[ruleType.filtervar] + ',' + rule.value
@@ -3,7 +3,7 @@ const base_url = new URL(document.baseURI)
 export const environment = {
  production: true,
  apiBaseUrl: document.baseURI + 'api/',
-  apiVersion: '7',
+  apiVersion: '8',
  appTitle: 'Paperless-ngx',
  version: '2.14.7',
  webSocketHost: window.location.host,
@@ -5,7 +5,7 @@
 export const environment = {
  production: false,
  apiBaseUrl: 'http://localhost:8000/api/',
-  apiVersion: '7',
+  apiVersion: '8',
  appTitle: 'Paperless-ngx',
  version: 'DEVELOPMENT',
  webSocketHost: 'localhost:8000',
@@ -15,7 +15,6 @@ class DocumentsConfig(AppConfig):
        from documents.signals.handlers import run_workflows_added
        from documents.signals.handlers import run_workflows_updated
        from documents.signals.handlers import set_correspondent
-        from documents.signals.handlers import set_custom_fields
        from documents.signals.handlers import set_document_type
        from documents.signals.handlers import set_storage_path
        from documents.signals.handlers import set_tags
@@ -25,7 +24,6 @@ class DocumentsConfig(AppConfig):
        document_consumption_finished.connect(set_document_type)
        document_consumption_finished.connect(set_tags)
        document_consumption_finished.connect(set_storage_path)
-        document_consumption_finished.connect(set_custom_fields)
        document_consumption_finished.connect(add_to_index)
        document_consumption_finished.connect(run_workflows_added)
        document_updated.connect(run_workflows_updated)
--- a/Show More
+++ b/Show More