Bump version to 2.6.0

Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
Co-authored-by: shamoon <4887959+shamoon@users.noreply.github.com>

.github/dependabot.yml

@@ -47,6 +47,8 @@ updates:
     # Add reviewers
     reviewers:
       - "paperless-ngx/backend"
+    ignore:
+      - dependency-name: "uvicorn"
     groups:
       development:
         patterns:

.github/workflows/ci.yml

@@ -42,7 +42,7 @@ jobs:
           python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
       -
         name: Check files
-        uses: pre-commit/action@v3.0.0
+        uses: pre-commit/action@v3.0.1
 
   documentation:
     name: "Build & Deploy Documentation"
@@ -577,7 +577,7 @@ jobs:
       -
         name: Create Release and Changelog
         id: create-release
-        uses: release-drafter/release-drafter@v5
+        uses: release-drafter/release-drafter@v6
         with:
           name: Paperless-ngx ${{ steps.get_version.outputs.version }}
           tag: ${{ steps.get_version.outputs.version }}

.github/workflows/cleanup-tags.yml

@@ -33,7 +33,7 @@ jobs:
       -
         name: Clean temporary images
         if: "${{ env.TOKEN != '' }}"
-        uses: stumpylog/image-cleaner-action/ephemeral@v0.4.0
+        uses: stumpylog/image-cleaner-action/ephemeral@v0.5.0
         with:
           token: "${{ env.TOKEN }}"
           owner: "${{ github.repository_owner }}"
@@ -61,7 +61,7 @@ jobs:
       -
         name: Clean untagged images
         if: "${{ env.TOKEN != '' }}"
-        uses: stumpylog/image-cleaner-action/untagged@v0.4.0
+        uses: stumpylog/image-cleaner-action/untagged@v0.5.0
         with:
           token: "${{ env.TOKEN }}"
           owner: "${{ github.repository_owner }}"

.github/workflows/project-actions.yml

@@ -22,6 +22,6 @@ jobs:
     if: github.event_name == 'pull_request_target' && (github.event.action == 'opened' || github.event.action == 'reopened') && github.event.pull_request.user.login != 'dependabot'
     steps:
       - name: Label PR with release-drafter
-        uses: release-drafter/release-drafter@v5
+        uses: release-drafter/release-drafter@v6
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/repo-maintenance.yml

@@ -28,7 +28,7 @@ jobs:
           stale-issue-message: >
             This issue has been automatically marked as stale because it has not had
             recent activity. It will be closed if no further activity occurs. Thank you
-            for your contributions.
+            for your contributions. See our [contributing guidelines](https://github.com/paperless-ngx/paperless-ngx/blob/dev/CONTRIBUTING.md#automatic-repository-maintenance) for more details.
   lock-threads:
     name: 'Lock Old Threads'
     runs-on: ubuntu-latest
@@ -43,14 +43,17 @@ jobs:
             This issue has been automatically locked since there
             has not been any recent activity after it was closed.
             Please open a new discussion or issue for related concerns.
+            See our [contributing guidelines](https://github.com/paperless-ngx/paperless-ngx/blob/dev/CONTRIBUTING.md#automatic-repository-maintenance) for more details.
           pr-comment: >
             This pull request has been automatically locked since there
             has not been any recent activity after it was closed.
             Please open a new discussion or issue for related concerns.
+            See our [contributing guidelines](https://github.com/paperless-ngx/paperless-ngx/blob/dev/CONTRIBUTING.md#automatic-repository-maintenance) for more details.
           discussion-comment: >
             This discussion has been automatically locked since there
             has not been any recent activity after it was closed.
             Please open a new discussion for related concerns.
+            See our [contributing guidelines](https://github.com/paperless-ngx/paperless-ngx/blob/dev/CONTRIBUTING.md#automatic-repository-maintenance) for more details.
   close-answered-discussions:
     name: 'Close Answered Discussions'
     runs-on: ubuntu-latest
@@ -90,7 +93,7 @@ jobs:
               }`;
               const commentVariables = {
                 discussion: discussion.id,
-                body: 'This discussion has been automatically closed because it was marked as answered.',
+                body: 'This discussion has been automatically closed because it was marked as answered. Please see our [contributing guidelines](https://github.com/paperless-ngx/paperless-ngx/blob/dev/CONTRIBUTING.md#automatic-repository-maintenance) for more details.',
               }
               await github.graphql(addCommentMutation, commentVariables)
 
@@ -180,7 +183,85 @@ jobs:
                 }`;
                 const commentVariables = {
                   discussion: discussion.id,
-                  body: 'This discussion has been automatically closed due to inactivity.',
+                  body: 'This discussion has been automatically closed due to inactivity. Please see our [contributing guidelines](https://github.com/paperless-ngx/paperless-ngx/blob/dev/CONTRIBUTING.md#automatic-repository-maintenance) for more details.',
+                }
+                await github.graphql(addCommentMutation, commentVariables);
+
+                const closeDiscussionMutation = `mutation($discussion:ID!, $reason:DiscussionCloseReason!) {
+                  closeDiscussion(input:{discussionId:$discussion, reason:$reason}) {
+                    clientMutationId
+                  }
+                }`;
+                const closeVariables = {
+                  discussion: discussion.id,
+                  reason: "OUTDATED",
+                }
+                await github.graphql(closeDiscussionMutation, closeVariables);
+
+                await sleep(1000);
+              }
+            }
+  close-unsupported-feature-requests:
+    name: 'Close Unsupported Feature Requests'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/github-script@v7
+        with:
+          script: |
+            function sleep(ms) {
+              return new Promise(resolve => setTimeout(resolve, ms));
+            }
+
+            const CUTOFF_1_DAYS = 180;
+            const CUTOFF_1_COUNT = 5;
+            const CUTOFF_2_DAYS = 365;
+            const CUTOFF_2_COUNT = 10;
+
+            const cutoff1Date = new Date();
+            cutoff1Date.setDate(cutoff1Date.getDate() - CUTOFF_1_DAYS);
+            const cutoff2Date = new Date();
+            cutoff2Date.setDate(cutoff2Date.getDate() - CUTOFF_2_DAYS);
+
+            const query = `query(
+                $owner:String!,
+                $name:String!,
+                $featureRequestsCategory:ID!,
+              ) {
+              repository(owner:$owner, name:$name){
+                discussions(
+                  categoryId:$featureRequestsCategory,
+                  last:100,
+                  states:[OPEN],
+                ) {
+                  nodes {
+                    id,
+                    number,
+                    updatedAt,
+                    upvoteCount,
+                  }
+                },
+              }
+            }`;
+            const variables = {
+              owner: context.repo.owner,
+              name: context.repo.repo,
+              featureRequestsCategory: "DIC_kwDOG1Zs184CBNr4"
+            }
+            const result = await github.graphql(query, variables);
+
+            for (const discussion of result.repository.discussions.nodes) {
+              const discussionDate = new Date(discussion.updatedAt);
+              if ((discussionDate < cutoff1Date && discussion.upvoteCount < CUTOFF_1_COUNT) ||
+                  (discussionDate < cutoff2Date && discussion.upvoteCount < CUTOFF_2_COUNT)) {
+                console.log(`Closing discussion #${discussion.number} (${discussion.id}), last updated at ${discussion.updatedAt} with votes ${discussion.upvoteCount}`);
+                const addCommentMutation = `mutation($discussion:ID!, $body:String!) {
+                  addDiscussionComment(input:{discussionId:$discussion, body:$body}) {
+                    clientMutationId
+                  }
+                }`;
+                const commentVariables = {
+                  discussion: discussion.id,
+                  body: 'This discussion has been automatically closed due to lack of community support. Please see our [contributing guidelines](https://github.com/paperless-ngx/paperless-ngx/blob/dev/CONTRIBUTING.md#automatic-repository-maintenance) for more details.',
                 }
                 await github.graphql(addCommentMutation, commentVariables);
 

.pre-commit-config.yaml

@@ -47,11 +47,11 @@ repos:
         exclude: "(^Pipfile\\.lock$)"
   # Python hooks
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: 'v0.2.1'
+    rev: 'v0.3.0'
     hooks:
       - id: ruff
   - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 24.1.1
+    rev: 24.2.0
     hooks:
       - id: black
   # Dockerfile hooks

CONTRIBUTING.md

@@ -137,3 +137,19 @@ All team members are notified when mentioned or assigned to a relevant issue or
 We are not overly strict with inviting people to the organization. If you have read the [team permissions](#permissions) and think having additional access would enhance your contributions, please reach out to an [admin](#structure) of the team.
 
 The admins occasionally invite contributors directly if we believe having them on a team will accelerate their work.
+
+# Automatic Repository Maintenance
+
+The Paperless-ngx team appreciates all effort and interest from the community in filing bug reports, creating feature requests, sharing ideas and helping other
+community members. That said, in an effort to keep the repository organized and managebale the project uses automatic handling of certain areas:
+
+- Issues that cannot be reproduced will be marked 'stale' after 7 days of inactivity and closed after 14 further days of inactivity.
+- Issues, pull requests and discussions that are closed will be locked after 30 days of inactivity.
+- Discussions with a marked answer will be automatically closed.
+- Discussions in the 'General' or 'Support' categories will be closed after 180 days of inactivity.
+- Feature requests that do not meet the following thresholds will be closed: 5 "up-votes" after 180 days of inactivity or 10 "up-votes" after 365 days.
+
+In all cases, threads can be re-opened by project maintainers and, of course, users can always create a new discussion for related concerns.
+Finally, remember that all information remains searchable and 'closed' feature requests can still serve as inspiration for new features.
+
+Thank you all for your contributions.

Dockerfile

@@ -59,7 +59,8 @@ ARG GS_VERSION=10.02.1
 ENV PYTHONDONTWRITEBYTECODE=1 \
     PYTHONUNBUFFERED=1 \
     # Ignore warning from Whitenoise
-    PYTHONWARNINGS="ignore:::django.http.response:517"
+    PYTHONWARNINGS="ignore:::django.http.response:517" \
+    PNGX_CONTAINERIZED=1
 
 #
 # Begin installation and configuration

Pipfile

@@ -7,7 +7,7 @@ name = "pypi"
 dateparser = "~=1.2"
 # WARNING: django does not use semver.
 #          Only patch versions are guaranteed to not introduce breaking changes.
-django = "~=4.2.10"
+django = "~=4.2.11"
 django-allauth = "*"
 django-auditlog = "*"
 django-celery-results = "*"
@@ -51,7 +51,7 @@ setproctitle = "*"
 tika-client = "*"
 tqdm = "*"
 uvicorn = {extras = ["standard"], version = "==0.25.0"}
-watchdog = "~=3.0"
+watchdog = "~=4.0"
 whitenoise = "~=6.6"
 whoosh="~=2.7"
 zxing-cpp = {version = "*", platform_machine = "== 'x86_64'"}

SECURITY.md

@@ -0,0 +1,9 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+The Paperless-ngx team and community take security bugs seriously. We appreciate your efforts to responsibly disclose your findings, and will make every effort to acknowledge your contributions.
+
+To report a security issue, please use the GitHub Security Advisory ["Report a Vulnerability"](https://github.com/paperless-ngx/paperless-ngx/security/advisories/new) tab.
+
+The team will send a response indicating the next steps in handling your report. After the initial reply to your report, the security team will keep you informed of the progress towards a fix and full announcement, and may ask for additional information or guidance.

docker/docker-entrypoint.sh

@@ -90,13 +90,13 @@ initialize() {
 		fi
 	done
 
-	local -r tmp_dir="/tmp/paperless"
-	echo "Creating directory ${tmp_dir}"
+	local -r tmp_dir="${PAPERLESS_SCRATCH_DIR:=/tmp/paperless}"
+	echo "Creating directory scratch directory ${tmp_dir}"
 	mkdir --parents "${tmp_dir}"
 
 	set +e
 	echo "Adjusting permissions of paperless files. This may take a while."
-	chown -R paperless:paperless ${tmp_dir}
+	chown -R paperless:paperless "${tmp_dir}"
 	for dir in \
 		"${export_dir}" \
 		"${DATA_DIR}" \

docs/advanced_usage.md

@@ -437,7 +437,7 @@ with Prometheus, as it exports metrics. For details on its capabilities,
 refer to the [Flower](https://flower.readthedocs.io/en/latest/index.html)
 documentation.
 
-Flower can be enabled with the setting [PAPERLESS_ENABLE_FLOWER](configuration/#PAPERLESS_ENABLE_FLOWER).
+Flower can be enabled with the setting [PAPERLESS_ENABLE_FLOWER](configuration.md#PAPERLESS_ENABLE_FLOWER).
 To configure Flower further, create a `flowerconfig.py` and
 place it into the `src/paperless` directory. For a Docker
 installation, you can use volumes to accomplish this:
@@ -670,6 +670,11 @@ relevant [configuration settings](configuration.md#PAPERLESS_SOCIALACCOUNT_PROVI
 [django-allauth docs](https://docs.allauth.org/en/latest/socialaccount/configuration.html)
 for more information.
 
+To associate an existing Paperless-ngx account with a social account, first login with your
+regular credentials and then choose "My Profile" from the user dropdown in the app and you
+will see options to connect social account(s). If enabled, signup options will be available
+on the login page.
+
 As an example, to set up login via Github, the following environment variables would need to be
 set:
 
@@ -686,4 +691,8 @@ PAPERLESS_SOCIALACCOUNT_PROVIDERS='
 {"openid_connect": {"APPS": [{"provider_id": "keycloak","name": "Keycloak","client_id": "paperless","secret": "<CLIENT_SECRET>","settings": { "server_url": "https://<KEYCLOAK_SERVER>/realms/<REALM>/.well-known/openid-configuration"}}]}}'
 ```
 
-More details about configuration option for various providers can be found in the allauth documentation: https://docs.allauth.org/en/latest/socialaccount/providers/index.html#provider-specifics
+More details about configuration option for various providers can be found in the [allauth documentation](https://docs.allauth.org/en/latest/socialaccount/providers/index.html#provider-specifics).
+
+### Disabling Regular Login
+
+Once external auth is set up, 'regular' login can be disabled with the [PAPERLESS_DISABLE_REGULAR_LOGIN](configuration.md#PAPERLESS_DISABLE_REGULAR_LOGIN) setting.

docs/api.md

@@ -58,6 +58,10 @@ fields:
 - `custom_fields`: Array of custom fields & values, specified as
   `{ field: CUSTOM_FIELD_ID, value: VALUE }`
 
+!!! note
+
+    Note that all endpoint URLs must end with a `/`slash.
+
 ## Downloading documents
 
 In addition to that, the document endpoint offers these additional

docs/changelog.md

@@ -1,5 +1,100 @@
 # Changelog
 
+## paperless-ngx 2.5.4
+
+### Bug Fixes
+
+- Fix: handle title placeholder for docs without original_filename [@shamoon](https://github.com/shamoon) ([#5828](https://github.com/paperless-ngx/paperless-ngx/pull/5828))
+- Fix: bulk edit objects does not respect global permissions [@shamoon](https://github.com/shamoon) ([#5888](https://github.com/paperless-ngx/paperless-ngx/pull/5888))
+- Fix: intermittent save \& close warnings [@shamoon](https://github.com/shamoon) ([#5838](https://github.com/paperless-ngx/paperless-ngx/pull/5838))
+- Fix: inotify read timeout not in ms [@grembo](https://github.com/grembo) ([#5876](https://github.com/paperless-ngx/paperless-ngx/pull/5876))
+- Fix: allow relative date queries not in quick list [@shamoon](https://github.com/shamoon) ([#5801](https://github.com/paperless-ngx/paperless-ngx/pull/5801))
+- Fix: pass rule id to consumed .eml files [@shamoon](https://github.com/shamoon) ([#5800](https://github.com/paperless-ngx/paperless-ngx/pull/5800))
+
+### Dependencies
+
+- Chore(deps): Bump cryptography from 42.0.2 to 42.0.4 [@dependabot](https://github.com/dependabot) ([#5851](https://github.com/paperless-ngx/paperless-ngx/pull/5851))
+- Chore(deps-dev): Bump ip from 2.0.0 to 2.0.1 in /src-ui [@dependabot](https://github.com/dependabot) ([#5835](https://github.com/paperless-ngx/paperless-ngx/pull/5835))
+- Chore(deps): Bump undici and [@<!---->angular-devkit/build-angular in /src-ui @dependabot](https://github.com/<!---->angular-devkit/build-angular in /src-ui @dependabot) ([#5796](https://github.com/paperless-ngx/paperless-ngx/pull/5796))
+
+### All App Changes
+
+<details>
+<summary>8 changes</summary>
+
+- Fix: handle title placeholder for docs without original_filename [@shamoon](https://github.com/shamoon) ([#5828](https://github.com/paperless-ngx/paperless-ngx/pull/5828))
+- Fix: bulk edit objects does not respect global permissions [@shamoon](https://github.com/shamoon) ([#5888](https://github.com/paperless-ngx/paperless-ngx/pull/5888))
+- Fix: intermittent save \& close warnings [@shamoon](https://github.com/shamoon) ([#5838](https://github.com/paperless-ngx/paperless-ngx/pull/5838))
+- Fix: inotify read timeout not in ms [@grembo](https://github.com/grembo) ([#5876](https://github.com/paperless-ngx/paperless-ngx/pull/5876))
+- Chore(deps-dev): Bump ip from 2.0.0 to 2.0.1 in /src-ui [@dependabot](https://github.com/dependabot) ([#5835](https://github.com/paperless-ngx/paperless-ngx/pull/5835))
+- Chore(deps): Bump undici and [@<!---->angular-devkit/build-angular in /src-ui @dependabot](https://github.com/<!---->angular-devkit/build-angular in /src-ui @dependabot) ([#5796](https://github.com/paperless-ngx/paperless-ngx/pull/5796))
+- Fix: allow relative date queries not in quick list [@shamoon](https://github.com/shamoon) ([#5801](https://github.com/paperless-ngx/paperless-ngx/pull/5801))
+- Fix: pass rule id to consumed .eml files [@shamoon](https://github.com/shamoon) ([#5800](https://github.com/paperless-ngx/paperless-ngx/pull/5800))
+</details>
+
+## paperless-ngx 2.5.3
+
+### Bug Fixes
+
+- Fix: dont allow allauth redirects to any host [@shamoon](https://github.com/shamoon) ([#5783](https://github.com/paperless-ngx/paperless-ngx/pull/5783))
+- Fix: Interaction when both splitting and ASN are enabled [@stumpylog](https://github.com/stumpylog) ([#5779](https://github.com/paperless-ngx/paperless-ngx/pull/5779))
+- Fix: moved ssl_mode parameter for mysql backend engine [@MaciejSzczurek](https://github.com/MaciejSzczurek) ([#5771](https://github.com/paperless-ngx/paperless-ngx/pull/5771))
+
+### All App Changes
+
+<details>
+<summary>3 changes</summary>
+
+- Fix: dont allow allauth redirects to any host [@shamoon](https://github.com/shamoon) ([#5783](https://github.com/paperless-ngx/paperless-ngx/pull/5783))
+- Fix: Interaction when both splitting and ASN are enabled [@stumpylog](https://github.com/stumpylog) ([#5779](https://github.com/paperless-ngx/paperless-ngx/pull/5779))
+- Fix: moved ssl_mode parameter for mysql backend engine [@MaciejSzczurek](https://github.com/MaciejSzczurek) ([#5771](https://github.com/paperless-ngx/paperless-ngx/pull/5771))
+</details>
+
+## paperless-ngx 2.5.2
+
+### Bug Fixes
+
+- Fix: Generated secret key may include single or double quotes [@schmidtnz](https://github.com/schmidtnz) ([#5767](https://github.com/paperless-ngx/paperless-ngx/pull/5767))
+- Fix: consumer status alerts container blocks elements [@shamoon](https://github.com/shamoon) ([#5762](https://github.com/paperless-ngx/paperless-ngx/pull/5762))
+- Fix: handle document notes user format api change [@shamoon](https://github.com/shamoon) ([#5751](https://github.com/paperless-ngx/paperless-ngx/pull/5751))
+- Fix: Assign ASN from barcode only after any splitting [@stumpylog](https://github.com/stumpylog) ([#5745](https://github.com/paperless-ngx/paperless-ngx/pull/5745))
+
+### Dependencies
+
+- Chore(deps): Bump the major-versions group with 1 update [@dependabot](https://github.com/dependabot) ([#5741](https://github.com/paperless-ngx/paperless-ngx/pull/5741))
+
+### All App Changes
+
+<details>
+<summary>4 changes</summary>
+
+- Fix: consumer status alerts container blocks elements [@shamoon](https://github.com/shamoon) ([#5762](https://github.com/paperless-ngx/paperless-ngx/pull/5762))
+- Fix: handle document notes user format api change [@shamoon](https://github.com/shamoon) ([#5751](https://github.com/paperless-ngx/paperless-ngx/pull/5751))
+- Fix: Assign ASN from barcode only after any splitting [@stumpylog](https://github.com/stumpylog) ([#5745](https://github.com/paperless-ngx/paperless-ngx/pull/5745))
+- Chore(deps): Bump the major-versions group with 1 update [@dependabot](https://github.com/dependabot) ([#5741](https://github.com/paperless-ngx/paperless-ngx/pull/5741))
+</details>
+
+## paperless-ngx 2.5.1
+
+### Bug Fixes
+
+- Fix: Splitting on ASN barcodes even if not enabled [@stumpylog](https://github.com/stumpylog) ([#5740](https://github.com/paperless-ngx/paperless-ngx/pull/5740))
+
+### Dependencies
+
+- Chore(deps-dev): Bump the development group with 2 updates [@dependabot](https://github.com/dependabot) ([#5737](https://github.com/paperless-ngx/paperless-ngx/pull/5737))
+- Chore(deps): Bump the django group with 1 update [@dependabot](https://github.com/dependabot) ([#5739](https://github.com/paperless-ngx/paperless-ngx/pull/5739))
+
+### All App Changes
+
+<details>
+<summary>3 changes</summary>
+
+- Chore(deps-dev): Bump the development group with 2 updates [@dependabot](https://github.com/dependabot) ([#5737](https://github.com/paperless-ngx/paperless-ngx/pull/5737))
+- Chore(deps): Bump the django group with 1 update [@dependabot](https://github.com/dependabot) ([#5739](https://github.com/paperless-ngx/paperless-ngx/pull/5739))
+- Fix: Splitting on ASN barcodes even if not enabled [@stumpylog](https://github.com/stumpylog) ([#5740](https://github.com/paperless-ngx/paperless-ngx/pull/5740))
+</details>
+
 ## paperless-ngx 2.5.0
 
 ### Breaking Changes

docs/configuration.md

@@ -539,7 +539,7 @@ This is for use with self-signed certificates against local IMAP servers.
 #### [`PAPERLESS_SOCIALACCOUNT_PROVIDERS=<json>`](#PAPERLESS_SOCIALACCOUNT_PROVIDERS) {#PAPERLESS_SOCIALACCOUNT_PROVIDERS}
 
 : This variable is used to setup login and signup via social account providers which are compatible with django-allauth.
-See the corresponding [django-allauth documentation](https://docs.allauth.org/en/0.60.0/socialaccount/providers/index.html)
+See the corresponding [django-allauth documentation](https://docs.allauth.org/en/latest/socialaccount/providers/index.html)
 for a list of provider configurations. You will also need to include the relevant Django 'application' inside the
 [PAPERLESS_APPS](#PAPERLESS_APPS) setting to activate that specific authentication provider (e.g. `allauth.socialaccount.providers.openid_connect` for the [OIDC Connect provider](https://docs.allauth.org/en/latest/socialaccount/providers/openid_connect.html)).
 
@@ -549,7 +549,7 @@ for a list of provider configurations. You will also need to include the relevan
 
 : Attempt to signup the user using retrieved email, username etc from the third party authentication
 system. See the corresponding
-[django-allauth documentation](https://docs.allauth.org/en/0.60.0/socialaccount/configuration.html)
+[django-allauth documentation](https://docs.allauth.org/en/latest/socialaccount/configuration.html)
 
     Defaults to False
 
@@ -572,6 +572,23 @@ system. See the corresponding
 
     Defaults to 'https'
 
+#### [`PAPERLESS_ACCOUNT_EMAIL_VERIFICATION=<string>`](#PAPERLESS_ACCOUNT_EMAIL_VERIFICATION) {#PAPERLESS_ACCOUNT_EMAIL_VERIFICATION}
+
+: Determines whether email addresses are verified during signup (as performed by Django allauth). See the relevant
+[paperless settings](#PAPERLESS_EMAIL_HOST) and [the allauth docs](https://docs.allauth.org/en/latest/account/configuration.html)
+
+    Defaults to 'optional'
+
+!!! note
+
+    If you do not have a working email server set up you should set this to 'none'.
+
+#### [`PAPERLESS_DISABLE_REGULAR_LOGIN=<bool>`](#PAPERLESS_DISABLE_REGULAR_LOGIN) {#PAPERLESS_DISABLE_REGULAR_LOGIN}
+
+: Disables the regular frontend username / password login, i.e. once you have setup SSO. Note that the Django admin login cannot be disabled.
+
+    Defaults to False
+
 ## OCR settings {#ocr}
 
 Paperless uses [OCRmyPDF](https://ocrmypdf.readthedocs.io/en/latest/)
@@ -749,6 +766,8 @@ but could result in missing text content.
     If unset, will default to the value determined by
     [Pillow](https://pillow.readthedocs.io/en/stable/reference/Image.html#PIL.Image.MAX_IMAGE_PIXELS).
 
+    Setting this value to 0 will entirely disable the limit.  See the below warning.
+
     !!! note
 
         Increasing this limit could cause Paperless to consume additional
@@ -758,7 +777,7 @@ but could result in missing text content.
     !!! warning
 
         The limit is intended to prevent malicious files from consuming
-        system resources and causing crashes and other errors. Only increase
+        system resources and causing crashes and other errors. Only change
         this value if you are certain your documents are not malicious and
         you need the text which was not OCRed
 
@@ -950,6 +969,20 @@ be used with caution!
 
     Defaults to None, which does not add any additional apps.
 
+#### [`PAPERLESS_MAX_IMAGE_PIXELS=<number>`](#PAPERLESS_MAX_IMAGE_PIXELS) {#PAPERLESS_MAX_IMAGE_PIXELS}
+
+: Configures the maximum size of an image PIL will allow to load without warning or error.
+
+: If unset, will default to the value determined by
+[Pillow](https://pillow.readthedocs.io/en/stable/reference/Image.html#PIL.Image.MAX_IMAGE_PIXELS).
+
+    Defaults to None, which does change the limit
+
+    !!! warning
+
+        This limit is designed to prevent denial of service from malicious files.
+        It should only be raised or disabled in certain circumstances and with great care.
+
 ## Document Consumption {#consume_config}
 
 #### [`PAPERLESS_CONSUMER_DELETE_DUPLICATES=<bool>`](#PAPERLESS_CONSUMER_DELETE_DUPLICATES) {#PAPERLESS_CONSUMER_DELETE_DUPLICATES}
@@ -997,7 +1030,7 @@ or hidden folders some tools use to store data.
     `._foo.pdf` and `._bar/foo.pdf`
 
     Defaults to
-    `[".DS_STORE/*", "._*", ".stfolder/*", ".stversions/*", ".localized/*", "desktop.ini", "@eaDir/*"]`.
+    `[".DS_Store", ".DS_STORE", "._*", ".stfolder/*", ".stversions/*", ".localized/*", "desktop.ini", "@eaDir/*", "Thumbs.db"]`.
 
 #### [`PAPERLESS_CONSUMER_BARCODE_SCANNER=<string>`](#PAPERLESS_CONSUMER_BARCODE_SCANNER) {#PAPERLESS_CONSUMER_BARCODE_SCANNER}
 

docs/usage.md

@@ -253,7 +253,8 @@ permissions can be granted to limit access to certain parts of the UI (and corre
 ### Password reset
 
 In order to enable the password reset feature you will need to setup an SMTP backend, see
-[`PAPERLESS_EMAIL_HOST`](configuration.md#PAPERLESS_EMAIL_HOST)
+[`PAPERLESS_EMAIL_HOST`](configuration.md#PAPERLESS_EMAIL_HOST). If your installation does not have
+[`PAPERLESS_URL`](configuration.md#PAPERLESS_URL) set, the reset link included in emails will use the server host.
 
 ## Workflows
 
@@ -328,7 +329,7 @@ Workflows allow you to filter by:
 
 ### Workflow Actions
 
-There is currently one type of workflow action, "Assignment", which can assign:
+There are currently two types of workflow actions, "Assignment", which can assign:
 
 - Title, see [title placeholders](usage.md#title-placeholders) below
 - Tags, correspondent, document type and storage path
@@ -336,6 +337,13 @@ There is currently one type of workflow action, "Assignment", which can assign:
 - View and / or edit permissions to users or groups
 - Custom fields. Note that no value for the field will be set
 
+and "Removal" actions, which can remove either all of or specific sets of the following:
+
+- Tags, correspondents, document types or storage paths
+- Document owner
+- View and / or edit permissions
+- Custom fields
+
 #### Title placeholders
 
 Workflow titles can include placeholders but the available options differ depending on the type of
@@ -406,7 +414,7 @@ The following custom field types are supported:
 - `URL`: a valid url
 - `Integer`: integer number e.g. 12
 - `Number`: float number e.g. 12.3456
-- `Monetary`: float number with exactly two decimals, e.g. 12.30
+- `Monetary`: [ISO 4217 currency code](https://en.wikipedia.org/wiki/ISO_4217#List_of_ISO_4217_currency_codes) and a number with exactly two decimals, e.g. USD12.30
 - `Document Link`: reference(s) to other document(s) displayed as links, automatically creates a symmetrical link in reverse
 
 ## Share Links

install-paperless-ngx.sh

@@ -56,8 +56,8 @@ if ! command -v docker &> /dev/null ; then
 	exit 1
 fi
 
-if ! command -v docker compose &> /dev/null ; then
-	echo "docker compose executable not found. Is docker compose installed?"
+if ! docker compose &> /dev/null ; then
+	echo "docker compose plugin not found. Is docker compose installed?"
 	exit 1
 fi
 
@@ -315,7 +315,7 @@ fi
 wget "https://raw.githubusercontent.com/paperless-ngx/paperless-ngx/main/docker/compose/docker-compose.$DOCKER_COMPOSE_VERSION.yml" -O docker-compose.yml
 wget "https://raw.githubusercontent.com/paperless-ngx/paperless-ngx/main/docker/compose/.env" -O .env
 
-SECRET_KEY=$(LC_ALL=C tr -dc 'a-zA-Z0-9!"#$%&'\''()*+,-./:;<=>?@[\]^_`{|}~' < /dev/urandom | dd bs=1 count=64 2>/dev/null)
+SECRET_KEY=$(LC_ALL=C tr -dc 'a-zA-Z0-9!#$%&()*+,-./:;<=>?@[\]^_`{|}~' < /dev/urandom | dd bs=1 count=64 2>/dev/null)
 
 
 DEFAULT_LANGUAGES=("deu eng fra ita spa")

src-ui/angular.json

@@ -77,7 +77,9 @@
             "scripts": [],
             "allowedCommonJsDependencies": [
               "pdfjs-dist",
-              "pdfjs-dist/web/pdf_viewer"
+              "pdfjs-dist/web/pdf_viewer",
+              "filesize",
+              "file-saver"
             ],
             "vendorChunk": true,
             "extractLicenses": false,

src-ui/e2e/dashboard/requests/api-dashboard2.har

@@ -2700,7 +2700,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -2734,7 +2734,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -2768,7 +2768,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -2802,7 +2802,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -2836,7 +2836,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -2870,7 +2870,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -2904,7 +2904,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -2938,7 +2938,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -2972,7 +2972,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -3006,7 +3006,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -3040,7 +3040,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -3074,7 +3074,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -3108,7 +3108,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -3142,7 +3142,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -3176,7 +3176,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -3210,7 +3210,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -3244,7 +3244,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -3278,7 +3278,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -3312,7 +3312,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],

src-ui/e2e/dashboard/requests/api-dashboard4.har

@@ -425,7 +425,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -470,7 +470,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -645,7 +645,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -685,7 +685,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -729,7 +729,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],

src-ui/e2e/document-detail/requests/api-document-detail.har

@@ -843,7 +843,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -994,7 +994,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],

src-ui/e2e/document-detail/requests/api-document-detail2.har

@@ -996,7 +996,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -1301,7 +1301,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -1484,7 +1484,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -1518,7 +1518,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -1552,7 +1552,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -1586,7 +1586,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -1620,7 +1620,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -1654,7 +1654,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -1688,7 +1688,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -1722,7 +1722,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -1756,7 +1756,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -1790,7 +1790,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -1824,7 +1824,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -1858,7 +1858,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -1892,7 +1892,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -1926,7 +1926,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -1960,7 +1960,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -1994,7 +1994,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -2028,7 +2028,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -2062,7 +2062,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -2096,7 +2096,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -2130,7 +2130,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -2164,7 +2164,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -2198,7 +2198,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -2232,7 +2232,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -2266,7 +2266,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -2300,7 +2300,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -2334,7 +2334,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -2368,7 +2368,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -2402,7 +2402,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -2436,7 +2436,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],
@@ -2470,7 +2470,7 @@
           "bodySize": -1
         },
         "response": {
-          "status": 200,
+          "status": -1,
           "statusText": "",
           "httpVersion": "HTTP/1.1",
           "cookies": [],

src-ui/package.json

@@ -11,57 +11,58 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/cdk": "^17.1.2",
-    "@angular/common": "~17.1.2",
-    "@angular/compiler": "~17.1.2",
-    "@angular/core": "~17.1.2",
-    "@angular/forms": "~17.1.2",
-    "@angular/localize": "~17.1.2",
-    "@angular/platform-browser": "~17.1.2",
-    "@angular/platform-browser-dynamic": "~17.1.2",
-    "@angular/router": "~17.1.2",
+    "@angular/cdk": "^17.2.1",
+    "@angular/common": "~17.2.3",
+    "@angular/compiler": "~17.2.3",
+    "@angular/core": "~17.2.3",
+    "@angular/forms": "~17.2.3",
+    "@angular/localize": "~17.2.3",
+    "@angular/platform-browser": "~17.2.3",
+    "@angular/platform-browser-dynamic": "~17.2.3",
+    "@angular/router": "~17.2.3",
     "@ng-bootstrap/ng-bootstrap": "^16.0.0",
-    "@ng-select/ng-select": "^12.0.6",
+    "@ng-select/ng-select": "^12.0.7",
     "@ngneat/dirty-check-forms": "^3.0.3",
     "@popperjs/core": "^2.11.8",
-    "bootstrap": "^5.3.2",
+    "bootstrap": "^5.3.3",
     "file-saver": "^2.0.5",
     "mime-names": "^1.0.0",
     "ngx-bootstrap-icons": "^1.9.3",
     "ngx-color": "^9.0.0",
-    "ngx-cookie-service": "^17.0.1",
+    "ngx-cookie-service": "^17.1.0",
     "ngx-file-drop": "^16.0.0",
+    "ngx-filesize": "^3.0.3",
     "ngx-ui-tour-ng-bootstrap": "^14.0.2",
     "pdfjs-dist": "^3.11.174",
     "rxjs": "^7.8.1",
     "tslib": "^2.6.2",
     "uuid": "^9.0.1",
-    "zone.js": "^0.14.3"
+    "zone.js": "^0.14.4"
   },
   "devDependencies": {
-    "@angular-builders/jest": "17.0.0",
-    "@angular-devkit/build-angular": "~17.1.2",
+    "@angular-builders/jest": "17.0.2",
+    "@angular-devkit/build-angular": "~17.2.2",
     "@angular-eslint/builder": "17.2.1",
     "@angular-eslint/eslint-plugin": "17.2.1",
     "@angular-eslint/eslint-plugin-template": "17.2.1",
     "@angular-eslint/schematics": "17.2.1",
     "@angular-eslint/template-parser": "17.2.1",
-    "@angular/cli": "~17.1.2",
-    "@angular/compiler-cli": "~17.1.2",
-    "@playwright/test": "^1.41.2",
+    "@angular/cli": "~17.2.2",
+    "@angular/compiler-cli": "~17.2.2",
+    "@playwright/test": "^1.42.0",
     "@types/jest": "^29.5.12",
-    "@types/node": "^20.11.16",
-    "@typescript-eslint/eslint-plugin": "^6.20.0",
-    "@typescript-eslint/parser": "^6.20.0",
+    "@types/node": "^20.11.24",
+    "@typescript-eslint/eslint-plugin": "^7.1.0",
+    "@typescript-eslint/parser": "^7.1.0",
     "concurrently": "^8.2.2",
-    "eslint": "^8.56.0",
+    "eslint": "^8.57.0",
     "jest": "29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "jest-preset-angular": "^14.0.0",
     "jest-websocket-mock": "^2.5.0",
     "patch-package": "^8.0.0",
     "ts-node": "~10.9.1",
-    "typescript": "^5.2.2",
+    "typescript": "^5.3.3",
     "wait-on": "^7.2.0"
   }
 }

src-ui/setup-jest.ts

@@ -94,6 +94,10 @@ Object.defineProperty(navigator, 'clipboard', {
 })
 Object.defineProperty(navigator, 'canShare', { value: () => true })
 Object.defineProperty(window, 'ResizeObserver', { value: mock() })
+Object.defineProperty(window, 'location', {
+  configurable: true,
+  value: { reload: jest.fn() },
+})
 
 HTMLCanvasElement.prototype.getContext = <
   typeof HTMLCanvasElement.prototype.getContext

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

@@ -163,7 +163,7 @@ export const routes: Routes = [
         canActivate: [PermissionsGuard],
         data: {
           requiredPermission: {
-            action: PermissionAction.View,
+            action: PermissionAction.Change,
             type: PermissionType.UISettings,
           },
         },

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

@@ -113,7 +113,11 @@ import { ConfigComponent } from './components/admin/config/config.component'
 import { FileComponent } from './components/common/input/file/file.component'
 import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { ConfirmButtonComponent } from './components/common/confirm-button/confirm-button.component'
+import { MonetaryComponent } from './components/common/input/monetary/monetary.component'
+import { SystemStatusDialogComponent } from './components/common/system-status-dialog/system-status-dialog.component'
+import { NgxFilesizeModule } from 'ngx-filesize'
 import {
+  airplane,
   archive,
   arrowCounterclockwise,
   arrowDown,
@@ -128,12 +132,14 @@ import {
   boxes,
   calendar,
   calendarEvent,
+  cardChecklist,
   caretDown,
   caretUp,
   chatLeftText,
   check,
   check2All,
   checkAll,
+  checkCircleFill,
   checkLg,
   chevronDoubleLeft,
   chevronDoubleRight,
@@ -147,7 +153,9 @@ import {
   doorOpen,
   download,
   envelope,
+  exclamationCircleFill,
   exclamationTriangle,
+  exclamationTriangleFill,
   eye,
   fileEarmark,
   fileEarmarkCheck,
@@ -199,6 +207,7 @@ import {
 } from 'ngx-bootstrap-icons'
 
 const icons = {
+  airplane,
   archive,
   arrowCounterclockwise,
   arrowDown,
@@ -213,12 +222,14 @@ const icons = {
   boxes,
   calendar,
   calendarEvent,
+  cardChecklist,
   caretDown,
   caretUp,
   chatLeftText,
   check,
   check2All,
   checkAll,
+  checkCircleFill,
   checkLg,
   chevronDoubleLeft,
   chevronDoubleRight,
@@ -232,7 +243,9 @@ const icons = {
   doorOpen,
   download,
   envelope,
+  exclamationCircleFill,
   exclamationTriangle,
+  exclamationTriangleFill,
   eye,
   fileEarmark,
   fileEarmarkCheck,
@@ -443,6 +456,8 @@ function initializeApp(settings: SettingsService) {
     ConfigComponent,
     FileComponent,
     ConfirmButtonComponent,
+    MonetaryComponent,
+    SystemStatusDialogComponent,
   ],
   imports: [
     BrowserModule,
@@ -457,6 +472,7 @@ function initializeApp(settings: SettingsService) {
     TourNgBootstrapModule,
     DragDropModule,
     NgxBootstrapIconsModule.pick(icons),
+    NgxFilesizeModule,
   ],
   providers: [
     {

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

@@ -4,10 +4,31 @@
   info="Options to customize appearance, notifications, saved views and more. Settings apply to the <strong>current user only</strong>."
   i18n-info
   >
-  <button class="btn btn-sm btn-outline-primary" (click)="tourService.start()"><ng-container i18n>Start tour</ng-container></button>
-  <a *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.Admin }" class="btn btn-sm btn-primary ms-3" href="admin/" target="_blank">
+  <button class="btn btn-sm btn-outline-primary" (click)="tourService.start()">
+    <i-bs class="me-1" name="airplane"></i-bs>&nbsp;<ng-container i18n>Start tour</ng-container>
+  </button>
+  <button class="btn btn-sm btn-outline-primary position-relative ms-md-5 me-1" (click)="showSystemStatus()"
+    [disabled]="!systemStatus"
+    *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.Admin }">
+    @if (!systemStatus) {
+      <div class="spinner-border spinner-border-sm me-1 h-75" role="status"></div>
+    } @else {
+      <i-bs class="me-2" name="card-checklist"></i-bs>
+      @if (systemStatusHasErrors) {
+        <span class="badge bg-body position-absolute top-0 start-100 translate-middle rounded-pill p-0">
+          <i-bs name="exclamation-circle-fill" class="text-danger" width="1.75em" height="1.75em"></i-bs>
+        </span>
+      } @else {
+        <span class="badge bg-body position-absolute top-0 start-100 translate-middle rounded-pill p-0">
+          <i-bs name="check-circle-fill" class="text-primary" width="1.75em" height="1.75em"></i-bs>
+        </span>
+      }
+    }
+    <ng-container i18n>System Status</ng-container>
+  </button>
+  <a *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.Admin }" class="btn btn-sm btn-primary" href="admin/" target="_blank">
     <ng-container i18n>Open Django Admin</ng-container>
-    <i-bs name="arrow-up-right"></i-bs>
+    &nbsp;<i-bs name="arrow-up-right"></i-bs>
   </a>
 </pngx-page-header>
 
@@ -351,5 +372,5 @@
 
   <div [ngbNavOutlet]="nav" class="border-start border-end border-bottom p-3 mb-3 shadow-sm"></div>
 
-  <button type="submit" class="btn btn-primary mb-2" *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.UISettings }" [disabled]="(isDirty$ | async) === false" i18n>Save</button>
+  <button type="submit" class="btn btn-primary mb-2" [disabled]="(isDirty$ | async) === false" i18n>Save</button>
 </form>

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

@@ -9,6 +9,8 @@ import {
   NgbModule,
   NgbAlertModule,
   NgbNavLink,
+  NgbModal,
+  NgbModalModule,
 } from '@ng-bootstrap/ng-bootstrap'
 import { NgSelectModule } from '@ng-select/ng-select'
 import { of, throwError } from 'rxjs'
@@ -39,6 +41,13 @@ import { SettingsComponent } from './settings.component'
 import { IfOwnerDirective } from 'src/app/directives/if-owner.directive'
 import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
 import { ConfirmButtonComponent } from '../../common/confirm-button/confirm-button.component'
+import { SystemStatusDialogComponent } from '../../common/system-status-dialog/system-status-dialog.component'
+import { SystemStatusService } from 'src/app/services/system-status.service'
+import {
+  SystemStatus,
+  InstallType,
+  SystemStatusItemStatus,
+} from 'src/app/data/system-status'
 
 const savedViews = [
   { id: 1, name: 'view1', show_in_sidebar: true, show_on_dashboard: true },
@@ -65,6 +74,8 @@ describe('SettingsComponent', () => {
   let userService: UserService
   let permissionsService: PermissionsService
   let groupService: GroupService
+  let modalService: NgbModal
+  let systemStatusService: SystemStatusService
 
   beforeEach(async () => {
     TestBed.configureTestingModule({
@@ -96,6 +107,7 @@ describe('SettingsComponent', () => {
         NgbAlertModule,
         NgSelectModule,
         NgxBootstrapIconsModule.pick(allIcons),
+        NgbModalModule,
       ],
     }).compileComponents()
 
@@ -107,6 +119,8 @@ describe('SettingsComponent', () => {
     settingsService.currentUser = users[0]
     userService = TestBed.inject(UserService)
     permissionsService = TestBed.inject(PermissionsService)
+    modalService = TestBed.inject(NgbModal)
+    systemStatusService = TestBed.inject(SystemStatusService)
     jest.spyOn(permissionsService, 'currentUserCan').mockReturnValue(true)
     jest
       .spyOn(permissionsService, 'currentUserHasObjectPermissions')
@@ -309,10 +323,15 @@ describe('SettingsComponent', () => {
     component.store.getValue()['displayLanguage'] = 'en-US'
     component.store.getValue()['updateCheckingEnabled'] = false
     component.settingsForm.value.displayLanguage = 'en-GB'
-    component.settingsForm.value.updateCheckingEnabled = true
-    jest.spyOn(settingsService, 'storeSettings').mockReturnValueOnce(of(true))
+    jest.spyOn(settingsService, 'storeSettings').mockReturnValue(of(true))
     component.saveSettings()
     expect(toast.actionName).toEqual('Reload now')
+
+    component.settingsForm.value.updateCheckingEnabled = true
+    component.saveSettings()
+
+    expect(toast.actionName).toEqual('Reload now')
+    toast.action()
   })
 
   it('should allow setting theme color, visually apply change immediately but not save', () => {
@@ -367,4 +386,54 @@ describe('SettingsComponent', () => {
     fixture.detectChanges()
     expect(toastErrorSpy).toBeCalled()
   })
+
+  it('should load system status on initialize, show errors if needed', () => {
+    const status: SystemStatus = {
+      pngx_version: '2.4.3',
+      server_os: 'macOS-14.1.1-arm64-arm-64bit',
+      install_type: InstallType.BareMetal,
+      storage: { total: 494384795648, available: 13573525504 },
+      database: {
+        type: 'sqlite',
+        url: '/paperless-ngx/data/db.sqlite3',
+        status: SystemStatusItemStatus.ERROR,
+        error: null,
+        migration_status: {
+          latest_migration: 'socialaccount.0006_alter_socialaccount_extra_data',
+          unapplied_migrations: [],
+        },
+      },
+      tasks: {
+        redis_url: 'redis://localhost:6379',
+        redis_status: SystemStatusItemStatus.ERROR,
+        redis_error:
+          'Error 61 connecting to localhost:6379. Connection refused.',
+        celery_status: SystemStatusItemStatus.ERROR,
+        index_status: SystemStatusItemStatus.OK,
+        index_last_modified: new Date().toISOString(),
+        index_error: null,
+        classifier_status: SystemStatusItemStatus.OK,
+        classifier_last_trained: new Date().toISOString(),
+        classifier_error: null,
+      },
+    }
+    jest.spyOn(systemStatusService, 'get').mockReturnValue(of(status))
+    completeSetup()
+    expect(component['systemStatus']).toEqual(status) // private
+    expect(component.systemStatusHasErrors).toBeTruthy()
+    // coverage
+    component['systemStatus'].database.status = SystemStatusItemStatus.OK
+    component['systemStatus'].tasks.redis_status = SystemStatusItemStatus.OK
+    component['systemStatus'].tasks.celery_status = SystemStatusItemStatus.OK
+    expect(component.systemStatusHasErrors).toBeFalsy()
+  })
+
+  it('should open system status dialog', () => {
+    const modalOpenSpy = jest.spyOn(modalService, 'open')
+    completeSetup()
+    component.showSystemStatus()
+    expect(modalOpenSpy).toHaveBeenCalledWith(SystemStatusDialogComponent, {
+      size: 'xl',
+    })
+  })
 })

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

@@ -9,7 +9,11 @@ import {
 } from '@angular/core'
 import { FormGroup, FormControl } from '@angular/forms'
 import { ActivatedRoute, Router } from '@angular/router'
-import { NgbNavChangeEvent } from '@ng-bootstrap/ng-bootstrap'
+import {
+  NgbModal,
+  NgbModalRef,
+  NgbNavChangeEvent,
+} from '@ng-bootstrap/ng-bootstrap'
 import { DirtyComponent, dirtyCheck } from '@ngneat/dirty-check-forms'
 import { TourService } from 'ngx-ui-tour-ng-bootstrap'
 import {
@@ -40,6 +44,12 @@ import {
 } from 'src/app/services/settings.service'
 import { ToastService, Toast } from 'src/app/services/toast.service'
 import { ComponentWithPermissions } from '../../with-permissions/with-permissions.component'
+import { SystemStatusDialogComponent } from '../../common/system-status-dialog/system-status-dialog.component'
+import { SystemStatusService } from 'src/app/services/system-status.service'
+import {
+  SystemStatusItemStatus,
+  SystemStatus,
+} from 'src/app/data/system-status'
 
 enum SettingsNavIDs {
   General = 1,
@@ -111,6 +121,18 @@ export class SettingsComponent
   users: User[]
   groups: Group[]
 
+  private systemStatus: SystemStatus
+
+  get systemStatusHasErrors(): boolean {
+    return (
+      this.systemStatus.database.status === SystemStatusItemStatus.ERROR ||
+      this.systemStatus.tasks.redis_status === SystemStatusItemStatus.ERROR ||
+      this.systemStatus.tasks.celery_status === SystemStatusItemStatus.ERROR ||
+      this.systemStatus.tasks.index_status === SystemStatusItemStatus.ERROR ||
+      this.systemStatus.tasks.classifier_status === SystemStatusItemStatus.ERROR
+    )
+  }
+
   get computedDateLocale(): string {
     return (
       this.settingsForm.value.dateLocale ||
@@ -131,7 +153,9 @@ export class SettingsComponent
     private usersService: UserService,
     private groupsService: GroupService,
     private router: Router,
-    public permissionsService: PermissionsService
+    public permissionsService: PermissionsService,
+    private modalService: NgbModal,
+    private systemStatusService: SystemStatusService
   ) {
     super()
     this.settings.settingsSaved.subscribe(() => {
@@ -360,6 +384,17 @@ export class SettingsComponent
       // prevents loss of unsaved changes
       this.settingsForm.patchValue(currentFormValue)
     }
+
+    if (
+      this.permissionsService.currentUserCan(
+        PermissionAction.View,
+        PermissionType.Admin
+      )
+    ) {
+      this.systemStatusService.get().subscribe((status) => {
+        this.systemStatus = status
+      })
+    }
   }
 
   private emptyGroup(group: FormGroup) {
@@ -565,4 +600,14 @@ export class SettingsComponent
   clearThemeColor() {
     this.settingsForm.get('themeColor').patchValue('')
   }
+
+  showSystemStatus() {
+    const modal: NgbModalRef = this.modalService.open(
+      SystemStatusDialogComponent,
+      {
+        size: 'xl',
+      }
+    )
+    modal.componentInstance.status = this.systemStatus
+  }
 }

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

@@ -4,16 +4,16 @@
     (click)="isMenuCollapsed = !isMenuCollapsed">
     <span class="navbar-toggler-icon"></span>
   </button>
-  <a class="navbar-brand d-flex col-auto col-md-3 col-lg-2 me-0 px-3 py-3 order-sm-0"
-    [ngClass]="{ 'slim': slimSidebarEnabled, 'd-flex col-auto col-md-3 col-lg-2' : !slimSidebarEnabled, 'py-3' : !customAppTitle?.length || slimSidebarEnabled, 'py-2': customAppTitle?.length }"
+  <a class="navbar-brand d-flex align-items-center me-0 px-3 py-3 order-sm-0"
+    [ngClass]="{ 'slim': slimSidebarEnabled, 'col-auto col-md-3 col-lg-2' : !slimSidebarEnabled, 'py-3' : !customAppTitle?.length || slimSidebarEnabled, 'py-2': customAppTitle?.length }"
     routerLink="/dashboard"
     tourAnchor="tour.intro">
-    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 198.43 238.91" width="1em" class="me-2" fill="currentColor">
+    <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 198.43 238.91" width="1em" height="1.5em" fill="currentColor">
       <path
         d="M194.7,0C164.22,70.94,17.64,79.74,64.55,194.06c.58,1.47-10.85,17-18.47,29.9-1.76-6.45-3.81-13.48-3.52-14.07,38.11-45.14-27.26-70.65-30.78-107.58C-4.64,131.62-10.5,182.92,39,212.53c.3,0,2.64,11.14,3.81,16.71a58.55,58.55,0,0,0-2.93,6.45c-1.17,2.93,7.62,2.64,7.62,3.22.88-.29,21.7-36.93,22.28-37.23C187.67,174.72,208.48,68.6,194.7,0ZM134.61,74.75C79.5,124,70.12,160.64,71.88,178.53,53.41,134.85,107.64,86.77,134.61,74.75ZM28.2,145.11c10.55,9.67,28.14,39.28,13.19,56.57C44.91,193.77,46.08,175.89,28.2,145.11Z"
         transform="translate(0 0)" />
     </svg>
-    <div class="ms-2 d-inline-block" [class.visually-hidden]="slimSidebarEnabled">
+    <div class="ms-2 ms-md-3 d-inline-block" [class.d-md-none]="slimSidebarEnabled">
       @if (customAppTitle?.length) {
         <div class="d-flex flex-column align-items-start">
           <span class="title">{{customAppTitle}}</span>
@@ -27,12 +27,12 @@
   <div class="search-form-container flex-grow-1 py-2 pb-3 pb-sm-2 px-3 ps-md-4 me-sm-auto order-3 order-sm-1"
     *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.Document }">
     <form (ngSubmit)="search()" class="form-inline flex-grow-1">
-      <i-bs style="top: .25em;" width="1em" height="1em" name="search"></i-bs>
+      <i-bs width="1em" height="1em" name="search"></i-bs>
       <input class="form-control form-control-sm" type="text" placeholder="Search documents" aria-label="Search"
         [formControl]="searchField" [ngbTypeahead]="searchAutoComplete" (keyup)="searchFieldKeyup($event)"
         (selectItem)="itemSelected($event)" i18n-placeholder>
       @if (!searchFieldEmpty) {
-        <button type="button" class="btn btn-link btn-sm px-0 position-absolute top-0 end-0" (click)="resetSearchField()">
+        <button type="button" class="btn btn-link btn-sm ps-0 pe-1 position-absolute top-0 end-0" (click)="resetSearchField()">
           <i-bs width="1em" height="1em" name="x"></i-bs>
         </button>
       }
@@ -55,7 +55,7 @@
           <i-bs class="me-2" name="person"></i-bs>&nbsp;<ng-container i18n>My Profile</ng-container>
         </button>
         <a ngbDropdownItem class="nav-link" routerLink="settings" (click)="closeMenu()"
-          *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.UISettings }">
+          *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.UISettings }">
           <i-bs class="me-2" name="gear"></i-bs><ng-container i18n>Settings</ng-container>
         </a>
         <a ngbDropdownItem class="nav-link d-flex" href="accounts/logout/" (click)="onLogout()">
@@ -227,7 +227,7 @@
           <span i18n>Administration</span>
         </h6>
         <ul class="nav flex-column mb-2">
-          <li class="nav-item" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.UISettings }"
+          <li class="nav-item" *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.UISettings }"
             tourAnchor="tour.settings">
             <a class="nav-link" routerLink="settings" routerLinkActive="active" (click)="closeMenu()"
               ngbPopover="Settings" i18n-ngbPopover [disablePopover]="!slimSidebarEnabled" placement="end"
@@ -256,10 +256,10 @@
               ngbPopover="File Tasks" i18n-ngbPopover [disablePopover]="!slimSidebarEnabled" placement="end"
               container="body" triggers="mouseenter:mouseleave" popoverClass="popover-slim">
               <i-bs class="me-1" name="list-task"></i-bs><span>&nbsp;<ng-container i18n>File Tasks</ng-container>@if (tasksService.failedFileTasks.length > 0) {
-                <span><span class="badge bg-danger ms-2">{{tasksService.failedFileTasks.length}}</span></span>
+                <span><span class="badge bg-danger ms-2 d-inline">{{tasksService.failedFileTasks.length}}</span></span>
               }</span>
               @if (tasksService.failedFileTasks.length > 0 && slimSidebarEnabled) {
-                <span class="badge bg-danger position-absolute top-0 end-0">{{tasksService.failedFileTasks.length}}</span>
+                <span class="badge bg-danger position-absolute top-0 end-0 d-none d-md-block">{{tasksService.failedFileTasks.length}}</span>
               }
             </a>
           </li>

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

@@ -262,9 +262,15 @@ main {
     > i-bs {
       position: absolute;
       left: 0.6rem;
-      top: 0.5rem;
+      top: .35rem;
       color: rgba(255, 255, 255, 0.6);
+
+      @media screen and (min-width: 768px) {
+        // adjust for smaller font size on non-mobile
+        top: 0.25rem;
+      }
     }
+
   }
 
 

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

@@ -1,6 +1,9 @@
 <form [formGroup]="objectForm" (ngSubmit)="save()" autocomplete="off">
   <div class="modal-header">
     <h4 class="modal-title" id="modal-basic-title">{{getTitle()}}</h4>
+    @if (object?.id) {
+      <span class="badge bg-primary text-primary-text-contrast ms-2">ID: {{object.id}}</span>
+    }
     <button type="button" [disabled]="!closeEnabled" class="btn-close" aria-label="Close" (click)="cancel()">
     </button>
   </div>

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

@@ -1,6 +1,9 @@
 <form [formGroup]="objectForm" (ngSubmit)="save()" autocomplete="off">
   <div class="modal-header">
     <h4 class="modal-title" id="modal-basic-title">{{getTitle()}}</h4>
+    @if (object?.id) {
+      <span class="badge bg-primary text-primary-text-contrast ms-2">ID: {{object.id}}</span>
+    }
     <button type="button" [disabled]="!closeEnabled" class="btn-close" aria-label="Close" (click)="cancel()">
     </button>
   </div>

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

@@ -1,6 +1,9 @@
 <form [formGroup]="objectForm" (ngSubmit)="save()" autocomplete="off">
   <div class="modal-header">
     <h4 class="modal-title" id="modal-basic-title">{{getTitle()}}</h4>
+    @if (object?.id) {
+      <span class="badge bg-primary text-primary-text-contrast ms-2">ID: {{object.id}}</span>
+    }
     <button type="button" [disabled]="!closeEnabled" class="btn-close" aria-label="Close" (click)="cancel()">
     </button>
   </div>

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

@@ -1,6 +1,9 @@
 <form [formGroup]="objectForm" (ngSubmit)="save()" autocomplete="off">
     <div class="modal-header">
       <h4 class="modal-title" id="modal-basic-title">{{getTitle()}}</h4>
+      @if (object?.id) {
+        <span class="badge bg-primary text-primary-text-contrast ms-2">ID: {{object.id}}</span>
+      }
       <button type="button" [disabled]="!closeEnabled" class="btn-close" aria-label="Close" (click)="cancel()">
       </button>
     </div>

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

@@ -1,6 +1,9 @@
 <form [formGroup]="objectForm" (ngSubmit)="save()" autocomplete="off">
   <div class="modal-header">
     <h4 class="modal-title" id="modal-basic-title">{{getTitle()}}</h4>
+    @if (object?.id) {
+      <span class="badge bg-primary text-primary-text-contrast ms-2">ID: {{object.id}}</span>
+    }
     <button type="button" [disabled]="!closeEnabled" class="btn-close" aria-label="Close" (click)="cancel()">
     </button>
   </div>

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

@@ -1,6 +1,9 @@
 <form [formGroup]="objectForm" (ngSubmit)="save()" autocomplete="off">
   <div class="modal-header">
     <h4 class="modal-title" id="modal-basic-title">{{getTitle()}}</h4>
+    @if (object?.id) {
+      <span class="badge bg-primary text-primary-text-contrast ms-2">ID: {{object.id}}</span>
+    }
     <button type="button" [disabled]="!closeEnabled" class="btn-close" aria-label="Close" (click)="cancel()">
     </button>
   </div>

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

@@ -1,6 +1,9 @@
 <form [formGroup]="objectForm" (ngSubmit)="save()" autocomplete="off">
   <div class="modal-header">
     <h4 class="modal-title" id="modal-basic-title">{{getTitle()}}</h4>
+    @if (object?.id) {
+      <span class="badge bg-primary text-primary-text-contrast ms-2">ID: {{object.id}}</span>
+    }
     <button type="button" [disabled]="!closeEnabled" class="btn-close" aria-label="Close" (click)="cancel()">
     </button>
   </div>

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

@@ -1,6 +1,9 @@
 <form [formGroup]="objectForm" (ngSubmit)="save()" autocomplete="off">
   <div class="modal-header">
     <h4 class="modal-title" id="modal-basic-title">{{getTitle()}}</h4>
+    @if (object?.id) {
+      <span class="badge bg-primary text-primary-text-contrast ms-2">ID: {{object.id}}</span>
+    }
     <button type="button" [disabled]="!closeEnabled" class="btn-close" aria-label="Close" (click)="cancel()">
     </button>
   </div>

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

@@ -1,6 +1,9 @@
 <form [formGroup]="objectForm" (ngSubmit)="save()" autocomplete="off">
     <div class="modal-header">
       <h4 class="modal-title" id="modal-basic-title">{{getTitle()}}</h4>
+      @if (object?.id) {
+        <span class="badge bg-primary text-primary-text-contrast ms-2">ID: {{object.id}}</span>
+      }
       <button type="button" [disabled]="!closeEnabled" class="btn-close" aria-label="Close" (click)="cancel()">
       </button>
     </div>

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

@@ -1,6 +1,9 @@
 <form [formGroup]="objectForm" (ngSubmit)="save()" autocomplete="off">
   <div class="modal-header">
     <h4 class="modal-title" id="modal-basic-title">{{getTitle()}}</h4>
+    @if (object?.id) {
+      <span class="badge bg-primary text-primary-text-contrast ms-2">ID: {{object.id}}</span>
+    }
     <button type="button" [disabled]="!closeEnabled" class="btn-close" aria-label="Close" (click)="cancel()">
     </button>
   </div>
@@ -35,7 +38,7 @@
                   <div ngbAccordionItem>
                     <div ngbAccordionHeader>
                       <button ngbAccordionButton>{{i + 1}}. {{getTriggerTypeOptionName(triggerFields.controls[i].value.type)}}
-                        @if(trigger.id > -1) {
+                        @if(trigger.id) {
                           <span class="badge bg-primary text-primary-text-contrast ms-2">ID: {{trigger.id}}</span>
                         }
                         <pngx-confirm-button
@@ -77,7 +80,7 @@
                   <div ngbAccordionItem cdkDrag [formGroup]="actionFields.controls[i]">
                     <div ngbAccordionHeader>
                       <button ngbAccordionButton>{{i + 1}}. {{getActionTypeOptionName(actionFields.controls[i].value.type)}}
-                        @if(action.id > -1) {
+                        @if(action.id) {
                           <span class="badge bg-primary text-primary-text-contrast ms-2">ID: {{action.id}}</span>
                         }
                         <pngx-confirm-button
@@ -91,63 +94,7 @@
                     </div>
                     <div ngbAccordionCollapse>
                       <div ngbAccordionBody>
-                        <pngx-input-select i18n-title title="Action type" [horizontal]="true" [items]="actionTypeOptions" formControlName="type"></pngx-input-select>
-                        <input type="hidden" formControlName="id" />
-                        <div class="row">
-                          <div class="col">
-                            <pngx-input-text i18n-title title="Assign title" formControlName="assign_title" i18n-hint hint="Can include some placeholders, see <a target='_blank' href='https://docs.paperless-ngx.com/usage/#workflows'>documentation</a>." [error]="error?.actions?.[i]?.assign_title"></pngx-input-text>
-                            <pngx-input-tags [allowCreate]="false" i18n-title title="Assign tags" formControlName="assign_tags"></pngx-input-tags>
-                            <pngx-input-select i18n-title title="Assign document type" [items]="documentTypes" [allowNull]="true" formControlName="assign_document_type"></pngx-input-select>
-                            <pngx-input-select i18n-title title="Assign correspondent" [items]="correspondents" [allowNull]="true" formControlName="assign_correspondent"></pngx-input-select>
-                            <pngx-input-select i18n-title title="Assign storage path" [items]="storagePaths" [allowNull]="true" formControlName="assign_storage_path"></pngx-input-select>
-                            <pngx-input-select i18n-title title="Assign custom fields" multiple="true" [items]="customFields" [allowNull]="true" formControlName="assign_custom_fields"></pngx-input-select>
-                          </div>
-                          <div class="col">
-                            <pngx-input-select i18n-title title="Assign owner" [items]="users" bindLabel="username" formControlName="assign_owner" [allowNull]="true"></pngx-input-select>
-                            <div>
-                              <label class="form-label" i18n>Assign view permissions</label>
-                              <div class="mb-2">
-                                <div class="row mb-1">
-                                  <div class="col-lg-3">
-                                    <label class="form-label d-block my-2 text-nowrap" i18n>Users:</label>
-                                  </div>
-                                  <div class="col-lg-9">
-                                    <pngx-permissions-user type="view" formControlName="assign_view_users"></pngx-permissions-user>
-                                  </div>
-                                </div>
-                                <div class="row">
-                                  <div class="col-lg-3">
-                                    <label class="form-label d-block my-2 text-nowrap" i18n>Groups:</label>
-                                  </div>
-                                  <div class="col-lg-9">
-                                    <pngx-permissions-group type="view" formControlName="assign_view_groups"></pngx-permissions-group>
-                                  </div>
-                                </div>
-                              </div>
-                              <label class="form-label" i18n>Assign edit permissions</label>
-                              <div>
-                                <div class="row mb-1">
-                                  <div class="col-lg-3">
-                                    <label class="form-label d-block my-2 text-nowrap" i18n>Users:</label>
-                                  </div>
-                                  <div class="col-lg-9">
-                                    <pngx-permissions-user type="change" formControlName="assign_change_users"></pngx-permissions-user>
-                                  </div>
-                                </div>
-                                <div class="row">
-                                  <div class="col-lg-3">
-                                    <label class="form-label d-block my-2 text-nowrap" i18n>Groups:</label>
-                                  </div>
-                                  <div class="col-lg-9">
-                                    <pngx-permissions-group type="change" formControlName="assign_change_groups"></pngx-permissions-group>
-                                  </div>
-                                </div>
-                                <small class="form-text text-muted text-end d-block" i18n>Edit permissions also grant viewing permissions</small>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-
+                        <ng-template [ngTemplateOutlet]="actionForm" [ngTemplateOutletContext]="{ formGroup: actionFields.controls[i], action: action }"></ng-template>
                       </div>
                     </div>
                   </div>
@@ -201,3 +148,154 @@
     </div>
   </div>
 </ng-template>
+
+<ng-template #actionForm let-formGroup="formGroup" let action="action">
+  <div [formGroup]="formGroup">
+    <input type="hidden" formControlName="id" />
+    <pngx-input-select i18n-title title="Action type" [horizontal]="true" [items]="actionTypeOptions" formControlName="type"></pngx-input-select>
+    @switch(formGroup.get('type').value) {
+      @case ( WorkflowActionType.Assignment) {
+        <div class="row">
+          <div class="col">
+            <pngx-input-text i18n-title title="Assign title" formControlName="assign_title" i18n-hint hint="Can include some placeholders, see <a target='_blank' href='https://docs.paperless-ngx.com/usage/#workflows'>documentation</a>." [error]="error?.actions?.[i]?.assign_title"></pngx-input-text>
+            <pngx-input-tags [allowCreate]="false" i18n-title title="Assign tags" formControlName="assign_tags"></pngx-input-tags>
+            <pngx-input-select i18n-title title="Assign document type" [items]="documentTypes" [allowNull]="true" formControlName="assign_document_type"></pngx-input-select>
+            <pngx-input-select i18n-title title="Assign correspondent" [items]="correspondents" [allowNull]="true" formControlName="assign_correspondent"></pngx-input-select>
+            <pngx-input-select i18n-title title="Assign storage path" [items]="storagePaths" [allowNull]="true" formControlName="assign_storage_path"></pngx-input-select>
+            <pngx-input-select i18n-title title="Assign custom fields" multiple="true" [items]="customFields" [allowNull]="true" formControlName="assign_custom_fields"></pngx-input-select>
+          </div>
+          <div class="col">
+            <pngx-input-select i18n-title title="Assign owner" [items]="users" bindLabel="username" formControlName="assign_owner" [allowNull]="true"></pngx-input-select>
+            <div>
+              <label class="form-label" i18n>Assign view permissions</label>
+              <div class="mb-2">
+                <div class="row mb-1">
+                  <div class="col-lg-3">
+                    <label class="form-label d-block my-2 text-nowrap" i18n>Users:</label>
+                  </div>
+                  <div class="col-lg-9">
+                    <pngx-permissions-user type="view" formControlName="assign_view_users"></pngx-permissions-user>
+                  </div>
+                </div>
+                <div class="row">
+                  <div class="col-lg-3">
+                    <label class="form-label d-block my-2 text-nowrap" i18n>Groups:</label>
+                  </div>
+                  <div class="col-lg-9">
+                    <pngx-permissions-group type="view" formControlName="assign_view_groups"></pngx-permissions-group>
+                  </div>
+                </div>
+              </div>
+              <label class="form-label" i18n>Assign edit permissions</label>
+              <div>
+                <div class="row mb-1">
+                  <div class="col-lg-3">
+                    <label class="form-label d-block my-2 text-nowrap" i18n>Users:</label>
+                  </div>
+                  <div class="col-lg-9">
+                    <pngx-permissions-user type="change" formControlName="assign_change_users"></pngx-permissions-user>
+                  </div>
+                </div>
+                <div class="row">
+                  <div class="col-lg-3">
+                    <label class="form-label d-block my-2 text-nowrap" i18n>Groups:</label>
+                  </div>
+                  <div class="col-lg-9">
+                    <pngx-permissions-group type="change" formControlName="assign_change_groups"></pngx-permissions-group>
+                  </div>
+                </div>
+                <small class="form-text text-muted text-end d-block" i18n>Edit permissions also grant viewing permissions</small>
+              </div>
+            </div>
+          </div>
+        </div>
+      }
+      @case (WorkflowActionType.Removal) {
+        <div class="row">
+          <div class="col">
+            <h6 class="form-label" i18n>Remove tags</h6>
+            <pngx-input-switch i18n-title title="Remove all" [horizontal]="true" formControlName="remove_all_tags"></pngx-input-switch>
+            <div class="mt-n3">
+              <pngx-input-tags [allowCreate]="false" title="" formControlName="remove_tags"></pngx-input-tags>
+            </div>
+
+            <h6 class="form-label" i18n>Remove correspondents</h6>
+            <pngx-input-switch i18n-title title="Remove all" [horizontal]="true" formControlName="remove_all_correspondents"></pngx-input-switch>
+            <div class="mt-n3">
+              <pngx-input-select i18n-title title="" multiple="true" [items]="correspondents" formControlName="remove_correspondents"></pngx-input-select>
+            </div>
+
+            <h6 class="form-label" i18n>Remove document types</h6>
+            <pngx-input-switch i18n-title title="Remove all" [horizontal]="true" formControlName="remove_all_document_types"></pngx-input-switch>
+            <div class="mt-n3">
+              <pngx-input-select i18n-title title="" multiple="true" [items]="documentTypes" formControlName="remove_document_types"></pngx-input-select>
+            </div>
+
+            <h6 class="form-label" i18n>Remove storage paths</h6>
+            <pngx-input-switch i18n-title title="Remove all" [horizontal]="true" formControlName="remove_all_storage_paths"></pngx-input-switch>
+            <div class="mt-n3">
+              <pngx-input-select i18n-title title="" multiple="true" [items]="storagePaths" formControlName="remove_storage_paths"></pngx-input-select>
+            </div>
+
+            <h6 class="form-label" i18n>Remove custom fields</h6>
+            <pngx-input-switch i18n-title title="Remove all" [horizontal]="true" formControlName="remove_all_custom_fields"></pngx-input-switch>
+            <div class="mt-n3">
+              <pngx-input-select i18n-title title="" multiple="true" [items]="customFields" formControlName="remove_custom_fields"></pngx-input-select>
+            </div>
+          </div>
+          <div class="col">
+            <h6 class="form-label" i18n>Remove owners</h6>
+            <pngx-input-switch i18n-title title="Remove all" [horizontal]="true" formControlName="remove_all_owners"></pngx-input-switch>
+            <div class="mt-n3">
+              <pngx-input-select i18n-title title="" multiple="true" [items]="users" bindLabel="username" formControlName="remove_owners"></pngx-input-select>
+            </div>
+
+            <h6 class="form-label" i18n>Remove permissions</h6>
+            <pngx-input-switch i18n-title title="Remove all" [horizontal]="true" formControlName="remove_all_permissions"></pngx-input-switch>
+            <div>
+              <label class="form-label" i18n>View permissions</label>
+              <div class="mb-2">
+                <div class="row mb-1">
+                  <div class="col-lg-3">
+                    <label class="form-label d-block my-2 text-nowrap" i18n>Users:</label>
+                  </div>
+                  <div class="col-lg-9">
+                    <pngx-permissions-user type="view" formControlName="remove_view_users"></pngx-permissions-user>
+                  </div>
+                </div>
+                <div class="row">
+                  <div class="col-lg-3">
+                    <label class="form-label d-block my-2 text-nowrap" i18n>Groups:</label>
+                  </div>
+                  <div class="col-lg-9">
+                    <pngx-permissions-group type="view" formControlName="remove_view_groups"></pngx-permissions-group>
+                  </div>
+                </div>
+              </div>
+              <label class="form-label" i18n>Edit permissions</label>
+              <div>
+                <div class="row mb-1">
+                  <div class="col-lg-3">
+                    <label class="form-label d-block my-2 text-nowrap" i18n>Users:</label>
+                  </div>
+                  <div class="col-lg-9">
+                    <pngx-permissions-user type="change" formControlName="remove_change_users"></pngx-permissions-user>
+                  </div>
+                </div>
+                <div class="row">
+                  <div class="col-lg-3">
+                    <label class="form-label d-block my-2 text-nowrap" i18n>Groups:</label>
+                  </div>
+                  <div class="col-lg-9">
+                    <pngx-permissions-group type="change" formControlName="remove_change_groups"></pngx-permissions-group>
+                  </div>
+                </div>
+                <small class="form-text text-muted text-end d-block" i18n>Edit permissions also grant viewing permissions</small>
+              </div>
+            </div>
+          </div>
+        </div>
+      }
+    }
+  </div>
+</ng-template>

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

@@ -235,4 +235,103 @@ describe('WorkflowEditDialogComponent', () => {
       MATCHING_ALGORITHMS.find((a) => a.id === MATCH_AUTO)
     )
   })
+
+  it('should disable or enable action fields based on removal action type', () => {
+    const workflow: Workflow = {
+      name: 'Workflow 1',
+      id: 1,
+      order: 1,
+      enabled: true,
+      triggers: [],
+      actions: [
+        {
+          id: 1,
+          type: WorkflowActionType.Removal,
+          remove_all_tags: true,
+          remove_all_document_types: true,
+          remove_all_correspondents: true,
+          remove_all_storage_paths: true,
+          remove_all_custom_fields: true,
+          remove_all_owners: true,
+          remove_all_permissions: true,
+        },
+      ],
+    }
+    component.object = workflow
+    component.ngOnInit()
+
+    component['checkRemovalActionFields'](workflow)
+
+    // Assert that the action fields are disabled or enabled correctly
+    expect(
+      component.actionFields.at(0).get('remove_tags').disabled
+    ).toBeTruthy()
+    expect(
+      component.actionFields.at(0).get('remove_document_types').disabled
+    ).toBeTruthy()
+    expect(
+      component.actionFields.at(0).get('remove_correspondents').disabled
+    ).toBeTruthy()
+    expect(
+      component.actionFields.at(0).get('remove_storage_paths').disabled
+    ).toBeTruthy()
+    expect(
+      component.actionFields.at(0).get('remove_custom_fields').disabled
+    ).toBeTruthy()
+    expect(
+      component.actionFields.at(0).get('remove_owners').disabled
+    ).toBeTruthy()
+    expect(
+      component.actionFields.at(0).get('remove_view_users').disabled
+    ).toBeTruthy()
+    expect(
+      component.actionFields.at(0).get('remove_view_groups').disabled
+    ).toBeTruthy()
+    expect(
+      component.actionFields.at(0).get('remove_change_users').disabled
+    ).toBeTruthy()
+    expect(
+      component.actionFields.at(0).get('remove_change_groups').disabled
+    ).toBeTruthy()
+
+    workflow.actions[0].remove_all_tags = false
+    workflow.actions[0].remove_all_document_types = false
+    workflow.actions[0].remove_all_correspondents = false
+    workflow.actions[0].remove_all_storage_paths = false
+    workflow.actions[0].remove_all_custom_fields = false
+    workflow.actions[0].remove_all_owners = false
+    workflow.actions[0].remove_all_permissions = false
+
+    component['checkRemovalActionFields'](workflow)
+
+    // Assert that the action fields are disabled or enabled correctly
+    expect(component.actionFields.at(0).get('remove_tags').disabled).toBeFalsy()
+    expect(
+      component.actionFields.at(0).get('remove_document_types').disabled
+    ).toBeFalsy()
+    expect(
+      component.actionFields.at(0).get('remove_correspondents').disabled
+    ).toBeFalsy()
+    expect(
+      component.actionFields.at(0).get('remove_storage_paths').disabled
+    ).toBeFalsy()
+    expect(
+      component.actionFields.at(0).get('remove_custom_fields').disabled
+    ).toBeFalsy()
+    expect(
+      component.actionFields.at(0).get('remove_owners').disabled
+    ).toBeFalsy()
+    expect(
+      component.actionFields.at(0).get('remove_view_users').disabled
+    ).toBeFalsy()
+    expect(
+      component.actionFields.at(0).get('remove_view_groups').disabled
+    ).toBeFalsy()
+    expect(
+      component.actionFields.at(0).get('remove_change_users').disabled
+    ).toBeFalsy()
+    expect(
+      component.actionFields.at(0).get('remove_change_groups').disabled
+    ).toBeFalsy()
+  })
 })

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

@@ -68,6 +68,10 @@ export const WORKFLOW_ACTION_OPTIONS = [
     id: WorkflowActionType.Assignment,
     name: $localize`Assignment`,
   },
+  {
+    id: WorkflowActionType.Removal,
+    name: $localize`Removal`,
+  },
 ]
 
 const TRIGGER_MATCHING_ALGORITHMS = MATCHING_ALGORITHMS.filter(
@@ -84,6 +88,7 @@ export class WorkflowEditDialogComponent
   implements OnInit
 {
   public WorkflowTriggerType = WorkflowTriggerType
+  public WorkflowActionType = WorkflowActionType
 
   templates: Workflow[]
   correspondents: Correspondent[]
@@ -159,6 +164,124 @@ export class WorkflowEditDialogComponent
   ngOnInit(): void {
     super.ngOnInit()
     this.updateAllTriggerActionFields()
+    this.objectForm.valueChanges.subscribe(
+      this.checkRemovalActionFields.bind(this)
+    )
+    this.checkRemovalActionFields(this.objectForm.value)
+  }
+
+  private checkRemovalActionFields(formWorkflow: Workflow) {
+    formWorkflow.actions
+      .filter((action) => action.type === WorkflowActionType.Removal)
+      .forEach((action, i) => {
+        if (action.remove_all_tags) {
+          this.actionFields
+            .at(i)
+            .get('remove_tags')
+            .disable({ emitEvent: false })
+        } else {
+          this.actionFields
+            .at(i)
+            .get('remove_tags')
+            .enable({ emitEvent: false })
+        }
+
+        if (action.remove_all_document_types) {
+          this.actionFields
+            .at(i)
+            .get('remove_document_types')
+            .disable({ emitEvent: false })
+        } else {
+          this.actionFields
+            .at(i)
+            .get('remove_document_types')
+            .enable({ emitEvent: false })
+        }
+
+        if (action.remove_all_correspondents) {
+          this.actionFields
+            .at(i)
+            .get('remove_correspondents')
+            .disable({ emitEvent: false })
+        } else {
+          this.actionFields
+            .at(i)
+            .get('remove_correspondents')
+            .enable({ emitEvent: false })
+        }
+
+        if (action.remove_all_storage_paths) {
+          this.actionFields
+            .at(i)
+            .get('remove_storage_paths')
+            .disable({ emitEvent: false })
+        } else {
+          this.actionFields
+            .at(i)
+            .get('remove_storage_paths')
+            .enable({ emitEvent: false })
+        }
+
+        if (action.remove_all_custom_fields) {
+          this.actionFields
+            .at(i)
+            .get('remove_custom_fields')
+            .disable({ emitEvent: false })
+        } else {
+          this.actionFields
+            .at(i)
+            .get('remove_custom_fields')
+            .enable({ emitEvent: false })
+        }
+
+        if (action.remove_all_owners) {
+          this.actionFields
+            .at(i)
+            .get('remove_owners')
+            .disable({ emitEvent: false })
+        } else {
+          this.actionFields
+            .at(i)
+            .get('remove_owners')
+            .enable({ emitEvent: false })
+        }
+
+        if (action.remove_all_permissions) {
+          this.actionFields
+            .at(i)
+            .get('remove_view_users')
+            .disable({ emitEvent: false })
+          this.actionFields
+            .at(i)
+            .get('remove_view_groups')
+            .disable({ emitEvent: false })
+          this.actionFields
+            .at(i)
+            .get('remove_change_users')
+            .disable({ emitEvent: false })
+          this.actionFields
+            .at(i)
+            .get('remove_change_groups')
+            .disable({ emitEvent: false })
+        } else {
+          this.actionFields
+            .at(i)
+            .get('remove_view_users')
+            .enable({ emitEvent: false })
+          this.actionFields
+            .at(i)
+            .get('remove_view_groups')
+            .enable({ emitEvent: false })
+          this.actionFields
+            .at(i)
+            .get('remove_change_users')
+            .enable({ emitEvent: false })
+          this.actionFields
+            .at(i)
+            .get('remove_change_groups')
+            .enable({ emitEvent: false })
+        }
+      })
   }
 
   get triggerFields(): FormArray {
@@ -215,6 +338,31 @@ export class WorkflowEditDialogComponent
         assign_change_users: new FormControl(action.assign_change_users),
         assign_change_groups: new FormControl(action.assign_change_groups),
         assign_custom_fields: new FormControl(action.assign_custom_fields),
+        remove_tags: new FormControl(action.remove_tags),
+        remove_all_tags: new FormControl(action.remove_all_tags),
+        remove_document_types: new FormControl(action.remove_document_types),
+        remove_all_document_types: new FormControl(
+          action.remove_all_document_types
+        ),
+        remove_correspondents: new FormControl(action.remove_correspondents),
+        remove_all_correspondents: new FormControl(
+          action.remove_all_correspondents
+        ),
+        remove_storage_paths: new FormControl(action.remove_storage_paths),
+        remove_all_storage_paths: new FormControl(
+          action.remove_all_storage_paths
+        ),
+        remove_owners: new FormControl(action.remove_owners),
+        remove_all_owners: new FormControl(action.remove_all_owners),
+        remove_view_users: new FormControl(action.remove_view_users),
+        remove_view_groups: new FormControl(action.remove_view_groups),
+        remove_change_users: new FormControl(action.remove_change_users),
+        remove_change_groups: new FormControl(action.remove_change_groups),
+        remove_all_permissions: new FormControl(action.remove_all_permissions),
+        remove_custom_fields: new FormControl(action.remove_custom_fields),
+        remove_all_custom_fields: new FormControl(
+          action.remove_all_custom_fields
+        ),
       }),
       { emitEvent }
     )
@@ -290,6 +438,23 @@ export class WorkflowEditDialogComponent
       assign_change_users: [],
       assign_change_groups: [],
       assign_custom_fields: [],
+      remove_tags: [],
+      remove_all_tags: false,
+      remove_document_types: [],
+      remove_all_document_types: false,
+      remove_correspondents: [],
+      remove_all_correspondents: false,
+      remove_storage_paths: [],
+      remove_all_storage_paths: false,
+      remove_owners: [],
+      remove_all_owners: false,
+      remove_view_users: [],
+      remove_view_groups: [],
+      remove_change_users: [],
+      remove_change_groups: [],
+      remove_all_permissions: false,
+      remove_custom_fields: [],
+      remove_all_custom_fields: false,
     }
     this.object.actions.push(action)
     this.createActionField(action)

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

@@ -493,12 +493,17 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
     expect(changedResult.getExcludedItems()).toEqual(items)
   }))
 
-  it('FilterableDropdownSelectionModel should sort items by state', () => {
-    component.items = items
+  it('selection model should sort items by state', () => {
+    component.items = items.concat([{ id: null, name: 'Null B' }])
     component.selectionModel = selectionModel
     selectionModel.toggle(items[1].id)
     selectionModel.apply()
-    expect(selectionModel.itemsSorted).toEqual([nullItem, items[1], items[0]])
+    expect(selectionModel.itemsSorted).toEqual([
+      nullItem,
+      { id: null, name: 'Null B' },
+      items[1],
+      items[0],
+    ])
   })
 
   it('should set support create, keep open model and call createRef method', fakeAsync(() => {
@@ -542,4 +547,34 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
     tick(300)
     expect(createSpy).toHaveBeenCalled()
   }))
+
+  it('should exclude item and trigger change event', () => {
+    const id = 1
+    const state = ToggleableItemState.Selected
+    component.selectionModel = selectionModel
+    component.manyToOne = true
+    component.selectionModel.singleSelect = true
+    component.selectionModel.intersection = Intersection.Include
+    component.selectionModel['temporarySelectionStates'].set(id, state)
+    const changedSpy = jest.spyOn(component.selectionModel.changed, 'next')
+    component.selectionModel.exclude(id)
+    expect(component.selectionModel.temporaryLogicalOperator).toBe(
+      LogicalOperator.And
+    )
+    expect(component.selectionModel['temporarySelectionStates'].get(id)).toBe(
+      ToggleableItemState.Excluded
+    )
+    expect(component.selectionModel['temporarySelectionStates'].size).toBe(1)
+    expect(changedSpy).toHaveBeenCalled()
+  })
+
+  it('should initialize selection states and apply changes', () => {
+    selectionModel.items = items
+    const map = new Map<number, ToggleableItemState>()
+    map.set(1, ToggleableItemState.Selected)
+    map.set(2, ToggleableItemState.Excluded)
+    selectionModel.init(map)
+    expect(selectionModel.getSelectedItems()).toEqual([items[0]])
+    expect(selectionModel.getExcludedItems()).toEqual([items[1]])
+  })
 })

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

@@ -275,7 +275,7 @@ export class FilterableDropdownSelectionModel {
     )
   }
 
-  init(map) {
+  init(map: Map<number, ToggleableItemState>) {
     this.temporarySelectionStates = map
     this.apply()
   }

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

@@ -0,0 +1,27 @@
+<div class="mb-3" [class.pb-3]="error">
+  <div class="row">
+    <div class="d-flex align-items-center position-relative hidden-button-container" [class.col-md-3]="horizontal">
+      @if (title) {
+        <label class="form-label" [class.mb-md-0]="horizontal" [for]="inputId">{{title}}</label>
+      }
+      @if (removable) {
+        <button type="button" class="btn btn-sm btn-danger position-absolute left-0" (click)="removed.emit(this)">
+          <i-bs name="x"></i-bs>&nbsp;<ng-container i18n>Remove</ng-container>
+        </button>
+      }
+    </div>
+    <div class="position-relative" [class.col-md-9]="horizontal">
+      <div class="input-group" [class.is-invalid]="error">
+        <span class="input-group-text fw-bold bg-light">{{monetaryValue | currency: currencyCode }}</span>
+        <input #currencyField class="form-control text-muted mw-60" tabindex="0" [(ngModel)]="currencyCode" maxlength="3" [class.is-invalid]="error" (change)="onChange(value)" [disabled]="disabled">
+        <input #inputField type="number" tabindex="0" class="form-control text-muted" step=".01" [id]="inputId" [(ngModel)]="monetaryValue" (change)="onChange(value)" [class.is-invalid]="error" [disabled]="disabled">
+      </div>
+      <div class="invalid-feedback position-absolute top-100">
+        {{error}}
+      </div>
+      @if (hint) {
+        <small class="form-text text-muted">{{hint}}</small>
+      }
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,11 @@
+.input-group-text {
+    font-size: inherit;
+}
+
+.text-muted:focus-within {
+    color: var(--bs-body-color) !important;
+}
+
+.mw-60 {
+    max-width: 60px;
+}

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

@@ -0,0 +1,59 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing'
+import {
+  FormsModule,
+  NG_VALUE_ACCESSOR,
+  ReactiveFormsModule,
+} from '@angular/forms'
+import { HttpClientTestingModule } from '@angular/common/http/testing'
+import { CurrencyPipe } from '@angular/common'
+import { MonetaryComponent } from './monetary.component'
+
+describe('MonetaryComponent', () => {
+  let component: MonetaryComponent
+  let fixture: ComponentFixture<MonetaryComponent>
+  let input: HTMLInputElement
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [MonetaryComponent],
+      providers: [CurrencyPipe],
+      imports: [FormsModule, ReactiveFormsModule, HttpClientTestingModule],
+    }).compileComponents()
+
+    fixture = TestBed.createComponent(MonetaryComponent)
+    fixture.debugElement.injector.get(NG_VALUE_ACCESSOR)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+    input = component.inputField.nativeElement
+  })
+
+  it('should set the currency code correctly', () => {
+    expect(component.currencyCode).toEqual('USD') // default
+    component.currencyCode = 'EUR'
+    expect(component.currencyCode).toEqual('EUR')
+
+    component.value = 'G123.4'
+    jest
+      .spyOn(document, 'activeElement', 'get')
+      .mockReturnValue(component.currencyField.nativeElement)
+    expect(component.currencyCode).toEqual('G')
+  })
+
+  it('should parse monetary value only when out of focus', () => {
+    component.monetaryValue = 10.5
+    jest.spyOn(document, 'activeElement', 'get').mockReturnValue(null)
+    expect(component.monetaryValue).toEqual('10.50')
+
+    component.value = 'GBP123.4'
+    jest
+      .spyOn(document, 'activeElement', 'get')
+      .mockReturnValue(component.inputField.nativeElement)
+    expect(component.monetaryValue).toEqual('123.4')
+  })
+
+  it('should report value including currency code and monetary value', () => {
+    component.currencyCode = 'EUR'
+    component.monetaryValue = 10.5
+    expect(component.value).toEqual('EUR10.50')
+  })
+})

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

@@ -0,0 +1,59 @@
+import {
+  Component,
+  DEFAULT_CURRENCY_CODE,
+  ElementRef,
+  forwardRef,
+  Inject,
+  ViewChild,
+} from '@angular/core'
+import { NG_VALUE_ACCESSOR } from '@angular/forms'
+import { AbstractInputComponent } from '../abstract-input'
+
+@Component({
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      useExisting: forwardRef(() => MonetaryComponent),
+      multi: true,
+    },
+  ],
+  selector: 'pngx-input-monetary',
+  templateUrl: './monetary.component.html',
+  styleUrls: ['./monetary.component.scss'],
+})
+export class MonetaryComponent extends AbstractInputComponent<string> {
+  @ViewChild('currencyField')
+  currencyField: ElementRef
+
+  constructor(
+    @Inject(DEFAULT_CURRENCY_CODE) public defaultCurrencyCode: string
+  ) {
+    super()
+  }
+
+  get currencyCode(): string {
+    const focused = document.activeElement === this.currencyField?.nativeElement
+    if (focused && this.value) return this.value.match(/^([A-Z]{0,3})/)?.[0]
+    return (
+      this.value
+        ?.toString()
+        .toUpperCase()
+        .match(/^([A-Z]{1,3})/)?.[0] ?? this.defaultCurrencyCode
+    )
+  }
+
+  set currencyCode(value: string) {
+    this.value = value + this.monetaryValue?.toString()
+  }
+
+  get monetaryValue(): string {
+    if (!this.value) return null
+    const focused = document.activeElement === this.inputField?.nativeElement
+    const val = parseFloat(this.value.toString().replace(/[^0-9.,]+/g, ''))
+    return focused ? val.toString() : val.toFixed(2)
+  }
+
+  set monetaryValue(value: number) {
+    this.value = this.currencyCode + value.toFixed(2)
+  }
+}

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

@@ -1,4 +1,4 @@
-<div class="paperless-input-select">
+<div class="paperless-input-select" [class.disabled]="disabled">
     <div>
       <ng-select name="inputId" [(ngModel)]="value"
         [disabled]="disabled"

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

@@ -0,0 +1,11 @@
+.paperless-input-select.disabled {
+    cursor: not-allowed;
+
+    ::ng-deep ng-select {
+        pointer-events: none;
+
+        .ng-select-container {
+            background-color: var(--pngx-bg-alt) !important;
+        }
+    }
+}

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

@@ -1,4 +1,4 @@
-<div class="paperless-input-select">
+<div class="paperless-input-select" [class.disabled]="disabled">
   <div>
     <ng-select name="inputId" [(ngModel)]="value"
       [disabled]="disabled"

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

@@ -0,0 +1,11 @@
+.paperless-input-select.disabled {
+    cursor: not-allowed;
+
+    ::ng-deep ng-select {
+        pointer-events: none;
+
+        .ng-select-container {
+            background-color: var(--pngx-bg-alt) !important;
+        }
+    }
+}

src-ui/src/app/components/common/input/select/select.component.scss

@@ -1,6 +1,7 @@
 // styles for ng-select child are in styles.scss
 .paperless-input-select.disabled {
-    .input-group {
+    .input-group,
+    div > div {
         cursor: not-allowed;
     }
 

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

@@ -118,4 +118,18 @@ describe('SelectComponent', () => {
     tick(3000)
     expect(clearSpy).toHaveBeenCalled()
   }))
+
+  it('should emit filtered documents', () => {
+    component.value = 10
+    component.items = items
+    const emitSpy = jest.spyOn(component.filterDocuments, 'emit')
+    component.onFilterDocuments()
+    expect(emitSpy).toHaveBeenCalledWith([items[2]])
+  })
+
+  it('should return the correct filter button title', () => {
+    component.title = 'Tag'
+    const expectedTitle = `Filter documents with this ${component.title}`
+    expect(component.filterButtonTitle).toEqual(expectedTitle)
+  })
 })

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

@@ -169,4 +169,12 @@ describe('TagsComponent', () => {
     expect(component.getTag(2)).toEqual(tags[1])
     expect(component.getTag(4)).toBeUndefined()
   })
+
+  it('should emit filtered documents', () => {
+    component.value = [10]
+    component.tags = tags
+    const emitSpy = jest.spyOn(component.filterDocuments, 'emit')
+    component.onFilterDocuments()
+    expect(emitSpy).toHaveBeenCalledWith([tags[2]])
+  })
 })

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

@@ -19,7 +19,7 @@
       }
     </h3>
   </div>
-  <div class="btn-toolbar col col-md-auto">
+  <div class="btn-toolbar col col-md-auto gap-2">
     <ng-content></ng-content>
   </div>
 </div>

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

@@ -0,0 +1,154 @@
+<div class="modal-header">
+  <h5 class="modal-title" id="modal-basic-title" i18n>System Status</h5>
+  <button type="button" class="btn-close" aria-label="Close" (click)="close()"></button>
+</div>
+<div class="modal-body">
+  @if (!status) {
+    <div class="w-100 h-100 d-flex align-items-center justify-content-center">
+      <div>
+        <div class="spinner-border spinner-border-sm me-2" role="status"></div>
+        <ng-container i18n>Loading...</ng-container>
+      </div>
+    </div>
+  } @else {
+    <div class="row row-cols-1 row-cols-md-3 g-3">
+      <div class="col">
+        <div class="card bg-light h-100">
+          <div class="card-header">
+            <h5 class="card-title mb-0" i18n>Environment</h5>
+          </div>
+          <div class="card-body">
+            <dl class="card-text">
+              <dt i18n>Paperless-ngx Version</dt>
+              <dd>{{status.pngx_version}}</dd>
+              <dt i18n>Install Type</dt>
+              <dd>{{status.install_type}}</dd>
+              <dt i18n>Server OS</dt>
+              <dd>{{status.server_os}}</dd>
+              <dt i18n>Media Storage</dt>
+              <dd>
+                <ngb-progressbar style="height: 4px;" class="mt-2 mb-1" type="primary" [max]="status.storage.total" [value]="status.storage.total - status.storage.available"></ngb-progressbar>
+                <span class="small">{{status.storage.available | filesize}} <ng-container i18n>available</ng-container> ({{status.storage.total | filesize}} <ng-container i18n>total</ng-container>)</span>
+              </dd>
+            </dl>
+          </div>
+        </div>
+      </div>
+
+      <div class="col">
+        <div class="card bg-light h-100">
+          <div class="card-header">
+            <h5 class="card-title mb-0" i18n>Database</h5>
+          </div>
+          <div class="card-body">
+            <dl class="card-text">
+              <dt i18n>Type</dt>
+              <dd>{{status.database.type}}</dd>
+              <dt i18n>Status</dt>
+              <dd class="d-flex align-items-center">
+                {{status.database.status}}
+                @if (status.database.status === 'OK') {
+                  <i-bs name="check-circle-fill" class="text-primary ms-2 lh-1" ngbPopover="{{status.database.url}}" triggers="mouseenter:mouseleave"></i-bs>
+                } @else {
+                  <i-bs name="exclamation-triangle-fill" class="text-danger ms-2 lh-1" ngbPopover="{{status.database.url}}: {{status.database.error}}" triggers="mouseenter:mouseleave"></i-bs>
+                }
+              </dd>
+              <dt i18n>Migration Status</dt>
+              <dd class="d-flex align-items-center">
+                @if (status.database.migration_status.unapplied_migrations.length === 0) {
+                  <ng-container>Up to date</ng-container><i-bs name="check-circle-fill" class="text-primary ms-2 lh-1" [ngbPopover]="migrationStatus" triggers="mouseenter:mouseleave"></i-bs>
+                } @else {
+                  <ng-container>{{status.database.migration_status.unapplied_migrations.length}} Pending</ng-container><i-bs name="exclamation-triangle-fill" class="text-warning ms-2 lh-1" [ngbPopover]="migrationStatus" triggers="mouseenter:mouseleave"></i-bs>
+                }
+                <ng-template #migrationStatus>
+                  <h6><ng-container i18n>Latest Migration</ng-container>:</h6> <span class="font-monospace small">{{status.database.migration_status.latest_migration}}</span>
+                  @if (status.database.migration_status.unapplied_migrations.length > 0) {
+                    <h6 class="mt-3"><ng-container i18n>Pending Migrations</ng-container>:</h6>
+                    <ul>
+                      @for (migration of status.database.migration_status.unapplied_migrations; track migration) {
+                        <li class="font-monospace small">{{migration}}</li>
+                      }
+                    </ul>
+                  }
+                </ng-template>
+              </dd>
+            </dl>
+          </div>
+        </div>
+      </div>
+
+      <div class="col">
+        <div class="card bg-light h-100">
+          <div class="card-header">
+            <h5 class="card-title mb-0" i18n>Tasks</h5>
+          </div>
+          <div class="card-body">
+            <dl class="card-text">
+              <dt i18n>Redis Status</dt>
+              <dd class="d-flex align-items-center">
+                {{status.tasks.redis_status}}
+                @if (status.tasks.redis_status === 'OK') {
+                  <i-bs name="check-circle-fill" class="text-primary ms-2 lh-1" ngbPopover="{{status.tasks.redis_url}}" triggers="mouseenter:mouseleave"></i-bs>
+                } @else {
+                  <i-bs name="exclamation-triangle-fill" class="text-danger ms-2 lh-1" ngbPopover="{{status.tasks.redis_url}}: {{status.tasks.redis_error}}" triggers="mouseenter:mouseleave"></i-bs>
+                }
+              </dd>
+              <dt i18n>Celery Status</dt>
+              <dd class="d-flex align-items-center">
+                {{status.tasks.celery_status}}
+                @if (status.tasks.celery_status === 'OK') {
+                  <i-bs name="check-circle-fill" class="text-primary ms-2 lh-1"></i-bs>
+                } @else {
+                  <i-bs name="exclamation-triangle-fill" class="text-danger ms-2 lh-1"></i-bs>
+                }
+              </dd>
+              <dt i18n>Search Index</dt>
+              <dd class="d-flex align-items-center">
+                {{status.tasks.index_status}}
+                @if (status.tasks.index_status === 'OK') {
+                  @if (isStale(status.tasks.index_last_modified)) {
+                    <i-bs name="exclamation-triangle-fill" class="text-warning ms-2 lh-1" [ngbPopover]="indexStatus" triggers="mouseenter:mouseleave"></i-bs>
+                  } @else {
+                    <i-bs name="check-circle-fill" class="text-primary ms-2 lh-1" [ngbPopover]="indexStatus" triggers="mouseenter:mouseleave"></i-bs>
+                  }
+                } @else {
+                  <i-bs name="exclamation-triangle-fill" class="text-danger ms-2 lh-1" ngbPopover="{{status.tasks.index_error}}" triggers="mouseenter:mouseleave"></i-bs>
+                }
+              </dd>
+              <ng-template #indexStatus>
+                <h6><ng-container i18n>Last Updated</ng-container>:</h6> <span class="font-monospace small">{{status.tasks.index_last_modified | customDate:'medium'}}</span>
+              </ng-template>
+              <dt i18n>Classifier</dt>
+              <dd class="d-flex align-items-center">
+                {{status.tasks.classifier_status}}
+                @if (status.tasks.classifier_status === 'OK') {
+                  @if (isStale(status.tasks.classifier_last_trained)) {
+                    <i-bs name="exclamation-triangle-fill" class="text-warning ms-2 lh-1" [ngbPopover]="classifierStatus" triggers="mouseenter:mouseleave"></i-bs>
+                  } @else {
+                    <i-bs name="check-circle-fill" class="text-primary ms-2 lh-1" [ngbPopover]="classifierStatus" triggers="mouseenter:mouseleave"></i-bs>
+                  }
+                } @else {
+                  <i-bs name="exclamation-triangle-fill" class="text-danger ms-2 lh-1" ngbPopover="{{status.tasks.classifier_error}}" triggers="mouseenter:mouseleave"></i-bs>
+                }
+              </dd>
+              <ng-template #classifierStatus>
+                <h6><ng-container i18n>Last Trained</ng-container>:</h6> <span class="font-monospace small">{{status.tasks.classifier_last_trained | customDate:'medium'}}</span>
+              </ng-template>
+            </dl>
+          </div>
+        </div>
+      </div>
+    </div>
+  }
+</div>
+<div class="modal-footer">
+  <button class="btn btn-sm btn-outline-secondary" (click)="copy()">
+    @if (!copied) {
+      <i-bs name="clipboard-fill"></i-bs>&nbsp;
+    }
+    @if (copied) {
+      <i-bs name="clipboard-check-fill"></i-bs>&nbsp;
+    }
+    <ng-container i18n>Copy</ng-container>
+  </button>
+</div>

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

@@ -0,0 +1,103 @@
+import {
+  ComponentFixture,
+  TestBed,
+  fakeAsync,
+  tick,
+} from '@angular/core/testing'
+import {
+  NgbActiveModal,
+  NgbModalModule,
+  NgbPopoverModule,
+  NgbProgressbarModule,
+} from '@ng-bootstrap/ng-bootstrap'
+import { Clipboard, ClipboardModule } from '@angular/cdk/clipboard'
+import { SystemStatusDialogComponent } from './system-status-dialog.component'
+import {
+  SystemStatusItemStatus,
+  InstallType,
+  SystemStatus,
+} from 'src/app/data/system-status'
+import { HttpClientTestingModule } from '@angular/common/http/testing'
+import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
+import { NgxFilesizeModule } from 'ngx-filesize'
+
+const status: SystemStatus = {
+  pngx_version: '2.4.3',
+  server_os: 'macOS-14.1.1-arm64-arm-64bit',
+  install_type: InstallType.BareMetal,
+  storage: { total: 494384795648, available: 13573525504 },
+  database: {
+    type: 'sqlite',
+    url: '/paperless-ngx/data/db.sqlite3',
+    status: SystemStatusItemStatus.ERROR,
+    error: null,
+    migration_status: {
+      latest_migration: 'socialaccount.0006_alter_socialaccount_extra_data',
+      unapplied_migrations: [],
+    },
+  },
+  tasks: {
+    redis_url: 'redis://localhost:6379',
+    redis_status: SystemStatusItemStatus.ERROR,
+    redis_error: 'Error 61 connecting to localhost:6379. Connection refused.',
+    celery_status: SystemStatusItemStatus.ERROR,
+    index_status: SystemStatusItemStatus.OK,
+    index_last_modified: new Date().toISOString(),
+    index_error: null,
+    classifier_status: SystemStatusItemStatus.OK,
+    classifier_last_trained: new Date().toISOString(),
+    classifier_error: null,
+  },
+}
+
+describe('SystemStatusDialogComponent', () => {
+  let component: SystemStatusDialogComponent
+  let fixture: ComponentFixture<SystemStatusDialogComponent>
+  let clipboard: Clipboard
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [SystemStatusDialogComponent],
+      providers: [NgbActiveModal],
+      imports: [
+        NgbModalModule,
+        ClipboardModule,
+        HttpClientTestingModule,
+        NgxBootstrapIconsModule.pick(allIcons),
+        NgxFilesizeModule,
+        NgbPopoverModule,
+        NgbProgressbarModule,
+      ],
+    }).compileComponents()
+
+    fixture = TestBed.createComponent(SystemStatusDialogComponent)
+    component = fixture.componentInstance
+    component.status = status
+    clipboard = TestBed.inject(Clipboard)
+    fixture.detectChanges()
+  })
+
+  it('should close the active modal', () => {
+    const closeSpy = jest.spyOn(component.activeModal, 'close')
+    component.close()
+    expect(closeSpy).toHaveBeenCalled()
+  })
+
+  it('should copy the system status to clipboard', fakeAsync(() => {
+    jest.spyOn(clipboard, 'copy')
+    component.copy()
+    expect(clipboard.copy).toHaveBeenCalledWith(
+      JSON.stringify(component.status)
+    )
+    expect(component.copied).toBeTruthy()
+    tick(3000)
+    expect(component.copied).toBeFalsy()
+  }))
+
+  it('should calculate if date is stale', () => {
+    const date = new Date()
+    date.setHours(date.getHours() - 25)
+    expect(component.isStale(date.toISOString())).toBeTruthy()
+    expect(component.isStale(date.toISOString(), 26)).toBeFalsy()
+  })
+})

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

@@ -0,0 +1,39 @@
+import { Component, Input } from '@angular/core'
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
+import { SystemStatus } from 'src/app/data/system-status'
+import { SystemStatusService } from 'src/app/services/system-status.service'
+import { Clipboard } from '@angular/cdk/clipboard'
+
+@Component({
+  selector: 'pngx-system-status-dialog',
+  templateUrl: './system-status-dialog.component.html',
+  styleUrl: './system-status-dialog.component.scss',
+})
+export class SystemStatusDialogComponent {
+  public status: SystemStatus
+
+  public copied: boolean = false
+
+  constructor(
+    public activeModal: NgbActiveModal,
+    private clipboard: Clipboard
+  ) {}
+
+  public close() {
+    this.activeModal.close()
+  }
+
+  public copy() {
+    this.clipboard.copy(JSON.stringify(this.status))
+    this.copied = true
+    setTimeout(() => {
+      this.copied = false
+    }, 3000)
+  }
+
+  public isStale(dateStr: string, hours: number = 24): boolean {
+    const date = new Date(dateStr)
+    const now = new Date()
+    return now.getTime() - date.getTime() > hours * 60 * 60 * 1000
+  }
+}

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

@@ -6,8 +6,8 @@
       <input type="file" class="visually-hidden" (change)="onFileSelected($event)" multiple #fileUpload>
     </form>
     @if (getStatus().length > 0) {
-    <div class="fixed-bottom p-2 p-md-4 d-flex justify-content-end" [ngClass]="slimSidebarEnabled ? 'col-slim' : 'offset-md-3 offset-lg-2'">
-      <div class="col col-lg-4 col-xl-3 ps-0 pe-0 ps-lg-3 pe-lg-0">
+    <div class="fixed-bottom p-2 p-md-4 d-flex justify-content-end pe-none" [ngClass]="slimSidebarEnabled ? 'col-slim' : 'offset-md-3 offset-lg-2'">
+      <div class="col col-lg-4 col-xl-3 ps-0 pe-0 ps-lg-3 pe-lg-0 pe-auto">
         <div class="card shadow-sm consumer-status-card">
           <div class="card-body">
             <div class="row">

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

@@ -119,6 +119,8 @@ describe('UploadFileWidgetComponent', () => {
     const processingStatus = new FileStatus()
     processingStatus.phase = FileStatusPhase.WORKING
     expect(component.getStatusColor(processingStatus)).toEqual('primary')
+    processingStatus.phase = FileStatusPhase.UPLOADING
+    expect(component.getStatusColor(processingStatus)).toEqual('primary')
     const failedStatus = new FileStatus()
     failedStatus.phase = FileStatusPhase.FAILED
     expect(component.getStatusColor(failedStatus)).toEqual('danger')

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

@@ -1,11 +1,11 @@
 <pngx-page-header [(title)]="title">
   @if (contentRenderType === ContentRenderType.PDF && !useNativePdfViewer) {
-    <div class="input-group input-group-sm me-2 d-none d-md-flex">
+    <div class="input-group input-group-sm d-none d-md-flex">
       <div class="input-group-text" i18n>Page</div>
       <input class="form-control flex-grow-0 w-auto" type="number" min="1" [max]="previewNumPages" [(ngModel)]="previewCurrentPage" />
       <div class="input-group-text" i18n>of {{previewNumPages}}</div>
     </div>
-    <div class="input-group input-group-sm me-5 d-none d-md-flex">
+    <div class="input-group input-group-sm me-md-5 d-none d-md-flex">
       <button class="btn btn-outline-secondary" (click)="decreaseZoom()" i18n>-</button>
       <select class="form-select" (change)="onZoomSelect($event)">
         @for (setting of zoomSettings; track setting) {
@@ -18,11 +18,11 @@
     </div>
   }
 
-  <button type="button" class="btn btn-sm btn-outline-danger me-4" (click)="delete()" [disabled]="!userIsOwner" *pngxIfPermissions="{ action: PermissionAction.Delete, type: PermissionType.Document }">
+  <button type="button" class="btn btn-sm btn-outline-danger me-md-4" (click)="delete()" [disabled]="!userIsOwner" *pngxIfPermissions="{ action: PermissionAction.Delete, type: PermissionType.Document }">
     <i-bs width="1.2em" height="1.2em" name="trash"></i-bs><span class="d-none d-lg-inline ps-1" i18n>Delete</span>
   </button>
 
-  <div class="btn-group me-2">
+  <div class="btn-group">
     <a [href]="downloadUrl" class="btn btn-sm btn-outline-primary">
       <i-bs width="1.2em" height="1.2em" name="download"></i-bs><span class="d-none d-lg-inline ps-1" i18n>Download</span>
     </a>
@@ -38,7 +38,7 @@
   </div>
 
   <div class="ms-auto" ngbDropdown>
-    <button class="btn btn-sm btn-outline-primary me-2" id="actionsDropdown" ngbDropdownToggle>
+    <button class="btn btn-sm btn-outline-primary" id="actionsDropdown" ngbDropdownToggle>
       <i-bs name="three-dots"></i-bs>
       <div class="d-none d-sm-inline">&nbsp;<ng-container i18n>Actions</ng-container></div>
     </button>
@@ -55,7 +55,6 @@
 
   <pngx-custom-fields-dropdown
     *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.CustomField }"
-    class="me-2"
     [documentId]="documentId"
     [disabled]="!userIsOwner"
     [existingFields]="document?.custom_fields"
@@ -142,14 +141,12 @@
                       [error]="getCustomFieldError(i)"></pngx-input-number>
                     }
                     @case (CustomFieldDataType.Monetary) {
-                      <pngx-input-number formControlName="value"
+                      <pngx-input-monetary formControlName="value"
                       [title]="getCustomFieldFromInstance(fieldInstance)?.name"
                       [removable]="userIsOwner"
                       (removed)="removeField(fieldInstance)"
                       [horizontal]="true"
-                      [showAdd]="false"
-                      [step]=".01"
-                      [error]="getCustomFieldError(i)"></pngx-input-number>
+                      [error]="getCustomFieldError(i)"></pngx-input-monetary>
                     }
                     @case (CustomFieldDataType.Boolean) {
                       <pngx-input-check formControlName="value"

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

@@ -95,12 +95,12 @@ const doc: Document = {
     {
       created: new Date(),
       note: 'note 1',
-      user: 1,
+      user: { id: 1, username: 'user1' },
     },
     {
       created: new Date(),
       note: 'note 2',
-      user: 2,
+      user: { id: 2, username: 'user2' },
     },
   ],
   custom_fields: [

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

@@ -634,11 +634,14 @@ export class DocumentDetailComponent
           // in case data changed while saving eg removing inbox_tags
           this.documentForm.patchValue(docValues)
           this.store.next(this.documentForm.value)
+          this.openDocumentService.setDirty(this.document, false)
           this.toastService.showInfo($localize`Document saved successfully.`)
-          close && this.close()
           this.networkActive = false
           this.error = null
-          this.openDocumentService.refreshDocument(this.documentId)
+          close &&
+            this.close(() =>
+              this.openDocumentService.refreshDocument(this.documentId)
+            )
         },
         error: (error) => {
           this.networkActive = false
@@ -693,12 +696,13 @@ export class DocumentDetailComponent
       })
   }
 
-  close() {
+  close(closedCallback: () => void = null) {
     this.openDocumentService
       .closeDocument(this.document)
       .pipe(first())
       .subscribe((closed) => {
         if (!closed) return
+        if (closedCallback) closedCallback()
         if (this.documentListViewService.activeSavedViewId) {
           this.router.navigate([
             'view',

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

@@ -1,6 +1,6 @@
 <pngx-page-header [title]="getTitle()">
 
-  <div ngbDropdown class="me-2 d-flex">
+  <div ngbDropdown class="d-flex">
     <button class="btn btn-sm btn-outline-primary" id="dropdownSelect" ngbDropdownToggle>
       <i-bs name="text-indent-left"></i-bs>
       <div class="d-none d-sm-inline">&nbsp;<ng-container i18n>Select</ng-container></div>
@@ -26,7 +26,7 @@
     </label>
   </div>
 
-  <div ngbDropdown class="btn-group ms-2 flex-fill">
+  <div ngbDropdown class="btn-group flex-fill">
     <button class="btn btn-outline-primary btn-sm" id="dropdownBasic1" ngbDropdownToggle i18n>Sort</button>
     <div ngbDropdownMenu aria-labelledby="dropdownBasic1" class="shadow dropdown-menu-right">
       <div class="w-100 d-flex pb-2 mb-1 border-bottom">
@@ -49,7 +49,7 @@
     </div>
   </div>
 
-  <div class="btn-group ms-2 flex-fill" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.SavedView }" ngbDropdown role="group">
+  <div class="btn-group flex-fill" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.SavedView }" ngbDropdown role="group">
     <button class="btn btn-sm btn-outline-primary dropdown-toggle flex-fill" tourAnchor="tour.documents-views" ngbDropdownToggle>
       <ng-container i18n>Views</ng-container>
       @if (savedViewIsModified) {

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

@@ -381,6 +381,28 @@ describe('FilterEditorComponent', () => {
     expect(component.textFilter).toBeNull()
   }))
 
+  it('should ingest text filter content with relative dates that are not in quick list', fakeAsync(() => {
+    expect(component.dateAddedRelativeDate).toBeNull()
+    component.filterRules = [
+      {
+        rule_type: FILTER_FULLTEXT_QUERY,
+        value: 'added:[-2 week to now]',
+      },
+    ]
+    expect(component.dateAddedRelativeDate).toBeNull()
+    expect(component.textFilter).toEqual('added:[-2 week to now]')
+
+    expect(component.dateCreatedRelativeDate).toBeNull()
+    component.filterRules = [
+      {
+        rule_type: FILTER_FULLTEXT_QUERY,
+        value: 'created:[-2 week to now]',
+      },
+    ]
+    expect(component.dateCreatedRelativeDate).toBeNull()
+    expect(component.textFilter).toEqual('created:[-2 week to now]')
+  }))
+
   it('should ingest text filter rules for more like', fakeAsync(() => {
     const moreLikeSpy = jest.spyOn(documentService, 'get')
     moreLikeSpy.mockReturnValue(of({ id: 1, title: 'Foo Bar' }))
@@ -1372,6 +1394,34 @@ describe('FilterEditorComponent', () => {
     ])
   }))
 
+  it('should leave relative dates not in quick list intact', fakeAsync(() => {
+    component.textFilterInput.nativeElement.value = 'created:[-2 week to now]'
+    component.textFilterInput.nativeElement.dispatchEvent(new Event('input'))
+    const textFieldTargetDropdown = fixture.debugElement.queryAll(
+      By.directive(NgbDropdownItem)
+    )[4]
+    textFieldTargetDropdown.triggerEventHandler('click')
+    fixture.detectChanges()
+    tick(400)
+    expect(component.filterRules).toEqual([
+      {
+        rule_type: FILTER_FULLTEXT_QUERY,
+        value: 'created:[-2 week to now]',
+      },
+    ])
+
+    component.textFilterInput.nativeElement.value = 'added:[-2 month to now]'
+    component.textFilterInput.nativeElement.dispatchEvent(new Event('input'))
+    fixture.detectChanges()
+    tick(400)
+    expect(component.filterRules).toEqual([
+      {
+        rule_type: FILTER_FULLTEXT_QUERY,
+        value: 'added:[-2 month to now]',
+      },
+    ])
+  }))
+
   it('should convert user input to correct filter rules on date added after', fakeAsync(() => {
     const dateAddedDropdown = fixture.debugElement.queryAll(
       By.directive(DateDropdownComponent)

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

@@ -362,10 +362,11 @@ export class FilterEditorComponent
                     this.dateCreatedRelativeDate =
                       RELATIVE_DATE_QUERYSTRINGS.find(
                         (qS) => qS.dateQuery == match[1]
-                      )?.relativeDate
+                      )?.relativeDate ?? null
                   }
                 }
               )
+              if (this.dateCreatedRelativeDate === null) textQueryArgs.push(arg) // relative query not in the quick list
             } else if (arg.match(RELATIVE_DATE_QUERY_REGEXP_ADDED)) {
               ;[...arg.matchAll(RELATIVE_DATE_QUERY_REGEXP_ADDED)].forEach(
                 (match) => {
@@ -373,10 +374,11 @@ export class FilterEditorComponent
                     this.dateAddedRelativeDate =
                       RELATIVE_DATE_QUERYSTRINGS.find(
                         (qS) => qS.dateQuery == match[1]
-                      )?.relativeDate
+                      )?.relativeDate ?? null
                   }
                 }
               )
+              if (this.dateAddedRelativeDate === null) textQueryArgs.push(arg) // relative query not in the quick list
             } else {
               textQueryArgs.push(arg)
             }
@@ -787,27 +789,6 @@ export class FilterEditorComponent
         })
       }
     }
-    if (
-      this.dateCreatedRelativeDate == null &&
-      this.dateAddedRelativeDate == null
-    ) {
-      const existingRule = filterRules.find(
-        (fr) => fr.rule_type == FILTER_FULLTEXT_QUERY
-      )
-      if (
-        existingRule?.value.match(RELATIVE_DATE_QUERY_REGEXP_CREATED) ||
-        existingRule?.value.match(RELATIVE_DATE_QUERY_REGEXP_ADDED)
-      ) {
-        // remove any existing date query
-        existingRule.value = existingRule.value
-          .replace(RELATIVE_DATE_QUERY_REGEXP_CREATED, '')
-          .replace(RELATIVE_DATE_QUERY_REGEXP_ADDED, '')
-        if (existingRule.value.replace(',', '').trim() === '') {
-          // if its empty now, remove it entirely
-          filterRules.splice(filterRules.indexOf(existingRule), 1)
-        }
-      }
-    }
     if (this.permissionsSelectionModel.ownerFilter == OwnerFilterType.SELF) {
       filterRules.push({
         rule_type: FILTER_OWNER,

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

@@ -19,22 +19,32 @@ const notes: DocumentNote[] = [
   {
     id: 23,
     note: 'Note 23',
-    user: 1,
+    user: {
+      id: 1,
+      username: 'user1',
+      first_name: 'User1',
+      last_name: 'Lastname1',
+    },
   },
   {
     id: 24,
     note: 'Note 24',
-    user: 1,
+    user: {
+      id: 1,
+      username: 'user1',
+      first_name: 'User1',
+      last_name: 'Lastname1',
+    },
   },
   {
     id: 25,
     note: 'Note 25',
-    user: 2,
+    user: { id: 2, username: 'user2' },
   },
   {
     id: 30,
     note: 'Note 30',
-    user: 3,
+    user: { id: 3, username: 'user3' },
   },
 ]
 
@@ -123,11 +133,24 @@ describe('DocumentNotesComponent', () => {
   })
 
   it('should handle note user display in all situations', () => {
-    expect(component.displayName({ id: 1, user: 1 })).toEqual(
-      'User1 Lastname1 (user1)'
-    )
-    expect(component.displayName({ id: 1, user: 2 })).toEqual('user2')
-    expect(component.displayName({ id: 1, user: 4 })).toEqual('')
+    expect(
+      component.displayName({
+        id: 1,
+        user: {
+          id: 1,
+          username: 'user1',
+          first_name: 'User1',
+          last_name: 'Lastname1',
+        },
+      })
+    ).toEqual('User1 Lastname1 (user1)')
+    expect(
+      component.displayName({ id: 1, user: { id: 2, username: 'user2' } })
+    ).toEqual('user2')
+    expect(component.displayName({ id: 1, user: 2 } as any)).toEqual('user2')
+    expect(
+      component.displayName({ id: 1, user: { id: 4, username: 'user4' } })
+    ).toEqual('')
     expect(component.displayName({ id: 1 })).toEqual('')
   })
 
@@ -146,7 +169,9 @@ describe('DocumentNotesComponent', () => {
     expect(addSpy).toHaveBeenCalledWith(12, note)
     expect(toastsSpy).toHaveBeenCalled()
 
-    addSpy.mockReturnValueOnce(of([...notes, { id: 31, note, user: 1 }]))
+    addSpy.mockReturnValueOnce(
+      of([...notes, { id: 31, note, user: { id: 1 } }])
+    )
     addButton.triggerEventHandler('click')
     fixture.detectChanges()
     expect(fixture.debugElement.nativeElement.textContent).toContain(note)

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

@@ -84,7 +84,8 @@ export class DocumentNotesComponent extends ComponentWithPermissions {
 
   displayName(note: DocumentNote): string {
     if (!note.user) return ''
-    const user = this.users?.find((u) => u.id === note.user)
+    const user_id = typeof note.user === 'number' ? note.user : note.user.id
+    const user = this.users?.find((u) => u.id === user_id)
     if (!user) return ''
     const nameComponents = []
     if (user.first_name) nameComponents.push(user.first_name)

src-ui/src/app/components/manage/custom-fields/custom-fields.component.html

@@ -5,7 +5,7 @@
   i18n-info
   infoLink="usage/#custom-fields"
   >
-  <button type="button" class="btn btn-sm btn-outline-primary ms-4" (click)="editField()" *pngxIfPermissions="{ action: PermissionAction.Add, type: PermissionType.CustomField }">
+  <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>

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

@@ -1,126 +1,120 @@
 <pngx-page-header title="{{ typeNamePlural | titlecase }}">
-  <button class="btn btn-sm btn-outline-secondary me-2" (click)="clearSelection()" [hidden]="selectedObjects.size === 0">
+  <button class="btn btn-sm btn-outline-secondary" (click)="clearSelection()" [hidden]="selectedObjects.size === 0">
     <i-bs  name="x"></i-bs>&nbsp;<ng-container i18n>Clear selection</ng-container>
     </button>
-    <button type="button" class="btn btn-sm btn-outline-primary me-2" (click)="setPermissions()" [disabled]="!userOwnsAll || 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 me-5" (click)="delete()" [disabled]="!userOwnsAll || selectedObjects.size === 0">
+    <button type="button" class="btn btn-sm btn-outline-danger" (click)="delete()" [disabled]="!userCanBulkEdit(PermissionAction.Delete) || selectedObjects.size === 0">
       <i-bs name="trash"></i-bs>&nbsp;<ng-container i18n>Delete</ng-container>
     </button>
-    <button type="button" class="btn btn-sm btn-outline-primary" (click)="openCreateDialog()" *pngxIfPermissions="{ action: PermissionAction.Add, type: permissionType }">
+    <button type="button" class="btn btn-sm btn-outline-primary ms-md-5" (click)="openCreateDialog()" *pngxIfPermissions="{ action: PermissionAction.Add, type: permissionType }">
       <i-bs name="plus-circle"></i-bs>&nbsp;<ng-container i18n>Create</ng-container>
     </button>
-    </pngx-page-header>
+</pngx-page-header>
 
-    <div class="row mb-3">
-      <div class="col-md mb-2 mb-xl-0">
-        <div class="form-inline d-flex align-items-center">
-          <label class="text-muted me-2 mb-0" i18n>Filter by:</label>
-          <input class="form-control form-control-sm flex-fill w-auto" type="text" autofocus [(ngModel)]="nameFilter" (keyup)="onNameFilterKeyUp($event)" placeholder="Name" i18n-placeholder>
-        </div>
-      </div>
-
-      <ngb-pagination class="col-auto" [pageSize]="25" [collectionSize]="collectionSize" [(page)]="page" [maxSize]="5" (pageChange)="reloadData()" size="sm" aria-label="Pagination"></ngb-pagination>
+<div class="row mb-3">
+  <div class="col-md mb-2 mb-xl-0">
+    <div class="form-inline d-flex align-items-center">
+      <label class="text-muted me-2 mb-0" i18n>Filter by:</label>
+      <input class="form-control form-control-sm flex-fill w-auto" type="text" autofocus [(ngModel)]="nameFilter" (keyup)="onNameFilterKeyUp($event)" placeholder="Name" i18n-placeholder>
     </div>
+  </div>
 
-    <div class="card border mb-3">
-      <table class="table table-striped align-middle shadow-sm mb-0">
-        <thead>
-          <tr>
-            <th scope="col">
-              <div class="form-check m-0 ms-2 me-n2">
-                <input type="checkbox" class="form-check-input" id="all-objects" [disabled]="data.length === 0" (click)="toggleAll($event); $event.stopPropagation();">
-                <label class="form-check-label" for="all-objects"></label>
-              </div>
-            </th>
-            <th scope="col" class="fw-normal" pngxSortable="name" [currentSortField]="sortField" [currentSortReverse]="sortReverse" (sort)="onSort($event)" i18n>Name</th>
-            <th scope="col" class="fw-normal d-none d-sm-table-cell" pngxSortable="matching_algorithm" [currentSortField]="sortField" [currentSortReverse]="sortReverse" (sort)="onSort($event)" i18n>Matching</th>
-            <th scope="col" class="fw-normal" pngxSortable="document_count" [currentSortField]="sortField" [currentSortReverse]="sortReverse" (sort)="onSort($event)" i18n>Document count</th>
-            @for (column of extraColumns; track column) {
-              <th scope="col" class="fw-normal" pngxSortable="{{column.key}}" [currentSortField]="sortField" [currentSortReverse]="sortReverse" (sort)="onSort($event)">{{column.name}}</th>
-            }
-            <th scope="col" class="fw-normal" i18n>Actions</th>
-          </tr>
-        </thead>
-        <tbody>
-          @if (isLoading) {
-            <tr>
-              <td colspan="5">
-                <div class="spinner-border spinner-border-sm me-2" role="status"></div>
-                <ng-container i18n>Loading...</ng-container>
-              </td>
-            </tr>
-          }
-          @for (object of data; track object) {
-            <tr (click)="toggleSelected(object); $event.stopPropagation();">
-              <td>
-                <div class="form-check m-0 ms-2 me-n2">
-                  <input type="checkbox" class="form-check-input" id="{{typeName}}{{object.id}}" [checked]="selectedObjects.has(object.id)" (click)="toggleSelected(object); $event.stopPropagation();">
-                  <label class="form-check-label" for="{{typeName}}{{object.id}}"></label>
-                </div>
-              </td>
-              <td scope="row"><button class="btn btn-link ms-0 ps-0 text-start" (click)="userCanEdit(object) ? openEditDialog(object) : null">{{ object.name }}</button> </td>
-              <td scope="row" class="d-none d-sm-table-cell">{{ getMatching(object) }}</td>
-              <td scope="row">{{ object.document_count }}</td>
-              @for (column of extraColumns; track column) {
-                <td scope="row">
-                  @if (column.rendersHtml) {
-                    <div [innerHtml]="column.valueFn.call(null, object) | safeHtml"></div>
-                  } @else {
-                    {{ column.valueFn.call(null, object) }}
-                  }
-                </td>
-              }
-              <td scope="row">
-                <div class="btn-group d-block d-sm-none">
-                  <div ngbDropdown class="d-inline-block">
-                    <button type="button" class="btn btn-link" id="actionsMenuMobile" ngbDropdownToggle>
-                      <i-bs name="three-dots-vertical"></i-bs>
-                    </button>
-                    <div ngbDropdownMenu aria-labelledby="actionsMenuMobile">
-                      <button (click)="filterDocuments(object)" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.Document }" ngbDropdownItem i18n>Filter Documents</button>
-                      <button (click)="openEditDialog(object)" *pngxIfPermissions="{ action: PermissionAction.Change, type: permissionType }" ngbDropdownItem i18n>Edit</button>
-                      <button class="text-danger" (click)="openDeleteDialog(object)" *pngxIfPermissions="{ action: PermissionAction.Delete, type: permissionType }" ngbDropdownItem i18n>Delete</button>
-                    </div>
-                  </div>
-                </div>
-                <div class="btn-group d-none d-sm-block">
-                  <button class="btn btn-sm btn-outline-secondary" (click)="filterDocuments(object); $event.stopPropagation();" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.Document }">
-                    <i-bs width="1em" height="1em" name="filter"></i-bs>&nbsp;<ng-container i18n>Documents</ng-container>
-                  </button>
-                  <button class="btn btn-sm btn-outline-secondary" (click)="openEditDialog(object); $event.stopPropagation();" *pngxIfPermissions="{ action: PermissionAction.Change, type: permissionType }" [disabled]="!userCanEdit(object)">
-                    <i-bs width="1em" height="1em" name="pencil"></i-bs>&nbsp;<ng-container i18n>Edit</ng-container>
-                  </button>
-                  <pngx-confirm-button
-                    label="Delete"
-                    i18n-label
-                    (confirm)="deleteObject(object)"
-                    *pngxIfPermissions="{ action: PermissionAction.Delete, type: permissionType }"
-                    [disabled]="!userCanDelete(object)"
-                    buttonClasses=" btn-sm btn-outline-danger"
-                    iconName="trash">
-                  </pngx-confirm-button>
-                </div>
-              </td>
-            </tr>
-          }
-        </tbody>
-      </table>
-    </div>
+  <ngb-pagination class="col-auto" [pageSize]="25" [collectionSize]="collectionSize" [(page)]="page" [maxSize]="5" (pageChange)="reloadData()" size="sm" aria-label="Pagination"></ngb-pagination>
+</div>
 
-    @if (!isLoading) {
-      <div class="d-flex mb-2">
-        @if (collectionSize > 0) {
-          <div>
-            <ng-container i18n>{collectionSize, plural, =1 {One {{typeName}}} other {{{collectionSize || 0}} total {{typeNamePlural}}}}</ng-container>
-            @if (selectedObjects.size > 0) {
-              &nbsp;({{selectedObjects.size}} selected)
-            }
+<div class="card border mb-3">
+  <table class="table table-striped align-middle shadow-sm mb-0">
+    <thead>
+      <tr>
+        <th scope="col">
+          <div class="form-check m-0 ms-2 me-n2">
+            <input type="checkbox" class="form-check-input" id="all-objects" [disabled]="data.length === 0" (click)="toggleAll($event); $event.stopPropagation();">
+            <label class="form-check-label" for="all-objects"></label>
           </div>
+        </th>
+        <th scope="col" class="fw-normal" pngxSortable="name" [currentSortField]="sortField" [currentSortReverse]="sortReverse" (sort)="onSort($event)" i18n>Name</th>
+        <th scope="col" class="fw-normal d-none d-sm-table-cell" pngxSortable="matching_algorithm" [currentSortField]="sortField" [currentSortReverse]="sortReverse" (sort)="onSort($event)" i18n>Matching</th>
+        <th scope="col" class="fw-normal" pngxSortable="document_count" [currentSortField]="sortField" [currentSortReverse]="sortReverse" (sort)="onSort($event)" i18n>Document count</th>
+        @for (column of extraColumns; track column) {
+          <th scope="col" class="fw-normal" pngxSortable="{{column.key}}" [currentSortField]="sortField" [currentSortReverse]="sortReverse" (sort)="onSort($event)">{{column.name}}</th>
         }
-        @if (collectionSize > 20) {
-          <ngb-pagination class="ms-auto" [pageSize]="25" [collectionSize]="collectionSize" [(page)]="page" [maxSize]="5" (pageChange)="reloadData()" size="sm" aria-label="Pagination"></ngb-pagination>
+        <th scope="col" class="fw-normal" i18n>Actions</th>
+      </tr>
+    </thead>
+    <tbody>
+      @if (isLoading) {
+        <tr>
+          <td colspan="5">
+            <div class="spinner-border spinner-border-sm me-2" role="status"></div>
+            <ng-container i18n>Loading...</ng-container>
+          </td>
+        </tr>
+      }
+      @for (object of data; track object) {
+        <tr (click)="toggleSelected(object); $event.stopPropagation();">
+          <td>
+            <div class="form-check m-0 ms-2 me-n2">
+              <input type="checkbox" class="form-check-input" id="{{typeName}}{{object.id}}" [checked]="selectedObjects.has(object.id)" (click)="toggleSelected(object); $event.stopPropagation();">
+              <label class="form-check-label" for="{{typeName}}{{object.id}}"></label>
+            </div>
+          </td>
+          <td scope="row"><button class="btn btn-link ms-0 ps-0 text-start" (click)="userCanEdit(object) ? openEditDialog(object) : null">{{ object.name }}</button> </td>
+          <td scope="row" class="d-none d-sm-table-cell">{{ getMatching(object) }}</td>
+          <td scope="row">{{ object.document_count }}</td>
+          @for (column of extraColumns; track column) {
+            <td scope="row">
+              @if (column.rendersHtml) {
+                <div [innerHtml]="column.valueFn.call(null, object) | safeHtml"></div>
+              } @else {
+                {{ column.valueFn.call(null, object) }}
+              }
+            </td>
+          }
+          <td scope="row">
+            <div class="btn-group d-block d-sm-none">
+              <div ngbDropdown 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)="filterDocuments(object)" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.Document }" ngbDropdownItem i18n>Filter Documents</button>
+                  <button (click)="openEditDialog(object)" *pngxIfPermissions="{ action: PermissionAction.Change, type: permissionType }" ngbDropdownItem i18n>Edit</button>
+                  <button class="text-danger" (click)="openDeleteDialog(object)" *pngxIfPermissions="{ action: PermissionAction.Delete, type: permissionType }" ngbDropdownItem i18n>Delete</button>
+                </div>
+              </div>
+            </div>
+            <div class="btn-group d-none d-sm-block">
+              <button class="btn btn-sm btn-outline-secondary" (click)="filterDocuments(object); $event.stopPropagation();" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.Document }">
+                <i-bs width="1em" height="1em" name="filter"></i-bs>&nbsp;<ng-container i18n>Documents</ng-container>
+              </button>
+              <button class="btn btn-sm btn-outline-secondary" (click)="openEditDialog(object); $event.stopPropagation();" *pngxIfPermissions="{ action: PermissionAction.Change, type: permissionType }" [disabled]="!userCanEdit(object)">
+                <i-bs width="1em" height="1em" name="pencil"></i-bs>&nbsp;<ng-container i18n>Edit</ng-container>
+              </button>
+              <button class="btn btn-sm btn-outline-danger" (click)="openDeleteDialog(object); $event.stopPropagation();" *pngxIfPermissions="{ action: PermissionAction.Delete, type: permissionType }" [disabled]="!userCanDelete(object)">
+                <i-bs width="1em" height="1em" name="trash"></i-bs>&nbsp;<ng-container i18n>Delete</ng-container>
+              </button>
+            </div>
+          </td>
+        </tr>
+      }
+    </tbody>
+  </table>
+</div>
+
+@if (!isLoading) {
+  <div class="d-flex mb-2">
+    @if (collectionSize > 0) {
+      <div>
+        <ng-container i18n>{collectionSize, plural, =1 {One {{typeName}}} other {{{collectionSize || 0}} total {{typeNamePlural}}}}</ng-container>
+        @if (selectedObjects.size > 0) {
+          &nbsp;({{selectedObjects.size}} selected)
         }
       </div>
     }
+    @if (collectionSize > 20) {
+      <ngb-pagination class="ms-auto" [pageSize]="25" [collectionSize]="collectionSize" [(page)]="page" [maxSize]="5" (pageChange)="reloadData()" size="sm" aria-label="Pagination"></ngb-pagination>
+    }
+  </div>
+}

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

@@ -13,7 +13,6 @@ import {
   NgbModalModule,
   NgbModalRef,
   NgbPaginationModule,
-  NgbPopoverModule,
 } from '@ng-bootstrap/ng-bootstrap'
 import { of, throwError } from 'rxjs'
 import { Tag } from 'src/app/data/tag'
@@ -24,7 +23,10 @@ import { TagService } from 'src/app/services/rest/tag.service'
 import { PageHeaderComponent } from '../../common/page-header/page-header.component'
 import { TagListComponent } from '../tag-list/tag-list.component'
 import { ManagementListComponent } from './management-list.component'
-import { PermissionsService } from 'src/app/services/permissions.service'
+import {
+  PermissionAction,
+  PermissionsService,
+} from 'src/app/services/permissions.service'
 import { ToastService } from 'src/app/services/toast.service'
 import { EditDialogComponent } from '../../common/edit-dialog/edit-dialog.component'
 import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dialog.component'
@@ -38,7 +40,6 @@ import { MATCH_NONE } from 'src/app/data/matching-model'
 import { MATCH_LITERAL } from 'src/app/data/matching-model'
 import { PermissionsDialogComponent } from '../../common/permissions-dialog/permissions-dialog.component'
 import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
-import { ConfirmButtonComponent } from '../../common/confirm-button/confirm-button.component'
 import { BulkEditObjectOperation } from 'src/app/services/rest/abstract-name-filter-service'
 
 const tags: Tag[] = [
@@ -67,6 +68,7 @@ describe('ManagementListComponent', () => {
   let modalService: NgbModal
   let toastService: ToastService
   let documentListViewService: DocumentListViewService
+  let permissionsService: PermissionsService
 
   beforeEach(async () => {
     TestBed.configureTestingModule({
@@ -78,20 +80,8 @@ describe('ManagementListComponent', () => {
         SafeHtmlPipe,
         ConfirmDialogComponent,
         PermissionsDialogComponent,
-        ConfirmButtonComponent,
-      ],
-      providers: [
-        {
-          provide: PermissionsService,
-          useValue: {
-            currentUserCan: () => true,
-            currentUserHasObjectPermissions: () => true,
-            currentUserOwnsObject: () => true,
-          },
-        },
-        DatePipe,
-        PermissionsGuard,
       ],
+      providers: [DatePipe, PermissionsGuard],
       imports: [
         HttpClientTestingModule,
         NgbPaginationModule,
@@ -100,7 +90,6 @@ describe('ManagementListComponent', () => {
         NgbModalModule,
         RouterTestingModule.withRoutes(routes),
         NgxBootstrapIconsModule.pick(allIcons),
-        NgbPopoverModule,
       ],
     }).compileComponents()
 
@@ -119,6 +108,14 @@ describe('ManagementListComponent', () => {
           })
         }
       )
+    permissionsService = TestBed.inject(PermissionsService)
+    jest.spyOn(permissionsService, 'currentUserCan').mockReturnValue(true)
+    jest
+      .spyOn(permissionsService, 'currentUserHasObjectPermissions')
+      .mockReturnValue(true)
+    jest
+      .spyOn(permissionsService, 'currentUserOwnsObject')
+      .mockReturnValue(true)
     modalService = TestBed.inject(NgbModal)
     toastService = TestBed.inject(ToastService)
     documentListViewService = TestBed.inject(DocumentListViewService)
@@ -197,23 +194,27 @@ describe('ManagementListComponent', () => {
   })
 
   it('should support delete, show notification on error / success', () => {
+    let modal: NgbModalRef
+    modalService.activeInstances.subscribe((m) => (modal = m[m.length - 1]))
     const toastErrorSpy = jest.spyOn(toastService, 'showError')
     const deleteSpy = jest.spyOn(tagService, 'delete')
     const reloadSpy = jest.spyOn(component, 'reloadData')
 
-    const deleteButton = fixture.debugElement.query(
-      By.directive(ConfirmButtonComponent)
-    )
+    const deleteButton = fixture.debugElement.queryAll(By.css('button'))[8]
+    deleteButton.triggerEventHandler('click')
+
+    expect(modal).not.toBeUndefined()
+    const editDialog = modal.componentInstance as ConfirmDialogComponent
 
     // fail first
     deleteSpy.mockReturnValueOnce(throwError(() => new Error('error deleting')))
-    deleteButton.nativeElement.dispatchEvent(new Event('confirm'))
+    editDialog.confirmClicked.emit()
     expect(toastErrorSpy).toHaveBeenCalled()
     expect(reloadSpy).not.toHaveBeenCalled()
 
     // succeed
     deleteSpy.mockReturnValueOnce(of(true))
-    deleteButton.nativeElement.dispatchEvent(new Event('confirm'))
+    editDialog.confirmClicked.emit()
     expect(reloadSpy).toHaveBeenCalled()
   })
 
@@ -312,4 +313,10 @@ describe('ManagementListComponent', () => {
     expect(bulkEditSpy).toHaveBeenCalled()
     expect(successToastSpy).toHaveBeenCalled()
   })
+
+  it('should disallow bulk permissions or delete objects if no global perms', () => {
+    jest.spyOn(permissionsService, 'currentUserCan').mockReturnValue(false)
+    expect(component.userCanBulkEdit(PermissionAction.Delete)).toBeFalsy()
+    expect(component.userCanBulkEdit(PermissionAction.Change)).toBeFalsy()
+  })
 })

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

@@ -22,6 +22,7 @@ import {
 } from 'src/app/directives/sortable.directive'
 import { DocumentListViewService } from 'src/app/services/document-list-view.service'
 import {
+  PermissionAction,
   PermissionsService,
   PermissionType,
 } from 'src/app/services/permissions.service'
@@ -194,21 +195,34 @@ export abstract class ManagementListComponent<T extends ObjectWithId>
     ])
   }
 
-  deleteObject(object: T) {
-    this.service
-      .delete(object)
-      .pipe(takeUntil(this.unsubscribeNotifier))
-      .subscribe({
-        next: () => {
-          this.reloadData()
-        },
-        error: (error) => {
-          this.toastService.showError(
-            $localize`Error while deleting element`,
-            error
-          )
-        },
-      })
+  openDeleteDialog(object: T) {
+    var activeModal = this.modalService.open(ConfirmDialogComponent, {
+      backdrop: 'static',
+    })
+    activeModal.componentInstance.title = $localize`Confirm delete`
+    activeModal.componentInstance.messageBold = this.getDeleteMessage(object)
+    activeModal.componentInstance.message = $localize`Associated documents will not be deleted.`
+    activeModal.componentInstance.btnClass = 'btn-danger'
+    activeModal.componentInstance.btnCaption = $localize`Delete`
+    activeModal.componentInstance.confirmClicked.subscribe(() => {
+      activeModal.componentInstance.buttonsEnabled = false
+      this.service
+        .delete(object)
+        .pipe(takeUntil(this.unsubscribeNotifier))
+        .subscribe({
+          next: () => {
+            activeModal.close()
+            this.reloadData()
+          },
+          error: (error) => {
+            activeModal.componentInstance.buttonsEnabled = true
+            this.toastService.showError(
+              $localize`Error while deleting element`,
+              error
+            )
+          },
+        })
+    })
   }
 
   get nameFilter() {
@@ -234,7 +248,9 @@ export abstract class ManagementListComponent<T extends ObjectWithId>
     )
   }
 
-  get userOwnsAll(): boolean {
+  userCanBulkEdit(action: PermissionAction): boolean {
+    if (!this.permissionsService.currentUserCan(action, this.permissionType))
+      return false
     let ownsAll: boolean = true
     const objects = this.data.filter((o) => this.selectedObjects.has(o.id))
     ownsAll = objects.every((o) =>

src-ui/src/app/components/manage/workflows/workflows.component.html

@@ -5,7 +5,7 @@
   i18n-info
   infoLink="usage/#workflows"
   >
-  <button type="button" class="btn btn-sm btn-outline-primary ms-4" (click)="editWorkflow()" *pngxIfPermissions="{ action: PermissionAction.Add, type: PermissionType.Workflow }">
+  <button type="button" class="btn btn-sm btn-outline-primary" (click)="editWorkflow()" *pngxIfPermissions="{ action: PermissionAction.Add, type: PermissionType.Workflow }">
     <i-bs name="plus-circle"></i-bs>&nbsp;<ng-container i18n>Add Workflow</ng-container>
   </button>
 </pngx-page-header>

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

@@ -1,7 +1,8 @@
 import { ObjectWithId } from './object-with-id'
+import { User } from './user'
 
 export interface DocumentNote extends ObjectWithId {
   created?: Date
   note?: string
-  user?: number // User
+  user?: User
 }

src-ui/src/app/data/system-status.ts

@@ -0,0 +1,41 @@
+export enum InstallType {
+  Containerized = 'containerized',
+  BareMetal = 'bare-metal',
+}
+
+export enum SystemStatusItemStatus {
+  OK = 'OK',
+  ERROR = 'ERROR',
+}
+
+export interface SystemStatus {
+  pngx_version: string
+  server_os: string
+  install_type: InstallType
+  storage: {
+    total: number
+    available: number
+  }
+  database: {
+    type: string
+    url: string
+    status: SystemStatusItemStatus
+    error?: string
+    migration_status: {
+      latest_migration: string
+      unapplied_migrations: string[]
+    }
+  }
+  tasks: {
+    redis_url: string
+    redis_status: SystemStatusItemStatus
+    redis_error: string
+    celery_status: SystemStatusItemStatus
+    index_status: SystemStatusItemStatus
+    index_last_modified: string // ISO date string
+    index_error: string
+    classifier_status: SystemStatusItemStatus
+    classifier_last_trained: string // ISO date string
+    classifier_error: string
+  }
+}

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

@@ -2,6 +2,7 @@ import { ObjectWithId } from './object-with-id'
 
 export enum WorkflowActionType {
   Assignment = 1,
+  Removal = 2,
 }
 export interface WorkflowAction extends ObjectWithId {
   type: WorkflowActionType
@@ -27,4 +28,38 @@ export interface WorkflowAction extends ObjectWithId {
   assign_change_groups?: number[] // [Group.id]
 
   assign_custom_fields?: number[] // [CustomField.id]
+
+  remove_tags?: number[] // Tag.id
+
+  remove_all_tags?: boolean
+
+  remove_document_types?: number[] // [DocumentType.id]
+
+  remove_all_document_types?: boolean
+
+  remove_correspondents?: number[] // [Correspondent.id]
+
+  remove_all_correspondents?: boolean
+
+  remove_storage_paths?: number[] // [StoragePath.id]
+
+  remove_all_storage_paths?: boolean
+
+  remove_owners?: number[] // [User.id]
+
+  remove_all_owners?: boolean
+
+  remove_view_users?: number[] // [User.id]
+
+  remove_view_groups?: number[] // [Group.id]
+
+  remove_change_users?: number[] // [User.id]
+
+  remove_change_groups?: number[] // [Group.id]
+
+  remove_all_permissions?: boolean
+
+  remove_custom_fields?: number[] // [CustomField.id]
+
+  remove_all_custom_fields?: boolean
 }

src-ui/src/app/guards/dirty-form.guard.spec.ts

@@ -17,6 +17,7 @@ describe('DirtyFormGuard', () => {
   let guard: DirtyFormGuard
   let component: DirtyComponent
   let route: ActivatedRoute
+  let modalService: NgbModal
 
   beforeEach(() => {
     TestBed.configureTestingModule({
@@ -37,6 +38,7 @@ describe('DirtyFormGuard', () => {
 
     guard = TestBed.inject(DirtyFormGuard)
     route = TestBed.inject(ActivatedRoute)
+    modalService = TestBed.inject(NgbModal)
     const fixture = TestBed.createComponent(GenericDirtyComponent)
     component = fixture.componentInstance
 
@@ -57,9 +59,14 @@ describe('DirtyFormGuard', () => {
     component.isDirty$ = true
     const confirmSpy = jest.spyOn(guard, 'confirmChanges')
     const canDeactivate = guard.canDeactivate(component, route.snapshot)
+    let modal
+    modalService.activeInstances.subscribe((instances) => {
+      modal = instances[0]
+    })
     canDeactivate.subscribe()
 
     expect(canDeactivate).toHaveProperty('source') // Observable
     expect(confirmSpy).toHaveBeenCalled()
+    modal.componentInstance.confirmClicked.next()
   })
 })

src-ui/src/app/services/open-documents.service.spec.ts

@@ -108,6 +108,7 @@ describe('OpenDocumentsService', () => {
   })
 
   it('should close documents', () => {
+    openDocumentsService.closeDocument({ id: 999 } as any)
     subscriptions.push(
       openDocumentsService.openDocument(documents[0]).subscribe()
     )
@@ -128,15 +129,21 @@ describe('OpenDocumentsService', () => {
     subscriptions.push(
       openDocumentsService.openDocument(documents[0]).subscribe()
     )
+    openDocumentsService.setDirty({ id: 999 }, true) // coverage
     openDocumentsService.setDirty(documents[0], false)
     expect(openDocumentsService.hasDirty()).toBeFalsy()
     openDocumentsService.setDirty(documents[0], true)
     expect(openDocumentsService.hasDirty()).toBeTruthy()
+    let openModal
+    modalService.activeInstances.subscribe((instances) => {
+      openModal = instances[0]
+    })
     const modalSpy = jest.spyOn(modalService, 'open')
     subscriptions.push(
       openDocumentsService.closeDocument(documents[0]).subscribe()
     )
     expect(modalSpy).toHaveBeenCalled()
+    openModal.componentInstance.confirmClicked.next()
   })
 
   it('should allow set dirty status, warn on closeAll', () => {
@@ -148,9 +155,14 @@ describe('OpenDocumentsService', () => {
     )
     openDocumentsService.setDirty(documents[0], true)
     expect(openDocumentsService.hasDirty()).toBeTruthy()
+    let openModal
+    modalService.activeInstances.subscribe((instances) => {
+      openModal = instances[0]
+    })
     const modalSpy = jest.spyOn(modalService, 'open')
     subscriptions.push(openDocumentsService.closeAll().subscribe())
     expect(modalSpy).toHaveBeenCalled()
+    openModal.componentInstance.confirmClicked.next()
   })
 
   it('should load open documents from localStorage', () => {

src-ui/src/app/services/rest/document.service.ts

@@ -183,7 +183,7 @@ export class DocumentService extends AbstractPaperlessService<Document> {
   update(o: Document): Observable<Document> {
     // we want to only set created_date
     o.created = undefined
-    o.remove_inbox_tags = this.settingsService.get(
+    o.remove_inbox_tags = !!this.settingsService.get(
       SETTINGS_KEYS.DOCUMENT_EDITING_REMOVE_INBOX_TAGS
     )
     return super.update(o)

src-ui/src/app/services/rest/mail-account.service.spec.ts

@@ -58,12 +58,25 @@ describe(`Additional service tests for MailAccountService`, () => {
   it('should support patchMany', () => {
     subscription = service.patchMany(mail_accounts).subscribe()
     mail_accounts.forEach((mail_account) => {
-      const reqs = httpTestingController.match(
+      const req = httpTestingController.expectOne(
         `${environment.apiBaseUrl}${endpoint}/${mail_account.id}/`
       )
-      expect(reqs).toHaveLength(1)
-      expect(reqs[0].request.method).toEqual('PATCH')
+      expect(req.request.method).toEqual('PATCH')
+      req.flush(mail_account)
     })
+    httpTestingController.expectOne(
+      `${environment.apiBaseUrl}${endpoint}/?page=1&page_size=100000`
+    )
+  })
+
+  it('should support reload', () => {
+    service['reload']()
+    const req = httpTestingController.expectOne(
+      `${environment.apiBaseUrl}${endpoint}/?page=1&page_size=100000`
+    )
+    expect(req.request.method).toEqual('GET')
+    req.flush({ results: mail_accounts })
+    expect(service.allAccounts).toEqual(mail_accounts)
   })
 
   beforeEach(() => {

src-ui/src/app/services/rest/mail-rule.service.spec.ts

@@ -76,12 +76,26 @@ describe(`Additional service tests for MailRuleService`, () => {
   it('should support patchMany', () => {
     subscription = service.patchMany(mail_rules).subscribe()
     mail_rules.forEach((mail_rule) => {
-      const reqs = httpTestingController.match(
+      const req = httpTestingController.expectOne(
         `${environment.apiBaseUrl}${endpoint}/${mail_rule.id}/`
       )
-      expect(reqs).toHaveLength(1)
-      expect(reqs[0].request.method).toEqual('PATCH')
+      expect(req.request.method).toEqual('PATCH')
+      req.flush(mail_rule)
     })
+    const reloadReq = httpTestingController.expectOne(
+      `${environment.apiBaseUrl}${endpoint}/?page=1&page_size=100000`
+    )
+    reloadReq.flush({ results: mail_rules })
+  })
+
+  it('should support reload', () => {
+    service['reload']()
+    const req = httpTestingController.expectOne(
+      `${environment.apiBaseUrl}${endpoint}/?page=1&page_size=100000`
+    )
+    expect(req.request.method).toEqual('GET')
+    req.flush({ results: mail_rules })
+    expect(service.allRules).toEqual(mail_rules)
   })
 
   beforeEach(() => {

src-ui/src/app/services/system-status.service.spec.ts

@@ -0,0 +1,35 @@
+import { TestBed } from '@angular/core/testing'
+
+import { SystemStatusService } from './system-status.service'
+import {
+  HttpClientTestingModule,
+  HttpTestingController,
+} from '@angular/common/http/testing'
+import { environment } from 'src/environments/environment'
+
+describe('SystemStatusService', () => {
+  let httpTestingController: HttpTestingController
+  let service: SystemStatusService
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [SystemStatusService],
+      imports: [HttpClientTestingModule],
+    })
+
+    httpTestingController = TestBed.inject(HttpTestingController)
+    service = TestBed.inject(SystemStatusService)
+  })
+
+  afterEach(() => {
+    httpTestingController.verify()
+  })
+
+  it('calls get status endpoint', () => {
+    service.get().subscribe()
+    const req = httpTestingController.expectOne(
+      `${environment.apiBaseUrl}status/`
+    )
+    expect(req.request.method).toEqual('GET')
+  })
+})

src-ui/src/app/services/system-status.service.ts

@@ -0,0 +1,20 @@
+import { HttpClient } from '@angular/common/http'
+import { Injectable } from '@angular/core'
+import { Observable } from 'rxjs'
+import { SystemStatus } from '../data/system-status'
+import { environment } from 'src/environments/environment'
+
+@Injectable({
+  providedIn: 'root',
+})
+export class SystemStatusService {
+  private endpoint = 'status'
+
+  constructor(private http: HttpClient) {}
+
+  get(): Observable<SystemStatus> {
+    return this.http.get<SystemStatus>(
+      `${environment.apiBaseUrl}${this.endpoint}/`
+    )
+  }
+}

src-ui/src/environments/environment.prod.ts

@@ -5,7 +5,7 @@ export const environment = {
   apiBaseUrl: document.baseURI + 'api/',
   apiVersion: '5',
   appTitle: 'Paperless-ngx',
-  version: '2.5.1',
+  version: '2.6.0',
   webSocketHost: window.location.host,
   webSocketProtocol: window.location.protocol == 'https:' ? 'wss:' : 'ws:',
   webSocketBaseUrl: base_url.pathname + 'ws/',