Encodes the string just once for compare json

Without explicit directory entries, some zip viewers (simpler tools,
web-based viewers) don't show the folder structure when browsing the
archive. Add a _ensure_zip_dirs() helper that writes directory markers
for all parent paths of each file entry, deduplicating via a set.
Uses ZipFile.mkdir() (available since Python 3.11, the project minimum).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

.github/workflows/ci-backend.yml

@@ -11,7 +11,7 @@ concurrency:
   group: backend-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 env:
-  DEFAULT_UV_VERSION: "0.11.x"
+  DEFAULT_UV_VERSION: "0.10.x"
   NLTK_DATA: "/usr/share/nltk_data"
 permissions: {}
 jobs:
@@ -165,7 +165,6 @@ jobs:
       contents: read
     env:
       DEFAULT_PYTHON: "3.12"
-      PAPERLESS_SECRET_KEY: "ci-typing-not-a-real-secret"
     steps:
       - name: Checkout
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

.github/workflows/ci-docs.yml

@@ -11,7 +11,7 @@ concurrency:
 permissions:
   contents: read
 env:
-  DEFAULT_UV_VERSION: "0.11.x"
+  DEFAULT_UV_VERSION: "0.10.x"
   DEFAULT_PYTHON_VERSION: "3.12"
 jobs:
   changes:

.github/workflows/ci-release.yml

@@ -8,7 +8,7 @@ concurrency:
   group: release-${{ github.ref }}
   cancel-in-progress: false
 env:
-  DEFAULT_UV_VERSION: "0.11.x"
+  DEFAULT_UV_VERSION: "0.10.x"
   DEFAULT_PYTHON_VERSION: "3.12"
 permissions: {}
 jobs:
@@ -88,7 +88,6 @@ jobs:
           uv export --quiet --no-dev --all-extras --format requirements-txt --output-file requirements.txt
       - name: Compile messages
         env:
-          PAPERLESS_SECRET_KEY: "ci-release-not-a-real-secret"
           PYTHON_VERSION: ${{ steps.setup-python.outputs.python-version }}
         run: |
           cd src/
@@ -97,7 +96,6 @@ jobs:
             manage.py compilemessages
       - name: Collect static files
         env:
-          PAPERLESS_SECRET_KEY: "ci-release-not-a-real-secret"
           PYTHON_VERSION: ${{ steps.setup-python.outputs.python-version }}
         run: |
           cd src/

.github/workflows/pr-bot.yml

@@ -3,7 +3,7 @@ on:
   pull_request_target:
     types: [opened]
 jobs:
-  Anti-slop:
+  anti-slop:
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -14,7 +14,6 @@ jobs:
         with:
           max-failures: 4
           failure-add-pr-labels: 'ai'
-          require-pr-template: true
   pr-bot:
     name: Automated PR Bot
     runs-on: ubuntu-latest

.github/workflows/translate-strings.yml

@@ -3,8 +3,6 @@ on:
   push:
     branches:
       - dev
-env:
-  DEFAULT_UV_VERSION: "0.11.x"
 jobs:
   generate-translate-strings:
     name: Generate Translation Strings
@@ -31,7 +29,6 @@ jobs:
       - name: Install uv
         uses: astral-sh/setup-uv@cec208311dfd045dd5311c1add060b2062131d57 # v8.0.0
         with:
-          version: ${{ env.DEFAULT_UV_VERSION }}
           enable-cache: true
       - name: Install backend python dependencies
         run: |
@@ -39,8 +36,6 @@ jobs:
             --group dev \
             --frozen
       - name: Generate backend translation strings
-        env:
-          PAPERLESS_SECRET_KEY: "ci-translate-not-a-real-secret"
         run: cd src/ && uv run manage.py makemessages -l en_US -i "samples*"
       - name: Install pnpm
         uses: pnpm/action-setup@fc06bc1257f339d1d5d8b3a19a8cae5388b55320 # v5.0.0

.gitignore

@@ -79,7 +79,6 @@ virtualenv
 /docker-compose.env
 /docker-compose.yml
 .ruff_cache/
-.mypy_cache/
 
 # Used for development
 scripts/import-for-development
@@ -112,6 +111,4 @@ celerybeat-schedule*
 
 # ignore pnpm package store folder created when setting up the devcontainer
 .pnpm-store/
-
-# Git worktree local folder
 .worktrees

Dockerfile

@@ -30,7 +30,7 @@ RUN set -eux \
 # Purpose: Installs s6-overlay and rootfs
 # Comments:
 #  - Don't leave anything extra in here either
-FROM ghcr.io/astral-sh/uv:0.11.6-python3.12-trixie-slim AS s6-overlay-base
+FROM ghcr.io/astral-sh/uv:0.10.9-python3.12-trixie-slim AS s6-overlay-base
 
 WORKDIR /usr/src/s6
 

README.md

@@ -7,9 +7,9 @@
 
 <p align="center">
   <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="https://github.com/paperless-ngx/paperless-ngx/blob/main/docs/assets/logo_full_white.png" width="50%">
-    <source media="(prefers-color-scheme: light)" srcset="https://github.com/paperless-ngx/paperless-ngx/blob/main/docs/assets/logo_full_black.png" width="50%">
-    <img src="https://github.com/paperless-ngx/paperless-ngx/blob/main/docs/assets/logo_full_black.png" width="50%">
+    <source media="(prefers-color-scheme: dark)" srcset="https://github.com/paperless-ngx/paperless-ngx/blob/main/resources/logo/web/png/White%20logo%20-%20no%20background.png" width="50%">
+    <source media="(prefers-color-scheme: light)" srcset="https://github.com/paperless-ngx/paperless-ngx/raw/main/resources/logo/web/png/Black%20logo%20-%20no%20background.png" width="50%">
+    <img src="https://github.com/paperless-ngx/paperless-ngx/raw/main/resources/logo/web/png/Black%20logo%20-%20no%20background.png" width="50%">
   </picture>
 </p>
 

docs/advanced_usage.md

@@ -842,7 +842,7 @@ MariaDB: `mariadb-tzinfo-to-sql /usr/share/zoneinfo | mariadb -u root mysql -p`
 
 ## Barcodes {#barcodes}
 
-Paperless is able to utilize barcodes for automatically performing some tasks. Barcodes are only supported for PDF documents or TIFF, [if enabled](configuration.md#PAPERLESS_CONSUMER_BARCODE_TIFF_SUPPORT).
+Paperless is able to utilize barcodes for automatically performing some tasks.
 
 At this time, the library utilized for detection of barcodes supports the following types:
 

docs/assets/logo.svg

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 1000 1000" style="enable-background:new 0 0 1000 1000;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<path class="st0" d="M299,891.7c-4.2-19.8-12.5-59.6-13.6-59.6c-176.7-105.7-155.8-288.7-97.3-393.4
+	c12.5,131.8,245.8,222.8,109.8,383.9c-1.1,2,6.2,27.2,12.5,50.2c27.2-46,68-101.4,65.8-106.7C208.9,358.2,731.9,326.9,840.6,73.7
+	c49.1,244.8-25.1,623.5-445.5,719.7c-2,1.1-76.3,131.8-79.5,132.9c0-2-31.4-1.1-27.2-11.5C290.7,908.4,294.8,900.1,299,891.7
+	L299,891.7z M293.8,793.4c53.3-61.8-9.4-167.4-47.1-201.9C310.5,701.3,306.3,765.1,293.8,793.4L293.8,793.4z"/>
+</svg>

docs/assets/logo_full_black.svg

@@ -1,19 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 2670 860">
-  <path id="leaf" style="fill:#005616;" d="M2227.4,821.2c-6.1-17.8-18.1-53.6-19.2-53.4-174.7-77.8-159.8-201.2-117.5-304.2,26.3,120.1,235.3,130.3,128,294.1-.7,2,8.8,24.3,17.1,44.9,19.9-45.4,51.3-101.1,48.8-105.7-199.9-357.4,278.8-444.7,350.7-690.2,72.6,220.1,46.5,577.5-330.4,713.3-1.8,1.2-55.6,130-58.5,131.4-.2-1.9-29.1,2.5-26.4-7.6,1.4-6.2,4.2-14.2,7.2-22.4h0v-.2h.2,0ZM2211.7,731.2c42.3-62.9-11.1-105.7-49.8-133.2,71,94,58.1,105.7,49.8,133.2h0Z"/>
-  <g id="text" style="fill: #000;">
-    <path class="st1" d="M654.6,393.2l-.7,137.7h-85.5V188.7h85.4c.4,11.3-.3,21.7,1.3,33.8,23.1-34.1,62.3-50,101.1-38.3,16.5,5,29.6,16.4,39.7,30,34.4,46.5,35.1,134,3.6,182.2-10.1,14.4-22.5,26.9-39,33.4-39.5,15.7-81,1.1-105.9-36.6h0ZM721,362.2c21-26.1,21-82.7-.4-108.4-13.2-15.9-36.4-16.1-49.9-.4-22.2,25.8-21.7,85.3.5,110.1,13.6,15.2,36.6,15,49.7-1.3h.1Z"/>
-    <path class="st1" d="M164,301l-72.8.7v126.1H3.4V98.1l159.7.5c31.3,0,58.9,13.6,79.4,36.1,30.8,37.6,30.9,91.7.6,129.6-20.1,22.8-47.6,36.5-79,36.8h-.1ZM176.8,199.8c0-20.8-15.1-35-34.7-35l-51,.2v69.5l53.6-.2c18.5,0,32-15.8,32.2-34.5h-.1Z"/>
-    <polygon class="st1" points="1338.2 427.8 1338 366 1412.4 365.8 1412.5 139.3 1338.1 139.1 1338.1 77.4 1498.1 77.4 1498.1 365.7 1572.3 365.9 1572.5 427.7 1338.2 427.8"/>
-    <path class="st1" d="M1741.8,364.3c9.1-8.6,14-18.1,17.7-30.3l68.4,13.3c-10.5,45.2-46.5,79.2-92.3,86.7-59.2,9.6-118.7-14.2-138.6-73.7-10.9-32.7-10.7-68.6.6-100.9,17.7-50.6,64.3-80.5,117.1-79.1,76.5,2,113.4,65.4,111.1,136.1h-155.4c-.7,12.5,3,25,9.7,35.9,13.2,21.3,40.9,26.9,61.5,12h.2ZM1749.4,273.1c-2.4-10.8-6.9-18-13.9-24.6-12.8-8.3-30.1-9.5-43.4-1.1-9.3,5.8-14.6,15.1-18,25.7h75.3Z"/>
-    <path class="st1" d="M1010.3,364.3c9.1-8.5,13.9-18.1,17.7-30.3l68.4,13.3c-10.4,45.2-46.5,79.2-92.3,86.7-59.3,9.6-118.8-14.2-138.7-73.9-10.8-32.3-10.6-67.4.2-99.3,17.3-51.2,64.2-81.8,117.6-80.4,76.6,2,113.5,65.3,111.1,136.1h-155.6c-.2,12.7,3.2,25.1,9.9,35.9,13.2,21.3,40.9,27,61.5,12h.2ZM1018,273.2c-2.4-9.4-6.3-18.5-14.2-24.4-12.3-9.1-30.4-9.4-43.3-1.3-9.3,5.9-14.4,15.1-17.9,25.6h75.4Z"/>
-    <path class="st1" d="M424.3,376.9c-7.1,13.6-12.5,25.7-23.2,35.5-14.3,13.3-32.6,19.3-52.3,19.4-40.4.2-75.6-23.1-73.6-65.7.9-20.1,9.7-37.2,26.5-49.2,30.5-21.8,55.8-22.4,87.8-40.6,8.1-4.6,18.2-15.3,12.4-22.2s-5-3-8-3.7h-96.3v-61.8h109.6c14.7.6,28.1,2.2,41.7,7.2,23.7,8.8,39.6,29.5,39.8,55.2l.7,90.6c0,13.5,11,23,23.7,23.9l10.1.7v61.3h-29.9c-13.1,0-25.9-3-37.3-8.6-16.9-8.2-26.9-22.2-31.6-42.2h0v.2h-.1ZM364.9,370.1c6.8,5.9,16.2,6.5,24.8,2.7,18.1-7.9,16.5-38.3,16.1-55-3.6,4.3-7.4,9-12.5,11.2l-21.1,9.3c-5.8,2.5-10.6,8-11.8,13s-1,13.8,4.7,18.7h-.2Z"/>
-    <path class="st1" d="M1943,430.1c-33.5-8.9-68.5-33.6-78.9-68.9l66.6-27.2c11.8,22.1,31.6,42.1,57.2,39.8,4.3-.4,9.3-3.1,11.2-6,7.8-12.5-4.3-24.3-16.2-30.7l-47.3-25.2c-32.2-17.1-57.7-50.7-41.6-87.4,11.9-27,48.1-35,75.3-36h99.2v61.8h-88.6c-2.5.4-6.2,2.3-7,4.2s.7,7,2.7,8.2c31.6,18.6,88.3,38.3,103.8,72,10.4,22.6,6.7,50-9.2,69.1-29.5,35.7-86.1,36.9-127,26.1v.2h-.2,0Z"/>
-    <path class="st1" d="M1318.2,264.3l-68.5.2c-19.4,0-30.1,10.8-31.6,30.2v133.1h-85.7v-239h85.6l1,58.9,11.9-25.1c14.3-30.5,56.9-36.5,87.4-33.6v75.4h-.1Z"/>
-    <path class="st1" d="M2232.8,374.2c-26,1.2-44.6-18.4-56.5-40.1l-66.5,27.3c10.8,35.9,46.2,60.4,80.3,69.2h0c10.6,2.6,22,4.5,33.7,5.2,3.2-7.9,6.8-15.6,10.8-23.4,18.5-35.9,44.3-68.4,73.8-98.8-23.6-21.1-62.6-36.7-87-50.6-2.2-1.2-3.6-6.7-2.7-8.7.9-2,4.5-3.5,7.4-3.9h88.2v-61.8h-97.4c-27,.7-63.8,8.2-76.5,34.8-8.3,17.5-6.8,38.5,3.5,54.9,9.3,14.9,22.2,25.8,37.7,33.9l45.8,24.3c11.5,6.1,24.7,17,17.9,30.5-2.1,4.1-7.4,6.5-12.6,7.2h.1Z"/>
-    <path class="st1" d="M1547.6,801.6h81.2c11.6-.2,23.2-3.8,31.9-11.2,7.3-6.2,11.7-15.4,13.9-24.8l16.8-72.7c-7.2,9-12.8,16.9-20.7,24.2-18.3,16.8-42.3,23.8-66.9,19.5-32.5-5.7-46.7-34.7-47-65.6-.5-44,18.9-93.6,57.6-117.1,18-10.9,39.5-13.9,60-9.6,12.4,2.6,22.1,9.9,29.1,20,5.8,8.4,7.8,17.2,10.8,27.8l10.7-45.4,15.6.3-50.6,219.5c-2.9,12.6-8.9,24.6-18.4,32.9-12,10.4-28.1,15.1-44,15.2l-82.9.2,2.7-13.1h.2ZM1691.8,673.5c12.9-26.3,20.1-60.3,11-88.6-5.1-15.8-17.9-26.5-34.2-28.8-20.7-2.9-40.3,2.9-55.9,16.8-13.6,12.1-23.5,26.7-30.3,43.7-9.8,24.4-14.8,56.5-4.6,81.1,5,12.1,14.7,21.3,27.6,24.7,39,10.3,70.1-16,86.4-49h0Z"/>
-    <path class="st1" d="M1441.6,556.8c-43.6-8.7-84.4,29.7-93.8,70l-24.8,106.6h-15.7l43.1-186.4,15.6-.2-8.6,39.5c22.3-28.9,53.9-49.3,90.7-42.5,16.8,3.1,29.1,15.6,32.1,32.4,2.1,11.6,1.6,23.4-1.1,35.3l-28.1,122.2h-15.6c0,0,27.5-119.9,27.5-119.9,4.7-20.6,5.9-51.3-21.2-56.7v-.3Z"/>
-    <path class="st1" d="M1958.9,733.3h-16.2l-38.2-90.1-79.8,90.3-19.3-.2,77.6-87.2c5.1-5.7,11-10.1,17.2-14.5-4.6-4.7-8.5-9.6-11.3-15.3l-33.9-69.3,16.2-.2,35.3,74.1,69-73.9c6.6-.3,12.7-.3,19.6.2l-63.1,66.6c-6.4,6.8-13.4,12.5-20.9,18,3.4,3.4,7.5,7.5,9.6,12.4l38.3,89.2h-.1Z"/>
-    <path class="st1" d="M1224.4,635.4H3.4c1.1-5.6,1.9-9.5,3.1-13.9h1220.9l-2.9,13.9h0Z"/>
-  </g>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 2962.2 860.2" style="enable-background:new 0 0 2962.2 860.2;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#17541F;stroke:#000000;stroke-miterlimit:10;}
+</style>
+<path d="M1055.6,639.7v-20.6c-18,20-43.1,30.1-75.4,30.1c-22.4,0-42.8-5.8-61-17.5c-18.3-11.7-32.5-27.8-42.9-48.3
+	c-10.3-20.5-15.5-43.3-15.5-68.4c0-25.1,5.2-48,15.5-68.5s24.6-36.6,42.9-48.3s38.6-17.5,61-17.5c32.3,0,57.5,10,75.4,30.1v-20.6
+	h85.3v249.6L1055.6,639.7L1055.6,639.7z M1059.1,514.9c0-17.4-5.2-31.9-15.5-43.8c-10.3-11.8-23.9-17.7-40.6-17.7
+	c-16.8,0-30.2,5.9-40.4,17.7c-10.2,11.8-15.3,26.4-15.3,43.8c0,17.4,5.1,31.9,15.3,43.8c10.2,11.8,23.6,17.7,40.4,17.7
+	c16.8,0,30.3-5.9,40.6-17.7C1054,546.9,1059.1,532.3,1059.1,514.9z"/>
+<path d="M1417.8,398.2c18.3,11.7,32.5,27.8,42.9,48.3c10.3,20.5,15.5,43.3,15.5,68.5c0,25.1-5.2,48-15.5,68.4
+	c-10.3,20.5-24.6,36.6-42.9,48.3s-38.6,17.5-61,17.5c-32.3,0-57.5-10-75.4-30.1v165.6h-85.3V390.2h85.3v20.6
+	c18-20,43.1-30.1,75.4-30.1C1379.2,380.7,1399.5,386.6,1417.8,398.2z M1389.5,514.9c0-17.4-5.1-31.9-15.3-43.8
+	c-10.2-11.8-23.6-17.7-40.4-17.7s-30.2,5.9-40.4,17.7c-10.2,11.8-15.3,26.4-15.3,43.8c0,17.4,5.1,31.9,15.3,43.8
+	c10.2,11.8,23.6,17.7,40.4,17.7s30.2-5.9,40.4-17.7S1389.5,532.3,1389.5,514.9z"/>
+<path d="M1713.6,555.3l53,49.4c-28.1,29.6-66.7,44.4-115.8,44.4c-28.1,0-53-5.8-74.5-17.5s-38.2-27.7-49.8-48
+	c-11.7-20.3-17.7-43.2-18-68.7c0-24.8,5.9-47.5,17.7-68c11.8-20.5,28.1-36.7,48.7-48.5s43.5-17.7,68.7-17.7
+	c24.8,0,47.6,6.1,68.2,18.2s37,29.5,49.1,52.3c12.1,22.7,18.2,49.1,18.2,79l-0.4,11.7h-181.8c3.6,11.4,10.5,20.7,20.9,28.1
+	c10.3,7.3,21.3,11,33,11c14.4,0,26.3-2.2,35.7-6.5C1695.8,570.1,1704.9,563.7,1713.6,555.3z M1596.9,486.2h92.9
+	c-2.1-12.3-7.5-22.1-16.2-29.4s-18.7-11-30.1-11s-21.5,3.7-30.3,11S1599,473.9,1596.9,486.2z"/>
+<path d="M1908.8,418.4c7.8-10.8,17.2-19,28.3-24.7s22-8.5,32.8-8.5c11.4,0,20,1.6,26,4.9l-10.8,72.7c-8.4-2.1-15.7-3.1-22-3.1
+	c-17.1,0-30.4,4.3-39.9,12.8c-9.6,8.5-14.4,24.2-14.4,46.9v120.3h-85.3V390.2h85.3V418.4L1908.8,418.4z"/>
+<path d="M2113,258.2v381.5h-85.3V258.2H2113z"/>
+<path d="M2360.8,555.3l53,49.4c-28.1,29.6-66.7,44.4-115.8,44.4c-28.1,0-53-5.8-74.5-17.5s-38.2-27.7-49.8-48
+	c-11.7-20.3-17.7-43.2-18-68.7c0-24.8,5.9-47.5,17.7-68s28.1-36.7,48.7-48.5c20.6-11.8,43.5-17.7,68.7-17.7
+	c24.8,0,47.6,6.1,68.2,18.2c20.6,12.1,37,29.5,49.1,52.3c12.1,22.7,18.2,49.1,18.2,79l-0.4,11.7h-181.8
+	c3.6,11.4,10.5,20.7,20.9,28.1c10.3,7.3,21.3,11,33,11c14.4,0,26.3-2.2,35.7-6.5C2343.1,570.1,2352.1,563.7,2360.8,555.3z
+	 M2244.1,486.2h92.9c-2.1-12.3-7.5-22.1-16.2-29.4s-18.7-11-30.1-11s-21.5,3.7-30.3,11C2251.7,464.1,2246.2,473.9,2244.1,486.2z"/>
+<path d="M2565.9,446.3c-9.9,0-17.1,1.1-21.5,3.4c-4.5,2.2-6.7,5.9-6.7,11s3.4,8.8,10.3,11.2c6.9,2.4,18,4.9,33.2,7.6
+	c20,3,37,6.7,50.9,11.2s26,12.1,36.1,22.9c10.2,10.8,15.3,25.9,15.3,45.3c0,29.9-10.9,52.4-32.8,67.6
+	c-21.8,15.1-50.3,22.7-85.3,22.7c-25.7,0-49.5-3.7-71.4-11c-21.8-7.3-37.4-14.7-46.7-22.2l33.7-60.6c10.2,9,23.4,15.8,39.7,20.4
+	c16.3,4.6,31.3,7,45.1,7c19.7,0,29.6-5.2,29.6-15.7c0-5.4-3.3-9.4-9.9-11.9c-6.6-2.5-17.2-5.2-31.9-7.9c-18.9-3.3-34.9-7.2-48-11.7
+	c-13.2-4.5-24.6-12.2-34.3-23.1c-9.7-10.9-14.6-26-14.6-45.1c0-27.2,9.7-48.5,29-63.7c19.3-15.3,46-22.9,80.1-22.9
+	c23.3,0,44.4,3.6,63.3,10.8c18.9,7.2,34,14.5,45.3,22l-32.8,58.8c-10.8-7.5-23.2-13.7-37.3-18.6
+	C2590.5,448.7,2577.6,446.3,2565.9,446.3z"/>
+<path d="M2817.3,446.3c-9.9,0-17.1,1.1-21.5,3.4c-4.5,2.2-6.7,5.9-6.7,11s3.4,8.8,10.3,11.2c6.9,2.4,18,4.9,33.2,7.6
+	c20,3,37,6.7,50.9,11.2s26,12.1,36.1,22.9c10.2,10.8,15.3,25.9,15.3,45.3c0,29.9-10.9,52.4-32.8,67.6
+	c-21.8,15.1-50.3,22.7-85.3,22.7c-25.7,0-49.5-3.7-71.4-11c-21.8-7.3-37.4-14.7-46.7-22.2l33.7-60.6c10.2,9,23.4,15.8,39.7,20.4
+	c16.3,4.6,31.3,7,45.1,7c19.8,0,29.6-5.2,29.6-15.7c0-5.4-3.3-9.4-9.9-11.9c-6.6-2.5-17.2-5.2-31.9-7.9c-18.9-3.3-34.9-7.2-48-11.7
+	c-13.2-4.5-24.6-12.2-34.3-23.1c-9.7-10.9-14.6-26-14.6-45.1c0-27.2,9.7-48.5,29-63.7c19.3-15.3,46-22.9,80.1-22.9
+	c23.3,0,44.4,3.6,63.3,10.8c18.9,7.2,34,14.5,45.3,22l-32.8,58.8c-10.8-7.5-23.2-13.7-37.3-18.6
+	C2841.8,448.7,2828.9,446.3,2817.3,446.3z"/>
+<g>
+	<path d="M2508,724h60.2v17.3H2508V724z"/>
+	<path d="M2629.2,694.4c4.9-2,10.2-3.1,16-3.1c10.9,0,19.5,3.4,25.9,10.2s9.6,16.7,9.6,29.6v57.3h-19.6v-52.6
+		c0-9.3-1.7-16.2-5.1-20.7c-3.4-4.5-9.1-6.7-17-6.7c-6.5,0-11.8,2.4-16.1,7.1c-4.3,4.8-6.4,11.5-6.4,20.2v52.6h-19.6v-94.6h19.6v9.5
+		C2620.2,699.4,2624.4,696.4,2629.2,694.4z"/>
+	<path d="M2790.3,833.2c-8.6,6.8-19.4,10.2-32.3,10.2c-7.9,0-15.2-1.4-21.9-4.1s-12.1-6.8-16.3-12.2s-6.6-11.9-7.1-19.6h19.6
+		c0.7,6.1,3.5,10.8,8.4,13.9c4.9,3.2,10.7,4.8,17.4,4.8c7,0,13.1-2,18.2-6c5.1-4,7.7-10.3,7.7-18.9v-24.7c-3.6,3.4-8,6.2-13.3,8.2
+		c-5.2,2.1-10.7,3.1-16.3,3.1c-8.7,0-16.6-2.1-23.7-6.4c-7.1-4.3-12.6-10-16.7-17.3c-4-7.3-6-15.5-6-24.6s2-17.3,6-24.7
+		s9.6-13.2,16.7-17.4c7.1-4.3,15-6.4,23.7-6.4c5.7,0,11.1,1,16.3,3.1s9.6,4.8,13.3,8.2v-8.8h19.4v107.8
+		C2803.2,815.9,2798.9,826.4,2790.3,833.2z M2782.2,755.7c2.6-4.7,3.8-10,3.8-15.9s-1.3-11.2-3.8-16c-2.6-4.8-6.1-8.5-10.5-11.1
+		c-4.5-2.7-9.5-4-15.1-4c-5.8,0-10.9,1.4-15.4,4.3c-4.5,2.8-7.9,6.6-10.3,11.4c-2.4,4.8-3.6,9.9-3.6,15.5c0,5.4,1.2,10.5,3.6,15.3
+		c2.4,4.8,5.8,8.6,10.3,11.5s9.6,4.3,15.4,4.3c5.6,0,10.6-1.4,15.1-4.1C2776.1,764.1,2779.6,760.4,2782.2,755.7z"/>
+	<path d="M2843.5,788.4h-21.6l37.9-48l-36.4-46.6h22.6l25.7,33.3l25.8-33.3h21.6l-36.2,45.9l37.9,48.6h-22.6l-27.4-35L2843.5,788.4z
+		"/>
+</g>
+<path d="M835.8,319.2c-11.5-18.9-27.4-33.7-47.6-44.7c-20.2-10.9-43-16.4-68.5-16.4h-90.6c-8.6,39.6-21.3,77.2-38,112.4
+	c-10,21-21.3,41-33.9,59.9v209.2H647v-135h72.7c25.4,0,48.3-5.5,68.5-16.4s36.1-25.8,47.6-44.7c11.5-18.9,17.3-39.5,17.3-61.9
+	C853.1,358.9,847.4,338.1,835.8,319.2z M747,416.6c-9.4,9-21.8,13.5-37,13.5l-62.8,0.4v-93.4l62.8-0.4c15.3,0,27.6,4.5,37,13.5
+	s14.1,20,14.1,33.2C761.1,396.6,756.4,407.7,747,416.6z"/>
+<path class="st0" d="M164.7,698.7c-3.5-16.5-10.4-49.6-11.3-49.6c-147.1-88-129.7-240.3-81-327.4C82.8,431.4,277,507.1,163.8,641.2
+	c-0.9,1.7,5.2,22.6,10.4,41.8c22.6-38.3,56.6-84.4,54.8-88.8C89.7,254.7,525,228.6,615.5,17.9c40.9,203.7-20.9,518.9-370.8,599
+	c-1.7,0.9-63.5,109.7-66.2,110.6c0-1.7-26.1-0.9-22.6-9.6C157.8,712.6,161.2,705.7,164.7,698.7L164.7,698.7z M160.4,616.9
+	c44.4-51.4-7.8-139.3-39.2-168C174.3,540.2,170.8,593.3,160.4,616.9L160.4,616.9z"/>
 </svg>

docs/assets/logo_full_eee.svg

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 2670 860">
-  <path id="leaf" style="fill:#005616;" d="M2227.4,821.2c-6.1-17.8-18.1-53.6-19.2-53.4-174.7-77.8-159.8-201.2-117.5-304.2,26.3,120.1,235.3,130.3,128,294.1-.7,2,8.8,24.3,17.1,44.9,19.9-45.4,51.3-101.1,48.8-105.7-199.9-357.4,278.8-444.7,350.7-690.2,72.6,220.1,46.5,577.5-330.4,713.3-1.8,1.2-55.6,130-58.5,131.4-.2-1.9-29.1,2.5-26.4-7.6,1.4-6.2,4.2-14.2,7.2-22.4h0v-.2h.2,0ZM2211.7,731.2c42.3-62.9-11.1-105.7-49.8-133.2,71,94,58.1,105.7,49.8,133.2h0Z"/>
-  <g id="text" style="fill: #eee;">
-    <path class="st1" d="M654.6,393.2l-.7,137.7h-85.5V188.7h85.4c.4,11.3-.3,21.7,1.3,33.8,23.1-34.1,62.3-50,101.1-38.3,16.5,5,29.6,16.4,39.7,30,34.4,46.5,35.1,134,3.6,182.2-10.1,14.4-22.5,26.9-39,33.4-39.5,15.7-81,1.1-105.9-36.6h0ZM721,362.2c21-26.1,21-82.7-.4-108.4-13.2-15.9-36.4-16.1-49.9-.4-22.2,25.8-21.7,85.3.5,110.1,13.6,15.2,36.6,15,49.7-1.3h.1Z"/>
-    <path class="st1" d="M164,301l-72.8.7v126.1H3.4V98.1l159.7.5c31.3,0,58.9,13.6,79.4,36.1,30.8,37.6,30.9,91.7.6,129.6-20.1,22.8-47.6,36.5-79,36.8h-.1ZM176.8,199.8c0-20.8-15.1-35-34.7-35l-51,.2v69.5l53.6-.2c18.5,0,32-15.8,32.2-34.5h-.1Z"/>
-    <polygon class="st1" points="1338.2 427.8 1338 366 1412.4 365.8 1412.5 139.3 1338.1 139.1 1338.1 77.4 1498.1 77.4 1498.1 365.7 1572.3 365.9 1572.5 427.7 1338.2 427.8"/>
-    <path class="st1" d="M1741.8,364.3c9.1-8.6,14-18.1,17.7-30.3l68.4,13.3c-10.5,45.2-46.5,79.2-92.3,86.7-59.2,9.6-118.7-14.2-138.6-73.7-10.9-32.7-10.7-68.6.6-100.9,17.7-50.6,64.3-80.5,117.1-79.1,76.5,2,113.4,65.4,111.1,136.1h-155.4c-.7,12.5,3,25,9.7,35.9,13.2,21.3,40.9,26.9,61.5,12h.2ZM1749.4,273.1c-2.4-10.8-6.9-18-13.9-24.6-12.8-8.3-30.1-9.5-43.4-1.1-9.3,5.8-14.6,15.1-18,25.7h75.3Z"/>
-    <path class="st1" d="M1010.3,364.3c9.1-8.5,13.9-18.1,17.7-30.3l68.4,13.3c-10.4,45.2-46.5,79.2-92.3,86.7-59.3,9.6-118.8-14.2-138.7-73.9-10.8-32.3-10.6-67.4.2-99.3,17.3-51.2,64.2-81.8,117.6-80.4,76.6,2,113.5,65.3,111.1,136.1h-155.6c-.2,12.7,3.2,25.1,9.9,35.9,13.2,21.3,40.9,27,61.5,12h.2ZM1018,273.2c-2.4-9.4-6.3-18.5-14.2-24.4-12.3-9.1-30.4-9.4-43.3-1.3-9.3,5.9-14.4,15.1-17.9,25.6h75.4Z"/>
-    <path class="st1" d="M424.3,376.9c-7.1,13.6-12.5,25.7-23.2,35.5-14.3,13.3-32.6,19.3-52.3,19.4-40.4.2-75.6-23.1-73.6-65.7.9-20.1,9.7-37.2,26.5-49.2,30.5-21.8,55.8-22.4,87.8-40.6,8.1-4.6,18.2-15.3,12.4-22.2s-5-3-8-3.7h-96.3v-61.8h109.6c14.7.6,28.1,2.2,41.7,7.2,23.7,8.8,39.6,29.5,39.8,55.2l.7,90.6c0,13.5,11,23,23.7,23.9l10.1.7v61.3h-29.9c-13.1,0-25.9-3-37.3-8.6-16.9-8.2-26.9-22.2-31.6-42.2h0v.2h-.1ZM364.9,370.1c6.8,5.9,16.2,6.5,24.8,2.7,18.1-7.9,16.5-38.3,16.1-55-3.6,4.3-7.4,9-12.5,11.2l-21.1,9.3c-5.8,2.5-10.6,8-11.8,13s-1,13.8,4.7,18.7h-.2Z"/>
-    <path class="st1" d="M1943,430.1c-33.5-8.9-68.5-33.6-78.9-68.9l66.6-27.2c11.8,22.1,31.6,42.1,57.2,39.8,4.3-.4,9.3-3.1,11.2-6,7.8-12.5-4.3-24.3-16.2-30.7l-47.3-25.2c-32.2-17.1-57.7-50.7-41.6-87.4,11.9-27,48.1-35,75.3-36h99.2v61.8h-88.6c-2.5.4-6.2,2.3-7,4.2s.7,7,2.7,8.2c31.6,18.6,88.3,38.3,103.8,72,10.4,22.6,6.7,50-9.2,69.1-29.5,35.7-86.1,36.9-127,26.1v.2h-.2,0Z"/>
-    <path class="st1" d="M1318.2,264.3l-68.5.2c-19.4,0-30.1,10.8-31.6,30.2v133.1h-85.7v-239h85.6l1,58.9,11.9-25.1c14.3-30.5,56.9-36.5,87.4-33.6v75.4h-.1Z"/>
-    <path class="st1" d="M2232.8,374.2c-26,1.2-44.6-18.4-56.5-40.1l-66.5,27.3c10.8,35.9,46.2,60.4,80.3,69.2h0c10.6,2.6,22,4.5,33.7,5.2,3.2-7.9,6.8-15.6,10.8-23.4,18.5-35.9,44.3-68.4,73.8-98.8-23.6-21.1-62.6-36.7-87-50.6-2.2-1.2-3.6-6.7-2.7-8.7.9-2,4.5-3.5,7.4-3.9h88.2v-61.8h-97.4c-27,.7-63.8,8.2-76.5,34.8-8.3,17.5-6.8,38.5,3.5,54.9,9.3,14.9,22.2,25.8,37.7,33.9l45.8,24.3c11.5,6.1,24.7,17,17.9,30.5-2.1,4.1-7.4,6.5-12.6,7.2h.1Z"/>
-    <path class="st1" d="M1547.6,801.6h81.2c11.6-.2,23.2-3.8,31.9-11.2,7.3-6.2,11.7-15.4,13.9-24.8l16.8-72.7c-7.2,9-12.8,16.9-20.7,24.2-18.3,16.8-42.3,23.8-66.9,19.5-32.5-5.7-46.7-34.7-47-65.6-.5-44,18.9-93.6,57.6-117.1,18-10.9,39.5-13.9,60-9.6,12.4,2.6,22.1,9.9,29.1,20,5.8,8.4,7.8,17.2,10.8,27.8l10.7-45.4,15.6.3-50.6,219.5c-2.9,12.6-8.9,24.6-18.4,32.9-12,10.4-28.1,15.1-44,15.2l-82.9.2,2.7-13.1h.2ZM1691.8,673.5c12.9-26.3,20.1-60.3,11-88.6-5.1-15.8-17.9-26.5-34.2-28.8-20.7-2.9-40.3,2.9-55.9,16.8-13.6,12.1-23.5,26.7-30.3,43.7-9.8,24.4-14.8,56.5-4.6,81.1,5,12.1,14.7,21.3,27.6,24.7,39,10.3,70.1-16,86.4-49h0Z"/>
-    <path class="st1" d="M1441.6,556.8c-43.6-8.7-84.4,29.7-93.8,70l-24.8,106.6h-15.7l43.1-186.4,15.6-.2-8.6,39.5c22.3-28.9,53.9-49.3,90.7-42.5,16.8,3.1,29.1,15.6,32.1,32.4,2.1,11.6,1.6,23.4-1.1,35.3l-28.1,122.2h-15.6c0,0,27.5-119.9,27.5-119.9,4.7-20.6,5.9-51.3-21.2-56.7v-.3Z"/>
-    <path class="st1" d="M1958.9,733.3h-16.2l-38.2-90.1-79.8,90.3-19.3-.2,77.6-87.2c5.1-5.7,11-10.1,17.2-14.5-4.6-4.7-8.5-9.6-11.3-15.3l-33.9-69.3,16.2-.2,35.3,74.1,69-73.9c6.6-.3,12.7-.3,19.6.2l-63.1,66.6c-6.4,6.8-13.4,12.5-20.9,18,3.4,3.4,7.5,7.5,9.6,12.4l38.3,89.2h-.1Z"/>
-    <path class="st1" d="M1224.4,635.4H3.4c1.1-5.6,1.9-9.5,3.1-13.9h1220.9l-2.9,13.9h0Z"/>
-  </g>
-</svg>

docs/assets/logo_full_white.svg

@@ -1,19 +1,69 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 2670 860">
-  <path id="leaf" style="fill:#005616;" d="M2227.4,821.2c-6.1-17.8-18.1-53.6-19.2-53.4-174.7-77.8-159.8-201.2-117.5-304.2,26.3,120.1,235.3,130.3,128,294.1-.7,2,8.8,24.3,17.1,44.9,19.9-45.4,51.3-101.1,48.8-105.7-199.9-357.4,278.8-444.7,350.7-690.2,72.6,220.1,46.5,577.5-330.4,713.3-1.8,1.2-55.6,130-58.5,131.4-.2-1.9-29.1,2.5-26.4-7.6,1.4-6.2,4.2-14.2,7.2-22.4h0v-.2h.2,0ZM2211.7,731.2c42.3-62.9-11.1-105.7-49.8-133.2,71,94,58.1,105.7,49.8,133.2h0Z"/>
-  <g id="text" style="fill: #fff;">
-    <path class="st1" d="M654.6,393.2l-.7,137.7h-85.5V188.7h85.4c.4,11.3-.3,21.7,1.3,33.8,23.1-34.1,62.3-50,101.1-38.3,16.5,5,29.6,16.4,39.7,30,34.4,46.5,35.1,134,3.6,182.2-10.1,14.4-22.5,26.9-39,33.4-39.5,15.7-81,1.1-105.9-36.6h0ZM721,362.2c21-26.1,21-82.7-.4-108.4-13.2-15.9-36.4-16.1-49.9-.4-22.2,25.8-21.7,85.3.5,110.1,13.6,15.2,36.6,15,49.7-1.3h.1Z"/>
-    <path class="st1" d="M164,301l-72.8.7v126.1H3.4V98.1l159.7.5c31.3,0,58.9,13.6,79.4,36.1,30.8,37.6,30.9,91.7.6,129.6-20.1,22.8-47.6,36.5-79,36.8h-.1ZM176.8,199.8c0-20.8-15.1-35-34.7-35l-51,.2v69.5l53.6-.2c18.5,0,32-15.8,32.2-34.5h-.1Z"/>
-    <polygon class="st1" points="1338.2 427.8 1338 366 1412.4 365.8 1412.5 139.3 1338.1 139.1 1338.1 77.4 1498.1 77.4 1498.1 365.7 1572.3 365.9 1572.5 427.7 1338.2 427.8"/>
-    <path class="st1" d="M1741.8,364.3c9.1-8.6,14-18.1,17.7-30.3l68.4,13.3c-10.5,45.2-46.5,79.2-92.3,86.7-59.2,9.6-118.7-14.2-138.6-73.7-10.9-32.7-10.7-68.6.6-100.9,17.7-50.6,64.3-80.5,117.1-79.1,76.5,2,113.4,65.4,111.1,136.1h-155.4c-.7,12.5,3,25,9.7,35.9,13.2,21.3,40.9,26.9,61.5,12h.2ZM1749.4,273.1c-2.4-10.8-6.9-18-13.9-24.6-12.8-8.3-30.1-9.5-43.4-1.1-9.3,5.8-14.6,15.1-18,25.7h75.3Z"/>
-    <path class="st1" d="M1010.3,364.3c9.1-8.5,13.9-18.1,17.7-30.3l68.4,13.3c-10.4,45.2-46.5,79.2-92.3,86.7-59.3,9.6-118.8-14.2-138.7-73.9-10.8-32.3-10.6-67.4.2-99.3,17.3-51.2,64.2-81.8,117.6-80.4,76.6,2,113.5,65.3,111.1,136.1h-155.6c-.2,12.7,3.2,25.1,9.9,35.9,13.2,21.3,40.9,27,61.5,12h.2ZM1018,273.2c-2.4-9.4-6.3-18.5-14.2-24.4-12.3-9.1-30.4-9.4-43.3-1.3-9.3,5.9-14.4,15.1-17.9,25.6h75.4Z"/>
-    <path class="st1" d="M424.3,376.9c-7.1,13.6-12.5,25.7-23.2,35.5-14.3,13.3-32.6,19.3-52.3,19.4-40.4.2-75.6-23.1-73.6-65.7.9-20.1,9.7-37.2,26.5-49.2,30.5-21.8,55.8-22.4,87.8-40.6,8.1-4.6,18.2-15.3,12.4-22.2s-5-3-8-3.7h-96.3v-61.8h109.6c14.7.6,28.1,2.2,41.7,7.2,23.7,8.8,39.6,29.5,39.8,55.2l.7,90.6c0,13.5,11,23,23.7,23.9l10.1.7v61.3h-29.9c-13.1,0-25.9-3-37.3-8.6-16.9-8.2-26.9-22.2-31.6-42.2h0v.2h-.1ZM364.9,370.1c6.8,5.9,16.2,6.5,24.8,2.7,18.1-7.9,16.5-38.3,16.1-55-3.6,4.3-7.4,9-12.5,11.2l-21.1,9.3c-5.8,2.5-10.6,8-11.8,13s-1,13.8,4.7,18.7h-.2Z"/>
-    <path class="st1" d="M1943,430.1c-33.5-8.9-68.5-33.6-78.9-68.9l66.6-27.2c11.8,22.1,31.6,42.1,57.2,39.8,4.3-.4,9.3-3.1,11.2-6,7.8-12.5-4.3-24.3-16.2-30.7l-47.3-25.2c-32.2-17.1-57.7-50.7-41.6-87.4,11.9-27,48.1-35,75.3-36h99.2v61.8h-88.6c-2.5.4-6.2,2.3-7,4.2s.7,7,2.7,8.2c31.6,18.6,88.3,38.3,103.8,72,10.4,22.6,6.7,50-9.2,69.1-29.5,35.7-86.1,36.9-127,26.1v.2h-.2,0Z"/>
-    <path class="st1" d="M1318.2,264.3l-68.5.2c-19.4,0-30.1,10.8-31.6,30.2v133.1h-85.7v-239h85.6l1,58.9,11.9-25.1c14.3-30.5,56.9-36.5,87.4-33.6v75.4h-.1Z"/>
-    <path class="st1" d="M2232.8,374.2c-26,1.2-44.6-18.4-56.5-40.1l-66.5,27.3c10.8,35.9,46.2,60.4,80.3,69.2h0c10.6,2.6,22,4.5,33.7,5.2,3.2-7.9,6.8-15.6,10.8-23.4,18.5-35.9,44.3-68.4,73.8-98.8-23.6-21.1-62.6-36.7-87-50.6-2.2-1.2-3.6-6.7-2.7-8.7.9-2,4.5-3.5,7.4-3.9h88.2v-61.8h-97.4c-27,.7-63.8,8.2-76.5,34.8-8.3,17.5-6.8,38.5,3.5,54.9,9.3,14.9,22.2,25.8,37.7,33.9l45.8,24.3c11.5,6.1,24.7,17,17.9,30.5-2.1,4.1-7.4,6.5-12.6,7.2h.1Z"/>
-    <path class="st1" d="M1547.6,801.6h81.2c11.6-.2,23.2-3.8,31.9-11.2,7.3-6.2,11.7-15.4,13.9-24.8l16.8-72.7c-7.2,9-12.8,16.9-20.7,24.2-18.3,16.8-42.3,23.8-66.9,19.5-32.5-5.7-46.7-34.7-47-65.6-.5-44,18.9-93.6,57.6-117.1,18-10.9,39.5-13.9,60-9.6,12.4,2.6,22.1,9.9,29.1,20,5.8,8.4,7.8,17.2,10.8,27.8l10.7-45.4,15.6.3-50.6,219.5c-2.9,12.6-8.9,24.6-18.4,32.9-12,10.4-28.1,15.1-44,15.2l-82.9.2,2.7-13.1h.2ZM1691.8,673.5c12.9-26.3,20.1-60.3,11-88.6-5.1-15.8-17.9-26.5-34.2-28.8-20.7-2.9-40.3,2.9-55.9,16.8-13.6,12.1-23.5,26.7-30.3,43.7-9.8,24.4-14.8,56.5-4.6,81.1,5,12.1,14.7,21.3,27.6,24.7,39,10.3,70.1-16,86.4-49h0Z"/>
-    <path class="st1" d="M1441.6,556.8c-43.6-8.7-84.4,29.7-93.8,70l-24.8,106.6h-15.7l43.1-186.4,15.6-.2-8.6,39.5c22.3-28.9,53.9-49.3,90.7-42.5,16.8,3.1,29.1,15.6,32.1,32.4,2.1,11.6,1.6,23.4-1.1,35.3l-28.1,122.2h-15.6c0,0,27.5-119.9,27.5-119.9,4.7-20.6,5.9-51.3-21.2-56.7v-.3Z"/>
-    <path class="st1" d="M1958.9,733.3h-16.2l-38.2-90.1-79.8,90.3-19.3-.2,77.6-87.2c5.1-5.7,11-10.1,17.2-14.5-4.6-4.7-8.5-9.6-11.3-15.3l-33.9-69.3,16.2-.2,35.3,74.1,69-73.9c6.6-.3,12.7-.3,19.6.2l-63.1,66.6c-6.4,6.8-13.4,12.5-20.9,18,3.4,3.4,7.5,7.5,9.6,12.4l38.3,89.2h-.1Z"/>
-    <path class="st1" d="M1224.4,635.4H3.4c1.1-5.6,1.9-9.5,3.1-13.9h1220.9l-2.9,13.9h0Z"/>
-  </g>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 2962.2 860.2" style="enable-background:new 0 0 2962.2 860.2;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;stroke:#000000;stroke-miterlimit:10;}
+	.st1{fill:#17541F;stroke:#000000;stroke-miterlimit:10;}
+</style>
+<path class="st0" d="M1055.6,639.7v-20.6c-18,20-43.1,30.1-75.4,30.1c-22.4,0-42.8-5.8-61-17.5c-18.3-11.7-32.5-27.8-42.9-48.3
+	c-10.3-20.5-15.5-43.3-15.5-68.4c0-25.1,5.2-48,15.5-68.5s24.6-36.6,42.9-48.3s38.6-17.5,61-17.5c32.3,0,57.5,10,75.4,30.1v-20.6
+	h85.3v249.6L1055.6,639.7L1055.6,639.7z M1059.1,514.9c0-17.4-5.2-31.9-15.5-43.8c-10.3-11.8-23.9-17.7-40.6-17.7
+	c-16.8,0-30.2,5.9-40.4,17.7c-10.2,11.8-15.3,26.4-15.3,43.8c0,17.4,5.1,31.9,15.3,43.8c10.2,11.8,23.6,17.7,40.4,17.7
+	c16.8,0,30.3-5.9,40.6-17.7C1054,546.9,1059.1,532.3,1059.1,514.9z"/>
+<path class="st0" d="M1417.8,398.2c18.3,11.7,32.5,27.8,42.9,48.3c10.3,20.5,15.5,43.3,15.5,68.5c0,25.1-5.2,48-15.5,68.4
+	c-10.3,20.5-24.6,36.6-42.9,48.3s-38.6,17.5-61,17.5c-32.3,0-57.5-10-75.4-30.1v165.6h-85.3V390.2h85.3v20.6
+	c18-20,43.1-30.1,75.4-30.1C1379.2,380.7,1399.5,386.6,1417.8,398.2z M1389.5,514.9c0-17.4-5.1-31.9-15.3-43.8
+	c-10.2-11.8-23.6-17.7-40.4-17.7s-30.2,5.9-40.4,17.7c-10.2,11.8-15.3,26.4-15.3,43.8c0,17.4,5.1,31.9,15.3,43.8
+	c10.2,11.8,23.6,17.7,40.4,17.7s30.2-5.9,40.4-17.7S1389.5,532.3,1389.5,514.9z"/>
+<path class="st0" d="M1713.6,555.3l53,49.4c-28.1,29.6-66.7,44.4-115.8,44.4c-28.1,0-53-5.8-74.5-17.5s-38.2-27.7-49.8-48
+	c-11.7-20.3-17.7-43.2-18-68.7c0-24.8,5.9-47.5,17.7-68c11.8-20.5,28.1-36.7,48.7-48.5s43.5-17.7,68.7-17.7
+	c24.8,0,47.6,6.1,68.2,18.2s37,29.5,49.1,52.3c12.1,22.7,18.2,49.1,18.2,79l-0.4,11.7h-181.8c3.6,11.4,10.5,20.7,20.9,28.1
+	c10.3,7.3,21.3,11,33,11c14.4,0,26.3-2.2,35.7-6.5C1695.8,570.1,1704.9,563.7,1713.6,555.3z M1596.9,486.2h92.9
+	c-2.1-12.3-7.5-22.1-16.2-29.4s-18.7-11-30.1-11s-21.5,3.7-30.3,11S1599,473.9,1596.9,486.2z"/>
+<path class="st0" d="M1908.8,418.4c7.8-10.8,17.2-19,28.3-24.7s22-8.5,32.8-8.5c11.4,0,20,1.6,26,4.9l-10.8,72.7
+	c-8.4-2.1-15.7-3.1-22-3.1c-17.1,0-30.4,4.3-39.9,12.8c-9.6,8.5-14.4,24.2-14.4,46.9v120.3h-85.3V390.2h85.3V418.4L1908.8,418.4z"/>
+<path class="st0" d="M2113,258.2v381.5h-85.3V258.2H2113z"/>
+<path class="st0" d="M2360.8,555.3l53,49.4c-28.1,29.6-66.7,44.4-115.8,44.4c-28.1,0-53-5.8-74.5-17.5s-38.2-27.7-49.8-48
+	c-11.7-20.3-17.7-43.2-18-68.7c0-24.8,5.9-47.5,17.7-68s28.1-36.7,48.7-48.5c20.6-11.8,43.5-17.7,68.7-17.7
+	c24.8,0,47.6,6.1,68.2,18.2c20.6,12.1,37,29.5,49.1,52.3c12.1,22.7,18.2,49.1,18.2,79l-0.4,11.7h-181.8
+	c3.6,11.4,10.5,20.7,20.9,28.1c10.3,7.3,21.3,11,33,11c14.4,0,26.3-2.2,35.7-6.5C2343.1,570.1,2352.1,563.7,2360.8,555.3z
+	 M2244.1,486.2h92.9c-2.1-12.3-7.5-22.1-16.2-29.4s-18.7-11-30.1-11s-21.5,3.7-30.3,11C2251.7,464.1,2246.2,473.9,2244.1,486.2z"/>
+<path class="st0" d="M2565.9,446.3c-9.9,0-17.1,1.1-21.5,3.4c-4.5,2.2-6.7,5.9-6.7,11s3.4,8.8,10.3,11.2c6.9,2.4,18,4.9,33.2,7.6
+	c20,3,37,6.7,50.9,11.2s26,12.1,36.1,22.9c10.2,10.8,15.3,25.9,15.3,45.3c0,29.9-10.9,52.4-32.8,67.6
+	c-21.8,15.1-50.3,22.7-85.3,22.7c-25.7,0-49.5-3.7-71.4-11c-21.8-7.3-37.4-14.7-46.7-22.2l33.7-60.6c10.2,9,23.4,15.8,39.7,20.4
+	c16.3,4.6,31.3,7,45.1,7c19.7,0,29.6-5.2,29.6-15.7c0-5.4-3.3-9.4-9.9-11.9c-6.6-2.5-17.2-5.2-31.9-7.9c-18.9-3.3-34.9-7.2-48-11.7
+	c-13.2-4.5-24.6-12.2-34.3-23.1c-9.7-10.9-14.6-26-14.6-45.1c0-27.2,9.7-48.5,29-63.7c19.3-15.3,46-22.9,80.1-22.9
+	c23.3,0,44.4,3.6,63.3,10.8c18.9,7.2,34,14.5,45.3,22l-32.8,58.8c-10.8-7.5-23.2-13.7-37.3-18.6
+	C2590.5,448.7,2577.6,446.3,2565.9,446.3z"/>
+<path class="st0" d="M2817.3,446.3c-9.9,0-17.1,1.1-21.5,3.4c-4.5,2.2-6.7,5.9-6.7,11s3.4,8.8,10.3,11.2c6.9,2.4,18,4.9,33.2,7.6
+	c20,3,37,6.7,50.9,11.2s26,12.1,36.1,22.9c10.2,10.8,15.3,25.9,15.3,45.3c0,29.9-10.9,52.4-32.8,67.6
+	c-21.8,15.1-50.3,22.7-85.3,22.7c-25.7,0-49.5-3.7-71.4-11c-21.8-7.3-37.4-14.7-46.7-22.2l33.7-60.6c10.2,9,23.4,15.8,39.7,20.4
+	c16.3,4.6,31.3,7,45.1,7c19.8,0,29.6-5.2,29.6-15.7c0-5.4-3.3-9.4-9.9-11.9c-6.6-2.5-17.2-5.2-31.9-7.9c-18.9-3.3-34.9-7.2-48-11.7
+	c-13.2-4.5-24.6-12.2-34.3-23.1c-9.7-10.9-14.6-26-14.6-45.1c0-27.2,9.7-48.5,29-63.7c19.3-15.3,46-22.9,80.1-22.9
+	c23.3,0,44.4,3.6,63.3,10.8c18.9,7.2,34,14.5,45.3,22l-32.8,58.8c-10.8-7.5-23.2-13.7-37.3-18.6
+	C2841.8,448.7,2828.9,446.3,2817.3,446.3z"/>
+<g>
+	<path class="st0" d="M2508,724h60.2v17.3H2508V724z"/>
+	<path class="st0" d="M2629.2,694.4c4.9-2,10.2-3.1,16-3.1c10.9,0,19.5,3.4,25.9,10.2s9.6,16.7,9.6,29.6v57.3h-19.6v-52.6
+		c0-9.3-1.7-16.2-5.1-20.7c-3.4-4.5-9.1-6.7-17-6.7c-6.5,0-11.8,2.4-16.1,7.1c-4.3,4.8-6.4,11.5-6.4,20.2v52.6h-19.6v-94.6h19.6v9.5
+		C2620.2,699.4,2624.4,696.4,2629.2,694.4z"/>
+	<path class="st0" d="M2790.3,833.2c-8.6,6.8-19.4,10.2-32.3,10.2c-7.9,0-15.2-1.4-21.9-4.1s-12.1-6.8-16.3-12.2s-6.6-11.9-7.1-19.6
+		h19.6c0.7,6.1,3.5,10.8,8.4,13.9c4.9,3.2,10.7,4.8,17.4,4.8c7,0,13.1-2,18.2-6c5.1-4,7.7-10.3,7.7-18.9v-24.7
+		c-3.6,3.4-8,6.2-13.3,8.2c-5.2,2.1-10.7,3.1-16.3,3.1c-8.7,0-16.6-2.1-23.7-6.4c-7.1-4.3-12.6-10-16.7-17.3c-4-7.3-6-15.5-6-24.6
+		s2-17.3,6-24.7s9.6-13.2,16.7-17.4c7.1-4.3,15-6.4,23.7-6.4c5.7,0,11.1,1,16.3,3.1s9.6,4.8,13.3,8.2v-8.8h19.4v107.8
+		C2803.2,815.9,2798.9,826.4,2790.3,833.2z M2782.2,755.7c2.6-4.7,3.8-10,3.8-15.9s-1.3-11.2-3.8-16c-2.6-4.8-6.1-8.5-10.5-11.1
+		c-4.5-2.7-9.5-4-15.1-4c-5.8,0-10.9,1.4-15.4,4.3c-4.5,2.8-7.9,6.6-10.3,11.4c-2.4,4.8-3.6,9.9-3.6,15.5c0,5.4,1.2,10.5,3.6,15.3
+		c2.4,4.8,5.8,8.6,10.3,11.5s9.6,4.3,15.4,4.3c5.6,0,10.6-1.4,15.1-4.1C2776.1,764.1,2779.6,760.4,2782.2,755.7z"/>
+	<path class="st0" d="M2843.5,788.4h-21.6l37.9-48l-36.4-46.6h22.6l25.7,33.3l25.8-33.3h21.6l-36.2,45.9l37.9,48.6h-22.6l-27.4-35
+		L2843.5,788.4z"/>
+</g>
+<path class="st0" d="M835.8,319.2c-11.5-18.9-27.4-33.7-47.6-44.7c-20.2-10.9-43-16.4-68.5-16.4h-90.6c-8.6,39.6-21.3,77.2-38,112.4
+	c-10,21-21.3,41-33.9,59.9v209.2H647v-135h72.7c25.4,0,48.3-5.5,68.5-16.4s36.1-25.8,47.6-44.7c11.5-18.9,17.3-39.5,17.3-61.9
+	C853.1,358.9,847.4,338.1,835.8,319.2z M747,416.6c-9.4,9-21.8,13.5-37,13.5l-62.8,0.4v-93.4l62.8-0.4c15.3,0,27.6,4.5,37,13.5
+	s14.1,20,14.1,33.2C761.1,396.6,756.4,407.7,747,416.6z"/>
+<path class="st1" d="M164.7,698.7c-3.5-16.5-10.4-49.6-11.3-49.6c-147.1-88-129.7-240.3-81-327.4C82.8,431.4,277,507.1,163.8,641.2
+	c-0.9,1.7,5.2,22.6,10.4,41.8c22.6-38.3,56.6-84.4,54.8-88.8C89.7,254.7,525,228.6,615.5,17.9c40.9,203.7-20.9,518.9-370.8,599
+	c-1.7,0.9-63.5,109.7-66.2,110.6c0-1.7-26.1-0.9-22.6-9.6C157.8,712.6,161.2,705.7,164.7,698.7L164.7,698.7z M160.4,616.9
+	c44.4-51.4-7.8-139.3-39.2-168C174.3,540.2,170.8,593.3,160.4,616.9L160.4,616.9z"/>
 </svg>

docs/assets/logo_leaf.svg

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 1000 1000">
-  <defs>
-    <style>
-      .st0 {
-        fill: #005616;
-      }
-    </style>
-  </defs>
-  <path class="st0" d="M341,949.1c-6.9-20.3-20.7-61.2-21.9-61-199.6-88.9-182.5-229.8-134.3-347.5,30,137.2,268.8,148.9,146.2,336-.9,2.2,10,27.8,19.5,51.3,22.7-51.9,58.6-115.5,55.8-120.8C178,398.7,724.9,299,807.1,18.5c83,251.5,53.1,659.8-377.4,814.9-2,1.4-63.5,148.6-66.9,150.2-.2-2.1-33.2,2.9-30.1-8.7,1.6-7,4.8-16.2,8.2-25.6h0v-.2h.1ZM323.1,846.2c48.3-71.9-12.7-120.8-56.9-152.2,81.2,107.4,66.4,120.8,56.9,152.2h0Z"/>
-</svg>

docs/assets/logo_leaf_white.svg

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0 0 1000 1000">
-  <defs>
-    <style>
-      .st0 {
-        fill: #fff;
-      }
-    </style>
-  </defs>
-  <path class="st0" d="M341,949.1c-6.9-20.3-20.7-61.2-21.9-61-199.6-88.9-182.5-229.8-134.3-347.5,30,137.2,268.8,148.9,146.2,336-.9,2.2,10,27.8,19.5,51.3,22.7-51.9,58.6-115.5,55.8-120.8C178,398.7,724.9,299,807.1,18.5c83,251.5,53.1,659.8-377.4,814.9-2,1.4-63.5,148.6-66.9,150.2-.2-2.1-33.2,2.9-30.1-8.7,1.6-7,4.8-16.2,8.2-25.6h0v-.2h.1ZM323.1,846.2c48.3-71.9-12.7-120.8-56.9-152.2,81.2,107.4,66.4,120.8,56.9,152.2h0Z"/>
-</svg>

docs/changelog.md

@@ -1,64 +1,5 @@
 # Changelog
 
-## paperless-ngx 2.20.15
-
-### Security
-
-- Resolve [GHSA-96jx-fj7m-qh6x](https://github.com/paperless-ngx/paperless-ngx/security/advisories/GHSA-8c6x-pfjq-9gr7)
-
-### Bug Fixes
-
-- Fix: use only allauth login/logout endpoints [@shamoon](https://github.com/shamoon) ([#12639](https://github.com/paperless-ngx/paperless-ngx/pull/12639))
-- Fix: correctly scope mail account enumeration [@shamoon](https://github.com/shamoon) ([#12636](https://github.com/paperless-ngx/paperless-ngx/pull/12636))
-- Fix: prevent intermediate change event when CustomFieldQueryAtom operator changes type [@ggouzi](https://github.com/ggouzi) ([#12597](https://github.com/paperless-ngx/paperless-ngx/pull/12597))
-- Fix: reject invalid requests to API notes endpoint [@ggouzi](https://github.com/ggouzi) ([#12582](https://github.com/paperless-ngx/paperless-ngx/pull/12582))
-
-### All App Changes
-
-<details>
-<summary>4 changes</summary>
-
-- Fix: use only allauth login/logout endpoints [@shamoon](https://github.com/shamoon) ([#12639](https://github.com/paperless-ngx/paperless-ngx/pull/12639))
-- Fix: correctly scope mail account enumeration [@shamoon](https://github.com/shamoon) ([#12636](https://github.com/paperless-ngx/paperless-ngx/pull/12636))
-- Fix: prevent intermediate change event when CustomFieldQueryAtom operator changes type [@ggouzi](https://github.com/ggouzi) ([#12597](https://github.com/paperless-ngx/paperless-ngx/pull/12597))
-- Fix: reject invalid requests to API notes endpoint [@ggouzi](https://github.com/ggouzi) ([#12582](https://github.com/paperless-ngx/paperless-ngx/pull/12582))
-</details>
-
-## paperless-ngx 2.20.14
-
-### Bug Fixes
-
-- Fix: do not submit permissions for non-owners [@shamoon](https://github.com/shamoon) ([#12571](https://github.com/paperless-ngx/paperless-ngx/pull/12571))
-- Fix: prevent duplicate parent tag IDs [@shamoon](https://github.com/shamoon) ([#12522](https://github.com/paperless-ngx/paperless-ngx/pull/12522))
-- Fix: dont defer tag change application in workflows [@shamoon](https://github.com/shamoon) ([#12478](https://github.com/paperless-ngx/paperless-ngx/pull/12478))
-- Fix: limit share link viewset actions [@shamoon](https://github.com/shamoon) ([#12461](https://github.com/paperless-ngx/paperless-ngx/pull/12461))
-- Fix: add fallback ordering for documents by id after created [@shamoon](https://github.com/shamoon) ([#12440](https://github.com/paperless-ngx/paperless-ngx/pull/12440))
-- Fixhancement: default mail-created correspondent matching to exact [@shamoon](https://github.com/shamoon) ([#12414](https://github.com/paperless-ngx/paperless-ngx/pull/12414))
-- Fix: validate date CF value in serializer [@shamoon](https://github.com/shamoon) ([#12410](https://github.com/paperless-ngx/paperless-ngx/pull/12410))
-
-### All App Changes
-
-<details>
-<summary>7 changes</summary>
-
-- Fix: do not submit permissions for non-owners [@shamoon](https://github.com/shamoon) ([#12571](https://github.com/paperless-ngx/paperless-ngx/pull/12571))
-- Fix: prevent duplicate parent tag IDs [@shamoon](https://github.com/shamoon) ([#12522](https://github.com/paperless-ngx/paperless-ngx/pull/12522))
-- Fix: dont defer tag change application in workflows [@shamoon](https://github.com/shamoon) ([#12478](https://github.com/paperless-ngx/paperless-ngx/pull/12478))
-- Fix: limit share link viewset actions [@shamoon](https://github.com/shamoon) ([#12461](https://github.com/paperless-ngx/paperless-ngx/pull/12461))
-- Fix: add fallback ordering for documents by id after created [@shamoon](https://github.com/shamoon) ([#12440](https://github.com/paperless-ngx/paperless-ngx/pull/12440))
-- Fixhancement: default mail-created correspondent matching to exact [@shamoon](https://github.com/shamoon) ([#12414](https://github.com/paperless-ngx/paperless-ngx/pull/12414))
-- Fix: validate date CF value in serializer [@shamoon](https://github.com/shamoon) ([#12410](https://github.com/paperless-ngx/paperless-ngx/pull/12410))
-</details>
-
-## paperless-ngx 2.20.13
-
-### Bug Fixes
-
-- Fix: suggest corrections only if visible results
-- Fix: require view permission for more-like search
-- Fix: validate document link targets
-- Fix: enforce permissions when attaching accounts to mail rules
-
 ## paperless-ngx 2.20.12
 
 ### Security

docs/configuration.md

@@ -101,7 +101,7 @@ and `mariadb`.
 
 #### [`PAPERLESS_DB_OPTIONS=<options>`](#PAPERLESS_DB_OPTIONS) {#PAPERLESS_DB_OPTIONS}
 
-: Advanced database connection options as a comma-delimited key-value string.
+: Advanced database connection options as a semicolon-delimited key-value string.
 Keys and values are separated by `=`. Dot-notation produces nested option
 dictionaries; for example, `pool.max_size=20` sets
 `OPTIONS["pool"]["max_size"] = 20`.
@@ -123,36 +123,18 @@ dictionaries; for example, `pool.max_size=20` sets
         to handle all pool connections across all workers:
         `(web_workers + celery_workers) * pool.max_size + safety_margin`.
 
-    !!! note "SQLite defaults"
-
-        SQLite connections are pre-configured with WAL journal mode, optimised
-        synchronous and cache settings, and a 5-second busy timeout. These defaults
-        suit most deployments. To override `init_command`, use `;` between PRAGMAs
-        within the value and `,` between options:
-
-        ```bash
-        PAPERLESS_DB_OPTIONS="init_command=PRAGMA journal_mode=DELETE;PRAGMA synchronous=FULL,transaction_mode=DEFERRED"
-        ```
-
-    !!! note "MariaDB: READ COMMITTED isolation level"
-
-        MariaDB connections default to `READ COMMITTED` isolation level, which
-        eliminates gap locking and reduces deadlock frequency. If binary logging is
-        enabled on your MariaDB server, this requires `binlog_format=ROW` (the
-        default for most managed MariaDB instances). Statement-based replication is
-        not compatible with `READ COMMITTED`.
-
     **Examples:**
 
     ```bash title="PostgreSQL: require SSL, set a custom CA certificate, and limit the pool size"
-    PAPERLESS_DB_OPTIONS="sslmode=require,sslrootcert=/certs/ca.pem,pool.max_size=5"
+    PAPERLESS_DB_OPTIONS="sslmode=require;sslrootcert=/certs/ca.pem;pool.max_size=5"
     ```
 
     ```bash title="MariaDB: require SSL with a custom CA certificate"
-    PAPERLESS_DB_OPTIONS="ssl_mode=REQUIRED,ssl.ca=/certs/ca.pem"
+    PAPERLESS_DB_OPTIONS="ssl_mode=REQUIRED;ssl.ca=/certs/ca.pem"
     ```
 
-    ```bash title="PostgreSQL or MariaDB: set a connection timeout"
+    ```bash title="SQLite: set a busy timeout of 30 seconds"
+    # PostgreSQL: set a connection timeout
     PAPERLESS_DB_OPTIONS="connect_timeout=10"
     ```
 
@@ -2014,57 +1996,49 @@ suggestions. This setting is required to be set to true in order to use the AI f
 
 #### [`PAPERLESS_AI_LLM_EMBEDDING_BACKEND=<str>`](#PAPERLESS_AI_LLM_EMBEDDING_BACKEND) {#PAPERLESS_AI_LLM_EMBEDDING_BACKEND}
 
-: The embedding backend to use for RAG. This can be either "openai-like" or "huggingface". The
-"openai-like" backend uses an OpenAI-compatible embeddings API.
+: The embedding backend to use for RAG. This can be either "openai" or "huggingface".
 
     Defaults to None.
 
 #### [`PAPERLESS_AI_LLM_EMBEDDING_MODEL=<str>`](#PAPERLESS_AI_LLM_EMBEDDING_MODEL) {#PAPERLESS_AI_LLM_EMBEDDING_MODEL}
 
-: The model to use for the embedding backend for RAG. This can be set to any of the embedding
-models supported by the current embedding backend. If not supplied, defaults to
-"text-embedding-3-small" for the OpenAI-compatible backend and
-"sentence-transformers/all-MiniLM-L6-v2" for Huggingface.
+: The model to use for the embedding backend for RAG. This can be set to any of the embedding models supported by the current embedding backend. If not supplied, defaults to "text-embedding-3-small" for OpenAI and "sentence-transformers/all-MiniLM-L6-v2" for Huggingface.
 
     Defaults to None.
 
 #### [`PAPERLESS_AI_LLM_BACKEND=<str>`](#PAPERLESS_AI_LLM_BACKEND) {#PAPERLESS_AI_LLM_BACKEND}
 
-: The AI backend to use. This can be either "openai-like" or "ollama". If set to "ollama", the AI
-features will be run locally on your machine. If set to "openai-like", the AI features will use
-an OpenAI-compatible API endpoint, including OpenAI itself and compatible providers. This
-setting is required to be set to use the AI features.
+: The AI backend to use. This can be either "openai" or "ollama". If set to "ollama", the AI
+features will be run locally on your machine. If set to "openai", the AI features will be run
+using the OpenAI API. This setting is required to be set to use the AI features.
 
     Defaults to None.
 
     !!! note
 
-        Remote AI providers may be paid services. If you use a hosted OpenAI-compatible API, you
-        are responsible for any usage charges incurred by Paperless-ngx features, and your
-        document data will be sent to the provider you configure.
+        The OpenAI API is a paid service. You will need to set up an OpenAI account and
+        will be charged for usage incurred by Paperless-ngx features and your document data
+        will (of course) be sent to the OpenAI API. Paperless-ngx does not endorse the use of the
+        OpenAI API in any way.
 
-        Paperless-ngx does not endorse any specific provider. Refer to your provider's terms of
-        service and privacy policy, and use at your own risk.
+        Refer to the OpenAI terms of service, and use at your own risk.
 
 #### [`PAPERLESS_AI_LLM_MODEL=<str>`](#PAPERLESS_AI_LLM_MODEL) {#PAPERLESS_AI_LLM_MODEL}
 
-: The model to use for the AI backend, i.e. "gpt-3.5-turbo", "gpt-4" or any of the models supported
-by the current backend. If not supplied, defaults to "gpt-3.5-turbo" for the OpenAI-compatible
-backend and "llama3.1" for Ollama.
+: The model to use for the AI backend, i.e. "gpt-3.5-turbo", "gpt-4" or any of the models supported by the
+current backend. If not supplied, defaults to "gpt-3.5-turbo" for OpenAI and "llama3.1" for Ollama.
 
     Defaults to None.
 
 #### [`PAPERLESS_AI_LLM_API_KEY=<str>`](#PAPERLESS_AI_LLM_API_KEY) {#PAPERLESS_AI_LLM_API_KEY}
 
-: The API key to use for the AI backend. This is typically required for the OpenAI-compatible
-backend (optional for others).
+: The API key to use for the AI backend. This is required for the OpenAI backend (optional for others).
 
     Defaults to None.
 
 #### [`PAPERLESS_AI_LLM_ENDPOINT=<str>`](#PAPERLESS_AI_LLM_ENDPOINT) {#PAPERLESS_AI_LLM_ENDPOINT}
 
-: The endpoint / url to use for the AI backend. This is required for the Ollama backend and may be
-used with the OpenAI-compatible backend to target a custom provider or local gateway.
+: The endpoint / url to use for the AI backend. This is required for the Ollama backend (optional for others).
 
     Defaults to None.
 

docs/index.md

@@ -4,7 +4,7 @@ title: Home
 
 <div class="grid-left" markdown>
 ![image](assets/logo_full_black.svg#only-light){.index-logo}
-![image](assets/logo_full_eee.svg#only-dark){.index-logo}
+![image](assets/logo_full_white.svg#only-dark){.index-logo}
 
 **Paperless-ngx** is a _community-supported_ open-source document management system that transforms your
 physical documents into a searchable online archive so you can keep, well, _less paper_.

docs/migration-v3.md

@@ -120,7 +120,7 @@ Users with any of the deprecated variables set should migrate to `PAPERLESS_DB_O
 Multiple options are combined in a single value:
 
 ```bash
-PAPERLESS_DB_OPTIONS="sslmode=require,sslrootcert=/certs/ca.pem,pool.max_size=10"
+PAPERLESS_DB_OPTIONS="sslmode=require;sslrootcert=/certs/ca.pem;pool.max_size=10"
 ```
 
 ## OCR and Archive File Generation Settings
@@ -241,72 +241,3 @@ For example:
   }
 }
 ```
-
-## Task History Cleared on Upgrade
-
-The task tracking system has been redesigned in this release. All existing task history records are dropped from the database during the upgrade. Previously completed, failed, or acknowledged tasks will no longer appear in the task list after upgrading.
-
-No user action is required.
-
-## Consume Script Positional Arguments Removed
-
-Pre- and post-consumption scripts no longer receive positional arguments. All information is
-now passed exclusively via environment variables, which have been available since earlier versions.
-
-### Pre-consumption script
-
-Previously, the original file path was passed as `$1`. It is now only available as
-`DOCUMENT_SOURCE_PATH`.
-
-**Before:**
-
-```bash
-#!/usr/bin/env bash
-# $1 was the original file path
-process_document "$1"
-```
-
-**After:**
-
-```bash
-#!/usr/bin/env bash
-process_document "${DOCUMENT_SOURCE_PATH}"
-```
-
-### Post-consumption script
-
-Previously, document metadata was passed as positional arguments `$1` through `$8`:
-
-| Argument | Environment Variable Equivalent |
-| -------- | ------------------------------- |
-| `$1`     | `DOCUMENT_ID`                   |
-| `$2`     | `DOCUMENT_FILE_NAME`            |
-| `$3`     | `DOCUMENT_SOURCE_PATH`          |
-| `$4`     | `DOCUMENT_THUMBNAIL_PATH`       |
-| `$5`     | `DOCUMENT_DOWNLOAD_URL`         |
-| `$6`     | `DOCUMENT_THUMBNAIL_URL`        |
-| `$7`     | `DOCUMENT_CORRESPONDENT`        |
-| `$8`     | `DOCUMENT_TAGS`                 |
-
-**Before:**
-
-```bash
-#!/usr/bin/env bash
-DOCUMENT_ID=$1
-CORRESPONDENT=$7
-TAGS=$8
-```
-
-**After:**
-
-```bash
-#!/usr/bin/env bash
-# Use environment variables directly
-echo "Document ${DOCUMENT_ID} from ${DOCUMENT_CORRESPONDENT} tagged: ${DOCUMENT_TAGS}"
-```
-
-### Action Required
-
-Update any pre- or post-consumption scripts that read `$1`, `$2`, etc. to use the
-corresponding environment variables instead. Environment variables have been the preferred
-option since v1.8.0.

docs/usage.md

@@ -302,19 +302,13 @@ Paperless-ngx includes several features that use AI to enhance the document mana
 
 !!! warning
 
-    Remember that Paperless-ngx will send document content to the AI provider you have configured,
-    so consider the privacy implications of using these features, especially if using a remote
-    model or API provider instead of the default local model.
+    Remember that Paperless-ngx will send document content to the AI provider you have configured, so consider the privacy implications of using these features, especially if using a remote model (e.g. OpenAI), instead of the default local model.
 
 The AI features work by creating an embedding of the text content and metadata of documents, which is then used for various tasks such as similarity search and question answering. This uses the FAISS vector store.
 
 ### AI-Enhanced Suggestions
 
-If enabled, Paperless-ngx can use an AI LLM model to suggest document titles, dates, tags,
-correspondents and document types for documents. This feature will always be "opt-in" and does not
-disable the existing classifier-based suggestion system. Currently, both remote
-(via OpenAI-compatible APIs) and local (via Ollama) models are supported, see
-[configuration](configuration.md#ai) for details.
+If enabled, Paperless-ngx can use an AI LLM model to suggest document titles, dates, tags, correspondents and document types for documents. This feature will always be "opt-in" and does not disable the existing classifier-based suggestion system. Currently, both remote (via the OpenAI API) and local (via Ollama) models are supported, see [configuration](configuration.md#ai) for details.
 
 ### Document Chat
 
@@ -420,10 +414,10 @@ still have "object-level" permissions.
 | SavedView        | Add, edit, delete or view Saved Views.                                                                                                                                                                                          |
 | ShareLink        | Add, delete or view Share Links.                                                                                                                                                                                                |
 | StoragePath      | Add, edit, delete or view Storage Paths.                                                                                                                                                                                        |
-| SystemMonitoring | View the system status dialog, tasks summary and their API endpoints. Admin users also retain system status access.                                                                                                             |
+| SystemStatus     | View the system status dialog and corresponding API endpoint. Admin users also retain system status access.                                                                                                                     |
 | Tag              | Add, edit, delete or view Tags.                                                                                                                                                                                                 |
 | UISettings       | Add, edit, delete or view the UI settings that are used by the web app.<br/>:warning: **Users that will access the web UI must be granted at least _View_ permissions.**                                                        |
-| User             | Add, edit, delete or view other user accounts via Settings > Users & Groups and `/api/users/`. These permissions are not needed for users to edit their own profile via "My Profile" or `/api/profile/`.                        |
+| User             | Add, edit, delete or view Users.                                                                                                                                                                                                |
 | Workflow         | Add, edit, delete or view Workflows.<br/>Note that Workflows are global; all users who can access workflows see the same set. Workflows have other permission implications — see [Workflow permissions](#workflow-permissions). |
 
 #### Detailed Explanation of Object Permissions {#object-permissions}
@@ -434,8 +428,6 @@ still have "object-level" permissions.
 | View  | Confers the ability to view (not edit) a document, tag, etc.<br/>Users without 'view' (or higher) permissions will be shown _'Private'_ in place of the object name for example when viewing a document with a tag for which the user doesn't have permissions.                                                                          |
 | Edit  | Confers the ability to edit (and view) a document, tag, etc.                                                                                                                                                                                                                                                                             |
 
-For related metadata such as tags, correspondents, document types, and storage paths, object visibility and document assignment are intentionally distinct. A user may still retain or submit a known object ID when editing a document even if that related object is displayed as _Private_ or omitted from search and selection results. This allows documents to preserve existing assignments that the current user cannot necessarily inspect in detail.
-
 ### Password reset
 
 In order to enable the password reset feature you will need to setup an SMTP backend, see
@@ -861,14 +853,13 @@ Matching natural date keywords:
 ```
 added:today
 modified:yesterday
-created:"previous week"
-added:"previous month"
-modified:"this year"
+created:this_week
+added:last_month
+modified:this_year
 ```
 
-Supported date keywords: `today`, `yesterday`, `previous week`,
-`this month`, `previous month`, `this year`, `previous year`,
-`previous quarter`.
+Supported date keywords: `today`, `yesterday`, `this_week`, `last_week`,
+`this_month`, `last_month`, `this_year`, `last_year`.
 
 #### Searching custom fields
 

paperless-ngx.code-workspace

@@ -30,25 +30,11 @@
 			"**/.idea": true,
 			"**/.venv": true,
 			"**/.coverage": true,
-			"**/coverage.json": true,
-			"htmlcov/": true,
-			"coverage.xml": true,
-			"junit.xml": true
+			"**/coverage.json": true
 		},
-		"python.languageServer": "Pylance",
-		"python.defaultInterpreterPath": "${workspaceFolder:paperless-ngx}/.venv/bin/python3",
-		"python.analysis.extraPaths": ["${workspaceFolder:paperless-ngx}/src"],
+		"python.defaultInterpreterPath": ".venv/bin/python3",
 		"python.analysis.inlayHints.pytestParameters": true,
 		"python.testing.pytestEnabled": true,
-		"python.testing.unittestEnabled": false,
-		"[python]": {
-			"editor.defaultFormatter": "charliermarsh.ruff",
-			"editor.formatOnSave": true,
-			"editor.codeActionsOnSave": {
-				"source.fixAll.ruff": "explicit",
-				"source.organizeImports.ruff": "explicit"
-			}
-		}
 	},
 	"extensions": {
 		"recommendations": ["ms-python.python", "charliermarsh.ruff", "editorconfig.editorconfig"],

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "paperless-ngx"
-version = "2.20.15"
+version = "2.20.13"
 description = "A community-supported supercharged document management system: scan, index and archive all your physical documents"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -24,10 +24,11 @@ dependencies = [
   "dateparser~=1.2",
   # WARNING: django does not use semver.
   #          Only patch versions are guaranteed to not introduce breaking changes.
-  "django~=5.2.13",
+  "django~=5.2.10",
   "django-allauth[mfa,socialaccount]~=65.15.0",
   "django-auditlog~=3.4.1",
   "django-cachalot~=2.9.0",
+  "django-celery-results~=2.6.0",
   "django-compression-middleware~=0.5.0",
   "django-cors-headers~=4.9.0",
   "django-extensions~=4.1",
@@ -53,9 +54,9 @@ dependencies = [
   "langdetect~=1.0.9",
   "llama-index-core>=0.14.12",
   "llama-index-embeddings-huggingface>=0.6.1",
-  "llama-index-embeddings-openai-like>=0.2.2",
+  "llama-index-embeddings-openai>=0.5.1",
   "llama-index-llms-ollama>=0.9.1",
-  "llama-index-llms-openai-like>=0.7.1",
+  "llama-index-llms-openai>=0.6.13",
   "llama-index-vector-stores-faiss>=0.5.2",
   "nltk~=3.9.1",
   "ocrmypdf~=17.4.0",
@@ -73,7 +74,7 @@ dependencies = [
   "scikit-learn~=1.8.0",
   "sentence-transformers>=4.1",
   "setproctitle~=1.3.4",
-  "tantivy~=0.26.0",
+  "tantivy>=0.25.1",
   "tika-client~=0.11.0",
   "torch~=2.11.0",
   "watchfiles>=1.1.1",
@@ -112,7 +113,7 @@ testing = [
   "factory-boy~=3.3.1",
   "faker~=40.12.0",
   "imagehash",
-  "pytest~=9.0.3",
+  "pytest~=9.0.0",
   "pytest-cov~=7.1.0",
   "pytest-django~=4.12.0",
   "pytest-env~=1.6.0",
@@ -143,8 +144,7 @@ typing = [
   "types-python-dateutil",
   "types-pytz",
   "types-redis",
-  "types-regex",
-  "types-setuptools"
+  "types-setuptools",
 ]
 
 [tool.uv]
@@ -179,8 +179,6 @@ respect-gitignore = true
 fix = true
 show-fixes = true
 output-format = "grouped"
-[tool.ruff.format]
-line-ending = "lf"
 [tool.ruff.lint]
 # https://docs.astral.sh/ruff/rules/
 extend-select = [
@@ -314,7 +312,6 @@ markers = [
   "date_parsing: Tests which cover date parsing from content or filename",
   "management: Tests which cover management commands/functionality",
   "search: Tests for the Tantivy search backend",
-  "api: Tests for REST API endpoints",
 ]
 
 [tool.pytest_env]

resources/logo.txt

@@ -0,0 +1,16 @@
+                         9w
+                       {@@N
+                     Q@@@@H
+                  G@@@@@@@\
+               SilN@@@@@@@
+            *Q  *@@@@@@@@S        /= = = = = = = = = = = = = = = = = =\
+          *@   B@@@@@@@@N        ||                                   ||
+ N       R$  A@@@@@@@@@@         ||           PAPERLESS-NGX           ||
+x@@     $U  B@@@@@@@@@R          ||                                   ||
+N@@N^   @  N@@@@@@@@@*            \= = = = = = = = = = = = = = = = = =/
+|@@@u   @ E@@@@@@@@l
+ Q@@@ \ Px@@@@@@P
+  1@@S`  @@@o'
+    z$  ;
+       v
+      /

resources/logo/print/pdf/White logo - no background.pdf

@@ -0,0 +1,329 @@
+%PDF-1.6
+%âãÏÓ
+3 0 obj
+<</Metadata 7 0 R/OCProperties<</D<</ON[8 0 R 22 0 R]/Order 23 0 R/RBGroups[]>>/OCGs[8 0 R 22 0 R]>>/Pages 4 0 R/Type/Catalog>>
+endobj
+7 0 obj
+<</Length 8109/Subtype/XML/Type/Metadata>>stream
+<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 7.1-c000 79.a8731b9, 2021/09/09-00:37:38        ">
+   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+      <rdf:Description rdf:about=""
+            xmlns:xmp="http://ns.adobe.com/xap/1.0/"
+            xmlns:xmpGImg="http://ns.adobe.com/xap/1.0/g/img/"
+            xmlns:pdf="http://ns.adobe.com/pdf/1.3/"
+            xmlns:xmpTPg="http://ns.adobe.com/xap/1.0/t/pg/"
+            xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"
+            xmlns:xmpG="http://ns.adobe.com/xap/1.0/g/"
+            xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"
+            xmlns:dc="http://purl.org/dc/elements/1.1/"
+            xmlns:illustrator="http://ns.adobe.com/illustrator/1.0/">
+         <xmp:CreateDate>2018-12-29T21:47:38Z</xmp:CreateDate>
+         <xmp:CreatorTool>Chromium</xmp:CreatorTool>
+         <xmp:ModifyDate>2022-02-26T20:11:14-08:00</xmp:ModifyDate>
+         <xmp:MetadataDate>2022-02-26T20:11:14-08:00</xmp:MetadataDate>
+         <xmp:Thumbnails>
+            <rdf:Alt>
+               <rdf:li rdf:parseType="Resource">
+                  <xmpGImg:width>256</xmpGImg:width>
+                  <xmpGImg:height>76</xmpGImg:height>
+                  <xmpGImg:format>JPEG</xmpGImg:format>
+                  <xmpGImg:image>/9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA&#xA;AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK&#xA;DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f&#xA;Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgATAEAAwER&#xA;AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA&#xA;AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB&#xA;UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE&#xA;1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ&#xA;qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy&#xA;obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp&#xA;0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo&#xA;+DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A9U4q7FXYq7FXYqlnmXzJ&#xA;pHlvR7jV9VmENpAP9k7n7MaD9pm7DBKQAssZSAFl5x+RvnjUfN2r+br+8+BWmtJLaCtVijZZUVB8&#xA;liFT3O+VYp8RLVhnxEvWsub3Yq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq&#xA;7FXYq7FXYq7FXYq7FWG+f/zU8seTLdlvJfrWqMKwaZCw9U1Gxc7iNfdvoByueQRa55BF8t+evzB8&#xA;w+c9T+t6pLxgjJFpYx1EMKn+Ud2PdjufltmJOZlzcOczI7vVP+cVYSbjzJNX4VSzSnuxmP8Axrl2&#xA;n6t2m6voLMlynYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7&#xA;FVk88FvBJPPIsMESl5ZZCFRVUVLMx2AA74q8A/Mv/nIqV2l0ryYeEYqkusuPiPY/V0Ybf67fQB1z&#xA;GyZugcXJn6B4TcXFxczyXFxK808rF5ZZGLuzHclmNSScxnGU8VfTH/OMOlNB5R1LUXFDfXnBPdII&#xA;wAf+CkYZl4Bs5enGz2TL3IdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirs&#xA;VdirsVYj5X/MGw13zf5i8vRFRJosiJDv8UqgcJ2/55zfD92QjOyQ1xnZIZdk2x8v/np+a1zr2qTe&#xA;XNJmMeh2MhjuHQ0+tTIaMWI6xow+EdD9rwpiZclmhycPNks0OTyPKGh2Kr4YZZ5khhQySysEjjUV&#xA;ZmY0AA8ScVfbnkXy2nlryjpeiinqWkAE5HQzPV5SPnIxzYQjQp2MI0KT3JMnYq7FXYq7FXYq7FXY&#xA;q7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXw9oPm/WdE8zx+Y7OWl+szTSg14SCQ1kj&#xA;cd1etD/XNeJEG3XRkQbfUt9+Ytlqv5U6n5q0ZykqWcw9Ov7y3uuPHi3TdGYH3G/fMwzuNhzDkuNh&#xA;8f5guC7FXYq9q/5x5/LaXUNTTzdqUVNPsWP6NRx/e3A29QA/sxdj/N8jmRhhe7kYMdmy+ksynLdi&#xA;rsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdir4a836BP5f8AM2pa&#xA;NOpVrOd40r+1HWsbivZkIYZr5CjTrpRo0y3ytqd6dCuLK3J9DzFYXmn3cP8ANe6dCLi3kUdjJG6R&#xA;e5qcnE7e9nE7e953lTU7FXrv5W/kPquuzQ6r5kiew0RSHS1eqXFyOwpsY4z3Y7n9nryF+PCTuW/H&#xA;hJ3PJ9NWlpbWltFa2sSwW0CiOGGMBURFFAqgdAMywHMAVcVdirsVdirsVdirsVdirsVdirsVdirs&#xA;VdirsVdirsVdirsVdirsVdirsVdirsVdiryr86/yjfzbbprOjKq69aJwaI0UXMQ3Ccugdf2SevQ9&#xA;qU5cfFuObRlxcW45vL/ym0y40i+vNc8xwvZaP5Raa5uopk4yPezxCGKDi1DypuPeleuU4xW56NOI&#xA;VueiJ8n/APOP2q+Z7WLXbq6j0XStQLT2tmqNNOsLMSgoxRQCv2TyO29MMcJO6Y4Cd3snk78mvI3l&#xA;Z0uLa0N7qKUIvrykrqw7otAifNVr75fHEA5EcUYs4yxsdirsVdirsVdirsVdirsVdirsVdirsVdi&#xA;rsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVeRedfy/wBa8z/mjBbyQyxeUJYra81aQlfSnntP&#xA;URUWhrUpIqUNNqnsMolAmXk0TgTLyeuIiIioihUUBVVRQADYAAZe3t4q7FXYq7FXYq7FXYq7FXYq&#xA;7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7&#xA;FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7F&#xA;XYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq//2Q==</xmpGImg:image>
+               </rdf:li>
+            </rdf:Alt>
+         </xmp:Thumbnails>
+         <pdf:Producer>Skia/PDF m64</pdf:Producer>
+         <xmpTPg:NPages>1</xmpTPg:NPages>
+         <xmpTPg:HasVisibleTransparency>False</xmpTPg:HasVisibleTransparency>
+         <xmpTPg:HasVisibleOverprint>False</xmpTPg:HasVisibleOverprint>
+         <xmpTPg:MaxPageSize rdf:parseType="Resource">
+            <stDim:w>2409.000000</stDim:w>
+            <stDim:h>909.000000</stDim:h>
+            <stDim:unit>Pixels</stDim:unit>
+         </xmpTPg:MaxPageSize>
+         <xmpTPg:PlateNames>
+            <rdf:Seq>
+               <rdf:li>Cyan</rdf:li>
+               <rdf:li>Magenta</rdf:li>
+               <rdf:li>Yellow</rdf:li>
+               <rdf:li>Black</rdf:li>
+            </rdf:Seq>
+         </xmpTPg:PlateNames>
+         <xmpTPg:SwatchGroups>
+            <rdf:Seq>
+               <rdf:li rdf:parseType="Resource">
+                  <xmpG:groupName>Default Swatch Group</xmpG:groupName>
+                  <xmpG:groupType>0</xmpG:groupType>
+               </rdf:li>
+            </rdf:Seq>
+         </xmpTPg:SwatchGroups>
+         <xmpMM:InstanceID>uuid:e5f59418-0be8-dd42-a564-bc1f41615750</xmpMM:InstanceID>
+         <xmpMM:RenditionClass>proof:pdf</xmpMM:RenditionClass>
+         <xmpMM:DocumentID>uuid:c2483dfa-3a53-3149-80a7-6822614a9dee</xmpMM:DocumentID>
+         <dc:format>application/pdf</dc:format>
+         <illustrator:CreatorSubTool>Adobe Illustrator</illustrator:CreatorSubTool>
+      </rdf:Description>
+   </rdf:RDF>
+</x:xmpmeta>
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                           
+<?xpacket end="w"?>
+endstream
+endobj
+4 0 obj
+<</Count 1/Kids[5 0 R]/Type/Pages>>
+endobj
+5 0 obj
+<</ArtBox[152.941 154.947 2262.04 755.845]/BleedBox[0.0 0.0 2409.0 909.0]/Contents 24 0 R/CropBox[0.0 0.0 2409.0 909.0]/LastModified(D:20220226201114-08'00')/MediaBox[0 0 2409 909]/Parent 4 0 R/PieceInfo<</Illustrator 25 0 R>>/Resources<</ExtGState<</GS0 26 0 R>>/Properties<</MC0 22 0 R>>>>/Thumb 27 0 R/TrimBox[0.0 0.0 2409.0 909.0]/Type/Page>>
+endobj
+24 0 obj
+<</Filter/FlateDecode/Length 3540>>stream
+H‰ì—ÍŽ¹„ïýõU"™ü½Z|2Ã?ÀÀ»{Øõûþ"ɪîI¼;ö° i²ø“ÌŒˆÌüð·�Û‡¿~ÛŸþüq»ý|ÛcK™ÿvýúå_·nÿ¾ÅMÿ~ùñöá/ÿÛ�ÿ¹ýÌ0ð/n}ԣƴÙÈG¨£l/Ÿnú¢ÿc:j­ÛnGëeKv¤·=Æ#uÛ,�?/·=v¾o9%—mOý¨ŒòÑjÛvf»ÕsÈâ’Ž1Òõ½¦£Ç¡Í¹¥moáH9?œÝ&¿{ض÷xX�—ak´rýÞÏokç~š½ŽÞïg¯»÷Óòbx€¿olßïÆëm¡ÝWÌ—ï§õË3WLÏíËüpYÜæŸ8‘«»butŒûtM´ÂÄØ^ñn9d+²®6;†ž3ÚÑ
+Æ—vd³k,—q©õûŠÞ�Ò5¶£h>†8ßÕË8Jä’ÐqN«G	Yf–#Ëá5ÏD“sø’ÇÑkòM<»š<š�¡=xÅru¯X~œGh)k†qȹ¾Æ�ºûsÝÂ%Íß";
+þ’Ñ=\ŽXÚ†�Ùâý-]&t‡
¯�eã±Yn[ÎÀµ·Ë[k¨Mwžß9¾Qw6öÍ`‹ÖªÇßÇ|m-›2çÏÆŠÕˆMÁ»‡wNütûáö÷öÅh툱~“<þ�ìzæ_á„Z¬�Ôô[Ë�,©_¬ãÅžh¸ä��èÊ
�ü“ê<ÐOÛ.ú­sŸé§‹ïô›vío¦Ÿ^öH?=ü‘òÌ3ÿ›¯ò/
á<Ÿn\Ü’€Ú‚^áL¹i!“P^À­F£`�Â]°?Ç|Θ¯­‰wœ‹v|'–8²˜']^|_ÌtƒïÌm\8îÔÝã�ù<»‡'mÈD%–ûŠ*q™uÕ‘vßÕGÑ_3‘4aèöëä}Ó­_˜»¨pnülb‘‰	î.H+ÌæiÚÉÄeû�©…r¢öÿ]aDò�¶Ç ¾¼%XêÚHŒrdE…ÕÁ*g§ÌÏ×[­„hl_�
+`F,�B|
Rä.¹\ȶ%Òf†tX–�ÿú,�tÑ-É�ÕÇ­	�øk'²	X;
+u�‹à]Ê{#ÔpsD™¬ë‰{!“�Á"Nr
+õ
+T;ïˆÁt#Ž
+ekìiÒdq>Ú8’¼}Ž_n+‡�ø²øwPX´‘†&‚üà˜0ÖHÖ‰…%îÊäQ TVÝ¢“¾“qûð@^©¸àå4¡%¸¥Ì¡é]Ië=]3~å^a£ÁÝèçg’ÄJÆB5�ÎÖ0;°¯‘�\É‚).�Y¬qf;ÆckÈŽŸév5^©ø±s�ˆIâàzŽk÷�³ÑpQÇ8DZ%ËŠÁWx[ -6Ljz
||š‚=¦ŠG^ÇúØ�-J…†,%y›Ðò´kÌß�<Jüš4™ªÂÃ@ËrÐÖü¿óþŠ›y`’·«ÞžÐXåyðnÜ.OÅîâpå	Ž5œX�íš(诈q2Ø‚ÀSÚÊ&wÉ¥1{¼ZÂQ㈭yØž~ßϘZ”ÛU¢e…_B~1µ4¤ã( ·á`ÐÎýØŽátóÒ“7FÈcªkA	Xû3Ž¯çÈ#«d³Æà3@Ièr}�V
+F	“Ôa½9xIéÉëØ¡ZŠaGx°¤9”v`R#þýšÀR³Š‹z„d79LKžùTôt¥+\7†Ò•
+™¢ì VApﮡàcÄ/Ma}I*9ÂãÏ=\EH¬¼³Éæ ]¶k'©»/z‡ãCÂÀèòm%
+peJ—”Tpž¢ö›•´<)iùº’Bõ ¤ý%ý
+JjßIIíû)i{£¤í;)©ýO%Ío•´þ_Jê”äØìB*–KH‘ão	éP]$™É¨Sù�¨Tˆ)ÔUgRBÜÎ.“I¿_µj¢À—"¿$d'|í>Zò¥Êüœa½÷‚T1ÝËGpe>]­¬j.Ì“Œf¥¼ãÓüÏ2þkb]QÁ¾[¡[쎥1Èdî^®-…jTá.É Žà⤂}  qV®Ñå<ú–¾œÛ9\Ô“©lë¨Ò9dÕ`7Ëׄô¡))	#b5O‰¨B¬i^Ì+šËtW­³ÔЄÜ(E*^5|„Àj¾�å}^ÖâÃS¥í¢Ê¿z³dòQi*«Eõ>›�hDƒ/:~Œj.mf>1µN[x»/T_ œéÏðD”]¡ÏþU.Ò'zÕT«	�ªÓ•ú�D,­WtaŸv¶kBš­žo+¥ç5ì$tóôyNdÏÌî—t5¡ë,ìO®DÖ¼óÌ’8äæ­LîzÒÌgÖšš²§Áî4xy	ìêw¡fÞKé“VÄÙyrsqè}øÆ®/8ªw*^"H[’JùY+Ám’Èœc¸g³=[3@TË!#aâÍC[’
¬B˜½œ÷‰KE–R™?ý¾F¸�:‚fr�	cÂ�ÂOÎ*ϼté±ÍÖ¶™·¶
+	©‡ƒd2sôpƒý«7óÚ(†I÷�½Þ8«9¶)) ¦5Ï„8_³ÔBC¢0;Œb,˜‘"ir}ØfŽ~–´IÙˆã7%­ý!i_”´ü,iù­¤åß«¤…º$­M
+_#Q“~­¨¥w5%ûwÓ´þžšÖÞ_ÓâïUÓâ¯Ô´þŽ’Ö…SÒ�«'I£‚³Ä e5-I•vOŽß£0ý¦çJA
+%/HÞ“J˜NÙ£fÞÝÐá
uN^;¢4•«¯ŽÙOY<‡ÞD9~ð dU¸·žüPþ[Xç™ÙUN�I¹†IΟÏ	’éü¨›m•°o'L"RÏ	Ž ·¨N‹Ñ§~N’�¡;n‚ÛÃÅÁôWXBÓ‘¶Æ™÷Ñ‹ªvo±‹ÊøÀ’ïÿôú„ÉYŒŸ
 �XÖî#ìÕI²&x™š"EZò>ŸÁ£A˜Y[ÞI59¸$ÕiŸº0uo¸RÖðǾ’þ(õI:DÐ{Le�<‘dÇõ¼�Š¼!x”–ÝA=Î�àDg5.¯I®Hy?×ðA.Ò ¸(fŒ©å³‚ªæÚàrJ£·²dCÅL
+L¿²¢†qJgb›I�cWœÝ%d Éd³zªì:ü;ö¶8¶sæÒ¸VÏÃbS¢—Ü°èg‡êÈ?Ý‘],g'&Sò˜©>Î]Fw°$ݵLßWÊÖK³ûÒgÚ¤ÈX`ÓÁ«ID"‹ÃEJ'‘õÓquô[Ê+¶�PÛIΙäB
³’%ìkoýä¢ÉÀê�ã¿8Ø<ch¦‹Q}ñ	
+Í›GáARýÀÛ�Á „–WªEì†ÊT3‹›ˆÓhó”c2uõL_dd÷�½ÍqQ‰A,Zð¤©|žìšyõ¸ôu[Ô-ØÕ”ˆ¹ÍñÃRóŽ”ÏÐèíêlcñØ%2ìÊžå…mó±E÷ºÐôV­H3Êžé,g~R­�†#¼Z�Ù>OîÅ!:;ÈP„n
+I‘æ&øzszV7¡„»¢3¦”ÈXŽªÅY>F=:ûê˜ecô‚¶¬ÔV^Òilc=Þ$�^É$¯K’l•Rjþ’dI€ÇäNÉôòL‰JY˜š¤TYÀÅÝqL�U¥Žaæzê¢HŽ$ô­ú(D/T›Û¯±	î¿d—=rÛ0F{ŸÂÐ YgRú*â"irÿ"ï-@HŠ{R$±ûí÷ã„6§�©á¯g3[ý­~¢»i<�o¯ÀƒÎfû5Ë2�Fç66¢M‘³)t+
+b÷ó¸ÚbJRT8kÝÊÛÚ®éÝb£Ø¦©«vAaÀùuôÞiVË&1Vµé9cD�åJÞ {µ�5pÁÇk’‡Uâ:/~¬fŠàh½¸k6y]gÓó¯™eM†~«=<Ç0>ñcí̵{4UoÞüýßqz?5[ø§.í²užIà&)�ýTù¹ êTçR¹8µ/oð{í4†aý?ÁÏå8FŒRÏ�ù>0%Ý'ó�2pÿÞJ‚{€3J/nV†›•˜æšr7P?H™öA«ßÝNœº»Pþ¹ª‡Ïîm´€Ž�"Fàr‹�§ÇOØdš«e»겆Aš…¾Öf=*V;J<}ç]˘ä8x3ÊXá¼E®œÔÀÊ:G8û‘hÐñ`×¼©&gT<Õ‘ŸÖV7öÙ…}pËÛµH-Z3?þy~ØÖÆ51¨EjWeœ÷œ�ìY63Ó»YSn£Ö³ä·i3ï¼?Bþ›:[@Å9L7¡u´ÖÝ
+̵^CA†I|T“0Êçk'Çœ&ã*Tü›)þß_ϳËs�æÒójoNÙ℃Íá
+ú.¸(‚ç¤ê�åy(Å@™7mÚ̘ʶPuÚÚªÚ­œ”P°¶�åJçUÒÙÃgéˆ^À’}æÉ–t9jËjHÉ5t]î!:>H|H>@‰êDë8p€s:¿â‰ÜlSÀ¬Ì
+EŒ÷¨/^6“p=ëR [�
B°Ú ëIžf�ŽÝ-Љµ+‡®ªÆ\q²9EÂÊ$NÅ“ƒ:=á
+aǸÇy§Ñ±œÝVö�$8(fóÉ~†/ç{²'<RdN87¸.O9ƒÛºû¶ÅWÜvås˜ÙvÁÖüS ²^ÚxŸÔùóëÇ'ÿþ	0B¸|–
+endstream
+endobj
+27 0 obj
+<</BitsPerComponent 8/ColorSpace 28 0 R/Filter[/ASCII85Decode/FlateDecode]/Height 39/Length 181/Width 105>>stream
+8;Z]!\Ij?G$j8@t/k5dUU3<am*`9`037'CAm[R>[,!)9)1.3+''h?`o>gmB[ET8ck
+@lE>-DRC'5>'BJ23HlQilI&Ga&7If\2VcDkpR`P&Ag+(rGsf,$]V4,Oi!oYPO?6G/
+Ye+**Y]%)+Lu]7C/1+obTM<jR!k7bhp#"6_FO&2i!:ndgO8~>
+endstream
+endobj
+28 0 obj
+[/Indexed/DeviceRGB 255 29 0 R]
+endobj
+29 0 obj
+<</Filter[/ASCII85Decode/FlateDecode]/Length 428>>stream
+8;X]O>EqN@%''O_@%e@?J;%+8(9e>X=MR6S?i^YgA3=].HDXF.R$lIL@"pJ+EP(%0
+b]6ajmNZn*!='OQZeQ^Y*,=]?C.B+\Ulg9dhD*"iC[;*=3`oP1[!S^)?1)IZ4dup`
+E1r!/,*0[*9.aFIR2&b-C#s<Xl5FH@[<=!#6V)uDBXnIr.F>oRZ7Dl%MLY\.?d>Mn
+6%Q2oYfNRF$$+ON<+]RUJmC0I<jlL.oXisZ;SYU[/7#<&37rclQKqeJe#,UF7Rgb1
+VNWFKf>nDZ4OTs0S!saG>GGKUlQ*Q?45:CI&4J'_2j<etJICj7e7nPMb=O6S7UOH<
+PO7r\I.Hu&e0d&E<.')fERr/l+*W,)q^D*ai5<uuLX.7g/>$XKrcYp0n+Xl_nU*O(
+l[$6Nn+Z_Nq0]s7hs]`XX1nZ8&94a\~>
+endstream
+endobj
+22 0 obj
+<</Intent 30 0 R/Name(Layer 1)/Type/OCG/Usage 31 0 R>>
+endobj
+30 0 obj
+[/View/Design]
+endobj
+31 0 obj
+<</CreatorInfo<</Creator(Adobe Illustrator 26.0)/Subtype/Artwork>>>>
+endobj
+26 0 obj
+<</AIS false/BM/Normal/CA 1.0/OP false/OPM 1/SA true/SMask/None/Type/ExtGState/ca 1.0/op false>>
+endobj
+25 0 obj
+<</LastModified(D:20220226201114-08'00')/Private 32 0 R>>
+endobj
+32 0 obj
+<</AIMetaData 33 0 R/AIPDFPrivateData1 34 0 R/ContainerVersion 12/CreatorVersion 26/RoundtripStreamType 2/RoundtripVersion 26>>
+endobj
+33 0 obj
+<</Length 1444>>stream
+%!PS-Adobe-3.0 
+%%Creator: Adobe Illustrator(R) 24.0
+%%AI8_CreatorVersion: 26.0.3
+%%For: (Michael Shamoon) ()
+%%Title: (White logo - no background.pdf)
+%%CreationDate: 2/26/22 8:11 PM
+%%Canvassize: 16383
+%%BoundingBox: 152 154 2263 756
+%%HiResBoundingBox: 152.941359391029 154.946950299891 2262.04187549133 755.845102922764
+%%DocumentProcessColors: Cyan Magenta Yellow Black
+%AI5_FileFormat 14.0
+%AI12_BuildNumber: 778
+%AI3_ColorUsage: Color
+%AI7_ImageSettings: 0
+%%RGBProcessColor: 0 0 0 ([Registration])
+%AI3_Cropmarks: 0 0 2409 909
+%AI3_TemplateBox: 1203.5 454.5 1203.5 454.5
+%AI3_TileBox: 826.5 166.5 1560.5 742.5
+%AI3_DocumentPreview: None
+%AI5_ArtSize: 14400 14400
+%AI5_RulerUnits: 6
+%AI24_LargeCanvasScale: 1
+%AI9_ColorModel: 1
+%AI5_ArtFlags: 0 0 0 1 0 0 1 0 0
+%AI5_TargetResolution: 800
+%AI5_NumLayers: 1
+%AI17_Begin_Content_if_version_gt:24 4
+%AI10_OpenToVie: -2651 3020 0.25059563884769 0 7787.44597860344 8164.54751330906 2548 1389 18 0 0 6 45 0 0 0 1 1 0 1 1 0 1
+%AI17_Alternate_Content
+%AI9_OpenToView: -2651 3020 0.25059563884769 2548 1389 18 0 0 6 45 0 0 0 1 1 0 1 1 0 1
+%AI17_End_Versioned_Content
+%AI5_OpenViewLayers: 7
+%AI17_Begin_Content_if_version_gt:24 4
+%AI17_Alternate_Content
+%AI17_End_Versioned_Content
+%%PageOrigin:704 -46
+%AI7_GridSettings: 72 8 72 8 1 0 0.800000011920929 0.800000011920929 0.800000011920929 0.899999976158142 0.899999976158142 0.899999976158142
+%AI9_Flatten: 1
+%AI12_CMSettings: 00.MS
+%%EndComments
+
+endstream
+endobj
+34 0 obj
+<</Length 33953>>stream
+%AI24_ZStandard_Data(µ/ýX<ž¿EZ-�D¤™€æ£Ù¥¶[ã*DÞJï§ënYÉwzOê°@Yþ=
+)œàr�²
+}€h>@>@$F"ôãr�’.)™�HØ
+Kˆ�j…Ãq
+E`ð è‡YXZª>Tü!ò¹TÕ¸A×À”Ÿ�Qìt€h4îRØdBFs2Ê�š�´lɵdˆ:-¢Hæd”–
+â€àd”ÙÅ�ŠKÑ™‡c4(Vš¦X‰b'S6 1Å
+
“y8p+cÁa3á.±€_&ÔAõ!êl&\âeÑñáÀºPÀêpM´,0O´ˆbǵ@U»Œˆ:‰•P
m�2ŸƒMK¢€Dv´X$+Q@ƒI±H"H¦”( Š
+£°:­Ïš€@ìHE;ٕΤ‚‚¡€G*ŠˆŒÃf4À±ŒÒÙŒv¤‚À*
�X—N«³Ù„É,¤€¸¤¤Èô¡ð0!i™],
+±A"˜ˆ"+2‰b'ƒÒpâ`"KDÂŽ
+H*2‰@bƒ´A—ÖÀ à>)¹É®D‚Ë¢d¦€x!Ù)“`Ñp°/&‘¥³	±T›uY”•fEÔµHÊñhiùÀRAl²ËDÔÙp@#j@!âUÂ5€…¥eD‰AK†¨³É®—¡(„t6ê°‰ø‰0Àˆ:­„�ÎFÃ@s"Rél"²%Z%„¨\2xT2 )‰�]«ÑÆAe�±z„�‡
+c“ñ’‘Àép° m…“]‚Bl�F*‹„,¢ÓÙhˆX$š] ¢Ø
!e'£ÌðÅÎAFgb© ²kJÉ“e>‘¤•AFg£±±9HP�}è0eVˆ
+ê%ÔÙì«XVo (|6Ù•¡©i†ìZHX Ð0aàTÁHDà"Dãj!mZÑ*::T¡Ü–Ð+¤·-»F^ž
ÁÛha°qzò²d D+ =‚L```Š
+¢
Vv��,NÁã˜B !­ÂÈVܣİÉ.…Œ†ƒØ24 +bÀƒ ”†‡ÀB@J;
ÛöÒÀɃ´à@­<˜ ³É.æhN®8¼³ÙPp >Ÿ’ƒø8
" Ž��(ä:BŸƒç!SL§a£NüQ:%hÄ‡à‚“]Á­j=™‰Xx(¾¤œ»Iˆ“+Íã¨ìCàÀ”…�ÆFBc<ˆ88 ¬xD'Ü'%³Ë�¥Ñ±9Cf¡¡!"G¾ )XŒGv"»4O„
ˆ„
Æ ‚%UÊ@:½™3ht6YI'ÄÒ’]ûÁ2Ze´
+|IvÒ°�]J6`úHqL x,hJ`8m<¢ËA
+ËCÀÈ`G(¥
†”ŠuHm*J"ë)!­Àì:Ù@X8² ‘ñ +©YXZv˜(|ïµÙgc€!x ‚®d×Kv2Ê•�ÕYP•xŒü™�´ì8ÑTÙ5‚NcÁ
b¡€³0*ͳm™B!m[
F@vQ|
+øä¢W	+®@¡o`Ä°i}$GsÓñ`mÙ•€ ¡!«!@ÁlZ
+*Ö¶5˜²ÃdB
+\
+˜¼lÙ•ÀÑœô, œdÅÈ(Ó9XR…ˆf5Œbò&/›Ë‚�)#H0Ù5 p
'ZNé‚Ùpd[JAÂ$³‹aÄhY¸P@±HŽ„LR »$X0HHH4JL": 
+‡
‰Ñ™|¼�‰ÕGƒ€‡�GÆV)"€r¢±Â¡’:øÈhD\h#Š
�	G*È®d�‚86.¶.ÙI,T2±<Á#‰¨ÈÕ«´Ñ+»Tá+R€Hˆe$b¤¡/F�Åq…‡‚Vv…|F;ð¤hàã$A”¤�þX¤X2‚Çâ¸	I(³c[6
+^%4p‘1”!!-Ò 4+ž]Ò9`%T¬€tÉg°6¬MƒpÀ‘Âydq\v]t(”pTLn² Ù@ù ÙH²%úŽÁƒƒŒNÁɦjS´<ã
"¨áhNNlidó`1l[vYtÅÄA…Š@”'ŒlaÈ.
+ˆŽPŽ„tLa€O€C†rd£%SàN^¶ìZ©
+XX<Yì‘€¬-»V�´ñP>-’ídca
+=’-»VÞFCJ
+L‰°°-²AV†£9i
Ò�l ,†mcU œ„¼¬Z°–ÕÙe€u6/°‚] �l+o£á‚¥‚xNž@½m¬Š
+'V%mÙ?Œô䃢-�΀ÍSÒ­E,<¤•H7Tüa†¢a“]ïbƒ´ Yu"P<Z `;(‘w6+Pˆ�É£ÀqU ’…ì
+e‹óÀñ
=X´\„pJ,`”ÞÈcñbqñ‚qض�f2ÊÎ	†CŸ&"RrB"ãaBÂ…å�AQ´¬€0­çUœ�Œ‡÷¼@Œô‚]IE,X$›]¬Žòè(Áð`FD)Ÿ-$5a�&wAC@c|2NFÙ2á��BiãJpx xŽ½8� °²qe>òŒ<$r‰@AùKh™)€±á
+©Y2Eàqp2NNüÐâ!Ò%Œdp"-=¼Ä-Ä�ª€Y�]šÆSïAPÒæ„@%Aòá0hÑ@8¨+ P´È Y Ââ<lh"D'qä,Žc
ygã0q2J�SJÅ3á™Ë‚Ê&#Y)œˆø`¸ðdב’XŒŠ‡��ÅËzH+›–Âce2;!™"5lŒXD1Ñêp`
+^ÐÐk±á$·V6‹
+'9(›?ñÎ&»0ͤ*i ‡[À®V´U	CêTaJ‘°VJ;™H›èÓ
+�22ÃiEúD觔S+¥™$L)ÕGâÓ"¡¨¶’'UR'Õ©EÚh¥T¡–ÆByáxyj±4ОP¬T)%‘Á²©ÐÚ<-ª-ô°l$‹MkUJeÑZ‹j[)©R*‹
H›hÒ&z¤
+M©N›
+õRO›
+…:‘R(-/+Z‹´i)Mtú¨P<š
+©E"hÒ&ÚÕP§ŽçKʨX­H[Çê´•XÈ¥ J±¤^0Ö)E…i¬EJ�R‹„­”^XXé„Z­HXëE5	…‘N˜V"¡V˜ª…™4-…½¨ØTXÂ	K�H**©SëdÒ°”
+K‘P+ìE5€Æby`.ÊH‘0	ÓP§,EÂTR'
H,,¥­ca˜¶Ò´�„i,m¥#9À°”
+3i,„Jh*¤“(£UÂíô�¢
+h±H!ˆM…Ê–ÓÖ±qªØH¦©Åae¬Jx´µy>ÊbÙH*ÚF‡I”¡*áùd<EU@ÓP%Hc½h(”ª”:m(ͤj1­VÕb¡Z¬Õ
+Õbm«•Ém+Õß­Â{Qß'Bƒm°2´”ZJºÒR¹­•:¹–Ò¾˜X+•[ ´R¥R$Ò©•"¹U´Öi«–[ ”zIq¬Í´­ Z±6ŠªÀê„*¹UZZ'É™¶’6ÕÊê„Jq¦­•ÒN,%
+Åm¨ÒŠÊ¦r¦­”R9±4“CQ@QµR§MK�P)šÉ±´¨¬ËÖ©…¢*pJ ÅÚT)©“¦BZ¥IÓP(	ű´¨¤T­‹¥m«U‰¤¢¥kEZµ¨JŠr¬Õ¦™H+,ÇZ
Àm«
+…”Ò@�Z¹"¡6MUª´"€ÓP¤jUb9ÓVêèªVŠ†‚ê4RËÉm«Õú«ZT)Û
+er­T
+J@C9ÖŠQ^X®•JÙ\JŠÊm«Õ¦	pÚ@Ø(˜IK�R4Pf#¥N(º±[À±V,––j‘P)-�åX«MÅ­ ZqÛjUÚK‹Êªµi¤T%·
+ÀŠ”2�FP­ph)›–�ÒpÊÀ°\	OéÂT))	Õ–"¡PV'–JcmšÚ–A¡H(”ª¤’"mš
+iåPT8œK•:aª_jGr`¨Jx°U	Ï
+µ:¡>Ê"�PìÔJyÆ‘
�q82"0Õo±H-Õ3i¦MUÒ68h¬–Æby4
+©µ©V
ˆà´J'PcP�T´
+€†Zµ¨JØê„*¡H(˜
+[j+uÚV›&€jµÂÒ,°(áÑÖ˪õ‚ÁX+D‚µ¼œLš�k;…¾þ¯Tñµ©Åqb�>R´ŠÝÛ­Çרs×ý‘R•4Žh¦”
+¥}ž2Ä০»å†*©Ó
+ë”"}hœZ$”¶‘®€åJ•�i*¤•©m-ê%$áaÉŒR*
œ6ÕÈ7E«à@¡´w¤hºoS´ŠÕ…Ò>ÚÒX))¤–;톘»�
+K)R‹u©¤NÐN°SZ+.¡o´R´ŠÖ)åÑJÑ*Fè%Ò
+#]%åÑJ¤PkEå´á­˜ŠzCl**db:m¢¿Ì¢ÚZ,mSÙ´‹´�©Z/LÂÃÂ"µ¨V¬
+¥*µ;­LB‘L&Òê13�6l€RJÛH+VŠ´µ°(áQÁZ/*–’*Ųp{�tB‘°S+EzÚ
+€Ö´Ô	ÕzQa›–‚%JJuj‘P/-'¶i+Ò
+‹
+ÓZ$”ŠuÂrÃÛT(U‰„Eg÷'€“„§uB�PH­h˜&À¦±´-S•ðxHÚæY©¶RX­­¢EÕj©P2õ©gª‹©»Ò2�€ðÃÝ·®0B—ùZ+*'me€
´Òö¢âÐJ'” …¥¥T)“ÆRR¡ô„¢ql$
X`m$
X`-C‹ªÅz)™°R™ª%¤	¤¡V-$Ö‚,­õ‚rÚZ-RJÛL¨ÓJ‰�ÕÒ84
+é´‘PR‹d"µ´–Õ­ø‚"	�ÒLª”‚fR¥P-
0d4“ê¢Â„ÃÀ`ÒZ%
+¥q°$2J¥‚Ixxp0
+J¢h)Ú“L/ª‚F¦Vh…«€!JLQ˜Ùðdd0eÙH�P+Ö	”ÁZ)	Îó?a|3b©µ�.2˜Jê´µ84“ªtJyp0�b¦�¤BimžŒIv%`šM©N­K•‘ÁL²kCÕ�Ò6Z©“*EÒ68X@Ú6Ï)¥:µJ§Œc’]¤	M©“ÞÞëT
‘q•2®K (Z«¥¡H¦T–¢�8ØÅÀ¹L ˜bzm€`y™°$!€Y`©0Å
+`‰M`y
+‚åå
ÁÓÇêõ½5£K,>�зߋ�
+»ŸëoG�ÿ\bþbÇþ׺û]^X^$½0°ÔP«–çJÀ´ÒÓ�´P/¤
+D s-`)¨Rœ‹¥¡hq´6OÌLÅ2W1Í\šÌeJE8LÃY)½¨:0ŽfÓL¶i*¤ÉSPpL£­H+˜)õ¢Zµ¨>ZëôÂ�mš)uJYi‘2@ZZŠ„Êh¥N¤Š�”"¡4
N,SJCA`+,”SÅJ©EǦj�L˜§VI[±6­tZY‘6•
+Eú´6Okó¬´H)ŒTJ¥ê@©TØ
+ëeƒÀ6­Õ"•´k
+U:µ6RFë„R¡´À±R¡4
R-›*Ee0
+¦m$TH³:‘\Ó¨¤N%ÒÖ�e0M«¤@ÁÀLšN›ªUÒ>2—*%%±zQm¢ÔIå•a/.•Ô©•:m)Õ…Éꥥq¨¨Pª-#Ë.V+¥µ´¨>¦TD–].Óâc²)­Õ"¡BÛ
+]ßǸ17ª&tÛ7�6‘É·Öù©“ÊiÃÐTHÙ@;}¸I31¥" µH©Mk¡<&¯Þ؃ŠEÈŠÁöÅ^ÆdVÿv×O!ÖÍùàGïvÿ±Äâû†�ŸGO_—Xn2¦þV
[ÐNªŽ”¶Â0I•ðdWc½-
LRN&­”ÖJ©>&©“ŠaòÊÚ´
H-/°õ‚R±´�–¦²‘:”„
+µ6�‰£4“Ê"Jx²K±
+E*qh*©Â¤W“][`µN)�MC½ldvs´6�–R]`ÐNhÛ�¹ËçO1wo!ê䮽1wœ«µH¨U‹Ö3b1{Y,©e¥Ú4$)Õ餢mÈ$¶!ÚȲ+±–JêÔjiš
+©EÂä%<Ù…-h*$–‡	Kx²þc›†ÒòraB�^ LV%<ŠµH-›*¤¡N!—ðdK‰„‚À B¡´ŒÔJi*$,Eàƒ-°6Jõa±´’jËh¥´–—’
+”eW¿ß�›ê
+�ûcÌÛj§Û·‹i„1nz|]»bqS#GgíèXÚÆi”e×óÇøíb튭+¶„JêdJ½¨ ²ìbÈO±M'‹$@ŠôɲË"S]€Ø.ç-g±­E¥T'MŠiåL©Õ¦ÂR"¡`ª¦€©TT(Lk�Vd°
+Õ:udÙ¥É`š”JÕBZáÀPi¥t²È`›*”e»to±…”êÄÚ´(áɲ+]/¦ÙÈlªik±^P(	[ØT-’¶}²ìÂÒ±‚†¢2y820YÙ•±¡4"2*’…QDJVd ¤<ž“Š&#%dìiPYp4^ÖÃÒá”a�l8³À)ÉdDØøD€€~(Zf—·´à‡ED(¤�Ð'äã$¤Ñ$ÞÙ´Š…
+‰w6™
!�M’xg“v$Þ1(øH†‡MLˆÈ8PûD¼'³«€t²,R²'+’""%ïl^CÄöK±á
ÞÙ¨èïl4$(�MàðΆóÑí€Ò;€¶;¸$„“Ù¥ÞÙd†I$âTðÂáQ�"$"­ £å
+B#ÍBdŒ¨"¥”áÉ.‡‚Ø`xpÐl‡w6
+­°™Œ’=4JªÞÙ@	‡’r4¼³Ñ…’f„E”4¼³qå�ÂHó¡`¤ÎÔ*"Í®„”Œ‚„HU>+…ö%	Ù¥PÚTlH­¨¡X9HÐä„|#±+‰
’¼gôÀ9'
+\êÄ$eQÒÀɃgÙ(
+æ�<# (Q'U!ÂPÂ"2XbˆÁÄâ<˜>/»@6D$Ÿˆ
D‰€^>ÙëŒ "LšÝ8h8y6T²÷Ð9܆*P6º-¨,8Ùo”ôeÃâäIÈtlx41a€é=-*%Œñ¶Á�NŽ�’›Ãˆ[�Š*°<h<¨´ÓÊ  2$<n
+Võp¡"ºàh\<$ Ëê!»T¤¤K˃{HyOL�¨4m©L)†+
ã`¯¼:ð`<+AQUÃJÅé§B”(,’U‰8©z‰Ð¯XV[œ`8ôæAä*Dª¹È®‰K,àT	˜qT”Â;…ME‚0•Dhf¡ãB@ 6ÓMJ8'ä"Qì¸�sRa”ÐàœÜP-'�…¥eÆ„¤%)b€§{Ta…E²FÊ"CpÂ10m0x˜3.=ïl|#šÈg™0„æƒñ˜Yœ„,>ž¡£A}´<»º@‹“.
+[2)©ÅÉ̃Š4KZ%�–�{-,™‹ÅÉš0¦dQØÄ‚¢%,I€„…“
+,mb
+'U+;[‚ÂI%€ÂI�DŠ&Ç…Ô¤”f·CAB8i’uh¡ìÁ¨
'4ŸT<8©ád‹ÛœŒ’@Ag³éðΆY8,8L ƒƒà‘ÁÉF'7Œ
’Še5Di8q ´‘EepÒdÀ
+Ov=dpòãáÀº!âäK
ÉjF@ !ÁÀ”NBTò•4”(†G…¡€9…OgÓ�]ú‘pNkÁ#¥+2—ƒ�V@K’–—É‚
NvTTtÅ¡Ê01	mº"%FÞÁ±HÀT¬\0 &“L#È`bf!%]:­Õ‹J+…‚²­¸h("((+#¬% x	ÙBDR!šKÈJ�ˆ2‚bÒÙ¬j$¤b1Ê–��-#¤£ÊxaÉ XÉè¸|
+XZ†HɆ’Qb’ÑÙ”Œ”„d¤>20(ÑJvµ´Šhd$„d’]ªÌÈÈ‚`5ó²/B ¶Ž
+â ¢ð…ÒË–]"*[âJL"�. ðFa@Ãा,Ƴ*Ã;ɈBqá�b ˆ˜ØÚõIGND\&·L‹“.	�Mr\g$B7£„ÎF¡3¡{‘ÐÙhš“#ƒÑ‹†€ˆ\y
++b€!`y°V\ˆ‡ƒ€Í¦
ºèŒãZà4lÛGÛlÖ…ÄÉ�„ήìZølMv1H 0ô¶aLBÙURÀ£Ã3‚°á°ðÙ4
+±‚�†æôɸ�8ùH(O
Åbò<{@â„f;(Ð( ²+¡À‰
‡´¼Æ‹Â¦¢-%“õ°D2ž àppD Øxéð‡
–ìÊ®ìú`
áäÁ	&
“°mÌÄ"
cb�¦ÃGh0Yò‘€Y¸ Á„œ+m0,�
+¦â€£€áˆQÀ,‚sÚ„+m0ÙõàJL¹Ð`^‹„"¤íJëXx>X¬;„P6ª
+•lptEB�”G’’ñ°�d(2sàò±Ê®ìÊ®ì:€xÈ®UÈÆÁÇÃ	Ç%õÀqBŠÈ®ìÊ.6™À”
+C
*`46V.	˜Ì.J�ò\ P%!ÕTKå
+WtÕ€²Q‰–Gçmxt�)è‹	b?
+ŸìÚh˜ �ñÛ–]Ù•±à°m ‚�Î(»v@vµxFíZÙ•]$­�è`¡%ÂÀB;<Rë@ E?% Íãá�Îv‘’Xˆ‚L³R‰H³‹€³4ˆD P
ÇD•±Þ�FR,ŸÏŠcðÒÙD�L†"»NZÄÂÃFÅ�I¨eBÔ1è08lbvm°L0<(IË$4@€s �]+
+*¤Z›]ÙuÁ:� 
+±N- Çãò §ŒQÄHɧÓ]& /Œ¸D,<|HTYv‰öck‘ÐQyaL�|²Ë´QC'ˆ¡‚ÖÆyÀÈ ½€
+JPPŽ�B²E0¬:R.NÞÈ3`…ôJU‚gÂ7 Ð…FÉó�«ÏEÄ€ˆMñ¡"<n	¼Œˆ³Kãå`E%0‹édjeÁa±TW,#šÅ`É‘Sf9&!NF ˜xt2–
+fåm4¬¼�†ÍÊ€I$Â�H#—_Á¼pxX¶¨1d×6à£Ã³"rÚD°'ÃÑqĤtBŠ@
}x�`e�ÒØ4dhiÂlÙFª�ƒ�‡Í tú<¸„F"T²iÈpÀ(�6eá”TCÊg;Ùp “•†“ÒfWsŒDè–ÊV8..ä àa óÂá™x$@™žì:q…H20 R ‘†
+t@‚am°4R@
+êðdW…Á(Á$´‚ñN"0-“�DÅǃöÁJ÷ hÊâ`X:L*@L‚ó	mæ•6šŒÈ3a2IÀ„µÁ<dD6˜‹Žf7@	#šÅ¨Ú€'N#�÷ŒN¢€ƒÉf×æ	
+…‘/�@	AÃ;Þpivé…w6Ri(5€‚(±	'5'=#Õ \xgƒ¡¢! Ÿ„(»”Â;
+Ϭè˜<,'ŸÑÇw6
+õHPŠMC‡DóNn2JSfÕ¡¸øpà‰†Þ,$œ\äÄIpŸ”$Á<ì�*¤³ÙŒ6.)š‘w6­€v0j™xgã2-Nf:CË-Ä;ÒŠ!¤�Óá IÀŒ^6˜‰Ž&#r¡¡@0iÉÁ�
+qvq¼†�„çá=.4»‘
+@‹:©XpX ½ 8¡(çäY-NF–R„Av2àŒ†¨³qïl„ÂÓ :XY
+5jy›ˆe•'³k31¡ÎãAPGp2J�–€Š5ÐÅÎA�ƒ”Ê‚�¤ ò:xâ�Í(äáÀ(.â�
+´ØˆP«8xˆ@,Ê’X>$Íx AU4@RçÁÂITv2JWAᤄ€’
+1eV�‹@,GÃÁ*|�4
4¡	'£t(œÌ®g`JRBÊ	wxg³a*N %M	
ˆ�Ëê
)O‡gEñ+ŸÏg¡Áã¥g#„“$€(ŒÐ[ù¤hJ4È‚Fƒ~t#ÂI�+Ðl�Ku80H'Y&É*
+‹ds#ƒ“®"ƒ“/
+œLp‚n>±E%ÁÉ(×CÄÉìjµÄÞ¸ACÄIN…ˆ“›GÃÁ–(„D%›‘†àd”šQveÅCɉu*6áAÀBI„",,d2¦Ì.’Lw8©Òé±úpà‘
(<#��ˆ
+Ç9÷Iyg“0 )#ïlXXZfä#県’5â‚“Q&˜€@l
H[áxHÃÁRИ„FZ
+H*!1Ê„^²ЦdÀ
+«BÕâ�­,ºÒ3¢‘RÀtP'
+¦Ä€£€É`�†�¥³ÁL�2�
	 /!RE‚Zˆ�°<œ4¤¼ÇåKëa­@,™]--ÒÒá!Å‚£áðPR‘Š¦ä†1@RÉiÃ(H„X¡ÍH„0¨x…ˆmt°âÏ vƒÇÉA�;yÙ@©Ì”-.�ŒÅ&n>J"šìbX)ÈlCq1sñR›K�Ç
+G+J;¨àH±dÕGÁÂ+	àl„<˜
+ˆÍJ©ÁÓªð„D@-VCO*TCÃ@³ÙµzH±à€hØ0Ë„?`H¤
+G°^¸R¡ –”*Ã;“V�YGGȃIY¼`€@
+ `Ä–ÈJ(‚Ì'd,+"ŽŒÅ2@2ŒŠÉÇCJ¼aŒL'…ƒÖn[k£9™�&/ÛGJ_6ÕkãDlÛ¦‘±8Éì:á“lñ†I¦€””$Æ
+Ij<D2ó¡0 _J>ÕÊ�LYayäÇI¢##[p䊆ÂH•”–Š4¹�¨H…¨!ÊŠ“*”
+ŠP.(ˆHN�ˆˆT±œ:6Ù²Á `]:O�‡Y•`<z€1ØŒd˜�”ѱáÕ3! Åy8mt:N8*<!ëA°øð�£°àdB>­T³k´y,<ŒÄò°±%OJ&ºx'UîÄ"[5t^V^V<D8¼÷IQpŸ”ä|4¸ÌB

resources/logo/web/svg/Black logo - no background.svg

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 3212.8 1212.8" style="enable-background:new 0 0 3212.8 1212.8;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#17541F;}
+</style>
+<path d="M1180.9,847.9v-20.6c-18,20-43.1,30.1-75.4,30.1c-22.4,0-42.8-5.8-61-17.5c-18.3-11.7-32.5-27.8-42.9-48.3
+	c-10.3-20.5-15.5-43.3-15.5-68.4c0-25.1,5.2-48,15.5-68.5s24.6-36.6,42.9-48.3s38.6-17.5,61-17.5c32.3,0,57.5,10,75.4,30.1v-20.6
+	h85.3V848L1180.9,847.9L1180.9,847.9z M1184.4,723.1c0-17.4-5.2-31.9-15.5-43.8c-10.3-11.8-23.9-17.7-40.6-17.7
+	c-16.8,0-30.2,5.9-40.4,17.7c-10.2,11.8-15.3,26.4-15.3,43.8c0,17.4,5.1,31.9,15.3,43.8c10.2,11.8,23.6,17.7,40.4,17.7
+	s30.3-5.9,40.6-17.7C1179.3,755.1,1184.4,740.5,1184.4,723.1z"/>
+<path d="M1543.1,606.4c18.3,11.7,32.5,27.8,42.9,48.3c10.3,20.5,15.5,43.3,15.5,68.5c0,25.1-5.2,48-15.5,68.4
+	c-10.3,20.5-24.6,36.6-42.9,48.3s-38.6,17.5-61,17.5c-32.3,0-57.5-10-75.4-30.1v165.6h-85.3V598.4h85.3V619
+	c18-20,43.1-30.1,75.4-30.1C1504.5,588.9,1524.8,594.8,1543.1,606.4z M1514.8,723.1c0-17.4-5.1-31.9-15.3-43.8
+	c-10.2-11.8-23.6-17.7-40.4-17.7s-30.2,5.9-40.4,17.7c-10.2,11.8-15.3,26.4-15.3,43.8c0,17.4,5.1,31.9,15.3,43.8
+	c10.2,11.8,23.6,17.7,40.4,17.7s30.2-5.9,40.4-17.7C1509.7,755.1,1514.8,740.5,1514.8,723.1z"/>
+<path d="M1838.9,763.5l53,49.4c-28.1,29.6-66.7,44.4-115.8,44.4c-28.1,0-53-5.8-74.5-17.5s-38.2-27.7-49.8-48
+	c-11.7-20.3-17.7-43.2-18-68.7c0-24.8,5.9-47.5,17.7-68c11.8-20.5,28.1-36.7,48.7-48.5s43.5-17.7,68.7-17.7
+	c24.8,0,47.6,6.1,68.2,18.2c20.6,12.1,37,29.5,49.1,52.3c12.1,22.7,18.2,49.1,18.2,79l-0.4,11.7h-181.8
+	c3.6,11.4,10.5,20.7,20.9,28.1c10.3,7.3,21.3,11,33,11c14.4,0,26.3-2.2,35.7-6.5C1821.1,778.3,1830.2,771.9,1838.9,763.5z
+	 M1722.2,694.4h92.9c-2.1-12.3-7.5-22.1-16.2-29.4c-8.7-7.3-18.7-11-30.1-11s-21.5,3.7-30.3,11S1724.3,682.1,1722.2,694.4z"/>
+<path d="M2034.1,626.6c7.8-10.8,17.2-19,28.3-24.7s22-8.5,32.8-8.5c11.4,0,20,1.6,26,4.9l-10.8,72.7c-8.4-2.1-15.7-3.1-22-3.1
+	c-17.1,0-30.4,4.3-39.9,12.8c-9.6,8.5-14.4,24.2-14.4,46.9v120.3h-85.3V598.4h85.3V626.6L2034.1,626.6z"/>
+<path d="M2238.3,466.4v381.5H2153V466.4H2238.3z"/>
+<path d="M2486.1,763.5l53,49.4c-28.1,29.6-66.7,44.4-115.8,44.4c-28.1,0-53-5.8-74.5-17.5s-38.2-27.7-49.8-48
+	c-11.7-20.3-17.7-43.2-18-68.7c0-24.8,5.9-47.5,17.7-68s28.1-36.7,48.7-48.5c20.6-11.8,43.5-17.7,68.7-17.7
+	c24.8,0,47.6,6.1,68.2,18.2c20.6,12.1,37,29.5,49.1,52.3c12.1,22.7,18.2,49.1,18.2,79l-0.4,11.7h-181.8
+	c3.6,11.4,10.5,20.7,20.9,28.1c10.3,7.3,21.3,11,33,11c14.4,0,26.3-2.2,35.7-6.5C2468.4,778.3,2477.4,771.9,2486.1,763.5z
+	 M2369.4,694.4h92.9c-2.1-12.3-7.5-22.1-16.2-29.4c-8.7-7.3-18.7-11-30.1-11s-21.5,3.7-30.3,11
+	C2377,672.3,2371.5,682.1,2369.4,694.4z"/>
+<path d="M2691.2,654.5c-9.9,0-17.1,1.1-21.5,3.4c-4.5,2.2-6.7,5.9-6.7,11s3.4,8.8,10.3,11.2c6.9,2.4,18,4.9,33.2,7.6
+	c20,3,37,6.7,50.9,11.2s26,12.1,36.1,22.9c10.2,10.8,15.3,25.9,15.3,45.3c0,29.9-10.9,52.4-32.8,67.6
+	c-21.8,15.1-50.3,22.7-85.3,22.7c-25.7,0-49.5-3.7-71.4-11c-21.8-7.3-37.4-14.7-46.7-22.2l33.7-60.6c10.2,9,23.4,15.8,39.7,20.4
+	c16.3,4.6,31.3,7,45.1,7c19.7,0,29.6-5.2,29.6-15.7c0-5.4-3.3-9.4-9.9-11.9c-6.6-2.5-17.2-5.2-31.9-7.9c-18.9-3.3-34.9-7.2-48-11.7
+	c-13.2-4.5-24.6-12.2-34.3-23.1c-9.7-10.9-14.6-26-14.6-45.1c0-27.2,9.7-48.5,29-63.7c19.3-15.3,46-22.9,80.1-22.9
+	c23.3,0,44.4,3.6,63.3,10.8c18.9,7.2,34,14.5,45.3,22l-32.8,58.8c-10.8-7.5-23.2-13.7-37.3-18.6
+	C2715.8,656.9,2702.9,654.5,2691.2,654.5z"/>
+<path d="M2942.6,654.5c-9.9,0-17.1,1.1-21.5,3.4c-4.5,2.2-6.7,5.9-6.7,11s3.4,8.8,10.3,11.2c6.9,2.4,18,4.9,33.2,7.6
+	c20,3,37,6.7,50.9,11.2s26,12.1,36.1,22.9c10.2,10.8,15.3,25.9,15.3,45.3c0,29.9-10.9,52.4-32.8,67.6
+	c-21.8,15.1-50.3,22.7-85.3,22.7c-25.7,0-49.5-3.7-71.4-11c-21.8-7.3-37.4-14.7-46.7-22.2l33.7-60.6c10.2,9,23.4,15.8,39.7,20.4
+	c16.3,4.6,31.3,7,45.1,7c19.8,0,29.6-5.2,29.6-15.7c0-5.4-3.3-9.4-9.9-11.9c-6.6-2.5-17.2-5.2-31.9-7.9c-18.9-3.3-34.9-7.2-48-11.7
+	c-13.2-4.5-24.6-12.2-34.3-23.1s-14.6-26-14.6-45.1c0-27.2,9.7-48.5,29-63.7c19.3-15.3,46-22.9,80.1-22.9c23.3,0,44.4,3.6,63.3,10.8
+	c18.9,7.2,34,14.5,45.3,22l-32.8,58.8c-10.8-7.5-23.2-13.7-37.3-18.6C2967.1,656.9,2954.2,654.5,2942.6,654.5z"/>
+<g>
+	<path d="M2633.3,932.2h60.2v17.3h-60.2V932.2z"/>
+	<path d="M2754.5,902.6c4.9-2,10.2-3.1,16-3.1c10.9,0,19.5,3.4,25.9,10.2s9.6,16.7,9.6,29.6v57.3h-19.6V944c0-9.3-1.7-16.2-5.1-20.7
+		c-3.4-4.5-9.1-6.7-17-6.7c-6.5,0-11.8,2.4-16.1,7.1c-4.3,4.8-6.4,11.5-6.4,20.2v52.6h-19.6v-94.6h19.6v9.5
+		C2745.5,907.6,2749.7,904.6,2754.5,902.6z"/>
+	<path d="M2915.6,1041.4c-8.6,6.8-19.4,10.2-32.3,10.2c-7.9,0-15.2-1.4-21.9-4.1s-12.1-6.8-16.3-12.2c-4.2-5.4-6.6-11.9-7.1-19.6
+		h19.6c0.7,6.1,3.5,10.8,8.4,13.9c4.9,3.2,10.7,4.8,17.4,4.8c7,0,13.1-2,18.2-6c5.1-4,7.7-10.3,7.7-18.9v-24.7
+		c-3.6,3.4-8,6.2-13.3,8.2c-5.2,2.1-10.7,3.1-16.3,3.1c-8.7,0-16.6-2.1-23.7-6.4c-7.1-4.3-12.6-10-16.7-17.3c-4-7.3-6-15.5-6-24.6
+		s2-17.3,6-24.7s9.6-13.2,16.7-17.4c7.1-4.3,15-6.4,23.7-6.4c5.7,0,11.1,1,16.3,3.1s9.6,4.8,13.3,8.2v-8.8h19.4v107.8
+		C2928.5,1024.1,2924.2,1034.6,2915.6,1041.4z M2907.5,963.9c2.6-4.7,3.8-10,3.8-15.9s-1.3-11.2-3.8-16c-2.6-4.8-6.1-8.5-10.5-11.1
+		c-4.5-2.7-9.5-4-15.1-4c-5.8,0-10.9,1.4-15.4,4.3c-4.5,2.8-7.9,6.6-10.3,11.4c-2.4,4.8-3.6,9.9-3.6,15.5c0,5.4,1.2,10.5,3.6,15.3
+		c2.4,4.8,5.8,8.6,10.3,11.5s9.6,4.3,15.4,4.3c5.6,0,10.6-1.4,15.1-4.1C2901.4,972.3,2904.9,968.6,2907.5,963.9z"/>
+	<path d="M2968.8,996.6h-21.6l37.9-48l-36.4-46.6h22.6l25.7,33.3l25.8-33.3h21.6l-36.2,45.9l37.9,48.6h-22.6l-27.4-35L2968.8,996.6z
+		"/>
+</g>
+<path d="M961.1,527.4c-11.5-18.9-27.4-33.7-47.6-44.7c-20.2-10.9-43-16.4-68.5-16.4h-90.6c-8.6,39.6-21.3,77.2-38,112.4
+	c-10,21-21.3,41-33.9,59.9v209.2h89.8v-135H845c25.4,0,48.3-5.5,68.5-16.4s36.1-25.8,47.6-44.7s17.3-39.5,17.3-61.9
+	C978.4,567.1,972.7,546.3,961.1,527.4z M872.3,624.8c-9.4,9-21.8,13.5-37,13.5l-62.8,0.4v-93.4l62.8-0.4c15.3,0,27.6,4.5,37,13.5
+	s14.1,20,14.1,33.2C886.4,604.8,881.7,615.9,872.3,624.8z"/>
+<path class="st0" d="M290,906.9c-3.5-16.5-10.4-49.6-11.3-49.6c-147.1-88-129.7-240.3-81-327.4c10.4,109.7,204.6,185.4,91.4,319.5
+	c-0.9,1.7,5.2,22.6,10.4,41.8c22.6-38.3,56.6-84.4,54.8-88.8C215,462.9,650.3,436.8,740.8,226.1c40.9,203.7-20.9,518.9-370.8,599
+	c-1.7,0.9-63.5,109.7-66.2,110.6c0-1.7-26.1-0.9-22.6-9.6C283.1,920.8,286.5,913.9,290,906.9L290,906.9z M285.7,825.1
+	c44.4-51.4-7.8-139.3-39.2-168C299.6,748.4,296.1,801.5,285.7,825.1L285.7,825.1z"/>
+</svg>

resources/logo/web/svg/Color logo - no background.svg

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 3212.8 1212.8" style="enable-background:new 0 0 3212.8 1212.8;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#17541F;}
+</style>
+<path d="M1180.9,847.9v-20.6c-18,20-43.1,30.1-75.4,30.1c-22.4,0-42.8-5.8-61-17.5c-18.3-11.7-32.5-27.8-42.9-48.3
+	c-10.3-20.5-15.5-43.3-15.5-68.4c0-25.1,5.2-48,15.5-68.5s24.6-36.6,42.9-48.3s38.6-17.5,61-17.5c32.3,0,57.5,10,75.4,30.1v-20.6
+	h85.3V848L1180.9,847.9L1180.9,847.9z M1184.4,723.1c0-17.4-5.2-31.9-15.5-43.8c-10.3-11.8-23.9-17.7-40.6-17.7
+	c-16.8,0-30.2,5.9-40.4,17.7c-10.2,11.8-15.3,26.4-15.3,43.8c0,17.4,5.1,31.9,15.3,43.8c10.2,11.8,23.6,17.7,40.4,17.7
+	s30.3-5.9,40.6-17.7C1179.3,755.1,1184.4,740.5,1184.4,723.1z"/>
+<path d="M1543.1,606.4c18.3,11.7,32.5,27.8,42.9,48.3c10.3,20.5,15.5,43.3,15.5,68.5c0,25.1-5.2,48-15.5,68.4
+	c-10.3,20.5-24.6,36.6-42.9,48.3s-38.6,17.5-61,17.5c-32.3,0-57.5-10-75.4-30.1v165.6h-85.3V598.4h85.3V619
+	c18-20,43.1-30.1,75.4-30.1C1504.5,588.9,1524.8,594.8,1543.1,606.4z M1514.8,723.1c0-17.4-5.1-31.9-15.3-43.8
+	c-10.2-11.8-23.6-17.7-40.4-17.7s-30.2,5.9-40.4,17.7c-10.2,11.8-15.3,26.4-15.3,43.8c0,17.4,5.1,31.9,15.3,43.8
+	c10.2,11.8,23.6,17.7,40.4,17.7s30.2-5.9,40.4-17.7C1509.7,755.1,1514.8,740.5,1514.8,723.1z"/>
+<path d="M1838.9,763.5l53,49.4c-28.1,29.6-66.7,44.4-115.8,44.4c-28.1,0-53-5.8-74.5-17.5s-38.2-27.7-49.8-48
+	c-11.7-20.3-17.7-43.2-18-68.7c0-24.8,5.9-47.5,17.7-68c11.8-20.5,28.1-36.7,48.7-48.5s43.5-17.7,68.7-17.7
+	c24.8,0,47.6,6.1,68.2,18.2c20.6,12.1,37,29.5,49.1,52.3c12.1,22.7,18.2,49.1,18.2,79l-0.4,11.7h-181.8
+	c3.6,11.4,10.5,20.7,20.9,28.1c10.3,7.3,21.3,11,33,11c14.4,0,26.3-2.2,35.7-6.5C1821.1,778.3,1830.2,771.9,1838.9,763.5z
+	 M1722.2,694.4h92.9c-2.1-12.3-7.5-22.1-16.2-29.4c-8.7-7.3-18.7-11-30.1-11s-21.5,3.7-30.3,11S1724.3,682.1,1722.2,694.4z"/>
+<path d="M2034.1,626.6c7.8-10.8,17.2-19,28.3-24.7s22-8.5,32.8-8.5c11.4,0,20,1.6,26,4.9l-10.8,72.7c-8.4-2.1-15.7-3.1-22-3.1
+	c-17.1,0-30.4,4.3-39.9,12.8c-9.6,8.5-14.4,24.2-14.4,46.9v120.3h-85.3V598.4h85.3V626.6L2034.1,626.6z"/>
+<path d="M2238.3,466.4v381.5H2153V466.4H2238.3z"/>
+<path d="M2486.1,763.5l53,49.4c-28.1,29.6-66.7,44.4-115.8,44.4c-28.1,0-53-5.8-74.5-17.5s-38.2-27.7-49.8-48
+	c-11.7-20.3-17.7-43.2-18-68.7c0-24.8,5.9-47.5,17.7-68s28.1-36.7,48.7-48.5c20.6-11.8,43.5-17.7,68.7-17.7
+	c24.8,0,47.6,6.1,68.2,18.2c20.6,12.1,37,29.5,49.1,52.3c12.1,22.7,18.2,49.1,18.2,79l-0.4,11.7h-181.8
+	c3.6,11.4,10.5,20.7,20.9,28.1c10.3,7.3,21.3,11,33,11c14.4,0,26.3-2.2,35.7-6.5C2468.4,778.3,2477.4,771.9,2486.1,763.5z
+	 M2369.4,694.4h92.9c-2.1-12.3-7.5-22.1-16.2-29.4c-8.7-7.3-18.7-11-30.1-11s-21.5,3.7-30.3,11
+	C2377,672.3,2371.5,682.1,2369.4,694.4z"/>
+<path d="M2691.2,654.5c-9.9,0-17.1,1.1-21.5,3.4c-4.5,2.2-6.7,5.9-6.7,11s3.4,8.8,10.3,11.2c6.9,2.4,18,4.9,33.2,7.6
+	c20,3,37,6.7,50.9,11.2s26,12.1,36.1,22.9c10.2,10.8,15.3,25.9,15.3,45.3c0,29.9-10.9,52.4-32.8,67.6
+	c-21.8,15.1-50.3,22.7-85.3,22.7c-25.7,0-49.5-3.7-71.4-11c-21.8-7.3-37.4-14.7-46.7-22.2l33.7-60.6c10.2,9,23.4,15.8,39.7,20.4
+	c16.3,4.6,31.3,7,45.1,7c19.7,0,29.6-5.2,29.6-15.7c0-5.4-3.3-9.4-9.9-11.9c-6.6-2.5-17.2-5.2-31.9-7.9c-18.9-3.3-34.9-7.2-48-11.7
+	c-13.2-4.5-24.6-12.2-34.3-23.1c-9.7-10.9-14.6-26-14.6-45.1c0-27.2,9.7-48.5,29-63.7c19.3-15.3,46-22.9,80.1-22.9
+	c23.3,0,44.4,3.6,63.3,10.8c18.9,7.2,34,14.5,45.3,22l-32.8,58.8c-10.8-7.5-23.2-13.7-37.3-18.6
+	C2715.8,656.9,2702.9,654.5,2691.2,654.5z"/>
+<path d="M2942.6,654.5c-9.9,0-17.1,1.1-21.5,3.4c-4.5,2.2-6.7,5.9-6.7,11s3.4,8.8,10.3,11.2c6.9,2.4,18,4.9,33.2,7.6
+	c20,3,37,6.7,50.9,11.2s26,12.1,36.1,22.9c10.2,10.8,15.3,25.9,15.3,45.3c0,29.9-10.9,52.4-32.8,67.6
+	c-21.8,15.1-50.3,22.7-85.3,22.7c-25.7,0-49.5-3.7-71.4-11c-21.8-7.3-37.4-14.7-46.7-22.2l33.7-60.6c10.2,9,23.4,15.8,39.7,20.4
+	c16.3,4.6,31.3,7,45.1,7c19.8,0,29.6-5.2,29.6-15.7c0-5.4-3.3-9.4-9.9-11.9c-6.6-2.5-17.2-5.2-31.9-7.9c-18.9-3.3-34.9-7.2-48-11.7
+	c-13.2-4.5-24.6-12.2-34.3-23.1s-14.6-26-14.6-45.1c0-27.2,9.7-48.5,29-63.7c19.3-15.3,46-22.9,80.1-22.9c23.3,0,44.4,3.6,63.3,10.8
+	c18.9,7.2,34,14.5,45.3,22l-32.8,58.8c-10.8-7.5-23.2-13.7-37.3-18.6C2967.1,656.9,2954.2,654.5,2942.6,654.5z"/>
+<g>
+	<path d="M2633.3,932.2h60.2v17.3h-60.2V932.2z"/>
+	<path d="M2754.5,902.6c4.9-2,10.2-3.1,16-3.1c10.9,0,19.5,3.4,25.9,10.2s9.6,16.7,9.6,29.6v57.3h-19.6V944c0-9.3-1.7-16.2-5.1-20.7
+		c-3.4-4.5-9.1-6.7-17-6.7c-6.5,0-11.8,2.4-16.1,7.1c-4.3,4.8-6.4,11.5-6.4,20.2v52.6h-19.6v-94.6h19.6v9.5
+		C2745.5,907.6,2749.7,904.6,2754.5,902.6z"/>
+	<path d="M2915.6,1041.4c-8.6,6.8-19.4,10.2-32.3,10.2c-7.9,0-15.2-1.4-21.9-4.1s-12.1-6.8-16.3-12.2c-4.2-5.4-6.6-11.9-7.1-19.6
+		h19.6c0.7,6.1,3.5,10.8,8.4,13.9c4.9,3.2,10.7,4.8,17.4,4.8c7,0,13.1-2,18.2-6c5.1-4,7.7-10.3,7.7-18.9v-24.7
+		c-3.6,3.4-8,6.2-13.3,8.2c-5.2,2.1-10.7,3.1-16.3,3.1c-8.7,0-16.6-2.1-23.7-6.4c-7.1-4.3-12.6-10-16.7-17.3c-4-7.3-6-15.5-6-24.6
+		s2-17.3,6-24.7s9.6-13.2,16.7-17.4c7.1-4.3,15-6.4,23.7-6.4c5.7,0,11.1,1,16.3,3.1s9.6,4.8,13.3,8.2v-8.8h19.4v107.8
+		C2928.5,1024.1,2924.2,1034.6,2915.6,1041.4z M2907.5,963.9c2.6-4.7,3.8-10,3.8-15.9s-1.3-11.2-3.8-16c-2.6-4.8-6.1-8.5-10.5-11.1
+		c-4.5-2.7-9.5-4-15.1-4c-5.8,0-10.9,1.4-15.4,4.3c-4.5,2.8-7.9,6.6-10.3,11.4c-2.4,4.8-3.6,9.9-3.6,15.5c0,5.4,1.2,10.5,3.6,15.3
+		c2.4,4.8,5.8,8.6,10.3,11.5s9.6,4.3,15.4,4.3c5.6,0,10.6-1.4,15.1-4.1C2901.4,972.3,2904.9,968.6,2907.5,963.9z"/>
+	<path d="M2968.8,996.6h-21.6l37.9-48l-36.4-46.6h22.6l25.7,33.3l25.8-33.3h21.6l-36.2,45.9l37.9,48.6h-22.6l-27.4-35L2968.8,996.6z
+		"/>
+</g>
+<path d="M961.1,527.4c-11.5-18.9-27.4-33.7-47.6-44.7c-20.2-10.9-43-16.4-68.5-16.4h-90.6c-8.6,39.6-21.3,77.2-38,112.4
+	c-10,21-21.3,41-33.9,59.9v209.2h89.8v-135H845c25.4,0,48.3-5.5,68.5-16.4s36.1-25.8,47.6-44.7s17.3-39.5,17.3-61.9
+	C978.4,567.1,972.7,546.3,961.1,527.4z M872.3,624.8c-9.4,9-21.8,13.5-37,13.5l-62.8,0.4v-93.4l62.8-0.4c15.3,0,27.6,4.5,37,13.5
+	s14.1,20,14.1,33.2C886.4,604.8,881.7,615.9,872.3,624.8z"/>
+<path class="st0" d="M290,906.9c-3.5-16.5-10.4-49.6-11.3-49.6c-147.1-88-129.7-240.3-81-327.4c10.4,109.7,204.6,185.4,91.4,319.5
+	c-0.9,1.7,5.2,22.6,10.4,41.8c22.6-38.3,56.6-84.4,54.8-88.8C215,462.9,650.3,436.8,740.8,226.1c40.9,203.7-20.9,518.9-370.8,599
+	c-1.7,0.9-63.5,109.7-66.2,110.6c0-1.7-26.1-0.9-22.6-9.6C283.1,920.8,286.5,913.9,290,906.9L290,906.9z M285.7,825.1
+	c44.4-51.4-7.8-139.3-39.2-168C299.6,748.4,296.1,801.5,285.7,825.1L285.7,825.1z"/>
+</svg>

resources/logo/web/svg/Color logo with background.svg

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 3212.8 1212.8" style="enable-background:new 0 0 3212.8 1212.8;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+	.st1{fill:#17541F;}
+</style>
+<rect class="st0" width="3212.8" height="1212.8"/>
+<path d="M1180.9,847.9v-20.6c-18,20-43.1,30.1-75.4,30.1c-22.4,0-42.8-5.8-61-17.5c-18.3-11.7-32.5-27.8-42.9-48.3
+	c-10.3-20.5-15.5-43.3-15.5-68.4c0-25.1,5.2-48,15.5-68.5s24.6-36.6,42.9-48.3s38.6-17.5,61-17.5c32.3,0,57.5,10,75.4,30.1v-20.6
+	h85.3V848L1180.9,847.9L1180.9,847.9z M1184.4,723.1c0-17.4-5.2-31.9-15.5-43.8c-10.3-11.8-23.9-17.7-40.6-17.7
+	c-16.8,0-30.2,5.9-40.4,17.7c-10.2,11.8-15.3,26.4-15.3,43.8c0,17.4,5.1,31.9,15.3,43.8c10.2,11.8,23.6,17.7,40.4,17.7
+	s30.3-5.9,40.6-17.7C1179.3,755.1,1184.4,740.5,1184.4,723.1z"/>
+<path d="M1543.1,606.4c18.3,11.7,32.5,27.8,42.9,48.3c10.3,20.5,15.5,43.3,15.5,68.5c0,25.1-5.2,48-15.5,68.4
+	c-10.3,20.5-24.6,36.6-42.9,48.3s-38.6,17.5-61,17.5c-32.3,0-57.5-10-75.4-30.1v165.6h-85.3V598.4h85.3V619
+	c18-20,43.1-30.1,75.4-30.1C1504.5,588.9,1524.8,594.8,1543.1,606.4z M1514.8,723.1c0-17.4-5.1-31.9-15.3-43.8
+	c-10.2-11.8-23.6-17.7-40.4-17.7s-30.2,5.9-40.4,17.7c-10.2,11.8-15.3,26.4-15.3,43.8c0,17.4,5.1,31.9,15.3,43.8
+	c10.2,11.8,23.6,17.7,40.4,17.7s30.2-5.9,40.4-17.7C1509.7,755.1,1514.8,740.5,1514.8,723.1z"/>
+<path d="M1838.9,763.5l53,49.4c-28.1,29.6-66.7,44.4-115.8,44.4c-28.1,0-53-5.8-74.5-17.5s-38.2-27.7-49.8-48
+	c-11.7-20.3-17.7-43.2-18-68.7c0-24.8,5.9-47.5,17.7-68c11.8-20.5,28.1-36.7,48.7-48.5s43.5-17.7,68.7-17.7
+	c24.8,0,47.6,6.1,68.2,18.2c20.6,12.1,37,29.5,49.1,52.3c12.1,22.7,18.2,49.1,18.2,79l-0.4,11.7h-181.8
+	c3.6,11.4,10.5,20.7,20.9,28.1c10.3,7.3,21.3,11,33,11c14.4,0,26.3-2.2,35.7-6.5C1821.1,778.3,1830.2,771.9,1838.9,763.5z
+	 M1722.2,694.4h92.9c-2.1-12.3-7.5-22.1-16.2-29.4c-8.7-7.3-18.7-11-30.1-11s-21.5,3.7-30.3,11S1724.3,682.1,1722.2,694.4z"/>
+<path d="M2034.1,626.6c7.8-10.8,17.2-19,28.3-24.7s22-8.5,32.8-8.5c11.4,0,20,1.6,26,4.9l-10.8,72.7c-8.4-2.1-15.7-3.1-22-3.1
+	c-17.1,0-30.4,4.3-39.9,12.8c-9.6,8.5-14.4,24.2-14.4,46.9v120.3h-85.3V598.4h85.3V626.6L2034.1,626.6z"/>
+<path d="M2238.3,466.4v381.5H2153V466.4H2238.3z"/>
+<path d="M2486.1,763.5l53,49.4c-28.1,29.6-66.7,44.4-115.8,44.4c-28.1,0-53-5.8-74.5-17.5s-38.2-27.7-49.8-48
+	c-11.7-20.3-17.7-43.2-18-68.7c0-24.8,5.9-47.5,17.7-68s28.1-36.7,48.7-48.5c20.6-11.8,43.5-17.7,68.7-17.7
+	c24.8,0,47.6,6.1,68.2,18.2c20.6,12.1,37,29.5,49.1,52.3c12.1,22.7,18.2,49.1,18.2,79l-0.4,11.7h-181.8
+	c3.6,11.4,10.5,20.7,20.9,28.1c10.3,7.3,21.3,11,33,11c14.4,0,26.3-2.2,35.7-6.5C2468.4,778.3,2477.4,771.9,2486.1,763.5z
+	 M2369.4,694.4h92.9c-2.1-12.3-7.5-22.1-16.2-29.4c-8.7-7.3-18.7-11-30.1-11s-21.5,3.7-30.3,11
+	C2377,672.3,2371.5,682.1,2369.4,694.4z"/>
+<path d="M2691.2,654.5c-9.9,0-17.1,1.1-21.5,3.4c-4.5,2.2-6.7,5.9-6.7,11s3.4,8.8,10.3,11.2c6.9,2.4,18,4.9,33.2,7.6
+	c20,3,37,6.7,50.9,11.2s26,12.1,36.1,22.9c10.2,10.8,15.3,25.9,15.3,45.3c0,29.9-10.9,52.4-32.8,67.6
+	c-21.8,15.1-50.3,22.7-85.3,22.7c-25.7,0-49.5-3.7-71.4-11c-21.8-7.3-37.4-14.7-46.7-22.2l33.7-60.6c10.2,9,23.4,15.8,39.7,20.4
+	c16.3,4.6,31.3,7,45.1,7c19.7,0,29.6-5.2,29.6-15.7c0-5.4-3.3-9.4-9.9-11.9c-6.6-2.5-17.2-5.2-31.9-7.9c-18.9-3.3-34.9-7.2-48-11.7
+	c-13.2-4.5-24.6-12.2-34.3-23.1c-9.7-10.9-14.6-26-14.6-45.1c0-27.2,9.7-48.5,29-63.7c19.3-15.3,46-22.9,80.1-22.9
+	c23.3,0,44.4,3.6,63.3,10.8c18.9,7.2,34,14.5,45.3,22l-32.8,58.8c-10.8-7.5-23.2-13.7-37.3-18.6
+	C2715.8,656.9,2702.9,654.5,2691.2,654.5z"/>
+<path d="M2942.6,654.5c-9.9,0-17.1,1.1-21.5,3.4c-4.5,2.2-6.7,5.9-6.7,11s3.4,8.8,10.3,11.2c6.9,2.4,18,4.9,33.2,7.6
+	c20,3,37,6.7,50.9,11.2s26,12.1,36.1,22.9c10.2,10.8,15.3,25.9,15.3,45.3c0,29.9-10.9,52.4-32.8,67.6
+	c-21.8,15.1-50.3,22.7-85.3,22.7c-25.7,0-49.5-3.7-71.4-11c-21.8-7.3-37.4-14.7-46.7-22.2l33.7-60.6c10.2,9,23.4,15.8,39.7,20.4
+	c16.3,4.6,31.3,7,45.1,7c19.8,0,29.6-5.2,29.6-15.7c0-5.4-3.3-9.4-9.9-11.9c-6.6-2.5-17.2-5.2-31.9-7.9c-18.9-3.3-34.9-7.2-48-11.7
+	c-13.2-4.5-24.6-12.2-34.3-23.1s-14.6-26-14.6-45.1c0-27.2,9.7-48.5,29-63.7c19.3-15.3,46-22.9,80.1-22.9c23.3,0,44.4,3.6,63.3,10.8
+	c18.9,7.2,34,14.5,45.3,22l-32.8,58.8c-10.8-7.5-23.2-13.7-37.3-18.6C2967.1,656.9,2954.2,654.5,2942.6,654.5z"/>
+<g>
+	<path d="M2633.3,932.2h60.2v17.3h-60.2V932.2z"/>
+	<path d="M2754.5,902.6c4.9-2,10.2-3.1,16-3.1c10.9,0,19.5,3.4,25.9,10.2s9.6,16.7,9.6,29.6v57.3h-19.6V944c0-9.3-1.7-16.2-5.1-20.7
+		c-3.4-4.5-9.1-6.7-17-6.7c-6.5,0-11.8,2.4-16.1,7.1c-4.3,4.8-6.4,11.5-6.4,20.2v52.6h-19.6v-94.6h19.6v9.5
+		C2745.5,907.6,2749.7,904.6,2754.5,902.6z"/>
+	<path d="M2915.6,1041.4c-8.6,6.8-19.4,10.2-32.3,10.2c-7.9,0-15.2-1.4-21.9-4.1s-12.1-6.8-16.3-12.2c-4.2-5.4-6.6-11.9-7.1-19.6
+		h19.6c0.7,6.1,3.5,10.8,8.4,13.9c4.9,3.2,10.7,4.8,17.4,4.8c7,0,13.1-2,18.2-6c5.1-4,7.7-10.3,7.7-18.9v-24.7
+		c-3.6,3.4-8,6.2-13.3,8.2c-5.2,2.1-10.7,3.1-16.3,3.1c-8.7,0-16.6-2.1-23.7-6.4c-7.1-4.3-12.6-10-16.7-17.3c-4-7.3-6-15.5-6-24.6
+		s2-17.3,6-24.7s9.6-13.2,16.7-17.4c7.1-4.3,15-6.4,23.7-6.4c5.7,0,11.1,1,16.3,3.1s9.6,4.8,13.3,8.2v-8.8h19.4v107.8
+		C2928.5,1024.1,2924.2,1034.6,2915.6,1041.4z M2907.5,963.9c2.6-4.7,3.8-10,3.8-15.9s-1.3-11.2-3.8-16c-2.6-4.8-6.1-8.5-10.5-11.1
+		c-4.5-2.7-9.5-4-15.1-4c-5.8,0-10.9,1.4-15.4,4.3c-4.5,2.8-7.9,6.6-10.3,11.4c-2.4,4.8-3.6,9.9-3.6,15.5c0,5.4,1.2,10.5,3.6,15.3
+		c2.4,4.8,5.8,8.6,10.3,11.5s9.6,4.3,15.4,4.3c5.6,0,10.6-1.4,15.1-4.1C2901.4,972.3,2904.9,968.6,2907.5,963.9z"/>
+	<path d="M2968.8,996.6h-21.6l37.9-48l-36.4-46.6h22.6l25.7,33.3l25.8-33.3h21.6l-36.2,45.9l37.9,48.6h-22.6l-27.4-35L2968.8,996.6z
+		"/>
+</g>
+<path d="M961.1,527.4c-11.5-18.9-27.4-33.7-47.6-44.7c-20.2-10.9-43-16.4-68.5-16.4h-90.6c-8.6,39.6-21.3,77.2-38,112.4
+	c-10,21-21.3,41-33.9,59.9v209.2h89.8v-135H845c25.4,0,48.3-5.5,68.5-16.4s36.1-25.8,47.6-44.7s17.3-39.5,17.3-61.9
+	C978.4,567.1,972.7,546.3,961.1,527.4z M872.3,624.8c-9.4,9-21.8,13.5-37,13.5l-62.8,0.4v-93.4l62.8-0.4c15.3,0,27.6,4.5,37,13.5
+	s14.1,20,14.1,33.2C886.4,604.8,881.7,615.9,872.3,624.8z"/>
+<path class="st1" d="M290,906.9c-3.5-16.5-10.4-49.6-11.3-49.6c-147.1-88-129.7-240.3-81-327.4c10.4,109.7,204.6,185.4,91.4,319.5
+	c-0.9,1.7,5.2,22.6,10.4,41.8c22.6-38.3,56.6-84.4,54.8-88.8C215,462.9,650.3,436.8,740.8,226.1c40.9,203.7-20.9,518.9-370.8,599
+	c-1.7,0.9-63.5,109.7-66.2,110.6c0-1.7-26.1-0.9-22.6-9.6C283.1,920.8,286.5,913.9,290,906.9L290,906.9z M285.7,825.1
+	c44.4-51.4-7.8-139.3-39.2-168C299.6,748.4,296.1,801.5,285.7,825.1L285.7,825.1z"/>
+</svg>

resources/logo/web/svg/White logo - no background.svg

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 3212.8 1212.8" style="enable-background:new 0 0 3212.8 1212.8;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+	.st1{fill:#17541F;}
+</style>
+<path class="st0" d="M1180.9,847.9v-20.6c-18,20-43.1,30.1-75.4,30.1c-22.4,0-42.8-5.8-61-17.5c-18.3-11.7-32.5-27.8-42.9-48.3
+	c-10.3-20.5-15.5-43.3-15.5-68.4c0-25.1,5.2-48,15.5-68.5s24.6-36.6,42.9-48.3s38.6-17.5,61-17.5c32.3,0,57.5,10,75.4,30.1v-20.6
+	h85.3V848L1180.9,847.9L1180.9,847.9z M1184.4,723.1c0-17.4-5.2-31.9-15.5-43.8c-10.3-11.8-23.9-17.7-40.6-17.7
+	c-16.8,0-30.2,5.9-40.4,17.7c-10.2,11.8-15.3,26.4-15.3,43.8c0,17.4,5.1,31.9,15.3,43.8c10.2,11.8,23.6,17.7,40.4,17.7
+	s30.3-5.9,40.6-17.7C1179.3,755.1,1184.4,740.5,1184.4,723.1z"/>
+<path class="st0" d="M1543.1,606.4c18.3,11.7,32.5,27.8,42.9,48.3c10.3,20.5,15.5,43.3,15.5,68.5c0,25.1-5.2,48-15.5,68.4
+	c-10.3,20.5-24.6,36.6-42.9,48.3s-38.6,17.5-61,17.5c-32.3,0-57.5-10-75.4-30.1v165.6h-85.3V598.4h85.3V619
+	c18-20,43.1-30.1,75.4-30.1C1504.5,588.9,1524.8,594.8,1543.1,606.4z M1514.8,723.1c0-17.4-5.1-31.9-15.3-43.8
+	c-10.2-11.8-23.6-17.7-40.4-17.7s-30.2,5.9-40.4,17.7c-10.2,11.8-15.3,26.4-15.3,43.8c0,17.4,5.1,31.9,15.3,43.8
+	c10.2,11.8,23.6,17.7,40.4,17.7s30.2-5.9,40.4-17.7C1509.7,755.1,1514.8,740.5,1514.8,723.1z"/>
+<path class="st0" d="M1838.9,763.5l53,49.4c-28.1,29.6-66.7,44.4-115.8,44.4c-28.1,0-53-5.8-74.5-17.5s-38.2-27.7-49.8-48
+	c-11.7-20.3-17.7-43.2-18-68.7c0-24.8,5.9-47.5,17.7-68c11.8-20.5,28.1-36.7,48.7-48.5s43.5-17.7,68.7-17.7
+	c24.8,0,47.6,6.1,68.2,18.2c20.6,12.1,37,29.5,49.1,52.3c12.1,22.7,18.2,49.1,18.2,79l-0.4,11.7h-181.8
+	c3.6,11.4,10.5,20.7,20.9,28.1c10.3,7.3,21.3,11,33,11c14.4,0,26.3-2.2,35.7-6.5C1821.1,778.3,1830.2,771.9,1838.9,763.5z
+	 M1722.2,694.4h92.9c-2.1-12.3-7.5-22.1-16.2-29.4c-8.7-7.3-18.7-11-30.1-11s-21.5,3.7-30.3,11S1724.3,682.1,1722.2,694.4z"/>
+<path class="st0" d="M2034.1,626.6c7.8-10.8,17.2-19,28.3-24.7s22-8.5,32.8-8.5c11.4,0,20,1.6,26,4.9l-10.8,72.7
+	c-8.4-2.1-15.7-3.1-22-3.1c-17.1,0-30.4,4.3-39.9,12.8c-9.6,8.5-14.4,24.2-14.4,46.9v120.3h-85.3V598.4h85.3V626.6L2034.1,626.6z"/>
+<path class="st0" d="M2238.3,466.4v381.5H2153V466.4H2238.3z"/>
+<path class="st0" d="M2486.1,763.5l53,49.4c-28.1,29.6-66.7,44.4-115.8,44.4c-28.1,0-53-5.8-74.5-17.5s-38.2-27.7-49.8-48
+	c-11.7-20.3-17.7-43.2-18-68.7c0-24.8,5.9-47.5,17.7-68s28.1-36.7,48.7-48.5c20.6-11.8,43.5-17.7,68.7-17.7
+	c24.8,0,47.6,6.1,68.2,18.2c20.6,12.1,37,29.5,49.1,52.3c12.1,22.7,18.2,49.1,18.2,79l-0.4,11.7h-181.8
+	c3.6,11.4,10.5,20.7,20.9,28.1c10.3,7.3,21.3,11,33,11c14.4,0,26.3-2.2,35.7-6.5C2468.4,778.3,2477.4,771.9,2486.1,763.5z
+	 M2369.4,694.4h92.9c-2.1-12.3-7.5-22.1-16.2-29.4c-8.7-7.3-18.7-11-30.1-11s-21.5,3.7-30.3,11
+	C2377,672.3,2371.5,682.1,2369.4,694.4z"/>
+<path class="st0" d="M2691.2,654.5c-9.9,0-17.1,1.1-21.5,3.4c-4.5,2.2-6.7,5.9-6.7,11s3.4,8.8,10.3,11.2c6.9,2.4,18,4.9,33.2,7.6
+	c20,3,37,6.7,50.9,11.2s26,12.1,36.1,22.9c10.2,10.8,15.3,25.9,15.3,45.3c0,29.9-10.9,52.4-32.8,67.6
+	c-21.8,15.1-50.3,22.7-85.3,22.7c-25.7,0-49.5-3.7-71.4-11c-21.8-7.3-37.4-14.7-46.7-22.2l33.7-60.6c10.2,9,23.4,15.8,39.7,20.4
+	c16.3,4.6,31.3,7,45.1,7c19.7,0,29.6-5.2,29.6-15.7c0-5.4-3.3-9.4-9.9-11.9c-6.6-2.5-17.2-5.2-31.9-7.9c-18.9-3.3-34.9-7.2-48-11.7
+	c-13.2-4.5-24.6-12.2-34.3-23.1c-9.7-10.9-14.6-26-14.6-45.1c0-27.2,9.7-48.5,29-63.7c19.3-15.3,46-22.9,80.1-22.9
+	c23.3,0,44.4,3.6,63.3,10.8c18.9,7.2,34,14.5,45.3,22l-32.8,58.8c-10.8-7.5-23.2-13.7-37.3-18.6
+	C2715.8,656.9,2702.9,654.5,2691.2,654.5z"/>
+<path class="st0" d="M2942.6,654.5c-9.9,0-17.1,1.1-21.5,3.4c-4.5,2.2-6.7,5.9-6.7,11s3.4,8.8,10.3,11.2c6.9,2.4,18,4.9,33.2,7.6
+	c20,3,37,6.7,50.9,11.2s26,12.1,36.1,22.9c10.2,10.8,15.3,25.9,15.3,45.3c0,29.9-10.9,52.4-32.8,67.6
+	c-21.8,15.1-50.3,22.7-85.3,22.7c-25.7,0-49.5-3.7-71.4-11c-21.8-7.3-37.4-14.7-46.7-22.2l33.7-60.6c10.2,9,23.4,15.8,39.7,20.4
+	c16.3,4.6,31.3,7,45.1,7c19.8,0,29.6-5.2,29.6-15.7c0-5.4-3.3-9.4-9.9-11.9c-6.6-2.5-17.2-5.2-31.9-7.9c-18.9-3.3-34.9-7.2-48-11.7
+	c-13.2-4.5-24.6-12.2-34.3-23.1s-14.6-26-14.6-45.1c0-27.2,9.7-48.5,29-63.7c19.3-15.3,46-22.9,80.1-22.9c23.3,0,44.4,3.6,63.3,10.8
+	c18.9,7.2,34,14.5,45.3,22l-32.8,58.8c-10.8-7.5-23.2-13.7-37.3-18.6C2967.1,656.9,2954.2,654.5,2942.6,654.5z"/>
+<g>
+	<path class="st0" d="M2633.3,932.2h60.2v17.3h-60.2V932.2z"/>
+	<path class="st0" d="M2754.5,902.6c4.9-2,10.2-3.1,16-3.1c10.9,0,19.5,3.4,25.9,10.2s9.6,16.7,9.6,29.6v57.3h-19.6V944
+		c0-9.3-1.7-16.2-5.1-20.7c-3.4-4.5-9.1-6.7-17-6.7c-6.5,0-11.8,2.4-16.1,7.1c-4.3,4.8-6.4,11.5-6.4,20.2v52.6h-19.6v-94.6h19.6v9.5
+		C2745.5,907.6,2749.7,904.6,2754.5,902.6z"/>
+	<path class="st0" d="M2915.6,1041.4c-8.6,6.8-19.4,10.2-32.3,10.2c-7.9,0-15.2-1.4-21.9-4.1s-12.1-6.8-16.3-12.2
+		c-4.2-5.4-6.6-11.9-7.1-19.6h19.6c0.7,6.1,3.5,10.8,8.4,13.9c4.9,3.2,10.7,4.8,17.4,4.8c7,0,13.1-2,18.2-6c5.1-4,7.7-10.3,7.7-18.9
+		v-24.7c-3.6,3.4-8,6.2-13.3,8.2c-5.2,2.1-10.7,3.1-16.3,3.1c-8.7,0-16.6-2.1-23.7-6.4c-7.1-4.3-12.6-10-16.7-17.3
+		c-4-7.3-6-15.5-6-24.6s2-17.3,6-24.7s9.6-13.2,16.7-17.4c7.1-4.3,15-6.4,23.7-6.4c5.7,0,11.1,1,16.3,3.1s9.6,4.8,13.3,8.2v-8.8
+		h19.4v107.8C2928.5,1024.1,2924.2,1034.6,2915.6,1041.4z M2907.5,963.9c2.6-4.7,3.8-10,3.8-15.9s-1.3-11.2-3.8-16
+		c-2.6-4.8-6.1-8.5-10.5-11.1c-4.5-2.7-9.5-4-15.1-4c-5.8,0-10.9,1.4-15.4,4.3c-4.5,2.8-7.9,6.6-10.3,11.4
+		c-2.4,4.8-3.6,9.9-3.6,15.5c0,5.4,1.2,10.5,3.6,15.3c2.4,4.8,5.8,8.6,10.3,11.5s9.6,4.3,15.4,4.3c5.6,0,10.6-1.4,15.1-4.1
+		C2901.4,972.3,2904.9,968.6,2907.5,963.9z"/>
+	<path class="st0" d="M2968.8,996.6h-21.6l37.9-48l-36.4-46.6h22.6l25.7,33.3l25.8-33.3h21.6l-36.2,45.9l37.9,48.6h-22.6l-27.4-35
+		L2968.8,996.6z"/>
+</g>
+<path class="st0" d="M961.1,527.4c-11.5-18.9-27.4-33.7-47.6-44.7c-20.2-10.9-43-16.4-68.5-16.4h-90.6c-8.6,39.6-21.3,77.2-38,112.4
+	c-10,21-21.3,41-33.9,59.9v209.2h89.8v-135H845c25.4,0,48.3-5.5,68.5-16.4s36.1-25.8,47.6-44.7s17.3-39.5,17.3-61.9
+	C978.4,567.1,972.7,546.3,961.1,527.4z M872.3,624.8c-9.4,9-21.8,13.5-37,13.5l-62.8,0.4v-93.4l62.8-0.4c15.3,0,27.6,4.5,37,13.5
+	s14.1,20,14.1,33.2C886.4,604.8,881.7,615.9,872.3,624.8z"/>
+<path class="st1" d="M290,906.9c-3.5-16.5-10.4-49.6-11.3-49.6c-147.1-88-129.7-240.3-81-327.4c10.4,109.7,204.6,185.4,91.4,319.5
+	c-0.9,1.7,5.2,22.6,10.4,41.8c22.6-38.3,56.6-84.4,54.8-88.8C215,462.9,650.3,436.8,740.8,226.1c40.9,203.7-20.9,518.9-370.8,599
+	c-1.7,0.9-63.5,109.7-66.2,110.6c0-1.7-26.1-0.9-22.6-9.6C283.1,920.8,286.5,913.9,290,906.9L290,906.9z M285.7,825.1
+	c44.4-51.4-7.8-139.3-39.2-168C299.6,748.4,296.1,801.5,285.7,825.1L285.7,825.1z"/>
+</svg>

resources/logo/web/svg/square.svg

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="900"
+   height="900"
+   id="svg3923"
+   sodipodi:docname="square.svg"
+   inkscape:export-filename="/tmp/test.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   inkscape:version="0.92.2 2405546, 2018-03-11">
+  <metadata
+     id="metadata3929">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs3927" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="3840"
+     inkscape:window-height="2096"
+     id="namedview3925"
+     showgrid="false"
+     inkscape:zoom="1.1360927"
+     inkscape:cx="635.07139"
+     inkscape:cy="606.383"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g3921" />
+  <g
+     transform="matrix(10.638298,0,0,10.638298,106.38298,-206.38301)"
+     id="g3921">
+    <defs
+       id="SvgjsDefs1018" />
+    <g
+       id="SvgjsG1019"
+       featureKey="root"
+       style="fill:#ffffff" />
+    <g
+       id="SvgjsG1020"
+       featureKey="symbol1"
+       transform="matrix(0.10341565,0,0,0.10341565,-11.43874,18.048418)"
+       inkscape:export-filename="/tmp/test.png"
+       inkscape:export-xdpi="116.02285"
+       inkscape:export-ydpi="116.02285"
+       style="fill:#17541f">
+      <defs
+         id="defs3911" />
+      <g
+         id="g3915">
+        <path
+           d="M 231,798 C 227,779 219,741 218,741 49,640 69,465 125,365 c 12,126 235,213 105,367 -1,2 6,26 12,48 26,-44 65,-97 63,-102 C 145,288 645,258 749,16 c 47,234 -24,596 -426,688 -2,1 -73,126 -76,127 0,-2 -30,-1 -26,-11 2,-6 6,-14 10,-22 z M 330,625 C 267,476 452,312 544,271 356,439 324,564 330,625 Z m -104,79 c 51,-59 -9,-160 -45,-193 61,105 57,166 45,193 z"
+           style="fill:#17541f"
+           id="path3913"
+           inkscape:connector-curvature="0" />
+      </g>
+    </g>
+  </g>
+</svg>

scripts/paperless-webserver.service

@@ -23,7 +23,7 @@ ExecStart=/bin/sh -c '\
   [ -n "$PAPERLESS_WEBSERVER_WORKERS" ] && export GRANIAN_WORKERS=$PAPERLESS_WEBSERVER_WORKERS; \
   # URL path prefix: only set if PAPERLESS_FORCE_SCRIPT_NAME exists \
   [ -n "$PAPERLESS_FORCE_SCRIPT_NAME" ] && export GRANIAN_URL_PATH_PREFIX=$PAPERLESS_FORCE_SCRIPT_NAME; \
-  exec granian --interface asginl --ws --loop uvloop "paperless.asgi:application"'
+  exec granian --interface asginl --ws "paperless.asgi:application"'
 
 [Install]
 WantedBy=multi-user.target

src-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "paperless-ngx-ui",
-  "version": "2.20.15",
+  "version": "2.20.13",
   "scripts": {
     "preinstall": "npx only-allow pnpm",
     "ng": "ng",
@@ -36,7 +36,7 @@
     "rxjs": "^7.8.2",
     "tslib": "^2.8.1",
     "utif": "^3.1.0",
-    "uuid": "^14.0.0",
+    "uuid": "^13.0.0",
     "zone.js": "^0.16.1"
   },
   "devDependencies": {

src-ui/pnpm-lock.yaml

@@ -84,8 +84,8 @@ importers:
         specifier: ^3.1.0
         version: 3.1.0
       uuid:
-        specifier: ^14.0.0
-        version: 14.0.0
+        specifier: ^13.0.0
+        version: 13.0.0
       zone.js:
         specifier: ^0.16.1
         version: 0.16.1
@@ -4363,8 +4363,8 @@ packages:
   flatted@3.4.2:
     resolution: {integrity: sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==}
 
-  follow-redirects@1.16.0:
-    resolution: {integrity: sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw==}
+  follow-redirects@1.15.11:
+    resolution: {integrity: sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==}
     engines: {node: '>=4.0'}
     peerDependencies:
       debug: '*'
@@ -4502,8 +4502,8 @@ packages:
     resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}
     engines: {node: '>= 0.4'}
 
-  hono@4.12.14:
-    resolution: {integrity: sha512-am5zfg3yu6sqn5yjKBNqhnTX7Cv+m00ox+7jbaKkrLMRJ4rAdldd1xPd/JzbBWspqaQv6RSTrgFN95EsfhC+7w==}
+  hono@4.12.12:
+    resolution: {integrity: sha512-p1JfQMKaceuCbpJKAPKVqyqviZdS0eUxH9v82oWo1kb9xjQ5wA6iP3FNVAPDFlz5/p7d45lO+BpSk1tuSZMF4Q==}
     engines: {node: '>=16.9.0'}
 
   hosted-git-info@9.0.2:
@@ -6562,8 +6562,8 @@ packages:
     resolution: {integrity: sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==}
     engines: {node: '>= 0.4.0'}
 
-  uuid@14.0.0:
-    resolution: {integrity: sha512-Qo+uWgilfSmAhXCMav1uYFynlQO7fMFiMVZsQqZRMIXp0O7rR7qjkj+cPvBHLgBqi960QCoo/PH2/6ZtVqKvrg==}
+  uuid@13.0.0:
+    resolution: {integrity: sha512-XQegIaBTVUjSHliKqcnFqYypAd4S+WCYt5NIeRs6w/UAry7z8Y9j5ZwRRL4kzq9U3sD6v+85er9FvkEaBpji2w==}
     hasBin: true
 
   uuid@8.3.2:
@@ -8685,9 +8685,9 @@ snapshots:
   '@harperfast/extended-iterable@1.0.3':
     optional: true
 
-  '@hono/node-server@1.19.13(hono@4.12.14)':
+  '@hono/node-server@1.19.13(hono@4.12.12)':
     dependencies:
-      hono: 4.12.14
+      hono: 4.12.12
 
   '@humanfs/core@0.19.1': {}
 
@@ -9270,7 +9270,7 @@ snapshots:
 
   '@modelcontextprotocol/sdk@1.26.0(zod@4.3.6)':
     dependencies:
-      '@hono/node-server': 1.19.13(hono@4.12.14)
+      '@hono/node-server': 1.19.13(hono@4.12.12)
       ajv: 8.18.0
       ajv-formats: 3.0.1(ajv@8.18.0)
       content-type: 1.0.5
@@ -9280,7 +9280,7 @@ snapshots:
       eventsource-parser: 3.0.6
       express: 5.2.1
       express-rate-limit: 8.3.2(express@5.2.1)
-      hono: 4.12.14
+      hono: 4.12.12
       jose: 6.2.2
       json-schema-typed: 8.0.2
       pkce-challenge: 5.0.1
@@ -11427,7 +11427,7 @@ snapshots:
 
   flatted@3.4.2: {}
 
-  follow-redirects@1.16.0(debug@4.4.3):
+  follow-redirects@1.15.11(debug@4.4.3):
     optionalDependencies:
       debug: 4.4.3
 
@@ -11553,7 +11553,7 @@ snapshots:
     dependencies:
       function-bind: 1.1.2
 
-  hono@4.12.14: {}
+  hono@4.12.12: {}
 
   hosted-git-info@9.0.2:
     dependencies:
@@ -11634,7 +11634,7 @@ snapshots:
   http-proxy@1.18.1(debug@4.4.3):
     dependencies:
       eventemitter3: 4.0.7
-      follow-redirects: 1.16.0(debug@4.4.3)
+      follow-redirects: 1.15.11(debug@4.4.3)
       requires-port: 1.0.0
     transitivePeerDependencies:
       - debug
@@ -14029,7 +14029,7 @@ snapshots:
 
   utils-merge@1.0.1: {}
 
-  uuid@14.0.0: {}
+  uuid@13.0.0: {}
 
   uuid@8.3.2: {}
 

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

@@ -219,7 +219,7 @@ export class AppComponent implements OnInit, OnDestroy {
       },
       {
         anchorId: 'tour.file-tasks',
-        content: $localize`Tasks helps you track background work, what needs attention, and what recently completed.`,
+        content: $localize`File Tasks shows you documents that have been consumed, are waiting to be, or may have failed during the process.`,
         route: '/tasks',
         backdropConfig: {
           offset: 0,

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

@@ -337,7 +337,7 @@ describe('SettingsComponent', () => {
       .mockImplementation(
         (action, type) =>
           action === PermissionAction.View &&
-          type === PermissionType.SystemMonitoring
+          type === PermissionType.SystemStatus
       )
     completeSetup()
     expect(component['systemStatus']).toEqual(status) // private
@@ -359,7 +359,7 @@ describe('SettingsComponent', () => {
       .mockImplementation(
         (action, type) =>
           action === PermissionAction.View &&
-          type === PermissionType.SystemMonitoring
+          type === PermissionType.SystemStatus
       )
     completeSetup()
     component.showSystemStatus()

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

@@ -652,7 +652,7 @@ export class SettingsComponent
       this.permissionsService.isAdmin() ||
       this.permissionsService.currentUserCan(
         PermissionAction.View,
-        PermissionType.SystemMonitoring
+        PermissionType.SystemStatus
       )
     )
   }

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

@@ -1,16 +1,41 @@
 <pngx-page-header
-  title="Tasks"
+  title="File Tasks"
   i18n-title
-  info="Tasks shows detailed information about document consumption and system tasks."
+  info="File Tasks shows you documents that have been consumed, are waiting to be, or may have failed during the process."
   i18n-info
   >
   <div class="btn-toolbar col col-md-auto align-items-center gap-2">
     <button class="btn btn-sm btn-outline-secondary me-2" (click)="clearSelection()" [hidden]="selectedTasks.size === 0">
       <i-bs name="x" class="me-1"></i-bs><ng-container i18n>Clear selection</ng-container>
     </button>
-    <button class="btn btn-sm btn-outline-primary me-2" (click)="dismissTasks()" *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.PaperlessTask }" [disabled]="visibleTasks.length === 0">
+    <button class="btn btn-sm btn-outline-primary me-2" (click)="dismissTasks()" *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.PaperlessTask }" [disabled]="tasksService.total === 0">
       <i-bs name="check2-all" class="me-1"></i-bs>{{dismissButtonText}}
     </button>
+    <div class="form-inline d-flex align-items-center">
+      <div class="input-group input-group-sm flex-fill w-auto flex-nowrap">
+        <span class="input-group-text text-muted" i18n>Filter by</span>
+        @if (filterTargets.length > 1) {
+          <div ngbDropdown>
+            <button class="btn btn-sm btn-outline-primary" ngbDropdownToggle>{{filterTargetName}}</button>
+            <div class="dropdown-menu shadow" ngbDropdownMenu>
+              @for (t of filterTargets; track t.id) {
+                <button ngbDropdownItem [class.active]="filterTargetID === t.id" (click)="filterTargetID = t.id">{{t.name}}</button>
+              }
+            </div>
+          </div>
+        } @else {
+          <span class="input-group-text">{{filterTargetName}}</span>
+        }
+        @if (filterText?.length) {
+          <button class="btn btn-link btn-sm px-2 position-absolute top-0 end-0 z-10" (click)="resetFilter()">
+            <i-bs width="1em" height="1em" name="x"></i-bs>
+          </button>
+        }
+        <input #filterInput class="form-control form-control-sm" type="text"
+          (keyup)="filterInputKeyup($event)"
+          [(ngModel)]="filterText">
+      </div>
+    </div>
     <div class="form-check form-switch mb-0 ms-2">
       <input class="form-check-input" type="checkbox" role="switch" [(ngModel)]="autoRefreshEnabled">
       <label class="form-check-label" for="autoRefreshSwitch" i18n>Auto refresh</label>
@@ -23,263 +48,139 @@
   <div class="visually-hidden" i18n>Loading...</div>
 }
 
-<div class="task-controls mb-3 btn-toolbar align-items-center" role="toolbar">
-  <div class="task-view-scope btn-group btn-group-sm me-3" role="group">
-    <input
-      type="radio"
-      class="btn-check"
-      [checked]="selectedSection === TaskSection.All"
-      id="section-all"
-      (click)="setSection(TaskSection.All)"
-      (keydown)="setSection(TaskSection.All)" />
-    <label class="btn btn-outline-primary" for="section-all">
-      <ng-container i18n>All</ng-container>
-    </label>
-    @for (section of sections; track section) {
-      <input
-        type="radio"
-        class="btn-check"
-        [checked]="selectedSection === section"
-        id="section-{{section}}"
-        (click)="setSection(section)"
-        (keydown)="setSection(section)" />
-      <label class="btn btn-outline-primary" for="section-{{section}}">
-        {{ sectionLabel(section) }}
-        @if (sectionCount(section) > 0) {
-          <span class="badge ms-2" [class.bg-danger]="section === TaskSection.NeedsAttention" [class.bg-secondary]="section !== TaskSection.NeedsAttention">{{sectionCount(section)}}</span>
+<ng-template let-tasks="tasks" #tasksTemplate>
+  <table class="table table-striped align-middle border shadow-sm">
+    <thead>
+      <tr>
+        <th scope="col">
+          <div class="form-check">
+            <input type="checkbox" class="form-check-input" id="all-tasks" [disabled]="currentTasks.length === 0" [(ngModel)]="togggleAll" (click)="toggleAll($event); $event.stopPropagation();">
+            <label class="form-check-label" for="all-tasks"></label>
+          </div>
+        </th>
+        <th scope="col" i18n>Name</th>
+        <th scope="col" class="d-none d-lg-table-cell" i18n>Created</th>
+        @if (activeTab !== 'started' && activeTab !== 'queued') {
+          <th scope="col" class="d-none d-lg-table-cell" i18n>Results</th>
         }
-      </label>
-    }
-  </div>
-
-  <div class="ms-3 me-2 text-muted"><ng-container i18n>Filter by</ng-container>:</div>
-
-  <div ngbDropdown>
-    <button class="btn btn-sm btn-outline-primary me-3" ngbDropdownToggle>{{selectedTaskTypeLabel}}</button>
-    <div class="dropdown-menu shadow" ngbDropdownMenu>
-      <button ngbDropdownItem [class.active]="selectedTaskType === null" (click)="setTaskType(null)" i18n>All types</button>
-      @for (option of taskTypeOptions; track option.value) {
-        <button ngbDropdownItem [class.active]="selectedTaskType === option.value" [disabled]="isTaskTypeOptionDisabled(option.value)" (click)="setTaskType(option.value)">{{option.label}}</button>
-      }
-    </div>
-  </div>
-  <div ngbDropdown>
-    <button class="btn btn-sm btn-outline-primary me-3" ngbDropdownToggle>{{selectedTriggerSourceLabel}}</button>
-    <div class="dropdown-menu shadow" ngbDropdownMenu>
-      <button ngbDropdownItem [class.active]="selectedTriggerSource === null" (click)="setTriggerSource(null)" i18n>All sources</button>
-      @for (option of triggerSourceOptions; track option.value) {
-        <button ngbDropdownItem [class.active]="selectedTriggerSource === option.value" [disabled]="isTriggerSourceOptionDisabled(option.value)" (click)="setTriggerSource(option.value)">{{option.label}}</button>
-      }
-    </div>
-  </div>
-
-  <div class="form-inline d-flex align-items-center flex-grow-1 task-search">
-    <div class="input-group input-group-sm flex-fill w-auto flex-nowrap">
-      <div ngbDropdown>
-        <button class="btn btn-sm btn-outline-primary" ngbDropdownToggle>{{filterTargetName}}</button>
-        <div class="dropdown-menu shadow" ngbDropdownMenu>
-          @for (t of filterTargets; track t.id) {
-            <button ngbDropdownItem [class.active]="filterTargetID === t.id" (click)="filterTargetID = t.id">{{t.name}}</button>
-          }
-        </div>
-      </div>
-      @if (filterText?.length) {
-        <button class="btn btn-link btn-sm px-2 position-absolute top-0 end-0 z-10" (click)="resetFilter()">
-          <i-bs width="1em" height="1em" name="x"></i-bs>
-        </button>
-      }
-      <input #filterInput class="form-control form-control-sm" type="text"
-        (keyup)="filterInputKeyup($event)"
-        [(ngModel)]="filterText">
-    </div>
-  </div>
-
-  @if (isFiltered) {
-    <button class="btn btn-link py-0 ms-md-auto" (click)="resetFilters()">
-      <i-bs width="1em" height="1em" name="x"></i-bs><small i18n>Reset filters</small>
-    </button>
-  }
-
-  <ngb-pagination
-    class="ms-md-3 mb-0"
-    [pageSize]="pageSize"
-    [collectionSize]="totalTasks"
-    [page]="page"
-    [maxSize]="5"
-    [rotate]="true"
-    size="sm"
-    aria-label="Tasks pagination"
-    (pageChange)="setPage($event)">
-  </ngb-pagination>
-</div>
-
-<ng-template let-tasks="tasks" let-section="section" #tasksTemplate>
-  <div class="section-header d-flex align-items-center justify-content-between mb-2">
-    <div>
-      <h5 class="mb-0">{{ sectionLabel(section) }}</h5>
-      <div class="small text-muted">
-        <ng-container i18n>{tasks.length, plural, =1 {1 task} other {{{tasks.length}} tasks}}</ng-container>
-      </div>
-    </div>
-  </div>
-
-  <div class="card border table-responsive mb-3">
-    <table class="table table-striped align-middle shadow-sm mb-0 tasks-table">
-      <thead>
-        <tr>
-          <th scope="col" class="select-col">
+        <th scope="col" class="d-table-cell d-lg-none" i18n>Info</th>
+        <th scope="col" i18n>Actions</th>
+      </tr>
+    </thead>
+    <tbody>
+      @for (task of tasks | slice: (page-1) * pageSize : page * pageSize; track task.id) {
+        <tr (click)="toggleSelected(task, $event); $event.stopPropagation();">
+          <td>
             <div class="form-check">
-              <input
-                type="checkbox"
-                class="form-check-input"
-                [id]="'all-tasks-' + section"
-                [disabled]="tasks.length === 0"
-                [checked]="areAllSelected(tasks)"
-                (click)="toggleSection(section, $event); $event.stopPropagation();"
-                (keydown)="toggleSection(section, $event); $event.stopPropagation();" />
-              <label class="form-check-label" for="all-tasks-{{section}}"><span class="visually-hidden">Check all</span></label>
+              <input type="checkbox" class="form-check-input" id="task{{task.id}}" [checked]="selectedTasks.has(task.id)" (click)="toggleSelected(task, $event); $event.stopPropagation();">
+              <label class="form-check-label" for="task{{task.id}}"></label>
             </div>
-          </th>
-          <th scope="col" class="name-col-header" i18n>Name</th>
-          <th scope="col" class="d-none d-lg-table-cell created-col" i18n>Created</th>
-          @if (sectionShowsResults(section)) {
-            <th scope="col" class="d-none d-lg-table-cell results-col" i18n>Results</th>
-          }
-          <th scope="col" class="d-table-cell d-lg-none" i18n>Info</th>
-          <th scope="col" class="actions-col" i18n>Actions</th>
-        </tr>
-      </thead>
-      <tbody>
-        @for (task of tasks; track task.id) {
-          <tr (click)="toggleSelected(task); $event.stopPropagation();" (keydown)="toggleSelected(task); $event.stopPropagation();">
-            <td class="select-col">
-              <div class="form-check">
-                <input
-                  type="checkbox"
-                  class="form-check-input"
-                  id="task{{task.id}}"
-                  [checked]="selectedTasks.has(task.id)"
-                  (click)="toggleSelected(task); $event.stopPropagation();"
-                  (keydown)="toggleSelected(task); $event.stopPropagation();" />
-                <label class="form-check-label" for="task{{task.id}}"></label>
-              </div>
-            </td>
-            <td class="overflow-auto name-col">
-              <div>{{ taskDisplayName(task) }}</div>
-              <div class="small text-muted">
-                @if (taskShowsSeparateTypeLabel(task)) {
-                  <span>{{ task.task_type_display }}</span>
-                  <span class="mx-1">&bull;</span>
-                }
-                <span>{{ task.trigger_source_display }}</span>
-              </div>
-            </td>
-            <td class="d-none d-lg-table-cell created-col">{{ task.date_created | customDate:'short' }}</td>
-            @if (sectionShowsResults(section)) {
-              <td class="d-none d-lg-table-cell results-col">
-                @if (taskHasLongResultMessage(task)) {
-                  <div class="result" (click)="expandTask(task); $event.stopPropagation();"
-                    [ngbPopover]="resultPopover" popoverClass="shadow small mobile" triggers="mouseenter:mouseleave" container="body">
-                    <span class="small d-none d-md-inline-block font-monospace text-muted">{{ taskResultPreview(task) }}</span>
-                  </div>
-                }
-                @if (taskHasResultMessage(task) && !taskHasLongResultMessage(task)) {
-                  <span class="small d-none d-md-inline-block font-monospace text-muted">{{ taskResultMessage(task) }}</span>
-                }
-                @if (duplicateDocumentId(task)) {
-                  <div class="small text-warning-emphasis d-flex align-items-center gap-1 mt-1">
-                    <i-bs class="lh-1" width="1em" height="1em" name="exclamation-triangle"></i-bs>
-                    <span>{{ duplicateTaskLabel(task) }}</span>
-                  </div>
-                }
-                <ng-template #resultPopover>
-                  <pre class="small mb-0">{{ taskResultPopoverMessage(task) }}@if (taskResultMessageOverflowsPopover(task)) {
-                    &hellip;
-                  }</pre>
-                  @if (taskResultMessageOverflowsPopover(task)) {
-                    <br/><em>(<ng-container i18n>click for full output</ng-container>)</em>
-                  }
-                </ng-template>
-              </td>
-            }
-            <td class="d-lg-none">
-              <button class="btn btn-link" (click)="expandTask(task); $event.stopPropagation();">
-                <i-bs width="1.2em" height="1.2em" name="info-circle"></i-bs>
-              </button>
-            </td>
-            <td scope="row" class="actions-col">
-              <div class="btn-group" role="group">
-                <button class="btn btn-sm btn-outline-secondary" (click)="dismissTask(task); $event.stopPropagation();" *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.PaperlessTask }">
-                  <i-bs name="check" class="me-1"></i-bs><ng-container i18n>Dismiss</ng-container>
-                </button>
-                <ng-container *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.Document }">
-                  @if (task.related_document_ids?.[0]) {
-                    <a class="btn btn-sm btn-outline-primary" [routerLink]="['/documents', task.related_document_ids[0]]" (click)="dismissTask(task)">
-                      <i-bs name="file-text" class="me-1"></i-bs><ng-container i18n>Open Document</ng-container>
-                    </a>
-                  }
-                </ng-container>
-              </div>
-            </td>
-          </tr>
-        <tr>
-          <td class="px-2 py-0" [class.border-0]="expandedTask !== task.id" [attr.colspan]="sectionShowsResults(section) ? 5 : 4">
-            <div #collapse="ngbCollapse" [ngbCollapse]="expandedTask !== task.id" class="task-detail-panel bg-darker small mb-0">
-              <div class="p-2 p-lg-3 ms-lg-3">
-                @if (taskHasResultMessage(task)) {
-                  <div class="detail-section mb-3">
-                    <div class="detail-label fs-7 fw-bold text-uppercase text-muted mb-1" i18n>Result message</div>
-                    <pre class="detail-block border border-dark bg-body p-3 rounded-2 mb-0">{{ taskResultMessage(task) }}</pre>
-                  </div>
-                }
-
-                @if (duplicateDocumentId(task); as duplicateDocumentId) {
-                  <div class="detail-section mb-3">
-                    <div class="detail-label fs-7 fw-bold text-uppercase text-muted mb-1" i18n>Duplicate</div>
-                    <div class="detail-block border border-dark bg-body p-3 rounded-2 mb-0">
-                      <div class="d-flex align-items-center justify-content-between gap-3">
-                        <div class="text-break">{{ duplicateTaskLabel(task) }}</div>
-                        <button
-                          class="btn btn-sm btn-outline-primary"
-                          type="button"
-                          (click)="openDuplicateDocument(duplicateDocumentId)">
-                          <ng-container i18n>Open</ng-container>
-                        </button>
-                      </div>
-                    </div>
-                  </div>
-                }
-
-                <div class="row g-3">
-                  <div class="col-12 col-xl-6">
-                    <div class="detail-section h-100">
-                      <div class="detail-label fs-7 fw-bold text-uppercase text-muted mb-1" i18n>Input data</div>
-                      <pre class="detail-block border border-dark bg-body p-3 rounded-2 mb-0">{{ task.input_data | json }}</pre>
-                    </div>
-                  </div>
-                  <div class="col-12 col-xl-6">
-                    <div class="detail-section h-100">
-                      <div class="detail-label fs-7 fw-bold text-uppercase text-muted mb-1" i18n>Result data</div>
-                      <pre class="detail-block border border-dark bg-body p-3 rounded-2 mb-0">{{ (task.result_data ?? {}) | json }}</pre>
-                    </div>
-                  </div>
+          </td>
+          <td class="overflow-auto name-col">{{ task.task_file_name }}</td>
+          <td class="d-none d-lg-table-cell">{{ task.date_created | customDate:'short' }}</td>
+          @if (activeTab !== 'started' && activeTab !== 'queued') {
+            <td class="d-none d-lg-table-cell">
+              @if (task.result?.length > 50) {
+                <div class="result" (click)="expandTask(task); $event.stopPropagation();"
+                  [ngbPopover]="resultPopover" popoverClass="shadow small mobile" triggers="mouseenter:mouseleave" container="body">
+                  <span class="small d-none d-md-inline-block font-monospace text-muted">{{ task.result | slice:0:50 }}&hellip;</span>
                 </div>
-              </div>
+              }
+              @if (task.result?.length <= 50) {
+                <span class="small d-none d-md-inline-block font-monospace text-muted">{{ task.result }}</span>
+              }
+              <ng-template #resultPopover>
+                <pre class="small mb-0">{{ task.result | slice:0:300 }}@if (task.result.length > 300) {
+                  &hellip;
+                }</pre>
+                @if (task.result?.length > 300) {
+                  <br/><em>(<ng-container i18n>click for full output</ng-container>)</em>
+                }
+              </ng-template>
+              @if (task.duplicate_documents?.length > 0) {
+                <div class="small text-warning-emphasis d-flex align-items-center gap-1">
+                  <i-bs class="lh-1" width="1em" height="1em" name="exclamation-triangle"></i-bs>
+                  <span i18n>Duplicate(s) detected</span>
+                </div>
+              }
+            </td>
+          }
+          <td class="d-lg-none">
+            <button class="btn btn-link" (click)="expandTask(task); $event.stopPropagation();">
+              <i-bs width="1.2em" height="1.2em" name="info-circle"></i-bs>
+            </button>
+          </td>
+          <td scope="row">
+            <div class="btn-group" role="group">
+              <button class="btn btn-sm btn-outline-secondary" (click)="dismissTask(task); $event.stopPropagation();" *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.PaperlessTask }">
+                <i-bs name="check" class="me-1"></i-bs><ng-container i18n>Dismiss</ng-container>
+              </button>
+              <ng-container *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.Document }">
+                @if (task.related_document) {
+                  <button class="btn btn-sm btn-outline-primary" (click)="dismissAndGo(task); $event.stopPropagation();">
+                    <i-bs name="file-text" class="me-1"></i-bs><ng-container i18n>Open Document</ng-container>
+                  </button>
+                }
+              </ng-container>
             </div>
           </td>
         </tr>
+        <tr>
+          <td class="p-0" [class.border-0]="expandedTask !== task.id" colspan="5">
+            <pre #collapse="ngbCollapse" [ngbCollapse]="expandedTask !== task.id" class="small mb-0"><div class="small p-1 p-lg-3 ms-lg-3">{{ task.result }}</div></pre>
+          </td>
+        </tr>
       }
-      </tbody>
-    </table>
+    </tbody>
+  </table>
+
+  <div class="pb-3 d-sm-flex justify-content-between align-items-center">
+    @if (tasks.length > 0) {
+      <div class="pb-2 pb-sm-0">
+        <ng-container i18n>{tasks.length, plural, =1 {One {{this.activeTabLocalized}} task} other {{{tasks.length || 0}} total {{this.activeTabLocalized}} tasks}}</ng-container>
+        @if (selectedTasks.size > 0) {
+          <ng-container i18n>&nbsp;({{selectedTasks.size}} selected)</ng-container>
+        }
+      </div>
+    }
+    @if (tasks.length > pageSize) {
+      <ngb-pagination [(page)]="page" [pageSize]="pageSize" [collectionSize]="tasks.length" maxSize="8" size="sm"></ngb-pagination>
+    }
   </div>
 </ng-template>
 
-@if (visibleSections.length > 0) {
-  @for (section of visibleSections; track section) {
-    <div class="mb-4">
-      <ng-container [ngTemplateOutlet]="tasksTemplate" [ngTemplateOutletContext]="{tasks: tasksForSection(section), section: section}"></ng-container>
-    </div>
-  }
-} @else {
-  <div class="alert alert-secondary fst-italic" i18n>No tasks match the current filters.</div>
-}
+<ul ngbNav #nav="ngbNav" [(activeId)]="activeTab" class="nav-tabs" (hidden)="duringTabChange()" (navChange)="beforeTabChange()">
+  <li ngbNavItem="failed">
+    <a ngbNavLink i18n>Failed@if (tasksService.failedFileTasks.length > 0) {
+      <span class="badge bg-danger ms-2">{{tasksService.failedFileTasks.length}}</span>
+    }</a>
+    <ng-template ngbNavContent>
+      <ng-container [ngTemplateOutlet]="tasksTemplate" [ngTemplateOutletContext]="{tasks:currentTasks}"></ng-container>
+    </ng-template>
+  </li>
+  <li ngbNavItem="completed">
+    <a ngbNavLink i18n>Complete@if (tasksService.completedFileTasks.length > 0) {
+      <span class="badge bg-secondary ms-2">{{tasksService.completedFileTasks.length}}</span>
+    }</a>
+    <ng-template ngbNavContent>
+      <ng-container [ngTemplateOutlet]="tasksTemplate" [ngTemplateOutletContext]="{tasks:currentTasks}"></ng-container>
+    </ng-template>
+  </li>
+  <li ngbNavItem="started">
+    <a ngbNavLink i18n>Started@if (tasksService.startedFileTasks.length > 0) {
+      <span class="badge bg-secondary ms-2">{{tasksService.startedFileTasks.length}}</span>
+    }</a>
+    <ng-template ngbNavContent>
+      <ng-container [ngTemplateOutlet]="tasksTemplate" [ngTemplateOutletContext]="{tasks:currentTasks}"></ng-container>
+    </ng-template>
+  </li>
+  <li ngbNavItem="queued">
+    <a ngbNavLink i18n>Queued@if (tasksService.queuedFileTasks.length > 0) {
+      <span class="badge bg-secondary ms-2">{{tasksService.queuedFileTasks.length}}</span>
+    }</a>
+    <ng-template ngbNavContent>
+      <ng-container [ngTemplateOutlet]="tasksTemplate" [ngTemplateOutletContext]="{tasks:currentTasks}"></ng-container>
+    </ng-template>
+  </li>
+</ul>
+<div [ngbNavOutlet]="nav"></div>

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

@@ -16,39 +16,6 @@ pre {
     cursor: pointer;
 }
 
-.tasks-table {
-    width: 100%;
-}
-
-@media (min-width: 992px) {
-    .tasks-table {
-        table-layout: fixed;
-    }
-
-    .tasks-table .select-col {
-        width: 3rem;
-    }
-
-    .tasks-table .created-col {
-        width: 13rem;
-        white-space: nowrap;
-    }
-
-    .tasks-table .results-col {
-        width: 24%;
-    }
-
-    .tasks-table .actions-col {
-        width: 18rem;
-        white-space: nowrap;
-    }
-
-    .tasks-table .name-col,
-    .tasks-table .results-col {
-        overflow: hidden;
-    }
-}
-
 .btn .spinner-border-sm {
     width: 0.8rem;
     height: 0.8rem;
@@ -63,12 +30,10 @@ pre {
 .input-group .dropdown .btn {
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
 }
 
 .z-10 {
     z-index: 10;
 }
-
-tbody tr:nth-last-child(2) td {
-    border-bottom: none !important;
-}

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

@@ -9,17 +9,21 @@ import { FormsModule } from '@angular/forms'
 import { By } from '@angular/platform-browser'
 import { Router } from '@angular/router'
 import { RouterTestingModule } from '@angular/router/testing'
-import { NgbModal, NgbModalRef, NgbModule } from '@ng-bootstrap/ng-bootstrap'
+import {
+  NgbModal,
+  NgbModalRef,
+  NgbModule,
+  NgbNavItem,
+} from '@ng-bootstrap/ng-bootstrap'
 import { allIcons, NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { throwError } from 'rxjs'
 import { routes } from 'src/app/app-routing.module'
 import {
   PaperlessTask,
+  PaperlessTaskName,
   PaperlessTaskStatus,
-  PaperlessTaskTriggerSource,
   PaperlessTaskType,
 } from 'src/app/data/paperless-task'
-import { Results } from 'src/app/data/results'
 import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
 import { PermissionsGuard } from 'src/app/guards/permissions.guard'
 import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe'
@@ -29,131 +33,90 @@ import { ToastService } from 'src/app/services/toast.service'
 import { environment } from 'src/environments/environment'
 import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dialog.component'
 import { PageHeaderComponent } from '../../common/page-header/page-header.component'
-import { TasksComponent, TaskSection } from './tasks.component'
+import { TasksComponent, TaskTab } from './tasks.component'
 
 const tasks: PaperlessTask[] = [
   {
     id: 467,
     task_id: '11ca1a5b-9f81-442c-b2c8-7e4ae53657f1',
-    input_data: { filename: 'test.pdf' },
+    task_file_name: 'test.pdf',
     date_created: new Date('2023-03-01T10:26:03.093116Z'),
     date_done: new Date('2023-03-01T10:26:07.223048Z'),
-    task_type: PaperlessTaskType.ConsumeFile,
-    task_type_display: 'Consume File',
-    trigger_source: PaperlessTaskTriggerSource.FolderConsume,
-    trigger_source_display: 'Folder Consume',
-    status: PaperlessTaskStatus.Failure,
-    status_display: 'Failure',
-    result_data: {
-      error_message:
-        'test.pd: Not consuming test.pdf: It is a duplicate of test (#100)',
-    },
+    type: PaperlessTaskType.Auto,
+    task_name: PaperlessTaskName.ConsumeFile,
+    status: PaperlessTaskStatus.Failed,
+    result: 'test.pd: Not consuming test.pdf: It is a duplicate of test (#100)',
     acknowledged: false,
-    related_document_ids: [],
+    related_document: null,
   },
   {
     id: 466,
     task_id: '10ca1a5b-3c08-442c-b2c8-7e4ae53657f1',
-    input_data: { filename: '191092.pdf' },
+    task_file_name: '191092.pdf',
     date_created: new Date('2023-03-01T09:26:03.093116Z'),
     date_done: new Date('2023-03-01T09:26:07.223048Z'),
-    task_type: PaperlessTaskType.ConsumeFile,
-    task_type_display: 'Consume File',
-    trigger_source: PaperlessTaskTriggerSource.FolderConsume,
-    trigger_source_display: 'Folder Consume',
-    status: PaperlessTaskStatus.Failure,
-    status_display: 'Failure',
-    result_data: { duplicate_of: 311 },
+    type: PaperlessTaskType.Auto,
+    task_name: PaperlessTaskName.ConsumeFile,
+    status: PaperlessTaskStatus.Failed,
+    result:
+      '191092.pd: Not consuming 191092.pdf: It is a duplicate of 191092 (#311)',
     acknowledged: false,
-    related_document_ids: [],
+    related_document: null,
   },
   {
     id: 465,
     task_id: '3612d477-bb04-44e3-985b-ac580dd496d8',
-    input_data: { filename: 'Scan Jun 6, 2023 at 3.19 PM.pdf' },
+    task_file_name: 'Scan Jun 6, 2023 at 3.19 PM.pdf',
     date_created: new Date('2023-06-06T15:22:05.722323-07:00'),
     date_done: new Date('2023-06-06T15:22:14.564305-07:00'),
-    task_type: PaperlessTaskType.ConsumeFile,
-    task_type_display: 'Consume File',
-    trigger_source: PaperlessTaskTriggerSource.FolderConsume,
-    trigger_source_display: 'Folder Consume',
+    type: PaperlessTaskType.Auto,
+    task_name: PaperlessTaskName.ConsumeFile,
     status: PaperlessTaskStatus.Pending,
-    status_display: 'Pending',
-    result_data: null,
+    result: null,
     acknowledged: false,
-    related_document_ids: [],
+    related_document: null,
   },
   {
     id: 464,
     task_id: '2eac4716-2aa6-4dcd-9953-264e11656d7e',
-    input_data: { filename: 'paperless-mail-l4dkg8ir' },
+    task_file_name: 'paperless-mail-l4dkg8ir',
     date_created: new Date('2023-06-04T11:24:32.898089-07:00'),
     date_done: new Date('2023-06-04T11:24:44.678605-07:00'),
-    task_type: PaperlessTaskType.ConsumeFile,
-    task_type_display: 'Consume File',
-    trigger_source: PaperlessTaskTriggerSource.EmailConsume,
-    trigger_source_display: 'Email Consume',
-    status: PaperlessTaskStatus.Success,
-    status_display: 'Success',
-    result_data: { document_id: 422, duplicate_of: 99 },
+    type: PaperlessTaskType.Auto,
+    task_name: PaperlessTaskName.ConsumeFile,
+    status: PaperlessTaskStatus.Complete,
+    result: 'Success. New document id 422 created',
     acknowledged: false,
-    related_document_ids: [422],
+    related_document: 422,
   },
   {
     id: 463,
     task_id: '28125528-1575-4d6b-99e6-168906e8fa5c',
-    input_data: { filename: 'onlinePaymentSummary.pdf' },
+    task_file_name: 'onlinePaymentSummary.pdf',
     date_created: new Date('2023-06-01T13:49:51.631305-07:00'),
     date_done: new Date('2023-06-01T13:49:54.190220-07:00'),
-    task_type: PaperlessTaskType.ConsumeFile,
-    task_type_display: 'Consume File',
-    trigger_source: PaperlessTaskTriggerSource.FolderConsume,
-    trigger_source_display: 'Folder Consume',
-    status: PaperlessTaskStatus.Success,
-    status_display: 'Success',
-    result_data: { document_id: 421 },
+    type: PaperlessTaskType.Auto,
+    task_name: PaperlessTaskName.ConsumeFile,
+    status: PaperlessTaskStatus.Complete,
+    result: 'Success. New document id 421 created',
     acknowledged: false,
-    related_document_ids: [421],
+    related_document: 421,
   },
   {
     id: 462,
     task_id: 'a5b9ca47-0c8e-490f-a04c-6db5d5fc09e5',
-    input_data: { filename: 'paperless-mail-_rrpmqk6' },
+    task_file_name: 'paperless-mail-_rrpmqk6',
     date_created: new Date('2023-06-07T02:54:35.694916Z'),
     date_done: null,
-    task_type: PaperlessTaskType.ConsumeFile,
-    task_type_display: 'Consume File',
-    trigger_source: PaperlessTaskTriggerSource.EmailConsume,
-    trigger_source_display: 'Email Consume',
+    type: PaperlessTaskType.Auto,
+    task_name: PaperlessTaskName.ConsumeFile,
     status: PaperlessTaskStatus.Started,
-    status_display: 'Started',
-    result_data: null,
+    result: null,
     acknowledged: false,
-    related_document_ids: [],
-  },
-  {
-    id: 461,
-    task_id: 'bb79efb3-1e78-4f31-b4be-0966620b0ce1',
-    input_data: { dry_run: false, scope: 'global' },
-    date_created: new Date('2023-06-07T03:54:35.694916Z'),
-    date_done: null,
-    task_type: PaperlessTaskType.SanityCheck,
-    task_type_display: 'Sanity Check',
-    trigger_source: PaperlessTaskTriggerSource.System,
-    trigger_source_display: 'System',
-    status: PaperlessTaskStatus.Started,
-    status_display: 'Started',
-    result_data: { issues_found: 0 },
-    acknowledged: false,
-    related_document_ids: [],
+    related_document: null,
   },
 ]
 
-const paginatedTasks: Results<PaperlessTask> = {
-  count: tasks.length,
-  results: tasks,
-}
-
 describe('TasksComponent', () => {
   let component: TasksComponent
   let fixture: ComponentFixture<TasksComponent>
@@ -202,193 +165,60 @@ describe('TasksComponent', () => {
     component = fixture.componentInstance
     jest.useFakeTimers()
     fixture.detectChanges()
-
     httpTestingController
       .expectOne(
-        (req) =>
-          req.url === `${environment.apiBaseUrl}tasks/` &&
-          req.params.get('acknowledged') === 'false' &&
-          req.params.get('page_size') === '1000'
+        `${environment.apiBaseUrl}tasks/?task_name=consume_file&acknowledged=false`
       )
-      .flush(paginatedTasks)
-
-    httpTestingController
-      .expectOne(
-        (req) =>
-          req.url === `${environment.apiBaseUrl}tasks/` &&
-          req.params.get('acknowledged') === 'false' &&
-          req.params.get('page_size') === '25' &&
-          req.params.get('page') === '1'
-      )
-      .flush(paginatedTasks)
+      .flush(tasks)
   })
 
-  it('should display task sections with counts', () => {
-    expect(component.selectedSection).toBe(TaskSection.All)
-    expect(component.selectedTaskType).toBeNull()
-    expect(component.selectedTriggerSource).toBeNull()
+  it('should display file tasks in 4 tabs by status', () => {
+    const tabButtons = fixture.debugElement.queryAll(By.directive(NgbNavItem))
 
+    let currentTasksLength = tasks.filter(
+      (t) => t.status === PaperlessTaskStatus.Failed
+    ).length
+    component.activeTab = TaskTab.Failed
     fixture.detectChanges()
+    expect(tabButtons[0].nativeElement.textContent).toEqual(
+      `Failed${currentTasksLength}`
+    )
+    expect(
+      fixture.debugElement.queryAll(By.css('table input[type="checkbox"]'))
+    ).toHaveLength(currentTasksLength + 1)
 
-    const viewScope = fixture.debugElement.query(By.css('.task-view-scope'))
-    const text = viewScope.nativeElement.textContent
-
-    expect(text).toContain('All')
-    expect(text).toContain('Needs attention')
-    expect(text).toContain('2')
-    expect(text).toContain('In progress')
-    expect(text).toContain('3')
-    expect(text).toContain('Recently completed')
-  })
-
-  it('should filter visible sections by selected status', () => {
-    component.setSection(TaskSection.InProgress)
+    currentTasksLength = tasks.filter(
+      (t) => t.status === PaperlessTaskStatus.Complete
+    ).length
+    component.activeTab = TaskTab.Completed
     fixture.detectChanges()
+    expect(tabButtons[1].nativeElement.textContent).toEqual(
+      `Complete${currentTasksLength}`
+    )
 
-    expect(component.visibleSections).toEqual([TaskSection.InProgress])
-    expect(fixture.nativeElement.textContent).toContain('In progress')
-    expect(fixture.nativeElement.textContent).not.toContain('Recent completed')
-  })
+    currentTasksLength = tasks.filter(
+      (t) => t.status === PaperlessTaskStatus.Started
+    ).length
+    component.activeTab = TaskTab.Started
+    fixture.detectChanges()
+    expect(tabButtons[2].nativeElement.textContent).toEqual(
+      `Started${currentTasksLength}`
+    )
 
-  it('should filter tasks by task type', () => {
-    component.setSection(TaskSection.InProgress)
-    component.setTaskType(PaperlessTaskType.SanityCheck)
-
-    expect(component.tasksForSection(TaskSection.InProgress)).toHaveLength(1)
-    expect(component.tasksForSection(TaskSection.InProgress)[0].task_type).toBe(
-      PaperlessTaskType.SanityCheck
+    currentTasksLength = tasks.filter(
+      (t) => t.status === PaperlessTaskStatus.Pending
+    ).length
+    component.activeTab = TaskTab.Queued
+    fixture.detectChanges()
+    expect(tabButtons[3].nativeElement.textContent).toEqual(
+      `Queued${currentTasksLength}`
     )
   })
 
-  it('should filter tasks by trigger source', () => {
-    component.setSection(TaskSection.InProgress)
-    component.setTriggerSource(PaperlessTaskTriggerSource.EmailConsume)
-
-    expect(component.tasksForSection(TaskSection.InProgress)).toHaveLength(1)
-    expect(
-      component.tasksForSection(TaskSection.InProgress)[0].trigger_source
-    ).toBe(PaperlessTaskTriggerSource.EmailConsume)
-  })
-
-  it('should reset all active filters together', () => {
-    component.setSection(TaskSection.InProgress)
-    component.setTaskType(PaperlessTaskType.SanityCheck)
-    component.setTriggerSource(PaperlessTaskTriggerSource.System)
-    component.filterText = 'system'
-    jest.advanceTimersByTime(150)
-
-    expect(component.isFiltered).toBe(true)
-
-    component.resetFilters()
-
-    expect(component.selectedSection).toBe(TaskSection.InProgress)
-    expect(component.selectedTaskType).toBeNull()
-    expect(component.selectedTriggerSource).toBeNull()
-    expect(component.filterText).toBe('')
-    expect(component.isFiltered).toBe(false)
-  })
-
-  it('should keep header controls focused on actions and auto refresh', () => {
-    fixture.detectChanges()
-
-    const header = fixture.debugElement.query(By.css('pngx-page-header'))
-    const headerText = header.nativeElement.textContent
-
-    expect(headerText).toContain('Dismiss visible')
-    expect(headerText).toContain('Auto refresh')
-    expect(headerText).not.toContain('All types')
-    expect(headerText).not.toContain('All sources')
-    expect(headerText).not.toContain('Reset filters')
-  })
-
-  it('should render the view scope row above the filter bar', () => {
-    fixture.detectChanges()
-
-    const controls = fixture.debugElement.query(By.css('.task-controls'))
-    const viewScope = controls.query(By.css('.task-view-scope'))
-    const search = controls.query(By.css('.task-search'))
-
-    expect(viewScope).not.toBeNull()
-    expect(search).not.toBeNull()
-    expect(
-      viewScope.nativeElement.compareDocumentPosition(search.nativeElement) &
-        Node.DOCUMENT_POSITION_FOLLOWING
-    ).toBeTruthy()
-  })
-
-  it('should render pagination controls next to the task filter', () => {
-    fixture.detectChanges()
-
-    const controls = fixture.debugElement.query(By.css('.task-controls'))
-    const search = controls.query(By.css('.task-search'))
-    const pagination = controls.query(By.css('ngb-pagination'))
-
-    expect(search).not.toBeNull()
-    expect(pagination).not.toBeNull()
-  })
-
-  it('should load a different task page when pagination changes', () => {
-    component.setPage(2)
-
-    const pageTwoTasks = {
-      count: 30,
-      results: [tasks[0]],
-    }
-
-    httpTestingController
-      .expectOne(
-        (req) =>
-          req.url === `${environment.apiBaseUrl}tasks/` &&
-          req.params.get('acknowledged') === 'false' &&
-          req.params.get('page_size') === '25' &&
-          req.params.get('page') === '2'
-      )
-      .flush(pageTwoTasks)
-
-    expect(component.page).toBe(2)
-    expect(component.totalTasks).toBe(30)
-    expect(component.pagedTasks).toEqual([tasks[0]])
-  })
-
-  it('should expose stable task type options and disable empty ones', () => {
-    expect(component.taskTypeOptions.map((option) => option.value)).toContain(
-      PaperlessTaskType.TrainClassifier
-    )
-    expect(
-      component.isTaskTypeOptionDisabled(PaperlessTaskType.TrainClassifier)
-    ).toBe(true)
-    expect(
-      component.isTaskTypeOptionDisabled(PaperlessTaskType.ConsumeFile)
-    ).toBe(false)
-  })
-
-  it('should fall back to the raw selected task type label when no option matches', () => {
-    component.selectedTaskType = 'unknown_task_type' as PaperlessTaskType
-
-    expect(component.selectedTaskTypeLabel).toBe('unknown_task_type')
-  })
-
-  it('should expose stable trigger source options and disable empty ones', () => {
-    expect(
-      component.triggerSourceOptions.map((option) => option.value)
-    ).toContain(PaperlessTaskTriggerSource.ApiUpload)
-    expect(
-      component.isTriggerSourceOptionDisabled(
-        PaperlessTaskTriggerSource.ApiUpload
-      )
-    ).toBe(true)
-    expect(
-      component.isTriggerSourceOptionDisabled(
-        PaperlessTaskTriggerSource.EmailConsume
-      )
-    ).toBe(false)
-  })
-
-  it('should fall back to the raw selected trigger source label when no option matches', () => {
-    component.selectedTriggerSource =
-      'unknown_trigger_source' as PaperlessTaskTriggerSource
-
-    expect(component.selectedTriggerSourceLabel).toBe('unknown_trigger_source')
+  it('should to go page 1 between tab switch', () => {
+    component.page = 10
+    component.duringTabChange()
+    expect(component.page).toEqual(1)
   })
 
   it('should support expanding / collapsing one task at a time', () => {
@@ -400,31 +230,6 @@ describe('TasksComponent', () => {
     expect(component.expandedTask).toBeUndefined()
   })
 
-  it('should show structured task details when expanded', () => {
-    component.setSection(TaskSection.InProgress)
-    component.expandTask(tasks[6])
-    fixture.detectChanges()
-
-    const detailText = fixture.nativeElement.textContent
-
-    expect(detailText).toContain('Input data')
-    expect(detailText).toContain('Result data')
-    expect(detailText).toContain('"scope": "global"')
-    expect(detailText).toContain('"issues_found": 0')
-  })
-
-  it('should show duplicate warnings and duplicate details when present', () => {
-    component.setSection(TaskSection.Completed)
-    component.expandTask(tasks[3])
-    fixture.detectChanges()
-
-    const content = fixture.nativeElement.textContent
-
-    expect(content).toContain('Duplicate of document #99')
-    expect(content).toContain('Duplicate')
-    expect(content).toContain('Open')
-  })
-
   it('should support dismiss single task', () => {
     const dismissSpy = jest.spyOn(tasksService, 'dismissTasks')
     component.dismissTask(tasks[0])
@@ -435,7 +240,7 @@ describe('TasksComponent', () => {
     component.toggleSelected(tasks[0])
     component.toggleSelected(tasks[1])
     component.toggleSelected(tasks[3])
-    component.toggleSelected(tasks[3])
+    component.toggleSelected(tasks[3]) // uncheck, for coverage
     const selected = new Set([tasks[0].id, tasks[1].id])
     expect(component.selectedTasks).toEqual(selected)
     let modal: NgbModalRef
@@ -484,70 +289,41 @@ describe('TasksComponent', () => {
     expect(component.selectedTasks.size).toBe(0)
   })
 
-  it('should support dismiss visible tasks', () => {
-    component.setSection(TaskSection.NeedsAttention)
+  it('should support dismiss all tasks', () => {
     let modal: NgbModalRef
     modalService.activeInstances.subscribe((m) => (modal = m[m.length - 1]))
     const dismissSpy = jest.spyOn(tasksService, 'dismissTasks')
     component.dismissTasks()
     expect(modal).not.toBeUndefined()
     modal.componentInstance.confirmClicked.emit()
-    expect(dismissSpy).toHaveBeenCalledWith(new Set([467, 466]))
+    expect(dismissSpy).toHaveBeenCalledWith(new Set(tasks.map((t) => t.id)))
   })
 
-  it('should dismiss the currently visible scoped and filtered tasks', () => {
-    component.setSection(TaskSection.InProgress)
-    component.setTaskType(PaperlessTaskType.SanityCheck)
-    component.setTriggerSource(PaperlessTaskTriggerSource.System)
-
-    const dismissSpy = jest.spyOn(tasksService, 'dismissTasks')
-
-    component.dismissTasks()
-
-    expect(dismissSpy).toHaveBeenCalledWith(new Set([461]))
-  })
-
-  it('should support toggling a full section', () => {
-    component.setSection(TaskSection.NeedsAttention)
-    fixture.detectChanges()
-
+  it('should support toggle all tasks', () => {
     const toggleCheck = fixture.debugElement.query(
-      By.css('#all-tasks-needs_attention')
+      By.css('table input[type=checkbox]')
+    )
+    toggleCheck.nativeElement.dispatchEvent(new MouseEvent('click'))
+    fixture.detectChanges()
+    expect(component.selectedTasks).toEqual(
+      new Set(
+        tasks
+          .filter((t) => t.status === PaperlessTaskStatus.Failed)
+          .map((t) => t.id)
+      )
     )
-    expect(toggleCheck).not.toBeNull()
     toggleCheck.nativeElement.dispatchEvent(new MouseEvent('click'))
     fixture.detectChanges()
-    expect(component.selectedTasks).toEqual(new Set([467, 466]))
-  })
-
-  it('should remove a full section from selection when toggled off', () => {
-    component.setSection(TaskSection.NeedsAttention)
-    component.selectedTasks = new Set([467, 466])
-
-    component.toggleSection(TaskSection.NeedsAttention, {
-      target: { checked: false },
-    } as unknown as PointerEvent)
-
     expect(component.selectedTasks).toEqual(new Set())
   })
 
   it('should support dismiss and open a document', () => {
-    const dismissSpy = jest.spyOn(component, 'dismissTask')
-
-    fixture.detectChanges()
-
-    const openDocumentLink = fixture.debugElement
-      .queryAll(By.css('a'))
-      .find((link) => link.nativeElement.textContent.includes('Open Document'))
-
-    expect(openDocumentLink).not.toBeNull()
-
-    openDocumentLink.triggerEventHandler(
-      'click',
-      new MouseEvent('click', { ctrlKey: true })
-    )
-
-    expect(dismissSpy).toHaveBeenCalledWith(tasks[3])
+    const routerSpy = jest.spyOn(router, 'navigate')
+    component.dismissAndGo(tasks[3])
+    expect(routerSpy).toHaveBeenCalledWith([
+      'documents',
+      tasks[3].related_document,
+    ])
   })
 
   it('should auto refresh, allow toggle', () => {
@@ -560,127 +336,57 @@ describe('TasksComponent', () => {
   })
 
   it('should filter tasks by file name', () => {
-    fixture.detectChanges()
     const input = fixture.debugElement.query(
-      By.css('.task-search input[type=text]')
+      By.css('pngx-page-header input[type=text]')
     )
-    expect(input).not.toBeNull()
     input.nativeElement.value = '191092'
     input.nativeElement.dispatchEvent(new Event('input'))
-    jest.advanceTimersByTime(150)
+    jest.advanceTimersByTime(150) // debounce time
     fixture.detectChanges()
     expect(component.filterText).toEqual('191092')
-    expect(component.tasksForSection(TaskSection.NeedsAttention)).toHaveLength(
-      1
-    )
-  })
-
-  it('should match task type and source in name filtering', () => {
-    component.setSection(TaskSection.InProgress)
-    component.filterText = 'system'
-    jest.advanceTimersByTime(150)
-
-    expect(component.tasksForSection(TaskSection.InProgress)).toHaveLength(1)
-    expect(component.tasksForSection(TaskSection.InProgress)[0].task_type).toBe(
-      PaperlessTaskType.SanityCheck
-    )
-  })
-
-  it('should fall back to task type when filename is unavailable', () => {
-    component.setSection(TaskSection.InProgress)
-    fixture.detectChanges()
-
-    const nameColumn = fixture.debugElement.queryAll(
-      By.css('tbody td.name-col')
-    )
-    const sanityTaskRow = nameColumn.find((cell) =>
-      cell.nativeElement.textContent.includes('Sanity Check')
-    )
-
-    expect(sanityTaskRow.nativeElement.textContent).toContain('Sanity Check')
-    expect(sanityTaskRow.nativeElement.textContent).toContain('System')
+    expect(
+      fixture.debugElement.queryAll(By.css('table tbody tr')).length
+    ).toEqual(2) // 1 task x 2 lines
   })
 
   it('should filter tasks by result', () => {
-    component.setSection(TaskSection.NeedsAttention)
-    component.filterTargetID = 1
+    component.activeTab = TaskTab.Failed
     fixture.detectChanges()
+    component.filterTargetID = 1
     const input = fixture.debugElement.query(
-      By.css('.task-search input[type=text]')
+      By.css('pngx-page-header input[type=text]')
     )
-    expect(input).not.toBeNull()
     input.nativeElement.value = 'duplicate'
     input.nativeElement.dispatchEvent(new Event('input'))
-    jest.advanceTimersByTime(150)
+    jest.advanceTimersByTime(150) // debounce time
     fixture.detectChanges()
     expect(component.filterText).toEqual('duplicate')
-    expect(component.tasksForSection(TaskSection.NeedsAttention)).toHaveLength(
-      2
-    )
-  })
-
-  it('should prefer explicit reason in the result message', () => {
     expect(
-      component.taskResultMessage({
-        ...tasks[0],
-        result_data: { reason: 'Manual review required', duplicate_of: 311 },
-      })
-    ).toBe('Manual review required')
-  })
-
-  it('should return null preview and popover text when there is no result message', () => {
-    expect(component.taskResultPreview(tasks[2])).toBeNull()
-    expect(component.taskResultPopoverMessage(tasks[2])).toBe('')
-    expect(component.taskResultMessageOverflowsPopover(tasks[2])).toBe(false)
-  })
-
-  it('should navigate to a duplicate document details page', () => {
-    const routerSpy = jest.spyOn(router, 'navigate')
-
-    component.openDuplicateDocument(99)
-
-    expect(routerSpy).toHaveBeenCalledWith(['documents', 99, 'details'])
-  })
-
-  it('should report when a result message overflows the popover limit', () => {
-    const longMessage = 'x'.repeat(350)
-    const task = {
-      ...tasks[0],
-      result_data: { error_message: longMessage },
-    }
-
-    expect(component.taskResultPopoverMessage(task)).toBe(
-      longMessage.slice(0, 300)
-    )
-    expect(component.taskResultMessageOverflowsPopover(task)).toBe(true)
+      fixture.debugElement.queryAll(By.css('table tbody tr')).length
+    ).toEqual(4) // 2 tasks x 2 lines
   })
 
   it('should support keyboard events for filtering', () => {
-    fixture.detectChanges()
     const input = fixture.debugElement.query(
-      By.css('.task-search input[type=text]')
+      By.css('pngx-page-header input[type=text]')
     )
-    expect(input).not.toBeNull()
     input.nativeElement.value = '191092'
     input.nativeElement.dispatchEvent(
       new KeyboardEvent('keyup', { key: 'Enter' })
     )
-    expect(component.filterText).toEqual('191092')
+    expect(component.filterText).toEqual('191092') // no debounce needed
     input.nativeElement.dispatchEvent(
       new KeyboardEvent('keyup', { key: 'Escape' })
     )
     expect(component.filterText).toEqual('')
   })
 
-  it('should keep clearing selection independent from resetting filters', () => {
-    component.setTaskType(PaperlessTaskType.ConsumeFile)
-    component.toggleSelected(tasks[0])
-    expect(component.selectedTasks.size).toBe(1)
-
-    component.clearSelection()
-
-    expect(component.selectedTasks.size).toBe(0)
-    expect(component.selectedTaskType).toBe(PaperlessTaskType.ConsumeFile)
-    expect(component.isFiltered).toBe(true)
+  it('should reset filter and target on tab switch', () => {
+    component.filterText = '191092'
+    component.filterTargetID = 1
+    component.activeTab = TaskTab.Completed
+    component.beforeTabChange()
+    expect(component.filterText).toEqual('')
+    expect(component.filterTargetID).toEqual(0)
   })
 })

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

@@ -1,11 +1,12 @@
-import { JsonPipe, NgTemplateOutlet } from '@angular/common'
+import { NgTemplateOutlet, SlicePipe } from '@angular/common'
 import { Component, inject, OnDestroy, OnInit } from '@angular/core'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
-import { Router, RouterLink } from '@angular/router'
+import { Router } from '@angular/router'
 import {
   NgbCollapseModule,
   NgbDropdownModule,
   NgbModal,
+  NgbNavModule,
   NgbPaginationModule,
   NgbPopoverModule,
 } from '@ng-bootstrap/ng-bootstrap'
@@ -19,12 +20,7 @@ import {
   takeUntil,
   timer,
 } from 'rxjs'
-import {
-  PaperlessTask,
-  PaperlessTaskStatus,
-  PaperlessTaskTriggerSource,
-  PaperlessTaskType,
-} from 'src/app/data/paperless-task'
+import { PaperlessTask } from 'src/app/data/paperless-task'
 import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
 import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe'
 import { TasksService } from 'src/app/services/tasks.service'
@@ -33,11 +29,11 @@ import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dial
 import { PageHeaderComponent } from '../../common/page-header/page-header.component'
 import { LoadingComponentWithPermissions } from '../../loading-component/loading.component'
 
-export enum TaskSection {
-  All = 'all',
-  NeedsAttention = 'needs_attention',
-  InProgress = 'in_progress',
+export enum TaskTab {
+  Queued = 'queued',
+  Started = 'started',
   Completed = 'completed',
+  Failed = 'failed',
 }
 
 enum TaskFilterTargetID {
@@ -50,82 +46,6 @@ const FILTER_TARGETS = [
   { id: TaskFilterTargetID.Result, name: $localize`Result` },
 ]
 
-const SECTION_LABELS = {
-  [TaskSection.All]: $localize`All`,
-  [TaskSection.NeedsAttention]: $localize`Needs attention`,
-  [TaskSection.InProgress]: $localize`In progress`,
-  [TaskSection.Completed]: $localize`Recently completed`,
-}
-
-const TASK_TYPE_OPTIONS: Array<{
-  value: PaperlessTaskType
-  label: string
-}> = [
-  {
-    value: PaperlessTaskType.ConsumeFile,
-    label: $localize`Consume File`,
-  },
-  {
-    value: PaperlessTaskType.TrainClassifier,
-    label: $localize`Train Classifier`,
-  },
-  {
-    value: PaperlessTaskType.SanityCheck,
-    label: $localize`Sanity Check`,
-  },
-  { value: PaperlessTaskType.MailFetch, label: $localize`Mail Fetch` },
-  { value: PaperlessTaskType.LlmIndex, label: $localize`LLM Index` },
-  {
-    value: PaperlessTaskType.EmptyTrash,
-    label: $localize`Empty Trash`,
-  },
-  {
-    value: PaperlessTaskType.CheckWorkflows,
-    label: $localize`Check Workflows`,
-  },
-  {
-    value: PaperlessTaskType.BulkUpdate,
-    label: $localize`Bulk Update`,
-  },
-  {
-    value: PaperlessTaskType.ReprocessDocument,
-    label: $localize`Reprocess Document`,
-  },
-  {
-    value: PaperlessTaskType.BuildShareLink,
-    label: $localize`Build Share Link`,
-  },
-  {
-    value: PaperlessTaskType.BulkDelete,
-    label: $localize`Bulk Delete`,
-  },
-]
-
-const TRIGGER_SOURCE_OPTIONS: Array<{
-  value: PaperlessTaskTriggerSource
-  label: string
-}> = [
-  {
-    value: PaperlessTaskTriggerSource.Scheduled,
-    label: $localize`Scheduled`,
-  },
-  { value: PaperlessTaskTriggerSource.WebUI, label: $localize`Web UI` },
-  {
-    value: PaperlessTaskTriggerSource.ApiUpload,
-    label: $localize`API Upload`,
-  },
-  {
-    value: PaperlessTaskTriggerSource.FolderConsume,
-    label: $localize`Folder Consume`,
-  },
-  {
-    value: PaperlessTaskTriggerSource.EmailConsume,
-    label: $localize`Email Consume`,
-  },
-  { value: PaperlessTaskTriggerSource.System, label: $localize`System` },
-  { value: PaperlessTaskTriggerSource.Manual, label: $localize`Manual` },
-]
-
 @Component({
   selector: 'pngx-tasks',
   templateUrl: './tasks.component.html',
@@ -134,13 +54,13 @@ const TRIGGER_SOURCE_OPTIONS: Array<{
     PageHeaderComponent,
     IfPermissionsDirective,
     CustomDatePipe,
-    JsonPipe,
+    SlicePipe,
     FormsModule,
     ReactiveFormsModule,
     NgTemplateOutlet,
-    RouterLink,
     NgbCollapseModule,
     NgbDropdownModule,
+    NgbNavModule,
     NgbPaginationModule,
     NgbPopoverModule,
     NgxBootstrapIconsModule,
@@ -155,22 +75,15 @@ export class TasksComponent
   private readonly router = inject(Router)
   private readonly toastService = inject(ToastService)
 
-  readonly TaskSection = TaskSection
-  readonly sections = [
-    TaskSection.NeedsAttention,
-    TaskSection.InProgress,
-    TaskSection.Completed,
-  ]
+  public activeTab: TaskTab
   public selectedTasks: Set<number> = new Set()
+  public togggleAll: boolean = false
   public expandedTask: number
-  public autoRefreshEnabled: boolean = true
-  public readonly pageSize = 25
+
+  public pageSize: number = 25
   public page: number = 1
-  public totalTasks: number = 0
-  public pagedTasks: PaperlessTask[] = []
-  public selectedSection: TaskSection = TaskSection.All
-  public selectedTaskType: PaperlessTaskType | null = null
-  public selectedTriggerSource: PaperlessTaskTriggerSource | null = null
+
+  public autoRefreshEnabled: boolean = true
 
   private _filterText: string = ''
   get filterText() {
@@ -182,86 +95,24 @@ export class TasksComponent
 
   public filterTargetID: TaskFilterTargetID = TaskFilterTargetID.Name
   public get filterTargetName(): string {
-    return FILTER_TARGETS.find((t) => t.id == this.filterTargetID).name
+    return this.filterTargets.find((t) => t.id == this.filterTargetID).name
   }
   private filterDebounce: Subject<string> = new Subject<string>()
 
   public get filterTargets(): Array<{ id: number; name: string }> {
-    return FILTER_TARGETS
-  }
-
-  public get taskTypeOptions(): Array<{
-    value: PaperlessTaskType
-    label: string
-  }> {
-    return TASK_TYPE_OPTIONS
-  }
-
-  public get triggerSourceOptions(): Array<{
-    value: PaperlessTaskTriggerSource
-    label: string
-  }> {
-    return TRIGGER_SOURCE_OPTIONS
-  }
-
-  public get selectedTaskTypeLabel(): string {
-    if (this.selectedTaskType === null) {
-      return $localize`All types`
-    }
-
-    return (
-      this.taskTypeOptions.find(
-        (option) => option.value === this.selectedTaskType
-      )?.label ?? this.selectedTaskType
-    )
-  }
-
-  public get selectedTriggerSourceLabel(): string {
-    if (this.selectedTriggerSource === null) {
-      return $localize`All sources`
-    }
-
-    return (
-      this.triggerSourceOptions.find(
-        (option) => option.value === this.selectedTriggerSource
-      )?.label ?? this.selectedTriggerSource
-    )
+    return [TaskTab.Failed, TaskTab.Completed].includes(this.activeTab)
+      ? FILTER_TARGETS
+      : FILTER_TARGETS.slice(0, 1)
   }
 
   get dismissButtonText(): string {
     return this.selectedTasks.size > 0
       ? $localize`Dismiss selected`
-      : $localize`Dismiss visible`
-  }
-
-  get visibleSections(): TaskSection[] {
-    const sections =
-      this.selectedSection === TaskSection.All
-        ? this.sections
-        : [this.selectedSection]
-
-    return sections.filter(
-      (section) => this.tasksForSection(section).length > 0
-    )
-  }
-
-  get visibleTasks(): PaperlessTask[] {
-    return this.visibleSections.flatMap((section) =>
-      this.tasksForSection(section)
-    )
-  }
-
-  get isFiltered(): boolean {
-    return (
-      this.selectedTaskType !== null ||
-      this.selectedTriggerSource !== null ||
-      this._filterText.length > 0
-    )
+      : $localize`Dismiss all`
   }
 
   ngOnInit() {
     this.tasksService.reload()
-    this.reloadPage()
     timer(5000, 5000)
       .pipe(
         filter(() => this.autoRefreshEnabled),
@@ -269,7 +120,6 @@ export class TasksComponent
       )
       .subscribe(() => {
         this.tasksService.reload()
-        this.reloadPage(false)
       })
 
     this.filterDebounce
@@ -279,10 +129,7 @@ export class TasksComponent
         distinctUntilChanged(),
         filter((query) => !query.length || query.length > 2)
       )
-      .subscribe((query) => {
-        this._filterText = query
-        this.clearSelection()
-      })
+      .subscribe((query) => (this._filterText = query))
   }
 
   ngOnDestroy() {
@@ -296,25 +143,20 @@ export class TasksComponent
 
   dismissTasks(task: PaperlessTask = undefined) {
     let tasks = task ? new Set([task.id]) : new Set(this.selectedTasks.values())
-    if (!task && tasks.size == 0) {
-      tasks = new Set(this.visibleTasks.map((t) => t.id))
-    }
-
+    if (!task && tasks.size == 0)
+      tasks = new Set(this.tasksService.allFileTasks.map((t) => t.id))
     if (tasks.size > 1) {
       let modal = this.modalService.open(ConfirmDialogComponent, {
         backdrop: 'static',
       })
-      modal.componentInstance.title = $localize`Confirm Dismiss`
-      modal.componentInstance.messageBold = $localize`Dismiss ${tasks.size} tasks?`
+      modal.componentInstance.title = $localize`Confirm Dismiss All`
+      modal.componentInstance.messageBold = $localize`Dismiss all ${tasks.size} tasks?`
       modal.componentInstance.btnClass = 'btn-warning'
       modal.componentInstance.btnCaption = $localize`Dismiss`
       modal.componentInstance.confirmClicked.pipe(first()).subscribe(() => {
         modal.componentInstance.buttonsEnabled = false
         modal.close()
         this.tasksService.dismissTasks(tasks).subscribe({
-          next: () => {
-            this.reloadPage(false)
-          },
           error: (e) => {
             this.toastService.showError($localize`Error dismissing tasks`, e)
             modal.componentInstance.buttonsEnabled = true
@@ -322,11 +164,8 @@ export class TasksComponent
         })
         this.clearSelection()
       })
-    } else if (tasks.size === 1) {
+    } else {
       this.tasksService.dismissTasks(tasks).subscribe({
-        next: () => {
-          this.reloadPage(false)
-        },
         error: (e) =>
           this.toastService.showError($localize`Error dismissing task`, e),
       })
@@ -334,6 +173,11 @@ export class TasksComponent
     }
   }
 
+  dismissAndGo(task: PaperlessTask) {
+    this.dismissTask(task)
+    this.router.navigate(['documents', task.related_document])
+  }
+
   expandTask(task: PaperlessTask) {
     this.expandedTask = this.expandedTask == task.id ? undefined : task.id
   }
@@ -344,177 +188,75 @@ export class TasksComponent
       : this.selectedTasks.add(task.id)
   }
 
-  toggleSection(section: TaskSection, event: PointerEvent) {
-    const sectionTasks = this.tasksForSection(section)
+  get currentTasks(): PaperlessTask[] {
+    let tasks: PaperlessTask[] = []
+    switch (this.activeTab) {
+      case TaskTab.Queued:
+        tasks = this.tasksService.queuedFileTasks
+        break
+      case TaskTab.Started:
+        tasks = this.tasksService.startedFileTasks
+        break
+      case TaskTab.Completed:
+        tasks = this.tasksService.completedFileTasks
+        break
+      case TaskTab.Failed:
+        tasks = this.tasksService.failedFileTasks
+        break
+    }
+    if (this._filterText.length) {
+      tasks = tasks.filter((t) => {
+        if (this.filterTargetID == TaskFilterTargetID.Name) {
+          return t.task_file_name
+            .toLowerCase()
+            .includes(this._filterText.toLowerCase())
+        } else if (this.filterTargetID == TaskFilterTargetID.Result) {
+          return t.result.toLowerCase().includes(this._filterText.toLowerCase())
+        }
+      })
+    }
+    return tasks
+  }
+
+  toggleAll(event: PointerEvent) {
     if ((event.target as HTMLInputElement).checked) {
-      sectionTasks.forEach((task) => this.selectedTasks.add(task.id))
+      this.selectedTasks = new Set(this.currentTasks.map((t) => t.id))
     } else {
-      sectionTasks.forEach((task) => this.selectedTasks.delete(task.id))
+      this.clearSelection()
     }
   }
 
-  areAllSelected(tasks: PaperlessTask[]): boolean {
-    return (
-      tasks.length > 0 && tasks.every((task) => this.selectedTasks.has(task.id))
-    )
-  }
-
-  taskDisplayName(task: PaperlessTask): string {
-    return task.input_data?.filename?.toString() || task.task_type_display
-  }
-
-  taskShowsSeparateTypeLabel(task: PaperlessTask): boolean {
-    return this.taskDisplayName(task) !== task.task_type_display
-  }
-
-  taskResultMessage(task: PaperlessTask): string | null {
-    if (!task.result_data) {
-      return null
-    }
-
-    const documentId = task.result_data?.['document_id']
-    if (typeof documentId === 'number') {
-      return $localize`Success. New document id ${documentId} created`
-    }
-
-    const reason = task.result_data?.['reason']
-    if (typeof reason === 'string') {
-      return reason
-    }
-
-    const duplicateOf = task.result_data?.['duplicate_of']
-    if (typeof duplicateOf === 'number') {
-      return $localize`Duplicate of document #${duplicateOf}`
-    }
-
-    const errorMessage = task.result_data?.['error_message']
-    if (typeof errorMessage === 'string') {
-      return errorMessage
-    }
-
-    return null
-  }
-
-  taskResultPreview(task: PaperlessTask): string | null {
-    const message = this.taskResultMessage(task)
-    if (!message) {
-      return null
-    }
-
-    return message.length > 50 ? `${message.slice(0, 50)}...` : message
-  }
-
-  taskHasLongResultMessage(task: PaperlessTask): boolean {
-    return (this.taskResultMessage(task)?.length ?? 0) > 50
-  }
-
-  taskHasResultMessage(task: PaperlessTask): boolean {
-    return !!this.taskResultMessage(task)
-  }
-
-  duplicateDocumentId(task: PaperlessTask): number | null {
-    const duplicateOf = task.result_data?.['duplicate_of']
-    return typeof duplicateOf === 'number' ? duplicateOf : null
-  }
-
-  duplicateTaskLabel(task: PaperlessTask): string {
-    return $localize`Duplicate of document #${this.duplicateDocumentId(task)}`
-  }
-
-  openDuplicateDocument(documentId: number) {
-    this.router.navigate(['documents', documentId, 'details'])
-  }
-
-  taskResultPopoverMessage(task: PaperlessTask): string {
-    return this.taskResultMessage(task)?.slice(0, 300) ?? ''
-  }
-
-  taskResultMessageOverflowsPopover(task: PaperlessTask): boolean {
-    return (this.taskResultMessage(task)?.length ?? 0) > 300
-  }
-
-  tasksForSection(section: TaskSection): PaperlessTask[] {
-    let tasks = this.pagedTasks.filter((task) =>
-      this.taskBelongsToSection(task, section)
-    )
-
-    return tasks.filter((task) => this.taskMatchesCurrentFilters(task))
-  }
-
-  sectionLabel(section: TaskSection): string {
-    return SECTION_LABELS[section]
-  }
-
-  sectionCount(section: TaskSection): number {
-    return this.pagedTasks.filter((task) =>
-      this.taskBelongsToSection(task, section)
-    ).length
-  }
-
-  sectionShowsResults(section: TaskSection): boolean {
-    return section !== TaskSection.InProgress
-  }
-
-  setSection(section: TaskSection) {
-    this.selectedSection = section
-    this.clearSelection()
-  }
-
-  setTaskType(taskType: PaperlessTaskType | null) {
-    this.selectedTaskType = taskType
-    this.clearSelection()
-  }
-
-  setTriggerSource(triggerSource: PaperlessTaskTriggerSource | null) {
-    this.selectedTriggerSource = triggerSource
-    this.clearSelection()
-  }
-
-  taskTypeOptionCount(taskType: PaperlessTaskType | null): number {
-    return this.tasksForOptionCounts({ taskType }).length
-  }
-
-  triggerSourceOptionCount(
-    triggerSource: PaperlessTaskTriggerSource | null
-  ): number {
-    return this.tasksForOptionCounts({ triggerSource }).length
-  }
-
-  isTaskTypeOptionDisabled(taskType: PaperlessTaskType | null): boolean {
-    return this.taskTypeOptionCount(taskType) === 0
-  }
-
-  isTriggerSourceOptionDisabled(
-    triggerSource: PaperlessTaskTriggerSource | null
-  ): boolean {
-    return this.triggerSourceOptionCount(triggerSource) === 0
-  }
-
   clearSelection() {
+    this.togggleAll = false
     this.selectedTasks.clear()
   }
 
-  setPage(page: number) {
-    if (this.page === page) {
-      return
-    }
+  duringTabChange() {
+    this.page = 1
+  }
 
-    this.page = page
-    this.clearSelection()
-    this.reloadPage()
+  beforeTabChange() {
+    this.resetFilter()
+    this.filterTargetID = TaskFilterTargetID.Name
+  }
+
+  get activeTabLocalized(): string {
+    switch (this.activeTab) {
+      case TaskTab.Queued:
+        return $localize`queued`
+      case TaskTab.Started:
+        return $localize`started`
+      case TaskTab.Completed:
+        return $localize`completed`
+      case TaskTab.Failed:
+        return $localize`failed`
+    }
   }
 
   public resetFilter() {
     this._filterText = ''
   }
 
-  public resetFilters() {
-    this.selectedTaskType = null
-    this.selectedTriggerSource = null
-    this.resetFilter()
-    this.clearSelection()
-  }
-
   filterInputKeyup(event: KeyboardEvent) {
     if (event.key == 'Enter') {
       this._filterText = (event.target as HTMLInputElement).value
@@ -522,116 +264,4 @@ export class TasksComponent
       this.resetFilter()
     }
   }
-
-  private taskBelongsToSection(
-    task: PaperlessTask,
-    section: TaskSection
-  ): boolean {
-    switch (section) {
-      case TaskSection.NeedsAttention:
-        return [
-          PaperlessTaskStatus.Failure,
-          PaperlessTaskStatus.Revoked,
-        ].includes(task.status)
-      case TaskSection.InProgress:
-        return [
-          PaperlessTaskStatus.Pending,
-          PaperlessTaskStatus.Started,
-        ].includes(task.status)
-      case TaskSection.Completed:
-        return task.status === PaperlessTaskStatus.Success
-    }
-  }
-
-  private taskMatchesCurrentFilters(task: PaperlessTask): boolean {
-    return this.taskMatchesFilters(task, {
-      taskType: this.selectedTaskType,
-      triggerSource: this.selectedTriggerSource,
-    })
-  }
-
-  private taskMatchesFilters(
-    task: PaperlessTask,
-    {
-      taskType,
-      triggerSource,
-    }: {
-      taskType: PaperlessTaskType | null
-      triggerSource: PaperlessTaskTriggerSource | null
-    }
-  ): boolean {
-    if (taskType !== null && task.task_type !== taskType) {
-      return false
-    }
-
-    if (triggerSource !== null && task.trigger_source !== triggerSource) {
-      return false
-    }
-
-    if (!this._filterText.length) {
-      return true
-    }
-
-    const query = this._filterText.toLowerCase()
-
-    if (this.filterTargetID == TaskFilterTargetID.Name) {
-      return [
-        this.taskDisplayName(task),
-        task.task_type_display,
-        task.trigger_source_display,
-      ]
-        .filter(Boolean)
-        .some((value) => value.toLowerCase().includes(query))
-    }
-
-    return this.taskResultMessage(task)?.toLowerCase().includes(query) ?? false
-  }
-
-  private tasksForOptionCounts({
-    taskType = this.selectedTaskType,
-    triggerSource = this.selectedTriggerSource,
-  }: {
-    taskType?: PaperlessTaskType | null
-    triggerSource?: PaperlessTaskTriggerSource | null
-  }): PaperlessTask[] {
-    const sections =
-      this.selectedSection === TaskSection.All
-        ? this.sections
-        : [this.selectedSection]
-
-    return this.pagedTasks.filter(
-      (task) =>
-        sections.some((section) => this.taskBelongsToSection(task, section)) &&
-        this.taskMatchesFilters(task, { taskType, triggerSource })
-    )
-  }
-
-  private reloadPage(resetToFirstPage: boolean = false) {
-    if (resetToFirstPage) {
-      this.page = 1
-    }
-
-    this.loading = true
-    this.tasksService
-      .list(this.page, this.pageSize, { acknowledged: false })
-      .pipe(first(), takeUntil(this.unsubscribeNotifier))
-      .subscribe({
-        next: (result) => {
-          this.pagedTasks = result.results
-          this.totalTasks = result.count
-          this.loading = false
-          if (
-            this.page > 1 &&
-            this.pagedTasks.length === 0 &&
-            this.totalTasks > 0
-          ) {
-            this.page -= 1
-            this.reloadPage()
-          }
-        },
-        error: () => {
-          this.loading = false
-        },
-      })
-  }
 }

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

@@ -8,8 +8,10 @@
     [ngClass]="{ 'slim': slimSidebarEnabled, 'col-auto col-md-3 col-lg-2 col-xxxl-1' : !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 1000 1000" width="1.5em" height="1.5em" fill="currentColor">
-      <path d="M341,949.1c-6.9-20.3-20.7-61.2-21.9-61-199.6-88.9-182.5-229.8-134.3-347.5,30,137.2,268.8,148.9,146.2,336-.9,2.2,10,27.8,19.5,51.3,22.7-51.9,58.6-115.5,55.8-120.8C178,398.7,724.9,299,807.1,18.5c83,251.5,53.1,659.8-377.4,814.9-2,1.4-63.5,148.6-66.9,150.2-.2-2.1-33.2,2.9-30.1-8.7,1.6-7,4.8-16.2,8.2-25.6h0v-.2h.1ZM323.1,846.2c48.3-71.9-12.7-120.8-56.9-152.2,81.2,107.4,66.4,120.8,56.9,152.2h0Z"/>
+    <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 ms-md-3 d-inline-block" [class.d-md-none]="slimSidebarEnabled">
       @if (customAppTitle?.length) {
@@ -292,13 +294,13 @@
               *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.PaperlessTask }"
               tourAnchor="tour.file-tasks">
               <a class="nav-link" routerLink="tasks" routerLinkActive="active" (click)="closeMenu()"
-                ngbPopover="Tasks" i18n-ngbPopover [disablePopover]="!slimSidebarEnabled" placement="end"
+                ngbPopover="File Tasks" i18n-ngbPopover [disablePopover]="!slimSidebarEnabled" placement="end"
                 container="body" triggers="mouseenter:mouseleave" popoverClass="popover-slim">
-                <i-bs class="me-2" name="list-task"></i-bs><span><ng-container i18n>Tasks</ng-container>@if (tasksService.needsAttentionTasks.length > 0) {
-                  <span><span class="badge bg-danger ms-2 d-inline">{{tasksService.needsAttentionTasks.length}}</span></span>
+                <i-bs class="me-2" name="list-task"></i-bs><span><ng-container i18n>File Tasks</ng-container>@if (tasksService.failedFileTasks.length > 0) {
+                  <span><span class="badge bg-danger ms-2 d-inline">{{tasksService.failedFileTasks.length}}</span></span>
                 }</span>
-                @if (tasksService.needsAttentionTasks.length > 0 && slimSidebarEnabled) {
-                  <span class="badge bg-danger position-absolute top-0 end-0 d-none d-md-block">{{tasksService.needsAttentionTasks.length}}</span>
+                @if (tasksService.failedFileTasks.length > 0 && slimSidebarEnabled) {
+                  <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

@@ -94,18 +94,12 @@ main {
   }
 
   .sidebar.slim:not(.animating) {
-    transition: none;
-
     li.nav-item span,
     .sidebar-heading span {
       display: none;
     }
   }
 
-  .sidebar.slim:not(.animating) ~ main.col-slim {
-    transition: none;
-  }
-
   .sidebar.animating {
     li.nav-item span,
     .sidebar-heading span {

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

@@ -36,7 +36,6 @@ import { RemoteVersionService } from 'src/app/services/rest/remote-version.servi
 import { SavedViewService } from 'src/app/services/rest/saved-view.service'
 import { SearchService } from 'src/app/services/rest/search.service'
 import { SettingsService } from 'src/app/services/settings.service'
-import { TasksService } from 'src/app/services/tasks.service'
 import { ToastService } from 'src/app/services/toast.service'
 import { environment } from 'src/environments/environment'
 import { ProfileEditDialogComponent } from '../common/profile-edit-dialog/profile-edit-dialog.component'
@@ -98,7 +97,6 @@ describe('AppFrameComponent', () => {
   let savedViewSpy
   let modalService: NgbModal
   let maybeRefreshSpy
-  let tasksService: TasksService
 
   beforeEach(async () => {
     TestBed.configureTestingModule({
@@ -176,7 +174,6 @@ describe('AppFrameComponent', () => {
     openDocumentsService = TestBed.inject(OpenDocumentsService)
     modalService = TestBed.inject(NgbModal)
     router = TestBed.inject(Router)
-    tasksService = TestBed.inject(TasksService)
 
     jest
       .spyOn(settingsService, 'displayName', 'get')
@@ -447,16 +444,6 @@ describe('AppFrameComponent', () => {
     expect(maybeRefreshSpy).toHaveBeenCalled()
   })
 
-  it('should show tasks badge for needs-attention tasks', () => {
-    jest
-      .spyOn(tasksService, 'needsAttentionTasks', 'get')
-      .mockReturnValue([{} as any, {} as any])
-
-    fixture.detectChanges()
-
-    expect(fixture.nativeElement.textContent).toContain('Tasks2')
-  })
-
   it('should indicate attributes management availability when any permission is granted', () => {
     jest
       .spyOn(permissionsService, 'currentUserCan')

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

@@ -8,21 +8,10 @@
       <div class="chat-messages font-monospace small">
         @for (message of messages; track message) {
           <div class="message d-flex flex-row small" [class.justify-content-end]="message.role === 'user'">
-            <div class="p-2 m-2" [class.bg-dark]="message.role === 'user'">
-              <span>
-                {{ message.content }}
-                @if (message.isStreaming) { <span class="blinking-cursor">|</span> }
-              </span>
-              @if (message.role === 'assistant' && message.references?.length) {
-                <div class="chat-references list-group mt-3">
-                  @for (reference of message.references; track reference.id) {
-                    <a class="list-group-item list-group-item-action text-primary" [routerLink]="['/documents', reference.id]">
-                      <i-bs width="0.9em" height="0.9em" name="file-text" class="me-1"></i-bs><span>{{ reference.title }}</span>
-                    </a>
-                  }
-                </div>
-              }
-            </div>
+            <span class="p-2 m-2" [class.bg-dark]="message.role === 'user'">
+              {{ message.content }}
+              @if (message.isStreaming) { <span class="blinking-cursor">|</span> }
+            </span>
           </div>
         }
         <div #scrollAnchor></div>

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

@@ -7,10 +7,6 @@
   overflow-y: auto;
 }
 
-.chat-references {
-  font-family: var(--bs-font-sans-serif);
-}
-
 .dropdown-toggle::after {
   display: none;
 }

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

@@ -3,13 +3,9 @@ import { provideHttpClientTesting } from '@angular/common/http/testing'
 import { ElementRef } from '@angular/core'
 import { ComponentFixture, TestBed } from '@angular/core/testing'
 import { NavigationEnd, Router } from '@angular/router'
-import { RouterTestingModule } from '@angular/router/testing'
 import { allIcons, NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { Subject } from 'rxjs'
-import {
-  CHAT_METADATA_DELIMITER,
-  ChatService,
-} from 'src/app/services/chat.service'
+import { ChatService } from 'src/app/services/chat.service'
 import { ChatComponent } from './chat.component'
 
 describe('ChatComponent', () => {
@@ -22,11 +18,7 @@ describe('ChatComponent', () => {
 
   beforeEach(async () => {
     TestBed.configureTestingModule({
-      imports: [
-        NgxBootstrapIconsModule.pick(allIcons),
-        RouterTestingModule,
-        ChatComponent,
-      ],
+      imports: [NgxBootstrapIconsModule.pick(allIcons), ChatComponent],
       providers: [
         provideHttpClient(withInterceptorsFromDi()),
         provideHttpClientTesting(),
@@ -92,57 +84,6 @@ describe('ChatComponent', () => {
     expect(component.messages[1].isStreaming).toBe(false)
   })
 
-  it('should parse references from the metadata trailer without showing it', () => {
-    component.input = 'Hello'
-    component.sendMessage()
-
-    mockStream$.next(
-      `Hi there${CHAT_METADATA_DELIMITER}{"references":[{"id":42,"title":"Bread Recipe"}]}`
-    )
-    jest.advanceTimersByTime(1000)
-
-    expect(component.messages[1].content).toBe('Hi there')
-    expect(component.messages[1].references).toEqual([
-      { id: 42, title: 'Bread Recipe' },
-    ])
-  })
-
-  it('should render document reference links under assistant messages', () => {
-    component.input = 'Hello'
-    component.sendMessage()
-
-    mockStream$.next(
-      `Hi there${CHAT_METADATA_DELIMITER}{"references":[{"id":42,"title":"Bread Recipe"}]}`
-    )
-    jest.advanceTimersByTime(1000)
-    fixture.detectChanges()
-
-    const link = fixture.nativeElement.querySelector('.chat-references a')
-    expect(link.textContent).toContain('Bread Recipe')
-    expect(link.getAttribute('href')).toContain('/documents/42')
-  })
-
-  it('should remove delimiter fragments that were already streamed', () => {
-    component.input = 'Hello'
-    component.sendMessage()
-
-    mockStream$.next(`Hi there${CHAT_METADATA_DELIMITER.slice(0, 8)}`)
-    jest.advanceTimersByTime(1000)
-    expect(component.messages[1].content).toBe(
-      `Hi there${CHAT_METADATA_DELIMITER.slice(0, 8)}`
-    )
-
-    mockStream$.next(
-      `Hi there${CHAT_METADATA_DELIMITER}{"references":[{"id":42,"title":"Bread Recipe"}]}`
-    )
-    jest.advanceTimersByTime(1000)
-
-    expect(component.messages[1].content).toBe('Hi there')
-    expect(component.messages[1].references).toEqual([
-      { id: 42, title: 'Bread Recipe' },
-    ])
-  })
-
   it('should handle errors during streaming', () => {
     component.input = 'Hello'
     component.sendMessage()

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

@@ -1,21 +1,16 @@
 import { Component, ElementRef, inject, OnInit, ViewChild } from '@angular/core'
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
-import { NavigationEnd, Router, RouterModule } from '@angular/router'
+import { NavigationEnd, Router } from '@angular/router'
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'
 import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { filter, map } from 'rxjs'
-import {
-  ChatMessage,
-  ChatService,
-  parseChatResponse,
-} from 'src/app/services/chat.service'
+import { ChatMessage, ChatService } from 'src/app/services/chat.service'
 
 @Component({
   selector: 'pngx-chat',
   imports: [
     FormsModule,
     ReactiveFormsModule,
-    RouterModule,
     NgxBootstrapIconsModule,
     NgbDropdownModule,
   ],
@@ -75,24 +70,13 @@ export class ChatComponent implements OnInit {
     this.messages.push(assistantMessage)
     this.loading = true
 
-    let lastVisibleContent = ''
+    let lastPartialLength = 0
 
     this.chatService.streamChat(this.documentId, this.input).subscribe({
       next: (chunk) => {
-        const nextResponse = parseChatResponse(chunk)
-
-        if (nextResponse.content.length < lastVisibleContent.length) {
-          this.resetTypewriter(assistantMessage, nextResponse.content)
-          lastVisibleContent = nextResponse.content
-        } else {
-          const visibleDelta = nextResponse.content.substring(
-            lastVisibleContent.length
-          )
-          lastVisibleContent = nextResponse.content
-          this.enqueueTypewriter(visibleDelta, assistantMessage)
-        }
-
-        assistantMessage.references = nextResponse.references
+        const delta = chunk.substring(lastPartialLength)
+        lastPartialLength = chunk.length
+        this.enqueueTypewriter(delta, assistantMessage)
       },
       error: () => {
         assistantMessage.content += '\n\n⚠️ Error receiving response.'
@@ -109,13 +93,6 @@ export class ChatComponent implements OnInit {
     this.input = ''
   }
 
-  private resetTypewriter(message: ChatMessage, content: string): void {
-    this.typewriterBuffer = []
-    this.typewriterActive = false
-    message.content = content
-    this.scrollToBottom()
-  }
-
   enqueueTypewriter(chunk: string, message: ChatMessage): void {
     if (!chunk) return
 

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

@@ -86,7 +86,7 @@
         <div class="selected-icon">
           @if (addedRelativeDate) {
             <a class="text-light focus-variants" href="javascript:void(0)" (click)="clearAddedRelativeDate()">
-              <i-bs width="1em" height="1em" name="check" class="variant-unfocused text-dark"></i-bs>
+              <i-bs width="1em" height="1em" name="check" class="variant-unfocused"></i-bs>
               <i-bs width="1em" height="1em" name="x" class="variant-focused text-primary"></i-bs>
             </a>
           }

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

@@ -26,7 +26,6 @@ import {
 } from 'src/app/data/matching-model'
 import { Tag } from 'src/app/data/tag'
 import { SETTINGS_KEYS } from 'src/app/data/ui-settings'
-import { PermissionsService } from 'src/app/services/permissions.service'
 import { TagService } from 'src/app/services/rest/tag.service'
 import { UserService } from 'src/app/services/rest/user.service'
 import { SettingsService } from 'src/app/services/settings.service'
@@ -88,7 +87,6 @@ describe('EditDialogComponent', () => {
   let component: TestComponent
   let fixture: ComponentFixture<TestComponent>
   let tagService: TagService
-  let permissionsService: PermissionsService
   let settingsService: SettingsService
   let activeModal: NgbActiveModal
   let httpTestingController: HttpTestingController
@@ -120,10 +118,8 @@ describe('EditDialogComponent', () => {
     }).compileComponents()
 
     tagService = TestBed.inject(TagService)
-    permissionsService = TestBed.inject(PermissionsService)
     settingsService = TestBed.inject(SettingsService)
     settingsService.currentUser = currentUser
-    permissionsService.initialize([], currentUser as any)
     activeModal = TestBed.inject(NgbActiveModal)
     httpTestingController = TestBed.inject(HttpTestingController)
 
@@ -230,25 +226,6 @@ describe('EditDialogComponent', () => {
     expect(updateSpy).toHaveBeenCalled()
   })
 
-  it('should not submit owner or permissions for non-owner edits', () => {
-    component.object = tag
-    component.dialogMode = EditDialogMode.EDIT
-    component.ngOnInit()
-
-    component.objectForm.get('name').setValue('Updated tag')
-    component.save()
-
-    const req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}tags/${tag.id}/`
-    )
-    expect(req.request.method).toEqual('PUT')
-    expect(req.request.body.name).toEqual('Updated tag')
-    expect(req.request.body.owner).toEqual(tag.owner)
-    expect(req.request.body.set_permissions).toBeUndefined()
-
-    req.flush({})
-  })
-
   it('should create an object on save in edit mode', () => {
     const createSpy = jest.spyOn(tagService, 'create')
     component.dialogMode = EditDialogMode.CREATE

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

@@ -18,7 +18,6 @@ import { ObjectWithId } from 'src/app/data/object-with-id'
 import { ObjectWithPermissions } from 'src/app/data/object-with-permissions'
 import { SETTINGS_KEYS } from 'src/app/data/ui-settings'
 import { User } from 'src/app/data/user'
-import { PermissionsService } from 'src/app/services/permissions.service'
 import { AbstractPaperlessService } from 'src/app/services/rest/abstract-paperless-service'
 import { UserService } from 'src/app/services/rest/user.service'
 import { SettingsService } from 'src/app/services/settings.service'
@@ -43,7 +42,6 @@ export abstract class EditDialogComponent<
   protected activeModal = inject(NgbActiveModal)
   protected userService = inject(UserService)
   protected settingsService = inject(SettingsService)
-  protected permissionsService = inject(PermissionsService)
 
   users: User[]
 
@@ -71,6 +69,10 @@ export abstract class EditDialogComponent<
 
   ngOnInit(): void {
     if (this.object != null && this.dialogMode !== EditDialogMode.CREATE) {
+      if ((this.object as ObjectWithPermissions).permissions) {
+        this.object['set_permissions'] = this.object['permissions']
+      }
+
       this.object['permissions_form'] = {
         owner: (this.object as ObjectWithPermissions).owner,
         set_permissions: (this.object as ObjectWithPermissions).permissions,
@@ -149,28 +151,18 @@ export abstract class EditDialogComponent<
     return Object.assign({}, this.objectForm.value)
   }
 
-  protected shouldSubmitPermissions(): boolean {
-    return (
-      this.dialogMode === EditDialogMode.CREATE ||
-      this.permissionsService.currentUserOwnsObject(this.object)
-    )
-  }
-
   save() {
     this.error = null
     const formValues = this.getFormValues()
     const permissionsObject: PermissionsFormObject =
       this.objectForm.get('permissions_form')?.value
-    if (permissionsObject && this.shouldSubmitPermissions()) {
+    if (permissionsObject) {
       formValues.owner = permissionsObject.owner
       formValues.set_permissions = permissionsObject.set_permissions
+      delete formValues.permissions_form
     }
-    delete formValues.permissions_form
 
     var newObject = Object.assign(Object.assign({}, this.object), formValues)
-    if (!this.shouldSubmitPermissions()) {
-      delete newObject['set_permissions']
-    }
     var serverResponse: Observable<T>
     switch (this.dialogMode) {
       case EditDialogMode.CREATE:

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

@@ -9,6 +9,7 @@ import { first } from 'rxjs'
 import { EditDialogComponent } from 'src/app/components/common/edit-dialog/edit-dialog.component'
 import { Group } from 'src/app/data/group'
 import { User } from 'src/app/data/user'
+import { PermissionsService } from 'src/app/services/permissions.service'
 import { GroupService } from 'src/app/services/rest/group.service'
 import { UserService } from 'src/app/services/rest/user.service'
 import { SettingsService } from 'src/app/services/settings.service'
@@ -38,6 +39,7 @@ export class UserEditDialogComponent
   implements OnInit
 {
   private toastService = inject(ToastService)
+  private permissionsService = inject(PermissionsService)
   private groupsService: GroupService
 
   groups: Group[]

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

@@ -205,20 +205,6 @@ describe('TagsComponent', () => {
     expect(component.value).toEqual([2, 1])
   })
 
-  it('should not duplicate parents when adding sibling nested tags', () => {
-    const root: Tag = { id: 1, name: 'root' }
-    const parent: Tag = { id: 2, name: 'parent', parent: 1 }
-    const leafA: Tag = { id: 3, name: 'leaf-a', parent: 2 }
-    const leafB: Tag = { id: 4, name: 'leaf-b', parent: 2 }
-    component.tags = [root, parent, leafA, leafB]
-
-    component.value = []
-    component.addTag(3)
-    component.addTag(4)
-
-    expect(component.value).toEqual([3, 2, 1, 4])
-  })
-
   it('should return ancestors from root to parent using getParentChain', () => {
     const root: Tag = { id: 1, name: 'root' }
     const mid: Tag = { id: 2, name: 'mid', parent: 1 }

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

@@ -153,13 +153,11 @@ export class TagsComponent implements OnInit, ControlValueAccessor {
   }
 
   public onAdd(tag: Tag) {
-    if (tag?.parent) {
+    if (tag.parent) {
       // add all parents recursively
       const parent = this.getTag(tag.parent)
-      if (parent && !this.value.includes(parent.id)) {
-        this.value = [...this.value, parent.id]
-        this.onAdd(parent)
-      }
+      this.value = [...this.value, parent.id]
+      this.onAdd(parent)
     }
   }
 

src-ui/src/app/components/common/logo/logo.component.html

@@ -1,22 +1,22 @@
 @if (customLogo) {
     <img src="{{customLogo}}" [class]="getClasses()" [attr.style]="'height:'+height" />
 } @else {
-    <svg [class]="getClasses()" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2670 860" [attr.style]="'height:'+height">
-      <path class="leaf" style="fill:#005616;" d="M2227.4,821.2c-6.1-17.8-18.1-53.6-19.2-53.4-174.7-77.8-159.8-201.2-117.5-304.2,26.3,120.1,235.3,130.3,128,294.1-.7,2,8.8,24.3,17.1,44.9,19.9-45.4,51.3-101.1,48.8-105.7-199.9-357.4,278.8-444.7,350.7-690.2,72.6,220.1,46.5,577.5-330.4,713.3-1.8,1.2-55.6,130-58.5,131.4-.2-1.9-29.1,2.5-26.4-7.6,1.4-6.2,4.2-14.2,7.2-22.4h0v-.2h.2,0ZM2211.7,731.2c42.3-62.9-11.1-105.7-49.8-133.2,71,94,58.1,105.7,49.8,133.2h0Z"/>
-      <g class="text" style="fill: #000;">
-        <path class="st1" d="M654.6,393.2l-.7,137.7h-85.5V188.7h85.4c.4,11.3-.3,21.7,1.3,33.8,23.1-34.1,62.3-50,101.1-38.3,16.5,5,29.6,16.4,39.7,30,34.4,46.5,35.1,134,3.6,182.2-10.1,14.4-22.5,26.9-39,33.4-39.5,15.7-81,1.1-105.9-36.6h0ZM721,362.2c21-26.1,21-82.7-.4-108.4-13.2-15.9-36.4-16.1-49.9-.4-22.2,25.8-21.7,85.3.5,110.1,13.6,15.2,36.6,15,49.7-1.3h.1Z"/>
-        <path class="st1" d="M164,301l-72.8.7v126.1H3.4V98.1l159.7.5c31.3,0,58.9,13.6,79.4,36.1,30.8,37.6,30.9,91.7.6,129.6-20.1,22.8-47.6,36.5-79,36.8h-.1ZM176.8,199.8c0-20.8-15.1-35-34.7-35l-51,.2v69.5l53.6-.2c18.5,0,32-15.8,32.2-34.5h-.1Z"/>
-        <polygon class="st1" points="1338.2 427.8 1338 366 1412.4 365.8 1412.5 139.3 1338.1 139.1 1338.1 77.4 1498.1 77.4 1498.1 365.7 1572.3 365.9 1572.5 427.7 1338.2 427.8"/>
-        <path class="st1" d="M1741.8,364.3c9.1-8.6,14-18.1,17.7-30.3l68.4,13.3c-10.5,45.2-46.5,79.2-92.3,86.7-59.2,9.6-118.7-14.2-138.6-73.7-10.9-32.7-10.7-68.6.6-100.9,17.7-50.6,64.3-80.5,117.1-79.1,76.5,2,113.4,65.4,111.1,136.1h-155.4c-.7,12.5,3,25,9.7,35.9,13.2,21.3,40.9,26.9,61.5,12h.2ZM1749.4,273.1c-2.4-10.8-6.9-18-13.9-24.6-12.8-8.3-30.1-9.5-43.4-1.1-9.3,5.8-14.6,15.1-18,25.7h75.3Z"/>
-        <path class="st1" d="M1010.3,364.3c9.1-8.5,13.9-18.1,17.7-30.3l68.4,13.3c-10.4,45.2-46.5,79.2-92.3,86.7-59.3,9.6-118.8-14.2-138.7-73.9-10.8-32.3-10.6-67.4.2-99.3,17.3-51.2,64.2-81.8,117.6-80.4,76.6,2,113.5,65.3,111.1,136.1h-155.6c-.2,12.7,3.2,25.1,9.9,35.9,13.2,21.3,40.9,27,61.5,12h.2ZM1018,273.2c-2.4-9.4-6.3-18.5-14.2-24.4-12.3-9.1-30.4-9.4-43.3-1.3-9.3,5.9-14.4,15.1-17.9,25.6h75.4Z"/>
-        <path class="st1" d="M424.3,376.9c-7.1,13.6-12.5,25.7-23.2,35.5-14.3,13.3-32.6,19.3-52.3,19.4-40.4.2-75.6-23.1-73.6-65.7.9-20.1,9.7-37.2,26.5-49.2,30.5-21.8,55.8-22.4,87.8-40.6,8.1-4.6,18.2-15.3,12.4-22.2s-5-3-8-3.7h-96.3v-61.8h109.6c14.7.6,28.1,2.2,41.7,7.2,23.7,8.8,39.6,29.5,39.8,55.2l.7,90.6c0,13.5,11,23,23.7,23.9l10.1.7v61.3h-29.9c-13.1,0-25.9-3-37.3-8.6-16.9-8.2-26.9-22.2-31.6-42.2h0v.2h-.1ZM364.9,370.1c6.8,5.9,16.2,6.5,24.8,2.7,18.1-7.9,16.5-38.3,16.1-55-3.6,4.3-7.4,9-12.5,11.2l-21.1,9.3c-5.8,2.5-10.6,8-11.8,13s-1,13.8,4.7,18.7h-.2Z"/>
-        <path class="st1" d="M1943,430.1c-33.5-8.9-68.5-33.6-78.9-68.9l66.6-27.2c11.8,22.1,31.6,42.1,57.2,39.8,4.3-.4,9.3-3.1,11.2-6,7.8-12.5-4.3-24.3-16.2-30.7l-47.3-25.2c-32.2-17.1-57.7-50.7-41.6-87.4,11.9-27,48.1-35,75.3-36h99.2v61.8h-88.6c-2.5.4-6.2,2.3-7,4.2s.7,7,2.7,8.2c31.6,18.6,88.3,38.3,103.8,72,10.4,22.6,6.7,50-9.2,69.1-29.5,35.7-86.1,36.9-127,26.1v.2h-.2,0Z"/>
-        <path class="st1" d="M1318.2,264.3l-68.5.2c-19.4,0-30.1,10.8-31.6,30.2v133.1h-85.7v-239h85.6l1,58.9,11.9-25.1c14.3-30.5,56.9-36.5,87.4-33.6v75.4h-.1Z"/>
-        <path class="st1" d="M2232.8,374.2c-26,1.2-44.6-18.4-56.5-40.1l-66.5,27.3c10.8,35.9,46.2,60.4,80.3,69.2h0c10.6,2.6,22,4.5,33.7,5.2,3.2-7.9,6.8-15.6,10.8-23.4,18.5-35.9,44.3-68.4,73.8-98.8-23.6-21.1-62.6-36.7-87-50.6-2.2-1.2-3.6-6.7-2.7-8.7.9-2,4.5-3.5,7.4-3.9h88.2v-61.8h-97.4c-27,.7-63.8,8.2-76.5,34.8-8.3,17.5-6.8,38.5,3.5,54.9,9.3,14.9,22.2,25.8,37.7,33.9l45.8,24.3c11.5,6.1,24.7,17,17.9,30.5-2.1,4.1-7.4,6.5-12.6,7.2h.1Z"/>
-        <path class="st1" d="M1547.6,801.6h81.2c11.6-.2,23.2-3.8,31.9-11.2,7.3-6.2,11.7-15.4,13.9-24.8l16.8-72.7c-7.2,9-12.8,16.9-20.7,24.2-18.3,16.8-42.3,23.8-66.9,19.5-32.5-5.7-46.7-34.7-47-65.6-.5-44,18.9-93.6,57.6-117.1,18-10.9,39.5-13.9,60-9.6,12.4,2.6,22.1,9.9,29.1,20,5.8,8.4,7.8,17.2,10.8,27.8l10.7-45.4,15.6.3-50.6,219.5c-2.9,12.6-8.9,24.6-18.4,32.9-12,10.4-28.1,15.1-44,15.2l-82.9.2,2.7-13.1h.2ZM1691.8,673.5c12.9-26.3,20.1-60.3,11-88.6-5.1-15.8-17.9-26.5-34.2-28.8-20.7-2.9-40.3,2.9-55.9,16.8-13.6,12.1-23.5,26.7-30.3,43.7-9.8,24.4-14.8,56.5-4.6,81.1,5,12.1,14.7,21.3,27.6,24.7,39,10.3,70.1-16,86.4-49h0Z"/>
-        <path class="st1" d="M1441.6,556.8c-43.6-8.7-84.4,29.7-93.8,70l-24.8,106.6h-15.7l43.1-186.4,15.6-.2-8.6,39.5c22.3-28.9,53.9-49.3,90.7-42.5,16.8,3.1,29.1,15.6,32.1,32.4,2.1,11.6,1.6,23.4-1.1,35.3l-28.1,122.2h-15.6c0,0,27.5-119.9,27.5-119.9,4.7-20.6,5.9-51.3-21.2-56.7v-.3Z"/>
-        <path class="st1" d="M1958.9,733.3h-16.2l-38.2-90.1-79.8,90.3-19.3-.2,77.6-87.2c5.1-5.7,11-10.1,17.2-14.5-4.6-4.7-8.5-9.6-11.3-15.3l-33.9-69.3,16.2-.2,35.3,74.1,69-73.9c6.6-.3,12.7-.3,19.6.2l-63.1,66.6c-6.4,6.8-13.4,12.5-20.9,18,3.4,3.4,7.5,7.5,9.6,12.4l38.3,89.2h-.1Z"/>
-        <path class="st1" d="M1224.4,635.4H3.4c1.1-5.6,1.9-9.5,3.1-13.9h1220.9l-2.9,13.9h0Z"/>
-      </g>
+    <svg [class]="getClasses()" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 2897.4 896.6" [attr.style]="'height:'+height">
+        <path class="leaf" d="M140,713.7c-3.4-16.4-10.3-49.1-11.2-49.1c-145.7-87.1-128.4-238-80.2-324.2C59,449,251.2,524,139.1,656.8 c-0.9,1.7,5.2,22.4,10.3,41.4c22.4-37.9,56-83.6,54.3-87.9C65.9,273.9,496.9,248.1,586.6,39.4c40.5,201.8-20.7,513.9-367.2,593.2 c-1.7,0.9-62.9,108.6-65.5,109.5c0-1.7-25.9-0.9-22.4-9.5C133.1,727.4,136.6,720.6,140,713.7L140,713.7z M135.7,632.6 c44-50.9-7.8-137.9-38.8-166.4C149.5,556.7,146,609.3,135.7,632.6L135.7,632.6z" transform="translate(0)" style="fill:#17541f"/>
+        <g class="text" style="fill:#000">
+            <path d="M1022.3,428.7c-17.8-19.9-42.7-29.8-74.7-29.8c-22.3,0-42.4,5.7-60.5,17.3c-18.1,11.6-32.3,27.5-42.5,47.8 s-15.3,42.9-15.3,67.8c0,24.9,5.1,47.5,15.3,67.8c10.3,20.3,24.4,36.2,42.5,47.8c18.1,11.5,38.3,17.3,60.5,17.3 c32,0,56.9-9.9,74.7-29.8v20.4v0.2h84.5V408.3h-84.5V428.7z M1010.5,575c-10.2,11.7-23.6,17.6-40.2,17.6s-29.9-5.9-40-17.6 s-15.1-26.1-15.1-43.3c0-17.1,5-31.6,15.1-43.3s23.4-17.6,40-17.6c16.6,0,30,5.9,40.2,17.6s15.3,26.1,15.3,43.3 S1020.7,563.3,1010.5,575z" transform="translate(0)"/>
+            <path d="M1381,416.1c-18.1-11.5-38.3-17.3-60.5-17.4c-32,0-56.9,9.9-74.7,29.8v-20.4h-84.5v390.7h84.5v-164 c17.8,19.9,42.7,29.8,74.7,29.8c22.3,0,42.4-5.7,60.5-17.3s32.3-27.5,42.5-47.8c10.2-20.3,15.3-42.9,15.3-67.8s-5.1-47.5-15.3-67.8 C1413.2,443.6,1399.1,427.7,1381,416.1z M1337.9,575c-10.1,11.7-23.4,17.6-40,17.6s-29.9-5.9-40-17.6s-15.1-26.1-15.1-43.3 c0-17.1,5-31.6,15.1-43.3s23.4-17.6,40-17.6s29.9,5.9,40,17.6s15.1,26.1,15.1,43.3S1347.9,563.3,1337.9,575z" transform="translate(0)"/>
+            <path d="M1672.2,416.8c-20.5-12-43-18-67.6-18c-24.9,0-47.6,5.9-68,17.6c-20.4,11.7-36.5,27.7-48.2,48s-17.6,42.7-17.6,67.3 c0.3,25.2,6.2,47.8,17.8,68c11.5,20.2,28,36,49.3,47.6c21.3,11.5,45.9,17.3,73.8,17.3c48.6,0,86.8-14.7,114.7-44l-52.5-48.9 c-8.6,8.3-17.6,14.6-26.7,19c-9.3,4.3-21.1,6.4-35.3,6.4c-11.6,0-22.5-3.6-32.7-10.9c-10.3-7.3-17.1-16.5-20.7-27.8h180l0.4-11.6 c0-29.6-6-55.7-18-78.2S1692.6,428.8,1672.2,416.8z M1558.3,503.2c2.1-12.1,7.5-21.8,16.2-29.1s18.7-10.9,30-10.9 s21.2,3.6,29.8,10.9c8.6,7.2,13.9,16.9,16,29.1H1558.3z" transform="translate(0)"/>
+            <path d="M1895.3,411.7c-11,5.6-20.3,13.7-28,24.4h-0.1v-28h-84.5v247.3h84.5V536.3c0-22.6,4.7-38.1,14.2-46.5 c9.5-8.5,22.7-12.7,39.6-12.7c6.2,0,13.5,1,21.8,3.1l10.7-72c-5.9-3.3-14.5-4.9-25.8-4.9C1917.1,403.3,1906.3,406.1,1895.3,411.7z"  transform="translate(0)"/>
+            <rect x="1985" y="277.4" width="84.5" height="377.8" transform="translate(0)"/>
+            <path d="M2313.2,416.8c-20.5-12-43-18-67.6-18c-24.9,0-47.6,5.9-68,17.6s-36.5,27.7-48.2,48c-11.7,20.3-17.6,42.7-17.6,67.3 c0.3,25.2,6.2,47.8,17.8,68c11.5,20.2,28,36,49.3,47.6c21.3,11.5,45.9,17.3,73.8,17.3c48.6,0,86.8-14.7,114.7-44l-52.5-48.9 c-8.6,8.3-17.6,14.6-26.7,19c-9.3,4.3-21.1,6.4-35.3,6.4c-11.6,0-22.5-3.6-32.7-10.9c-10.3-7.3-17.1-16.5-20.7-27.8h180l0.4-11.6 c0-29.6-6-55.7-18-78.2S2333.6,428.8,2313.2,416.8z M2199.3,503.2c2.1-12.1,7.5-21.8,16.2-29.1s18.7-10.9,30-10.9 s21.2,3.6,29.8,10.9c8.6,7.2,13.9,16.9,16,29.1H2199.3z" transform="translate(0)"/>
+            <path d="M2583.6,507.7c-13.8-4.4-30.6-8.1-50.5-11.1c-15.1-2.7-26.1-5.2-32.9-7.6c-6.8-2.4-10.2-6.1-10.2-11.1s2.3-8.7,6.7-10.9 c4.4-2.2,11.5-3.3,21.3-3.3c11.6,0,24.3,2.4,38.1,7.2c13.9,4.8,26.2,11,36.9,18.4l32.4-58.2c-11.3-7.4-26.2-14.7-44.9-21.8 c-18.7-7.1-39.6-10.7-62.7-10.7c-33.7,0-60.2,7.6-79.3,22.7c-19.1,15.1-28.7,36.1-28.7,63.1c0,19,4.8,33.9,14.4,44.7 c9.6,10.8,21,18.5,34,22.9c13.1,4.5,28.9,8.3,47.6,11.6c14.6,2.7,25.1,5.3,31.6,7.8s9.8,6.5,9.8,11.8c0,10.4-9.7,15.6-29.3,15.6 c-13.7,0-28.5-2.3-44.7-6.9c-16.1-4.6-29.2-11.3-39.3-20.2l-33.3,60c9.2,7.4,24.6,14.7,46.2,22c21.7,7.3,45.2,10.9,70.7,10.9 c34.7,0,62.9-7.4,84.5-22.4c21.7-15,32.5-37.3,32.5-66.9c0-19.3-5-34.2-15.1-44.9S2597.4,512.1,2583.6,507.7z" transform="translate(0)"/>
+            <path d="M2883.4,575.3c0-19.3-5-34.2-15.1-44.9s-22-18.3-35.8-22.7c-13.8-4.4-30.6-8.1-50.5-11.1c-15.1-2.7-26.1-5.2-32.9-7.6 c-6.8-2.4-10.2-6.1-10.2-11.1s2.3-8.7,6.7-10.9c4.4-2.2,11.5-3.3,21.3-3.3c11.6,0,24.3,2.4,38.1,7.2c13.9,4.8,26.2,11,36.9,18.4 l32.4-58.2c-11.3-7.4-26.2-14.7-44.9-21.8c-18.7-7.1-39.6-10.7-62.7-10.7c-33.7,0-60.2,7.6-79.3,22.7 c-19.1,15.1-28.7,36.1-28.7,63.1c0,19,4.8,33.9,14.4,44.7c9.6,10.8,21,18.5,34,22.9c13.1,4.5,28.9,8.3,47.6,11.6 c14.6,2.7,25.1,5.3,31.6,7.8s9.8,6.5,9.8,11.8c0,10.4-9.7,15.6-29.3,15.6c-13.7,0-28.5-2.3-44.7-6.9c-16.1-4.6-29.2-11.3-39.3-20.2 l-33.3,60c9.2,7.4,24.6,14.7,46.2,22c21.7,7.3,45.2,10.9,70.7,10.9c34.7,0,62.9-7.4,84.5-22.4 C2872.6,627.2,2883.4,604.9,2883.4,575.3z" transform="translate(0)"/>
+            <rect x="2460.7" y="738.7" width="59.6" height="17.2" transform="translate(0)"/>
+            <path d="M2596.5,706.4c-5.7,0-11,1-15.8,3s-9,5-12.5,8.9v-9.4h-19.4v93.6h19.4v-52c0-8.6,2.1-15.3,6.3-20c4.2-4.7,9.5-7.1,15.9-7.1 c7.8,0,13.4,2.3,16.8,6.7c3.4,4.5,5.1,11.3,5.1,20.5v52h19.4v-56.8c0-12.8-3.2-22.6-9.5-29.3 C2615.8,709.8,2607.3,706.4,2596.5,706.4z" transform="translate(0)"/>
+            <path d="M2733.8,717.7c-3.6-3.4-7.9-6.1-13.1-8.2s-10.6-3.1-16.2-3.1c-8.7,0-16.5,2.1-23.5,6.3s-12.5,10-16.5,17.3 c-4,7.3-6,15.4-6,24.4c0,8.9,2,17.1,6,24.3c4,7.3,9.5,13,16.5,17.2s14.9,6.3,23.5,6.3c5.6,0,11-1,16.2-3.1 c5.1-2.1,9.5-4.8,13.1-8.2v24.4c0,8.5-2.5,14.8-7.6,18.7c-5,3.9-11,5.9-18,5.9c-6.7,0-12.4-1.6-17.3-4.7c-4.8-3.1-7.6-7.7-8.3-13.8 h-19.4c0.6,7.7,2.9,14.2,7.1,19.5s9.6,9.3,16.2,12c6.6,2.7,13.8,4,21.7,4c12.8,0,23.5-3.4,32-10.1c8.6-6.7,12.8-17.1,12.8-31.1 V708.9h-19.2V717.7z M2732.2,770.1c-2.5,4.7-6,8.3-10.4,11.2c-4.4,2.7-9.4,4-14.9,4c-5.7,0-10.8-1.4-15.2-4.3s-7.8-6.7-10.2-11.4 c-2.3-4.8-3.5-9.8-3.5-15.2c0-5.5,1.1-10.6,3.5-15.3s5.8-8.5,10.2-11.3s9.5-4.2,15.2-4.2c5.5,0,10.5,1.4,14.9,4s7.9,6.3,10.4,11 s3.8,10,3.8,15.8S2734.7,765.4,2732.2,770.1z" transform="translate(0)"/>
+            <polygon points="2867.9,708.9 2846.5,708.9 2820.9,741.9 2795.5,708.9 2773.1,708.9 2809.1,755 2771.5,802.5 2792.9,802.5  2820.1,767.9 2847.2,802.6 2869.6,802.6 2832,754.4 	" transform="translate(0)"/>
+            <path d="M757.6,293.7c-20-10.8-42.6-16.2-67.8-16.2H600c-8.5,39.2-21.1,76.4-37.6,111.3c-9.9,20.8-21.1,40.6-33.6,59.4v207.2h88.9 V521.5h72c25.2,0,47.8-5.4,67.8-16.2s35.7-25.6,47.1-44.2c11.4-18.7,17.1-39.1,17.1-61.3c0.1-22.7-5.6-43.3-17-61.9 C793.3,319.2,777.6,304.5,757.6,293.7z M716.6,434.3c-9.3,8.9-21.6,13.3-36.7,13.3l-62.2,0.4v-92.5l62.2-0.4 c15.1,0,27.3,4.4,36.7,13.3c9.4,8.9,14,19.9,14,32.9C730.6,414.5,726,425.4,716.6,434.3z" transform="translate(0)"/>
+        </g>
     </svg>
 }

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

@@ -272,7 +272,7 @@ export class PngxPdfViewerComponent
     if (!this.hasRenderedPage) {
       return
     }
-    const query = this.searchQuery?.trim()
+    const query = this.searchQuery.trim()
     if (query === this.lastFindQuery) {
       return
     }

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

@@ -133,28 +133,28 @@ describe('PermissionsSelectComponent', () => {
     expect(viewInput.nativeElement.disabled).toBeFalsy()
   })
 
-  it('should treat system monitoring as view-only', () => {
+  it('should treat system status as view-only', () => {
     component.ngOnInit()
     fixture.detectChanges()
 
     expect(
       component.isActionSupported(
-        PermissionType.SystemMonitoring,
+        PermissionType.SystemStatus,
         PermissionAction.View
       )
     ).toBeTruthy()
     expect(
       component.isActionSupported(
-        PermissionType.SystemMonitoring,
+        PermissionType.SystemStatus,
         PermissionAction.Change
       )
     ).toBeFalsy()
 
     const changeInput = fixture.debugElement.query(
-      By.css('input#SystemMonitoring_Change')
+      By.css('input#SystemStatus_Change')
     )
     const viewInput = fixture.debugElement.query(
-      By.css('input#SystemMonitoring_View')
+      By.css('input#SystemStatus_View')
     )
 
     expect(changeInput.nativeElement.disabled).toBeTruthy()

src-ui/src/app/components/common/permissions-select/permissions-select.component.ts

@@ -261,7 +261,7 @@ export class PermissionsSelectComponent
     // Global statistics and system status only support view
     if (
       type === PermissionType.GlobalStatistics ||
-      type === PermissionType.SystemMonitoring
+      type === PermissionType.SystemStatus
     ) {
       return action === PermissionAction.View
     }

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

@@ -142,31 +142,6 @@
                   }
                 </ng-template>
               </dd>
-              <dt i18n>Recent Task Activity <span class="small text-muted fw-light">({{status.tasks.summary.days}} days)</span></dt>
-              <dd class="mb-0">
-                @if (status.tasks.summary.total_count > 0) {
-                  <ul class="list-group border-light mt-2">
-                    <li class="list-group-item list-group-item-action d-flex justify-content-between align-items-center">
-                      <span class="small"><ng-container i18n>Total</ng-container>:</span>
-                      <span class="badge bg-light rounded-pill">{{status.tasks.summary.total_count}}</span>
-                    </li>
-                    <li class="list-group-item list-group-item-action d-flex justify-content-between align-items-center">
-                      <span class="small"><ng-container i18n>Successful</ng-container>:</span>
-                      <span class="badge bg-primary rounded-pill">{{status.tasks.summary.success_count}}</span>
-                    </li>
-                    <li class="list-group-item list-group-item-action d-flex justify-content-between align-items-center">
-                      <span class="small"><ng-container i18n>Failed</ng-container>:</span>
-                      <span class="badge bg-danger rounded-pill">{{status.tasks.summary.failure_count}}</span>
-                    </li>
-                    <li class="list-group-item list-group-item-action d-flex justify-content-between align-items-center">
-                      <span class="small"><ng-container i18n>Pending</ng-container>:</span>
-                      <span class="badge bg-warning rounded-pill">{{status.tasks.summary.pending_count}}</span>
-                    </li>
-                  </ul>
-                } @else {
-                  <span class="small text-muted" i18n>No recent tasks</span>
-                }
-              </dd>
             </dl>
           </div>
         </div>
@@ -184,11 +159,25 @@
                 <button class="btn btn-sm d-flex align-items-center btn-dark text-uppercase small" [ngbPopover]="indexStatus" triggers="click mouseenter:mouseleave">
                   {{status.tasks.index_status}}
                   @if (status.tasks.index_status === 'OK') {
-                    <i-bs name="check-circle-fill" class="text-primary ms-2 lh-1"></i-bs>
+                    @if (isStale(status.tasks.index_last_modified)) {
+                      <i-bs name="exclamation-triangle-fill" class="text-warning ms-2 lh-1"></i-bs>
+                    } @else {
+                      <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>
                   }
                 </button>
+                @if (currentUserIsSuperUser) {
+                  @if (isRunning(PaperlessTaskName.IndexOptimize)) {
+                    <div class="spinner-border spinner-border-sm ms-2" role="status"></div>
+                  } @else {
+                    <button class="btn btn-sm d-flex align-items-center btn-dark small ms-2" (click)="runTask(PaperlessTaskName.IndexOptimize)">
+                      <i-bs name="play-fill" class="me-1"></i-bs>
+                      <ng-container i18n>Run Task</ng-container>
+                    </button>
+                  }
+                }
               </dd>
               <ng-template #indexStatus>
                 @if (status.tasks.index_status === 'OK') {
@@ -214,10 +203,10 @@
                   }
                 </button>
                 @if (currentUserIsSuperUser) {
-                  @if (isRunning(PaperlessTaskType.TrainClassifier)) {
+                  @if (isRunning(PaperlessTaskName.TrainClassifier)) {
                     <div class="spinner-border spinner-border-sm ms-2" role="status"></div>
                   } @else {
-                    <button class="btn btn-sm d-flex align-items-center btn-dark small ms-2" (click)="runTask(PaperlessTaskType.TrainClassifier)">
+                    <button class="btn btn-sm d-flex align-items-center btn-dark small ms-2" (click)="runTask(PaperlessTaskName.TrainClassifier)">
                       <i-bs name="play-fill" class="me-1"></i-bs>
                       <ng-container i18n>Run Task</ng-container>
                     </button>
@@ -248,10 +237,10 @@
                   }
                 </button>
                 @if (currentUserIsSuperUser) {
-                  @if (isRunning(PaperlessTaskType.SanityCheck)) {
+                  @if (isRunning(PaperlessTaskName.SanityCheck)) {
                     <div class="spinner-border spinner-border-sm ms-2" role="status"></div>
                   } @else {
-                    <button class="btn btn-sm d-flex align-items-center btn-dark small ms-2" (click)="runTask(PaperlessTaskType.SanityCheck)">
+                    <button class="btn btn-sm d-flex align-items-center btn-dark small ms-2" (click)="runTask(PaperlessTaskName.SanityCheck)">
                       <i-bs name="play-fill" class="me-1"></i-bs>
                       <ng-container i18n>Run Task</ng-container>
                     </button>
@@ -296,10 +285,10 @@
                     }
                   </button>
                   @if (currentUserIsSuperUser) {
-                    @if (isRunning(PaperlessTaskType.LlmIndex)) {
+                    @if (isRunning(PaperlessTaskName.LLMIndexUpdate)) {
                       <div class="spinner-border spinner-border-sm ms-2" role="status"></div>
                     } @else {
-                      <button class="btn btn-sm d-flex align-items-center btn-dark small ms-2" (click)="runTask(PaperlessTaskType.LlmIndex)">
+                      <button class="btn btn-sm d-flex align-items-center btn-dark small ms-2" (click)="runTask(PaperlessTaskName.LLMIndexUpdate)">
                         <i-bs name="play-fill" class="me-1"></i-bs>
                         <ng-container i18n>Run Task</ng-container>
                       </button>

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

@@ -25,7 +25,7 @@ import {
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
 import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
 import { Subject, of, throwError } from 'rxjs'
-import { PaperlessTaskType } from 'src/app/data/paperless-task'
+import { PaperlessTaskName } from 'src/app/data/paperless-task'
 import {
   InstallType,
   SystemStatus,
@@ -71,13 +71,6 @@ const status: SystemStatus = {
     llmindex_status: SystemStatusItemStatus.OK,
     llmindex_last_modified: new Date().toISOString(),
     llmindex_error: null,
-    summary: {
-      days: 30,
-      total_count: 12,
-      pending_count: 1,
-      success_count: 10,
-      failure_count: 1,
-    },
   },
 }
 
@@ -145,9 +138,9 @@ describe('SystemStatusDialogComponent', () => {
   })
 
   it('should check if task is running', () => {
-    component.runTask(PaperlessTaskType.SanityCheck)
-    expect(component.isRunning(PaperlessTaskType.SanityCheck)).toBeTruthy()
-    expect(component.isRunning(PaperlessTaskType.TrainClassifier)).toBeFalsy()
+    component.runTask(PaperlessTaskName.IndexOptimize)
+    expect(component.isRunning(PaperlessTaskName.IndexOptimize)).toBeTruthy()
+    expect(component.isRunning(PaperlessTaskName.SanityCheck)).toBeFalsy()
   })
 
   it('should support running tasks, refresh status and show toasts', () => {
@@ -158,22 +151,22 @@ describe('SystemStatusDialogComponent', () => {
 
     // fail first
     runSpy.mockReturnValue(throwError(() => new Error('error')))
-    component.runTask(PaperlessTaskType.SanityCheck)
-    expect(runSpy).toHaveBeenCalledWith(PaperlessTaskType.SanityCheck)
+    component.runTask(PaperlessTaskName.IndexOptimize)
+    expect(runSpy).toHaveBeenCalledWith(PaperlessTaskName.IndexOptimize)
     expect(toastErrorSpy).toHaveBeenCalledWith(
-      `Failed to start task ${PaperlessTaskType.SanityCheck}, see the logs for more details`,
+      `Failed to start task ${PaperlessTaskName.IndexOptimize}, see the logs for more details`,
       expect.any(Error)
     )
 
     // succeed
     runSpy.mockReturnValue(of({}))
     getStatusSpy.mockReturnValue(of(status))
-    component.runTask(PaperlessTaskType.SanityCheck)
-    expect(runSpy).toHaveBeenCalledWith(PaperlessTaskType.SanityCheck)
+    component.runTask(PaperlessTaskName.IndexOptimize)
+    expect(runSpy).toHaveBeenCalledWith(PaperlessTaskName.IndexOptimize)
 
     expect(getStatusSpy).toHaveBeenCalled()
     expect(toastSpy).toHaveBeenCalledWith(
-      `Task ${PaperlessTaskType.SanityCheck} started`
+      `Task ${PaperlessTaskName.IndexOptimize} started`
     )
   })
 

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

@@ -8,7 +8,7 @@ import {
 } from '@ng-bootstrap/ng-bootstrap'
 import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { Subject, takeUntil } from 'rxjs'
-import { PaperlessTaskType } from 'src/app/data/paperless-task'
+import { PaperlessTaskName } from 'src/app/data/paperless-task'
 import {
   SystemStatus,
   SystemStatusItemStatus,
@@ -49,14 +49,14 @@ export class SystemStatusDialogComponent implements OnInit, OnDestroy {
   private settingsService = inject(SettingsService)
 
   public SystemStatusItemStatus = SystemStatusItemStatus
-  public PaperlessTaskType = PaperlessTaskType
+  public PaperlessTaskName = PaperlessTaskName
   public status: SystemStatus
   public frontendVersion: string = environment.version
   public versionMismatch: boolean = false
 
   public copied: boolean = false
 
-  private runningTasks: Set<PaperlessTaskType> = new Set()
+  private runningTasks: Set<PaperlessTaskName> = new Set()
   private unsubscribeNotifier: Subject<any> = new Subject()
 
   get currentUserIsSuperUser(): boolean {
@@ -107,11 +107,11 @@ export class SystemStatusDialogComponent implements OnInit, OnDestroy {
     return now.getTime() - date.getTime() > hours * 60 * 60 * 1000
   }
 
-  public isRunning(taskName: PaperlessTaskType): boolean {
+  public isRunning(taskName: PaperlessTaskName): boolean {
     return this.runningTasks.has(taskName)
   }
 
-  public runTask(taskName: PaperlessTaskType) {
+  public runTask(taskName: PaperlessTaskName) {
     this.runningTasks.add(taskName)
     this.toastService.showInfo(`Task ${taskName} started`)
     this.tasksService.run(taskName).subscribe({

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

@@ -1,5 +1,5 @@
 <pngx-page-header title="Dashboard" [subTitle]="subtitle" i18n-title tourAnchor="tour.dashboard">
-  <pngx-logo extra_classes="d-none d-md-block mt-n2" height="3rem"></pngx-logo>
+  <pngx-logo extra_classes="d-none d-md-block mt-n2" height="3.5rem"></pngx-logo>
 </pngx-page-header>
 
 <div class="row">

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

@@ -54,10 +54,10 @@
       @if (isFinished(status)) {
         <div>
           @if (status.documentId) {
-            <a class="btn btn-sm btn-outline-primary btn-open" [routerLink]="['/documents', status.documentId]" (click)="dismiss(status)">
+            <button class="btn btn-sm btn-outline-primary btn-open" routerLink="/documents/{{status.documentId}}" (click)="dismiss(status)">
               <small i18n>Open document</small>
               <i-bs name="arrow-right-short"></i-bs>
-            </a>
+            </button>
           }
         </div>
       }

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

@@ -1381,7 +1381,6 @@ describe('DocumentDetailComponent', () => {
 
   it('should get suggestions', () => {
     const suggestionsSpy = jest.spyOn(documentService, 'getSuggestions')
-    const aiSuggestionsSpy = jest.spyOn(documentService, 'getAiSuggestions')
     suggestionsSpy.mockReturnValue(
       of({
         tags: [42, 43],
@@ -1392,35 +1391,6 @@ describe('DocumentDetailComponent', () => {
     )
     initNormally()
     expect(suggestionsSpy).toHaveBeenCalled()
-    expect(aiSuggestionsSpy).not.toHaveBeenCalled()
-    expect(component.suggestions).toEqual({
-      tags: [42, 43],
-      suggested_tags: [],
-      suggested_document_types: [],
-      suggested_correspondents: [],
-    })
-  })
-
-  it('should get AI suggestions when AI is enabled', () => {
-    const getSetting = settingsService.get.bind(settingsService)
-    jest
-      .spyOn(settingsService, 'get')
-      .mockImplementation((key) =>
-        key === SETTINGS_KEYS.AI_ENABLED ? true : getSetting(key)
-      )
-    const suggestionsSpy = jest.spyOn(documentService, 'getSuggestions')
-    const aiSuggestionsSpy = jest.spyOn(documentService, 'getAiSuggestions')
-    aiSuggestionsSpy.mockReturnValue(
-      of({
-        tags: [42, 43],
-        suggested_tags: [],
-        suggested_document_types: [],
-        suggested_correspondents: [],
-      })
-    )
-    initNormally()
-    expect(suggestionsSpy).not.toHaveBeenCalled()
-    expect(aiSuggestionsSpy).toHaveBeenCalled()
     expect(component.suggestions).toEqual({
       tags: [42, 43],
       suggested_tags: [],

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

@@ -981,10 +981,8 @@ export class DocumentDetailComponent
 
   getSuggestions() {
     this.suggestionsLoading = true
-    const suggestionsObservable = this.aiEnabled
-      ? this.documentsService.getAiSuggestions(this.documentId)
-      : this.documentsService.getSuggestions(this.documentId)
-    suggestionsObservable
+    this.documentsService
+      .getSuggestions(this.documentId)
       .pipe(
         first(),
         takeUntil(this.unsubscribeNotifier),

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

@@ -43,7 +43,7 @@
         </div>
         <p class="card-text">
           @if (document) {
-            @if (hasSearchHighlights) {
+            @if (document.__search_hit__ && document.__search_hit__.highlights) {
               <span [innerHtml]="document.__search_hit__.highlights"></span>
             }
             @for (highlight of searchNoteHighlights; track highlight) {
@@ -52,7 +52,7 @@
                 <span [innerHtml]="highlight"></span>
               </span>
             }
-            @if (shouldShowContentFallback) {
+            @if (!document.__search_hit__?.score) {
               <span class="result-content">{{contentTrimmed}}</span>
             }
           } @else {

src-ui/src/app/components/document-list/document-card-large/document-card-large.component.scss

@@ -65,9 +65,7 @@
   }
 }
 
-.card-text ::ng-deep .match,
-.card-text ::ng-deep b {
-  font-weight: normal;
+span ::ng-deep .match {
   color: black;
   background-color: rgb(255, 211, 66);
 }

src-ui/src/app/components/document-list/document-card-large/document-card-large.component.spec.ts

@@ -127,19 +127,6 @@ describe('DocumentCardLargeComponent', () => {
     expect(component.searchNoteHighlights).toContain('<span>bananas</span>')
   })
 
-  it('should fall back to document content when a search hit has no highlights', () => {
-    component.document.__search_hit__ = {
-      score: 0.9,
-      rank: 1,
-      highlights: '',
-      note_highlights: null,
-    }
-    fixture.detectChanges()
-
-    expect(fixture.nativeElement.textContent).toContain('Cupcake ipsum')
-    expect(component.shouldShowContentFallback).toBe(true)
-  })
-
   it('should try to close the preview on mouse leave', () => {
     component.popupPreview = {
       close: jest.fn(),

src-ui/src/app/components/document-list/document-card-large/document-card-large.component.ts

@@ -164,17 +164,6 @@ export class DocumentCardLargeComponent
     )
   }
 
-  get hasSearchHighlights() {
-    return Boolean(this.document?.__search_hit__?.highlights?.trim()?.length)
-  }
-
-  get shouldShowContentFallback() {
-    return (
-      this.document?.__search_hit__?.score == null ||
-      (!this.hasSearchHighlights && this.searchNoteHighlights.length === 0)
-    )
-  }
-
   get notesEnabled(): boolean {
     return this.settingsService.get(SETTINGS_KEYS.NOTES_ENABLED)
   }

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

@@ -55,12 +55,12 @@ export const ConfigCategory = {
 }
 
 export const LLMEmbeddingBackendConfig = {
-  OPENAI_LIKE: 'openai-like',
+  OPENAI: 'openai',
   HUGGINGFACE: 'huggingface',
 }
 
 export const LLMBackendConfig = {
-  OPENAI_LIKE: 'openai-like',
+  OPENAI: 'openai',
   OLLAMA: 'ollama',
 }
 

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

@@ -1,66 +1,49 @@
+import { Document } from './document'
 import { ObjectWithId } from './object-with-id'
 
 export enum PaperlessTaskType {
-  ConsumeFile = 'consume_file',
-  TrainClassifier = 'train_classifier',
-  SanityCheck = 'sanity_check',
-  MailFetch = 'mail_fetch',
-  LlmIndex = 'llm_index',
-  EmptyTrash = 'empty_trash',
-  CheckWorkflows = 'check_workflows',
-  BulkUpdate = 'bulk_update',
-  ReprocessDocument = 'reprocess_document',
-  BuildShareLink = 'build_share_link',
-  BulkDelete = 'bulk_delete',
+  Auto = 'auto_task',
+  ScheduledTask = 'scheduled_task',
+  ManualTask = 'manual_task',
 }
 
-export enum PaperlessTaskTriggerSource {
-  Scheduled = 'scheduled',
-  WebUI = 'web_ui',
-  ApiUpload = 'api_upload',
-  FolderConsume = 'folder_consume',
-  EmailConsume = 'email_consume',
-  System = 'system',
-  Manual = 'manual',
+export enum PaperlessTaskName {
+  ConsumeFile = 'consume_file',
+  TrainClassifier = 'train_classifier',
+  SanityCheck = 'check_sanity',
+  IndexOptimize = 'index_optimize',
+  LLMIndexUpdate = 'llmindex_update',
 }
 
 export enum PaperlessTaskStatus {
-  Pending = 'pending',
-  Started = 'started',
-  Success = 'success',
-  Failure = 'failure',
-  Revoked = 'revoked',
+  Pending = 'PENDING',
+  Started = 'STARTED',
+  Complete = 'SUCCESS',
+  Failed = 'FAILURE',
 }
 
 export interface PaperlessTask extends ObjectWithId {
-  task_id: string
-  task_type: PaperlessTaskType
-  task_type_display: string
-  trigger_source: PaperlessTaskTriggerSource
-  trigger_source_display: string
+  type: PaperlessTaskType
+
   status: PaperlessTaskStatus
-  status_display: string
-  date_created: Date
-  date_started?: Date
-  date_done?: Date
-  duration_seconds?: number
-  wait_time_seconds?: number
-  input_data: Record<string, any>
-  result_data?: Record<string, any>
-  related_document_ids: number[]
+
   acknowledged: boolean
+
+  task_id: string
+
+  task_file_name: string
+
+  task_name: PaperlessTaskName
+
+  date_created: Date
+
+  date_done?: Date
+
+  result?: string
+
+  related_document?: number
+
+  duplicate_documents?: Document[]
+
   owner?: number
 }
-
-export interface PaperlessTaskSummary {
-  task_type: PaperlessTaskType
-  total_count: number
-  pending_count: number
-  success_count: number
-  failure_count: number
-  avg_duration_seconds: number | null
-  avg_wait_time_seconds: number | null
-  last_run: Date | null
-  last_success: Date | null
-  last_failure: Date | null
-}

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

@@ -47,13 +47,6 @@ export interface SystemStatus {
     llmindex_status: SystemStatusItemStatus
     llmindex_last_modified: string // ISO date string
     llmindex_error: string
-    summary: {
-      days: number
-      total_count: number
-      pending_count: number
-      success_count: number
-      failure_count: number
-    }
   }
   websocket_connected?: SystemStatusItemStatus // added client-side
 }

src-ui/src/app/services/chat.service.spec.ts

@@ -9,11 +9,7 @@ import {
 } from '@angular/common/http/testing'
 import { TestBed } from '@angular/core/testing'
 import { environment } from 'src/environments/environment'
-import {
-  CHAT_METADATA_DELIMITER,
-  ChatService,
-  parseChatResponse,
-} from './chat.service'
+import { ChatService } from './chat.service'
 
 describe('ChatService', () => {
   let service: ChatService
@@ -59,22 +55,4 @@ describe('ChatService', () => {
       partialText: mockResponse,
     } as any)
   })
-
-  it('should parse chat references from the metadata trailer', () => {
-    const parsed = parseChatResponse(
-      `Answer text${CHAT_METADATA_DELIMITER}{"references":[{"id":1,"title":"Document 1"}]}`
-    )
-
-    expect(parsed.content).toBe('Answer text')
-    expect(parsed.references).toEqual([{ id: 1, title: 'Document 1' }])
-  })
-
-  it('should hide incomplete metadata trailer from the visible content', () => {
-    const parsed = parseChatResponse(
-      `Answer text${CHAT_METADATA_DELIMITER}{"references"`
-    )
-
-    expect(parsed.content).toBe('Answer text')
-    expect(parsed.references).toBeUndefined()
-  })
 })

src-ui/src/app/services/chat.service.ts

@@ -11,46 +11,6 @@ export interface ChatMessage {
   role: 'user' | 'assistant'
   content: string
   isStreaming?: boolean
-  references?: ChatReference[]
-}
-
-export interface ChatReference {
-  id: number
-  title: string
-}
-
-export interface ParsedChatResponse {
-  content: string
-  references?: ChatReference[]
-}
-
-export const CHAT_METADATA_DELIMITER = '\n\n__PAPERLESS_CHAT_METADATA__'
-
-export function parseChatResponse(response: string): ParsedChatResponse {
-  const delimiterIndex = response.indexOf(CHAT_METADATA_DELIMITER)
-
-  if (delimiterIndex === -1) {
-    return { content: response }
-  }
-
-  const metadataString = response.slice(
-    delimiterIndex + CHAT_METADATA_DELIMITER.length
-  )
-
-  try {
-    const metadata = JSON.parse(metadataString) as {
-      references?: ChatReference[]
-    }
-
-    return {
-      content: response.slice(0, delimiterIndex),
-      references: metadata.references ?? [],
-    }
-  } catch {
-    return {
-      content: response.slice(0, delimiterIndex),
-    }
-  }
 }
 
 @Injectable({

src-ui/src/app/services/permissions.service.spec.ts

@@ -8,7 +8,7 @@ import {
 
 const VIEW_ONLY_PERMISSION_TYPES = new Set<PermissionType>([
   PermissionType.GlobalStatistics,
-  PermissionType.SystemMonitoring,
+  PermissionType.SystemStatus,
 ])
 
 describe('PermissionsService', () => {
@@ -270,7 +270,7 @@ describe('PermissionsService', () => {
         'delete_applicationconfiguration',
         'view_applicationconfiguration',
         'view_global_statistics',
-        'view_system_monitoring',
+        'view_system_status',
       ],
       {
         username: 'testuser',

src-ui/src/app/services/permissions.service.ts

@@ -30,7 +30,7 @@ export enum PermissionType {
   Workflow = '%s_workflow',
   ProcessedMail = '%s_processedmail',
   GlobalStatistics = '%s_global_statistics',
-  SystemMonitoring = '%s_system_monitoring',
+  SystemStatus = '%s_system_status',
 }
 
 @Injectable({

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

@@ -193,14 +193,6 @@ describe(`DocumentService`, () => {
     expect(req.request.method).toEqual('GET')
   })
 
-  it('should call appropriate api endpoint for getting AI suggestions', () => {
-    subscription = service.getAiSuggestions(documents[0].id).subscribe()
-    const req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}${endpoint}/${documents[0].id}/ai_suggestions/`
-    )
-    expect(req.request.method).toEqual('GET')
-  })
-
   it('should call appropriate api endpoint for bulk download', () => {
     const ids = [1, 2, 3]
     const content = 'both'

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

@@ -404,12 +404,6 @@ export class DocumentService extends AbstractPaperlessService<Document> {
     )
   }
 
-  getAiSuggestions(id: number): Observable<DocumentSuggestions> {
-    return this.http.get<DocumentSuggestions>(
-      this.getResourceUrl(id, 'ai_suggestions')
-    )
-  }
-
   getHistory(id: number): Observable<AuditLogEntry[]> {
     return this.http.get<AuditLogEntry[]>(this.getResourceUrl(id, 'history'))
   }

src-ui/src/app/services/tasks.service.spec.ts

@@ -1,8 +1,4 @@
-import {
-  HttpRequest,
-  provideHttpClient,
-  withInterceptorsFromDi,
-} from '@angular/common/http'
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
 import {
   HttpTestingController,
   provideHttpClientTesting,
@@ -10,8 +6,8 @@ import {
 import { TestBed } from '@angular/core/testing'
 import { environment } from 'src/environments/environment'
 import {
+  PaperlessTaskName,
   PaperlessTaskStatus,
-  PaperlessTaskTriggerSource,
   PaperlessTaskType,
 } from '../data/paperless-task'
 import { TasksService } from './tasks.service'
@@ -41,21 +37,16 @@ describe('TasksService', () => {
   it('calls tasks api endpoint on reload', () => {
     tasksService.reload()
     const req = httpTestingController.expectOne(
-      (req: HttpRequest<unknown>) =>
-        req.url === `${environment.apiBaseUrl}tasks/` &&
-        req.params.get('acknowledged') === 'false' &&
-        req.params.get('page_size') === '1000'
+      `${environment.apiBaseUrl}tasks/?task_name=consume_file&acknowledged=false`
     )
     expect(req.request.method).toEqual('GET')
-    req.flush({ count: 0, results: [] })
   })
 
   it('does not call tasks api endpoint on reload if already loading', () => {
     tasksService.loading = true
     tasksService.reload()
     httpTestingController.expectNone(
-      (req: HttpRequest<unknown>) =>
-        req.url === `${environment.apiBaseUrl}tasks/`
+      `${environment.apiBaseUrl}tasks/?task_name=consume_file&acknowledged=false`
     )
   })
 
@@ -72,79 +63,68 @@ describe('TasksService', () => {
     // reload is then called
     httpTestingController
       .expectOne(
-        (req: HttpRequest<unknown>) =>
-          req.url === `${environment.apiBaseUrl}tasks/` &&
-          req.params.get('acknowledged') === 'false' &&
-          req.params.get('page_size') === '1000'
+        `${environment.apiBaseUrl}tasks/?task_name=consume_file&acknowledged=false`
       )
-      .flush({ count: 0, results: [] })
+      .flush([])
   })
 
-  it('groups mixed task types by status when reloading', () => {
+  it('sorts tasks returned from api', () => {
     expect(tasksService.total).toEqual(0)
     const mockTasks = [
       {
-        task_type: PaperlessTaskType.ConsumeFile,
-        trigger_source: PaperlessTaskTriggerSource.FolderConsume,
-        status: PaperlessTaskStatus.Success,
+        type: PaperlessTaskType.Auto,
+        task_name: PaperlessTaskName.ConsumeFile,
+        status: PaperlessTaskStatus.Complete,
         acknowledged: false,
         task_id: '1234',
-        input_data: { filename: 'file1.pdf' },
+        task_file_name: 'file1.pdf',
         date_created: new Date(),
-        related_document_ids: [],
       },
       {
-        task_type: PaperlessTaskType.SanityCheck,
-        trigger_source: PaperlessTaskTriggerSource.System,
-        status: PaperlessTaskStatus.Failure,
+        type: PaperlessTaskType.Auto,
+        task_name: PaperlessTaskName.ConsumeFile,
+        status: PaperlessTaskStatus.Failed,
         acknowledged: false,
         task_id: '1235',
-        input_data: {},
+        task_file_name: 'file2.pdf',
         date_created: new Date(),
-        related_document_ids: [],
       },
       {
-        task_type: PaperlessTaskType.MailFetch,
-        trigger_source: PaperlessTaskTriggerSource.Scheduled,
+        type: PaperlessTaskType.Auto,
+        task_name: PaperlessTaskName.ConsumeFile,
         status: PaperlessTaskStatus.Pending,
         acknowledged: false,
         task_id: '1236',
-        input_data: {},
+        task_file_name: 'file3.pdf',
         date_created: new Date(),
-        related_document_ids: [],
       },
       {
-        task_type: PaperlessTaskType.LlmIndex,
-        trigger_source: PaperlessTaskTriggerSource.WebUI,
+        type: PaperlessTaskType.Auto,
+        task_name: PaperlessTaskName.ConsumeFile,
         status: PaperlessTaskStatus.Started,
         acknowledged: false,
         task_id: '1237',
-        input_data: {},
+        task_file_name: 'file4.pdf',
         date_created: new Date(),
-        related_document_ids: [],
       },
       {
-        task_type: PaperlessTaskType.EmptyTrash,
-        trigger_source: PaperlessTaskTriggerSource.Manual,
-        status: PaperlessTaskStatus.Success,
+        type: PaperlessTaskType.Auto,
+        task_name: PaperlessTaskName.ConsumeFile,
+        status: PaperlessTaskStatus.Complete,
         acknowledged: false,
         task_id: '1238',
-        input_data: {},
+        task_file_name: 'file5.pdf',
         date_created: new Date(),
-        related_document_ids: [],
       },
     ]
 
     tasksService.reload()
 
     const req = httpTestingController.expectOne(
-      (req: HttpRequest<unknown>) =>
-        req.url === `${environment.apiBaseUrl}tasks/` &&
-        req.params.get('acknowledged') === 'false' &&
-        req.params.get('page_size') === '1000'
+      `${environment.apiBaseUrl}tasks/?task_name=consume_file&acknowledged=false`
     )
 
-    req.flush({ count: mockTasks.length, results: mockTasks })
+    req.flush(mockTasks)
 
     expect(tasksService.allFileTasks).toHaveLength(5)
     expect(tasksService.completedFileTasks).toHaveLength(2)
@@ -153,64 +133,10 @@ describe('TasksService', () => {
     expect(tasksService.startedFileTasks).toHaveLength(1)
   })
 
-  it('includes revoked tasks in needs attention', () => {
-    const mockTasks = [
-      {
-        task_type: PaperlessTaskType.SanityCheck,
-        trigger_source: PaperlessTaskTriggerSource.System,
-        status: PaperlessTaskStatus.Failure,
-        acknowledged: false,
-        task_id: '1235',
-        input_data: {},
-        date_created: new Date(),
-        related_document_ids: [],
-      },
-      {
-        task_type: PaperlessTaskType.MailFetch,
-        trigger_source: PaperlessTaskTriggerSource.Scheduled,
-        status: PaperlessTaskStatus.Revoked,
-        acknowledged: false,
-        task_id: '1236',
-        input_data: {},
-        date_created: new Date(),
-        related_document_ids: [],
-      },
-      {
-        task_type: PaperlessTaskType.EmptyTrash,
-        trigger_source: PaperlessTaskTriggerSource.Manual,
-        status: PaperlessTaskStatus.Success,
-        acknowledged: false,
-        task_id: '1238',
-        input_data: {},
-        date_created: new Date(),
-        related_document_ids: [],
-      },
-    ]
-
-    tasksService.reload()
-
-    const req = httpTestingController.expectOne(
-      (req: HttpRequest<unknown>) =>
-        req.url === `${environment.apiBaseUrl}tasks/` &&
-        req.params.get('acknowledged') === 'false' &&
-        req.params.get('page_size') === '1000'
-    )
-
-    req.flush({ count: mockTasks.length, results: mockTasks })
-
-    expect(tasksService.needsAttentionTasks).toHaveLength(2)
-    expect(tasksService.needsAttentionTasks.map((task) => task.status)).toEqual(
-      expect.arrayContaining([
-        PaperlessTaskStatus.Failure,
-        PaperlessTaskStatus.Revoked,
-      ])
-    )
-  })
-
   it('supports running tasks', () => {
-    tasksService.run(PaperlessTaskType.SanityCheck).subscribe((res) => {
+    tasksService.run(PaperlessTaskName.SanityCheck).subscribe((res) => {
       expect(res).toEqual({
-        task_id: 'abc-123',
+        result: 'success',
       })
     })
     const req = httpTestingController.expectOne(
@@ -218,7 +144,7 @@ describe('TasksService', () => {
     )
     expect(req.request.method).toEqual('POST')
     req.flush({
-      task_id: 'abc-123',
+      result: 'success',
     })
   })
 })

src-ui/src/app/services/tasks.service.ts

@@ -1,13 +1,12 @@
 import { HttpClient } from '@angular/common/http'
 import { Injectable, inject } from '@angular/core'
 import { Observable, Subject } from 'rxjs'
-import { first, map, takeUntil, tap } from 'rxjs/operators'
+import { first, takeUntil, tap } from 'rxjs/operators'
 import {
   PaperlessTask,
+  PaperlessTaskName,
   PaperlessTaskStatus,
-  PaperlessTaskType,
 } from 'src/app/data/paperless-task'
-import { Results } from 'src/app/data/results'
 import { environment } from 'src/environments/environment'
 
 @Injectable({
@@ -18,9 +17,8 @@ export class TasksService {
 
   private baseUrl: string = environment.apiBaseUrl
   private endpoint: string = 'tasks'
-  private readonly defaultReloadPageSize = 1000
 
-  public loading: boolean = false
+  public loading: boolean
 
   private fileTasks: PaperlessTask[] = []
 
@@ -35,35 +33,21 @@ export class TasksService {
   }
 
   public get queuedFileTasks(): PaperlessTask[] {
-    return this.fileTasks.filter(
-      (t) => t.status === PaperlessTaskStatus.Pending
-    )
+    return this.fileTasks.filter((t) => t.status == PaperlessTaskStatus.Pending)
   }
 
   public get startedFileTasks(): PaperlessTask[] {
-    return this.fileTasks.filter(
-      (t) => t.status === PaperlessTaskStatus.Started
-    )
+    return this.fileTasks.filter((t) => t.status == PaperlessTaskStatus.Started)
   }
 
   public get completedFileTasks(): PaperlessTask[] {
     return this.fileTasks.filter(
-      (t) => t.status === PaperlessTaskStatus.Success
+      (t) => t.status == PaperlessTaskStatus.Complete
     )
   }
 
   public get failedFileTasks(): PaperlessTask[] {
-    return this.fileTasks.filter(
-      (t) => t.status === PaperlessTaskStatus.Failure
-    )
-  }
-
-  public get needsAttentionTasks(): PaperlessTask[] {
-    return this.fileTasks.filter((t) =>
-      [PaperlessTaskStatus.Failure, PaperlessTaskStatus.Revoked].includes(
-        t.status
-      )
-    )
+    return this.fileTasks.filter((t) => t.status == PaperlessTaskStatus.Failed)
   }
 
   public reload() {
@@ -71,38 +55,19 @@ export class TasksService {
     this.loading = true
 
     this.http
-      .get<Results<PaperlessTask>>(`${this.baseUrl}${this.endpoint}/`, {
-        params: {
-          acknowledged: 'false',
-          page_size: this.defaultReloadPageSize,
-        },
-      })
-      .pipe(map((r) => r.results))
+      .get<PaperlessTask[]>(
+        `${this.baseUrl}${this.endpoint}/?task_name=consume_file&acknowledged=false`
+      )
       .pipe(takeUntil(this.unsubscribeNotifer), first())
       .subscribe((r) => {
-        this.fileTasks = r
+        this.fileTasks = r.filter(
+          (t) => t.task_name == PaperlessTaskName.ConsumeFile
+        )
         this.loading = false
       })
   }
 
-  public list(
-    page: number,
-    pageSize: number,
-    extraParams?: Record<string, string | number | boolean>
-  ): Observable<Results<PaperlessTask>> {
-    return this.http.get<Results<PaperlessTask>>(
-      `${this.baseUrl}${this.endpoint}/`,
-      {
-        params: {
-          page,
-          page_size: pageSize,
-          ...extraParams,
-        },
-      }
-    )
-  }
-
-  public dismissTasks(task_ids: Set<number>): Observable<any> {
+  public dismissTasks(task_ids: Set<number>) {
     return this.http
       .post(`${this.baseUrl}tasks/acknowledge/`, {
         tasks: [...task_ids],
@@ -120,10 +85,12 @@ export class TasksService {
     this.unsubscribeNotifer.next(true)
   }
 
-  public run(taskType: PaperlessTaskType): Observable<{ task_id: string }> {
-    return this.http.post<{ task_id: string }>(
+  public run(taskName: PaperlessTaskName): Observable<any> {
+    return this.http.post<any>(
       `${environment.apiBaseUrl}${this.endpoint}/run/`,
-      { task_type: taskType }
+      {
+        task_name: taskName,
+      }
     )
   }
 }

src-ui/src/app/utils/custom-field-query-element.spec.ts

@@ -142,21 +142,6 @@ describe('CustomFieldQueryAtom', () => {
     atom.value = [1, 3]
     expect(changeSpy).toHaveBeenCalledTimes(1)
   })
-
-  it('should emit one changed event when operator change coerces value', () => {
-    const atom = new CustomFieldQueryAtom([
-      1,
-      CustomFieldQueryOperator.In,
-      [1, 2],
-    ])
-    const changeSpy = jest.fn()
-    atom.changed.subscribe(changeSpy)
-
-    atom.operator = CustomFieldQueryOperator.Exact
-
-    expect(changeSpy).toHaveBeenCalledTimes(1)
-    expect(atom.serialize()).toEqual([1, CustomFieldQueryOperator.Exact, ''])
-  })
 })
 
 describe('CustomFieldQueryExpression', () => {

src-ui/src/app/utils/custom-field-query-element.ts

@@ -70,29 +70,29 @@ export class CustomFieldQueryAtom extends CustomFieldQueryElement {
     const newTypes: string[] =
       CUSTOM_FIELD_QUERY_VALUE_TYPES_BY_OPERATOR[operator]?.split('|')
     if (!newTypes) {
-      this._value = null
+      this.value = null
     } else {
       if (!newTypes.includes(typeof this.value)) {
         switch (newTypes[0]) {
           case 'string':
-            this._value = ''
+            this.value = ''
             break
           case 'boolean':
-            this._value = 'true'
+            this.value = 'true'
             break
           case 'array':
-            this._value = []
+            this.value = []
             break
           case 'number':
             const num = parseFloat(this.value as string)
-            this._value = isNaN(num) ? null : num.toString()
+            this.value = isNaN(num) ? null : num.toString()
             break
         }
       } else if (
         ['true', 'false'].includes(this.value as string) &&
         newTypes.includes('string')
       ) {
-        this._value = ''
+        this.value = ''
       }
     }
     super.operator = operator
@@ -103,13 +103,7 @@ export class CustomFieldQueryAtom extends CustomFieldQueryElement {
     return super.operator
   }
 
-  constructor(
-    queryArray: [number, string, string | string[] | number[]] = [
-      null,
-      null,
-      null,
-    ]
-  ) {
+  constructor(queryArray: [number, string, string] = [null, null, null]) {
     super(CustomFieldQueryElementType.Atom)
     ;[this._field, this._operator, this._value] = queryArray
   }

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

@@ -6,7 +6,7 @@ export const environment = {
   apiVersion: '10', // match src/paperless/settings.py
   appTitle: 'Paperless-ngx',
   tag: 'prod',
-  version: '2.20.15',
+  version: '2.20.13',
   webSocketHost: window.location.host,
   webSocketProtocol: window.location.protocol == 'https:' ? 'wss:' : 'ws:',
   webSocketBaseUrl: base_url.pathname + 'ws/',