mirror of
https://github.com/paperless-ngx/paperless-ngx.git
synced 2025-05-09 11:59:27 -05:00
Compare commits
No commits in common. "dev" and "v2.15.0-beta.rc1" have entirely different histories.
dev
...
v2.15.0-be
.devcontainer
.github
.pre-commit-config.yamlCONTRIBUTING.mdDockerfileREADME.mddocker
compose
docker-compose.ci-test.ymldocker-compose.mariadb-tika.ymldocker-compose.mariadb.ymldocker-compose.portainer.ymldocker-compose.postgres-tika.ymldocker-compose.postgres.ymldocker-compose.sqlite-tika.ymldocker-compose.sqlite.yml
docker-entrypoint.shinstall_management_commands.shrootfs
docs
administration.mdapi.mdchangelog.mdconfiguration.mddevelopment.mdfaq.mdindex.mdsetup.mdtroubleshooting.mdusage.md
mkdocs.ymlpyproject.tomlsrc-ui
messages.xlfpackage.jsonpnpm-lock.yaml
src
app
components
app-frame
common
custom-fields-dropdown
edit-dialog
email-document-dialog
filterable-dropdown
input
document-detail
document-list
bulk-editor
document-card-large
filter-editor
manage/mail
data
pipes
services
utils
environments
locale
@ -21,17 +21,19 @@
|
|||||||
# This file is intended only to be used through VSCOde devcontainers. See README.md
|
# This file is intended only to be used through VSCOde devcontainers. See README.md
|
||||||
# in the folder .devcontainer.
|
# in the folder .devcontainer.
|
||||||
|
|
||||||
|
|
||||||
services:
|
services:
|
||||||
broker:
|
broker:
|
||||||
image: docker.io/library/redis:7
|
image: docker.io/library/redis:7
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- ./redisdata:/data
|
- ./redisdata:/data
|
||||||
|
|
||||||
# No ports need to be exposed; the VSCode DevContainer plugin manages them.
|
# No ports need to be exposed; the VSCode DevContainer plugin manages them.
|
||||||
paperless-development:
|
paperless-development:
|
||||||
image: paperless-ngx
|
image: paperless-ngx
|
||||||
build:
|
build:
|
||||||
context: ../ # Dockerfile cannot access files from parent directories if context is not set.
|
context: ../ # Dockerfile cannot access files from parent directories if context is not set.
|
||||||
dockerfile: ./.devcontainer/Dockerfile
|
dockerfile: ./.devcontainer/Dockerfile
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
depends_on:
|
depends_on:
|
||||||
@ -58,20 +60,25 @@ services:
|
|||||||
PAPERLESS_TIKA_ENDPOINT: http://tika:9998
|
PAPERLESS_TIKA_ENDPOINT: http://tika:9998
|
||||||
PAPERLESS_STATICDIR: ./src/documents/static
|
PAPERLESS_STATICDIR: ./src/documents/static
|
||||||
PAPERLESS_DEBUG: true
|
PAPERLESS_DEBUG: true
|
||||||
|
|
||||||
# Overrides default command so things don't shut down after the process ends.
|
# Overrides default command so things don't shut down after the process ends.
|
||||||
command: /bin/sh -c "chown -R paperless:paperless /usr/src/paperless/paperless-ngx/src/documents/static/frontend && chown -R paperless:paperless /usr/src/paperless/paperless-ngx/.ruff_cache && while sleep 1000; do :; done"
|
command: /bin/sh -c "chown -R paperless:paperless /usr/src/paperless/paperless-ngx/src/documents/static/frontend && chown -R paperless:paperless /usr/src/paperless/paperless-ngx/.ruff_cache && while sleep 1000; do :; done"
|
||||||
|
|
||||||
gotenberg:
|
gotenberg:
|
||||||
image: docker.io/gotenberg/gotenberg:8.17
|
image: docker.io/gotenberg/gotenberg:8.17
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
# The Gotenberg Chromium route is used to convert .eml files. We do not
|
# The Gotenberg Chromium route is used to convert .eml files. We do not
|
||||||
# want to allow external content like tracking pixels or even JavaScript.
|
# want to allow external content like tracking pixels or even JavaScript.
|
||||||
command:
|
command:
|
||||||
- "gotenberg"
|
- "gotenberg"
|
||||||
- "--chromium-disable-javascript=true"
|
- "--chromium-disable-javascript=true"
|
||||||
- "--chromium-allow-list=file:///tmp/.*"
|
- "--chromium-allow-list=file:///tmp/.*"
|
||||||
|
|
||||||
tika:
|
tika:
|
||||||
image: docker.io/apache/tika:latest
|
image: docker.io/apache/tika:latest
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
data:
|
data:
|
||||||
media:
|
media:
|
||||||
|
8
.github/dependabot.yml
vendored
8
.github/dependabot.yml
vendored
@ -5,6 +5,7 @@ version: 2
|
|||||||
# Required for uv support for now
|
# Required for uv support for now
|
||||||
enable-beta-ecosystems: true
|
enable-beta-ecosystems: true
|
||||||
updates:
|
updates:
|
||||||
|
|
||||||
# Enable version updates for pnpm
|
# Enable version updates for pnpm
|
||||||
- package-ecosystem: "npm"
|
- package-ecosystem: "npm"
|
||||||
target-branch: "dev"
|
target-branch: "dev"
|
||||||
@ -34,6 +35,7 @@ updates:
|
|||||||
patterns:
|
patterns:
|
||||||
- "@typescript-eslint*"
|
- "@typescript-eslint*"
|
||||||
- "eslint"
|
- "eslint"
|
||||||
|
|
||||||
# Enable version updates for Python
|
# Enable version updates for Python
|
||||||
- package-ecosystem: "uv"
|
- package-ecosystem: "uv"
|
||||||
target-branch: "dev"
|
target-branch: "dev"
|
||||||
@ -57,7 +59,6 @@ updates:
|
|||||||
django:
|
django:
|
||||||
patterns:
|
patterns:
|
||||||
- "*django*"
|
- "*django*"
|
||||||
- "drf-*"
|
|
||||||
major-versions:
|
major-versions:
|
||||||
update-types:
|
update-types:
|
||||||
- "major"
|
- "major"
|
||||||
@ -69,6 +70,7 @@ updates:
|
|||||||
patterns:
|
patterns:
|
||||||
- psycopg*
|
- psycopg*
|
||||||
- zxing-cpp
|
- zxing-cpp
|
||||||
|
|
||||||
# Enable updates for GitHub Actions
|
# Enable updates for GitHub Actions
|
||||||
- package-ecosystem: "github-actions"
|
- package-ecosystem: "github-actions"
|
||||||
target-branch: "dev"
|
target-branch: "dev"
|
||||||
@ -88,6 +90,7 @@ updates:
|
|||||||
- "major"
|
- "major"
|
||||||
- "minor"
|
- "minor"
|
||||||
- "patch"
|
- "patch"
|
||||||
|
|
||||||
# Update Dockerfile in root directory
|
# Update Dockerfile in root directory
|
||||||
- package-ecosystem: "docker"
|
- package-ecosystem: "docker"
|
||||||
directory: "/"
|
directory: "/"
|
||||||
@ -97,10 +100,12 @@ updates:
|
|||||||
reviewers:
|
reviewers:
|
||||||
- "paperless-ngx/ci-cd"
|
- "paperless-ngx/ci-cd"
|
||||||
labels:
|
labels:
|
||||||
|
- "ci-cd"
|
||||||
- "dependencies"
|
- "dependencies"
|
||||||
commit-message:
|
commit-message:
|
||||||
prefix: "docker"
|
prefix: "docker"
|
||||||
include: "scope"
|
include: "scope"
|
||||||
|
|
||||||
# Update Docker Compose files in docker/compose directory
|
# Update Docker Compose files in docker/compose directory
|
||||||
- package-ecosystem: "docker-compose"
|
- package-ecosystem: "docker-compose"
|
||||||
directory: "/docker/compose/"
|
directory: "/docker/compose/"
|
||||||
@ -110,6 +115,7 @@ updates:
|
|||||||
reviewers:
|
reviewers:
|
||||||
- "paperless-ngx/ci-cd"
|
- "paperless-ngx/ci-cd"
|
||||||
labels:
|
labels:
|
||||||
|
- "ci-cd"
|
||||||
- "dependencies"
|
- "dependencies"
|
||||||
commit-message:
|
commit-message:
|
||||||
prefix: "docker-compose"
|
prefix: "docker-compose"
|
||||||
|
19
.github/labeler.yml
vendored
19
.github/labeler.yml
vendored
@ -1,19 +0,0 @@
|
|||||||
backend:
|
|
||||||
- changed-files:
|
|
||||||
- any-glob-to-any-file:
|
|
||||||
- 'src/**'
|
|
||||||
- 'pyproject.toml'
|
|
||||||
- 'uv.lock'
|
|
||||||
- 'requirements.txt'
|
|
||||||
frontend:
|
|
||||||
- changed-files:
|
|
||||||
- any-glob-to-any-file:
|
|
||||||
- 'src-ui/**'
|
|
||||||
documentation:
|
|
||||||
- changed-files:
|
|
||||||
- any-glob-to-any-file:
|
|
||||||
- 'docs/**'
|
|
||||||
ci-cd:
|
|
||||||
- changed-files:
|
|
||||||
- any-glob-to-any-file:
|
|
||||||
- '.github/**'
|
|
294
.github/workflows/ci.yml
vendored
294
.github/workflows/ci.yml
vendored
@ -1,4 +1,5 @@
|
|||||||
name: ci
|
name: ci
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
tags:
|
tags:
|
||||||
@ -11,57 +12,72 @@ on:
|
|||||||
pull_request:
|
pull_request:
|
||||||
branches-ignore:
|
branches-ignore:
|
||||||
- 'translations**'
|
- 'translations**'
|
||||||
|
|
||||||
env:
|
env:
|
||||||
DEFAULT_UV_VERSION: "0.6.x"
|
DEFAULT_UV_VERSION: "0.6.x"
|
||||||
# This is the default version of Python to use in most steps which aren't specific
|
# This is the default version of Python to use in most steps which aren't specific
|
||||||
DEFAULT_PYTHON_VERSION: "3.11"
|
DEFAULT_PYTHON_VERSION: "3.11"
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
pre-commit:
|
pre-commit:
|
||||||
# We want to run on external PRs, but not on our own internal PRs as they'll be run
|
# We want to run on external PRs, but not on our own internal PRs as they'll be run
|
||||||
# by the push to the branch. Without this if check, checks are duplicated since
|
# by the push to the branch. Without this if check, checks are duplicated since
|
||||||
# internal PRs match both the push and pull_request events.
|
# internal PRs match both the push and pull_request events.
|
||||||
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
|
if:
|
||||||
|
github.event_name == 'push' || github.event.pull_request.head.repo.full_name !=
|
||||||
|
github.repository
|
||||||
|
|
||||||
name: Linting Checks
|
name: Linting Checks
|
||||||
runs-on: ubuntu-24.04
|
runs-on: ubuntu-24.04
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
-
|
||||||
|
name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
- name: Install python
|
-
|
||||||
|
name: Install python
|
||||||
uses: actions/setup-python@v5
|
uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
|
python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
|
||||||
- name: Check files
|
-
|
||||||
|
name: Check files
|
||||||
uses: pre-commit/action@v3.0.1
|
uses: pre-commit/action@v3.0.1
|
||||||
|
|
||||||
documentation:
|
documentation:
|
||||||
name: "Build & Deploy Documentation"
|
name: "Build & Deploy Documentation"
|
||||||
runs-on: ubuntu-24.04
|
runs-on: ubuntu-24.04
|
||||||
needs:
|
needs:
|
||||||
- pre-commit
|
- pre-commit
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
-
|
||||||
|
name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
- name: Set up Python
|
-
|
||||||
|
name: Set up Python
|
||||||
id: setup-python
|
id: setup-python
|
||||||
uses: actions/setup-python@v5
|
uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
|
python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
|
||||||
- name: Install uv
|
-
|
||||||
uses: astral-sh/setup-uv@v6
|
name: Install uv
|
||||||
|
uses: astral-sh/setup-uv@v5
|
||||||
with:
|
with:
|
||||||
version: ${{ env.DEFAULT_UV_VERSION }}
|
version: ${{ env.DEFAULT_UV_VERSION }}
|
||||||
enable-cache: true
|
enable-cache: true
|
||||||
python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
|
python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
|
||||||
- name: Install Python dependencies
|
-
|
||||||
|
name: Install Python dependencies
|
||||||
run: |
|
run: |
|
||||||
uv sync --python ${{ steps.setup-python.outputs.python-version }} --dev --frozen
|
uv sync --python ${{ steps.setup-python.outputs.python-version }} --dev --frozen
|
||||||
- name: Make documentation
|
-
|
||||||
|
name: Make documentation
|
||||||
run: |
|
run: |
|
||||||
uv run \
|
uv run \
|
||||||
--python ${{ steps.setup-python.outputs.python-version }} \
|
--python ${{ steps.setup-python.outputs.python-version }} \
|
||||||
--dev \
|
--dev \
|
||||||
--frozen \
|
--frozen \
|
||||||
mkdocs build --config-file ./mkdocs.yml
|
mkdocs build --config-file ./mkdocs.yml
|
||||||
- name: Deploy documentation
|
-
|
||||||
|
name: Deploy documentation
|
||||||
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
|
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
|
||||||
run: |
|
run: |
|
||||||
echo "docs.paperless-ngx.com" > "${{ github.workspace }}/docs/CNAME"
|
echo "docs.paperless-ngx.com" > "${{ github.workspace }}/docs/CNAME"
|
||||||
@ -72,12 +88,14 @@ jobs:
|
|||||||
--dev \
|
--dev \
|
||||||
--frozen \
|
--frozen \
|
||||||
mkdocs gh-deploy --force --no-history
|
mkdocs gh-deploy --force --no-history
|
||||||
- name: Upload artifact
|
-
|
||||||
|
name: Upload artifact
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: documentation
|
name: documentation
|
||||||
path: site/
|
path: site/
|
||||||
retention-days: 7
|
retention-days: 7
|
||||||
|
|
||||||
tests-backend:
|
tests-backend:
|
||||||
name: "Backend Tests (Python ${{ matrix.python-version }})"
|
name: "Backend Tests (Python ${{ matrix.python-version }})"
|
||||||
runs-on: ubuntu-24.04
|
runs-on: ubuntu-24.04
|
||||||
@ -88,40 +106,49 @@ jobs:
|
|||||||
python-version: ['3.10', '3.11', '3.12']
|
python-version: ['3.10', '3.11', '3.12']
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
-
|
||||||
|
name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
- name: Start containers
|
-
|
||||||
|
name: Start containers
|
||||||
run: |
|
run: |
|
||||||
docker compose --file ${{ github.workspace }}/docker/compose/docker-compose.ci-test.yml pull --quiet
|
docker compose --file ${{ github.workspace }}/docker/compose/docker-compose.ci-test.yml pull --quiet
|
||||||
docker compose --file ${{ github.workspace }}/docker/compose/docker-compose.ci-test.yml up --detach
|
docker compose --file ${{ github.workspace }}/docker/compose/docker-compose.ci-test.yml up --detach
|
||||||
- name: Set up Python
|
-
|
||||||
|
name: Set up Python
|
||||||
id: setup-python
|
id: setup-python
|
||||||
uses: actions/setup-python@v5
|
uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: "${{ matrix.python-version }}"
|
python-version: "${{ matrix.python-version }}"
|
||||||
- name: Install uv
|
-
|
||||||
uses: astral-sh/setup-uv@v6
|
name: Install uv
|
||||||
|
uses: astral-sh/setup-uv@v5
|
||||||
with:
|
with:
|
||||||
version: ${{ env.DEFAULT_UV_VERSION }}
|
version: ${{ env.DEFAULT_UV_VERSION }}
|
||||||
enable-cache: true
|
enable-cache: true
|
||||||
python-version: ${{ steps.setup-python.outputs.python-version }}
|
python-version: ${{ steps.setup-python.outputs.python-version }}
|
||||||
- name: Install system dependencies
|
-
|
||||||
|
name: Install system dependencies
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update -qq
|
sudo apt-get update -qq
|
||||||
sudo apt-get install -qq --no-install-recommends unpaper tesseract-ocr imagemagick ghostscript libzbar0 poppler-utils
|
sudo apt-get install -qq --no-install-recommends unpaper tesseract-ocr imagemagick ghostscript libzbar0 poppler-utils
|
||||||
- name: Configure ImageMagick
|
-
|
||||||
|
name: Configure ImageMagick
|
||||||
run: |
|
run: |
|
||||||
sudo cp docker/rootfs/etc/ImageMagick-6/paperless-policy.xml /etc/ImageMagick-6/policy.xml
|
sudo cp docker/rootfs/etc/ImageMagick-6/paperless-policy.xml /etc/ImageMagick-6/policy.xml
|
||||||
- name: Install Python dependencies
|
-
|
||||||
|
name: Install Python dependencies
|
||||||
run: |
|
run: |
|
||||||
uv sync \
|
uv sync \
|
||||||
--python ${{ steps.setup-python.outputs.python-version }} \
|
--python ${{ steps.setup-python.outputs.python-version }} \
|
||||||
--group testing \
|
--group testing \
|
||||||
--frozen
|
--frozen
|
||||||
- name: List installed Python dependencies
|
-
|
||||||
|
name: List installed Python dependencies
|
||||||
run: |
|
run: |
|
||||||
uv pip list
|
uv pip list
|
||||||
- name: Tests
|
-
|
||||||
|
name: Tests
|
||||||
env:
|
env:
|
||||||
PAPERLESS_CI_TEST: 1
|
PAPERLESS_CI_TEST: 1
|
||||||
# Enable paperless_mail testing against real server
|
# Enable paperless_mail testing against real server
|
||||||
@ -134,24 +161,28 @@ jobs:
|
|||||||
--dev \
|
--dev \
|
||||||
--frozen \
|
--frozen \
|
||||||
pytest
|
pytest
|
||||||
- name: Upload backend test results to Codecov
|
-
|
||||||
|
name: Upload backend test results to Codecov
|
||||||
if: always()
|
if: always()
|
||||||
uses: codecov/test-results-action@v1
|
uses: codecov/test-results-action@v1
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.CODECOV_TOKEN }}
|
token: ${{ secrets.CODECOV_TOKEN }}
|
||||||
flags: backend-python-${{ matrix.python-version }}
|
flags: backend-python-${{ matrix.python-version }}
|
||||||
files: junit.xml
|
files: junit.xml
|
||||||
- name: Upload backend coverage to Codecov
|
-
|
||||||
|
name: Upload backend coverage to Codecov
|
||||||
uses: codecov/codecov-action@v5
|
uses: codecov/codecov-action@v5
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.CODECOV_TOKEN }}
|
token: ${{ secrets.CODECOV_TOKEN }}
|
||||||
flags: backend-python-${{ matrix.python-version }}
|
flags: backend-python-${{ matrix.python-version }}
|
||||||
files: coverage.xml
|
files: coverage.xml
|
||||||
- name: Stop containers
|
-
|
||||||
|
name: Stop containers
|
||||||
if: always()
|
if: always()
|
||||||
run: |
|
run: |
|
||||||
docker compose --file ${{ github.workspace }}/docker/compose/docker-compose.ci-test.yml logs
|
docker compose --file ${{ github.workspace }}/docker/compose/docker-compose.ci-test.yml logs
|
||||||
docker compose --file ${{ github.workspace }}/docker/compose/docker-compose.ci-test.yml down
|
docker compose --file ${{ github.workspace }}/docker/compose/docker-compose.ci-test.yml down
|
||||||
|
|
||||||
install-frontend-dependencies:
|
install-frontend-dependencies:
|
||||||
name: "Install Frontend Dependencies"
|
name: "Install Frontend Dependencies"
|
||||||
runs-on: ubuntu-24.04
|
runs-on: ubuntu-24.04
|
||||||
@ -163,7 +194,8 @@ jobs:
|
|||||||
uses: pnpm/action-setup@v4
|
uses: pnpm/action-setup@v4
|
||||||
with:
|
with:
|
||||||
version: 10
|
version: 10
|
||||||
- name: Use Node.js 20
|
-
|
||||||
|
name: Use Node.js 20
|
||||||
uses: actions/setup-node@v4
|
uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: 20.x
|
node-version: 20.x
|
||||||
@ -177,10 +209,17 @@ jobs:
|
|||||||
~/.pnpm-store
|
~/.pnpm-store
|
||||||
~/.cache
|
~/.cache
|
||||||
key: ${{ runner.os }}-frontenddeps-${{ hashFiles('src-ui/pnpm-lock.yaml') }}
|
key: ${{ runner.os }}-frontenddeps-${{ hashFiles('src-ui/pnpm-lock.yaml') }}
|
||||||
- name: Install dependencies
|
-
|
||||||
|
name: Install dependencies
|
||||||
|
if: steps.cache-frontend-deps.outputs.cache-hit != 'true'
|
||||||
run: cd src-ui && pnpm install
|
run: cd src-ui && pnpm install
|
||||||
|
-
|
||||||
|
name: Install Playwright
|
||||||
|
if: steps.cache-frontend-deps.outputs.cache-hit != 'true'
|
||||||
|
run: cd src-ui && pnpm playwright install --with-deps
|
||||||
|
|
||||||
tests-frontend:
|
tests-frontend:
|
||||||
name: "Frontend Unit Tests (Node ${{ matrix.node-version }} - ${{ matrix.shard-index }}/${{ matrix.shard-count }})"
|
name: "Frontend Tests (Node ${{ matrix.node-version }} - ${{ matrix.shard-index }}/${{ matrix.shard-count }})"
|
||||||
runs-on: ubuntu-24.04
|
runs-on: ubuntu-24.04
|
||||||
needs:
|
needs:
|
||||||
- install-frontend-dependencies
|
- install-frontend-dependencies
|
||||||
@ -196,7 +235,8 @@ jobs:
|
|||||||
uses: pnpm/action-setup@v4
|
uses: pnpm/action-setup@v4
|
||||||
with:
|
with:
|
||||||
version: 10
|
version: 10
|
||||||
- name: Use Node.js 20
|
-
|
||||||
|
name: Use Node.js 20
|
||||||
uses: actions/setup-node@v4
|
uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: 20.x
|
node-version: 20.x
|
||||||
@ -212,90 +252,52 @@ jobs:
|
|||||||
key: ${{ runner.os }}-frontenddeps-${{ hashFiles('src-ui/pnpm-lock.yaml') }}
|
key: ${{ runner.os }}-frontenddeps-${{ hashFiles('src-ui/pnpm-lock.yaml') }}
|
||||||
- name: Re-link Angular cli
|
- name: Re-link Angular cli
|
||||||
run: cd src-ui && pnpm link @angular/cli
|
run: cd src-ui && pnpm link @angular/cli
|
||||||
- name: Linting checks
|
-
|
||||||
|
name: Linting checks
|
||||||
run: cd src-ui && pnpm run lint
|
run: cd src-ui && pnpm run lint
|
||||||
- name: Run Jest unit tests
|
-
|
||||||
|
name: Run Jest unit tests
|
||||||
run: cd src-ui && pnpm run test --max-workers=2 --shard=${{ matrix.shard-index }}/${{ matrix.shard-count }}
|
run: cd src-ui && pnpm run test --max-workers=2 --shard=${{ matrix.shard-index }}/${{ matrix.shard-count }}
|
||||||
- name: Upload frontend test results to Codecov
|
-
|
||||||
|
name: Run Playwright e2e tests
|
||||||
|
run: cd src-ui && pnpm exec playwright test --shard ${{ matrix.shard-index }}/${{ matrix.shard-count }}
|
||||||
|
-
|
||||||
|
name: Upload frontend test results to Codecov
|
||||||
uses: codecov/test-results-action@v1
|
uses: codecov/test-results-action@v1
|
||||||
if: always()
|
if: always()
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.CODECOV_TOKEN }}
|
token: ${{ secrets.CODECOV_TOKEN }}
|
||||||
flags: frontend-node-${{ matrix.node-version }}
|
flags: frontend-node-${{ matrix.node-version }}
|
||||||
directory: src-ui/
|
directory: src-ui/
|
||||||
- name: Upload frontend coverage to Codecov
|
-
|
||||||
|
name: Upload frontend coverage to Codecov
|
||||||
uses: codecov/codecov-action@v5
|
uses: codecov/codecov-action@v5
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.CODECOV_TOKEN }}
|
token: ${{ secrets.CODECOV_TOKEN }}
|
||||||
flags: frontend-node-${{ matrix.node-version }}
|
flags: frontend-node-${{ matrix.node-version }}
|
||||||
directory: src-ui/coverage/
|
directory: src-ui/coverage/
|
||||||
tests-frontend-e2e:
|
|
||||||
name: "Frontend E2E Tests (Node ${{ matrix.node-version }} - ${{ matrix.shard-index }}/${{ matrix.shard-count }})"
|
|
||||||
runs-on: ubuntu-24.04
|
|
||||||
needs:
|
|
||||||
- install-frontend-dependencies
|
|
||||||
strategy:
|
|
||||||
fail-fast: false
|
|
||||||
matrix:
|
|
||||||
node-version: [20.x]
|
|
||||||
shard-index: [1, 2]
|
|
||||||
shard-count: [2]
|
|
||||||
steps:
|
|
||||||
- uses: actions/checkout@v4
|
|
||||||
- name: Install pnpm
|
|
||||||
uses: pnpm/action-setup@v4
|
|
||||||
with:
|
|
||||||
version: 10
|
|
||||||
- name: Use Node.js 20
|
|
||||||
uses: actions/setup-node@v4
|
|
||||||
with:
|
|
||||||
node-version: 20.x
|
|
||||||
cache: 'pnpm'
|
|
||||||
cache-dependency-path: 'src-ui/pnpm-lock.yaml'
|
|
||||||
- name: Cache frontend dependencies
|
|
||||||
id: cache-frontend-deps
|
|
||||||
uses: actions/cache@v4
|
|
||||||
with:
|
|
||||||
path: |
|
|
||||||
~/.pnpm-store
|
|
||||||
~/.cache
|
|
||||||
key: ${{ runner.os }}-frontenddeps-${{ hashFiles('src-ui/pnpm-lock.yaml') }}
|
|
||||||
- name: Re-link Angular cli
|
|
||||||
run: cd src-ui && pnpm link @angular/cli
|
|
||||||
- name: Cache Playwright browsers
|
|
||||||
uses: actions/cache@v4
|
|
||||||
with:
|
|
||||||
path: ~/.cache/ms-playwright
|
|
||||||
key: ${{ runner.os }}-playwright-${{ hashFiles('src-ui/pnpm-lock.yaml') }}
|
|
||||||
restore-keys: |
|
|
||||||
${{ runner.os }}-playwright-
|
|
||||||
- name: Install Playwright system dependencies
|
|
||||||
run: npx playwright install-deps
|
|
||||||
- name: Install dependencies
|
|
||||||
run: cd src-ui && pnpm install --no-frozen-lockfile
|
|
||||||
- name: Install Playwright
|
|
||||||
run: cd src-ui && pnpm exec playwright install
|
|
||||||
- name: Run Playwright e2e tests
|
|
||||||
run: cd src-ui && pnpm exec playwright test --shard ${{ matrix.shard-index }}/${{ matrix.shard-count }}
|
|
||||||
frontend-bundle-analysis:
|
frontend-bundle-analysis:
|
||||||
name: "Frontend Bundle Analysis"
|
name: "Frontend Bundle Analysis"
|
||||||
runs-on: ubuntu-24.04
|
runs-on: ubuntu-24.04
|
||||||
needs:
|
needs:
|
||||||
- tests-frontend
|
- tests-frontend
|
||||||
- tests-frontend-e2e
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- name: Install pnpm
|
-
|
||||||
|
name: Install pnpm
|
||||||
uses: pnpm/action-setup@v4
|
uses: pnpm/action-setup@v4
|
||||||
with:
|
with:
|
||||||
version: 10
|
version: 10
|
||||||
- name: Use Node.js 20
|
-
|
||||||
|
name: Use Node.js 20
|
||||||
uses: actions/setup-node@v4
|
uses: actions/setup-node@v4
|
||||||
with:
|
with:
|
||||||
node-version: 20.x
|
node-version: 20.x
|
||||||
cache: 'pnpm'
|
cache: 'pnpm'
|
||||||
cache-dependency-path: 'src-ui/pnpm-lock.yaml'
|
cache-dependency-path: 'src-ui/pnpm-lock.yaml'
|
||||||
- name: Cache frontend dependencies
|
-
|
||||||
|
name: Cache frontend dependencies
|
||||||
id: cache-frontend-deps
|
id: cache-frontend-deps
|
||||||
uses: actions/cache@v4
|
uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
@ -303,12 +305,15 @@ jobs:
|
|||||||
~/.pnpm-store
|
~/.pnpm-store
|
||||||
~/.cache
|
~/.cache
|
||||||
key: ${{ runner.os }}-frontenddeps-${{ hashFiles('src-ui/package-lock.json') }}
|
key: ${{ runner.os }}-frontenddeps-${{ hashFiles('src-ui/package-lock.json') }}
|
||||||
- name: Re-link Angular cli
|
-
|
||||||
|
name: Re-link Angular cli
|
||||||
run: cd src-ui && pnpm link @angular/cli
|
run: cd src-ui && pnpm link @angular/cli
|
||||||
- name: Build frontend and upload analysis
|
-
|
||||||
|
name: Build frontend and upload analysis
|
||||||
env:
|
env:
|
||||||
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
|
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
|
||||||
run: cd src-ui && pnpm run build --configuration=production
|
run: cd src-ui && pnpm run build --configuration=production
|
||||||
|
|
||||||
build-docker-image:
|
build-docker-image:
|
||||||
name: Build Docker image for ${{ github.ref_name }}
|
name: Build Docker image for ${{ github.ref_name }}
|
||||||
runs-on: ubuntu-24.04
|
runs-on: ubuntu-24.04
|
||||||
@ -319,9 +324,9 @@ jobs:
|
|||||||
needs:
|
needs:
|
||||||
- tests-backend
|
- tests-backend
|
||||||
- tests-frontend
|
- tests-frontend
|
||||||
- tests-frontend-e2e
|
|
||||||
steps:
|
steps:
|
||||||
- name: Check pushing to Docker Hub
|
-
|
||||||
|
name: Check pushing to Docker Hub
|
||||||
id: push-other-places
|
id: push-other-places
|
||||||
# Only push to Dockerhub from the main repo AND the ref is either:
|
# Only push to Dockerhub from the main repo AND the ref is either:
|
||||||
# main
|
# main
|
||||||
@ -337,13 +342,15 @@ jobs:
|
|||||||
echo "Not pushing to DockerHub"
|
echo "Not pushing to DockerHub"
|
||||||
echo "enable=false" >> $GITHUB_OUTPUT
|
echo "enable=false" >> $GITHUB_OUTPUT
|
||||||
fi
|
fi
|
||||||
- name: Set ghcr repository name
|
-
|
||||||
|
name: Set ghcr repository name
|
||||||
id: set-ghcr-repository
|
id: set-ghcr-repository
|
||||||
run: |
|
run: |
|
||||||
ghcr_name=$(echo "${{ github.repository }}" | awk '{ print tolower($0) }')
|
ghcr_name=$(echo "${{ github.repository }}" | awk '{ print tolower($0) }')
|
||||||
echo "Name is ${ghcr_name}"
|
echo "Name is ${ghcr_name}"
|
||||||
echo "ghcr-repository=${ghcr_name}" >> $GITHUB_OUTPUT
|
echo "ghcr-repository=${ghcr_name}" >> $GITHUB_OUTPUT
|
||||||
- name: Gather Docker metadata
|
-
|
||||||
|
name: Gather Docker metadata
|
||||||
id: docker-meta
|
id: docker-meta
|
||||||
uses: docker/metadata-action@v5
|
uses: docker/metadata-action@v5
|
||||||
with:
|
with:
|
||||||
@ -358,31 +365,37 @@ jobs:
|
|||||||
# For a tag x.y.z or vX.Y.Z, output an x.y.z and x.y image tag
|
# For a tag x.y.z or vX.Y.Z, output an x.y.z and x.y image tag
|
||||||
type=semver,pattern={{version}}
|
type=semver,pattern={{version}}
|
||||||
type=semver,pattern={{major}}.{{minor}}
|
type=semver,pattern={{major}}.{{minor}}
|
||||||
- name: Checkout
|
-
|
||||||
|
name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
# If https://github.com/docker/buildx/issues/1044 is resolved,
|
# If https://github.com/docker/buildx/issues/1044 is resolved,
|
||||||
# the append input with a native arm64 arch could be used to
|
# the append input with a native arm64 arch could be used to
|
||||||
# significantly speed up building
|
# significantly speed up building
|
||||||
- name: Set up Docker Buildx
|
-
|
||||||
|
name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v3
|
uses: docker/setup-buildx-action@v3
|
||||||
- name: Set up QEMU
|
-
|
||||||
|
name: Set up QEMU
|
||||||
uses: docker/setup-qemu-action@v3
|
uses: docker/setup-qemu-action@v3
|
||||||
with:
|
with:
|
||||||
platforms: arm64
|
platforms: arm64
|
||||||
- name: Login to GitHub Container Registry
|
-
|
||||||
|
name: Login to GitHub Container Registry
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v3
|
||||||
with:
|
with:
|
||||||
registry: ghcr.io
|
registry: ghcr.io
|
||||||
username: ${{ github.actor }}
|
username: ${{ github.actor }}
|
||||||
password: ${{ secrets.GITHUB_TOKEN }}
|
password: ${{ secrets.GITHUB_TOKEN }}
|
||||||
- name: Login to Docker Hub
|
-
|
||||||
|
name: Login to Docker Hub
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v3
|
||||||
# Don't attempt to login if not pushing to Docker Hub
|
# Don't attempt to login if not pushing to Docker Hub
|
||||||
if: steps.push-other-places.outputs.enable == 'true'
|
if: steps.push-other-places.outputs.enable == 'true'
|
||||||
with:
|
with:
|
||||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
- name: Login to Quay.io
|
-
|
||||||
|
name: Login to Quay.io
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v3
|
||||||
# Don't attempt to login if not pushing to Quay.io
|
# Don't attempt to login if not pushing to Quay.io
|
||||||
if: steps.push-other-places.outputs.enable == 'true'
|
if: steps.push-other-places.outputs.enable == 'true'
|
||||||
@ -390,7 +403,8 @@ jobs:
|
|||||||
registry: quay.io
|
registry: quay.io
|
||||||
username: ${{ secrets.QUAY_USERNAME }}
|
username: ${{ secrets.QUAY_USERNAME }}
|
||||||
password: ${{ secrets.QUAY_ROBOT_TOKEN }}
|
password: ${{ secrets.QUAY_ROBOT_TOKEN }}
|
||||||
- name: Build and push
|
-
|
||||||
|
name: Build and push
|
||||||
uses: docker/build-push-action@v6
|
uses: docker/build-push-action@v6
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
@ -408,19 +422,23 @@ jobs:
|
|||||||
type=registry,ref=ghcr.io/${{ steps.set-ghcr-repository.outputs.ghcr-repository }}/builder/cache/app:dev
|
type=registry,ref=ghcr.io/${{ steps.set-ghcr-repository.outputs.ghcr-repository }}/builder/cache/app:dev
|
||||||
cache-to: |
|
cache-to: |
|
||||||
type=registry,mode=max,ref=ghcr.io/${{ steps.set-ghcr-repository.outputs.ghcr-repository }}/builder/cache/app:${{ github.ref_name }}
|
type=registry,mode=max,ref=ghcr.io/${{ steps.set-ghcr-repository.outputs.ghcr-repository }}/builder/cache/app:${{ github.ref_name }}
|
||||||
- name: Inspect image
|
-
|
||||||
|
name: Inspect image
|
||||||
run: |
|
run: |
|
||||||
docker buildx imagetools inspect ${{ fromJSON(steps.docker-meta.outputs.json).tags[0] }}
|
docker buildx imagetools inspect ${{ fromJSON(steps.docker-meta.outputs.json).tags[0] }}
|
||||||
- name: Export frontend artifact from docker
|
-
|
||||||
|
name: Export frontend artifact from docker
|
||||||
run: |
|
run: |
|
||||||
docker create --name frontend-extract ${{ fromJSON(steps.docker-meta.outputs.json).tags[0] }}
|
docker create --name frontend-extract ${{ fromJSON(steps.docker-meta.outputs.json).tags[0] }}
|
||||||
docker cp frontend-extract:/usr/src/paperless/src/documents/static/frontend src/documents/static/frontend/
|
docker cp frontend-extract:/usr/src/paperless/src/documents/static/frontend src/documents/static/frontend/
|
||||||
- name: Upload frontend artifact
|
-
|
||||||
|
name: Upload frontend artifact
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: frontend-compiled
|
name: frontend-compiled
|
||||||
path: src/documents/static/frontend/
|
path: src/documents/static/frontend/
|
||||||
retention-days: 7
|
retention-days: 7
|
||||||
|
|
||||||
build-release:
|
build-release:
|
||||||
name: "Build Release"
|
name: "Build Release"
|
||||||
needs:
|
needs:
|
||||||
@ -428,52 +446,63 @@ jobs:
|
|||||||
- documentation
|
- documentation
|
||||||
runs-on: ubuntu-24.04
|
runs-on: ubuntu-24.04
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
-
|
||||||
|
name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
- name: Set up Python
|
-
|
||||||
|
name: Set up Python
|
||||||
id: setup-python
|
id: setup-python
|
||||||
uses: actions/setup-python@v5
|
uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
|
python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
|
||||||
- name: Install uv
|
-
|
||||||
uses: astral-sh/setup-uv@v6
|
name: Install uv
|
||||||
|
uses: astral-sh/setup-uv@v5
|
||||||
with:
|
with:
|
||||||
version: ${{ env.DEFAULT_UV_VERSION }}
|
version: ${{ env.DEFAULT_UV_VERSION }}
|
||||||
enable-cache: true
|
enable-cache: true
|
||||||
python-version: ${{ steps.setup-python.outputs.python-version }}
|
python-version: ${{ steps.setup-python.outputs.python-version }}
|
||||||
- name: Install Python dependencies
|
-
|
||||||
|
name: Install Python dependencies
|
||||||
run: |
|
run: |
|
||||||
uv sync --python ${{ steps.setup-python.outputs.python-version }} --dev --frozen
|
uv sync --python ${{ steps.setup-python.outputs.python-version }} --dev --frozen
|
||||||
- name: Install system dependencies
|
-
|
||||||
|
name: Install system dependencies
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update -qq
|
sudo apt-get update -qq
|
||||||
sudo apt-get install -qq --no-install-recommends gettext liblept5
|
sudo apt-get install -qq --no-install-recommends gettext liblept5
|
||||||
- name: Download frontend artifact
|
-
|
||||||
|
name: Download frontend artifact
|
||||||
uses: actions/download-artifact@v4
|
uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: frontend-compiled
|
name: frontend-compiled
|
||||||
path: src/documents/static/frontend/
|
path: src/documents/static/frontend/
|
||||||
- name: Download documentation artifact
|
-
|
||||||
|
name: Download documentation artifact
|
||||||
uses: actions/download-artifact@v4
|
uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: documentation
|
name: documentation
|
||||||
path: docs/_build/html/
|
path: docs/_build/html/
|
||||||
- name: Generate requirements file
|
-
|
||||||
|
name: Generate requirements file
|
||||||
run: |
|
run: |
|
||||||
uv export --quiet --no-dev --all-extras --format requirements-txt --output-file requirements.txt
|
uv export --quiet --no-dev --all-extras --format requirements-txt --output-file requirements.txt
|
||||||
- name: Compile messages
|
-
|
||||||
|
name: Compile messages
|
||||||
run: |
|
run: |
|
||||||
cd src/
|
cd src/
|
||||||
uv run \
|
uv run \
|
||||||
--python ${{ steps.setup-python.outputs.python-version }} \
|
--python ${{ steps.setup-python.outputs.python-version }} \
|
||||||
manage.py compilemessages
|
manage.py compilemessages
|
||||||
- name: Collect static files
|
-
|
||||||
|
name: Collect static files
|
||||||
run: |
|
run: |
|
||||||
cd src/
|
cd src/
|
||||||
uv run \
|
uv run \
|
||||||
--python ${{ steps.setup-python.outputs.python-version }} \
|
--python ${{ steps.setup-python.outputs.python-version }} \
|
||||||
manage.py collectstatic --no-input
|
manage.py collectstatic --no-input
|
||||||
- name: Move files
|
-
|
||||||
|
name: Move files
|
||||||
run: |
|
run: |
|
||||||
echo "Making dist folders"
|
echo "Making dist folders"
|
||||||
for directory in dist \
|
for directory in dist \
|
||||||
@ -510,18 +539,21 @@ jobs:
|
|||||||
cp --recursive docs/_build/html/ dist/paperless-ngx/docs
|
cp --recursive docs/_build/html/ dist/paperless-ngx/docs
|
||||||
|
|
||||||
mv --verbose static dist/paperless-ngx
|
mv --verbose static dist/paperless-ngx
|
||||||
- name: Make release package
|
-
|
||||||
|
name: Make release package
|
||||||
run: |
|
run: |
|
||||||
echo "Creating release archive"
|
echo "Creating release archive"
|
||||||
cd dist
|
cd dist
|
||||||
sudo chown -R 1000:1000 paperless-ngx/
|
sudo chown -R 1000:1000 paperless-ngx/
|
||||||
tar -cJf paperless-ngx.tar.xz paperless-ngx/
|
tar -cJf paperless-ngx.tar.xz paperless-ngx/
|
||||||
- name: Upload release artifact
|
-
|
||||||
|
name: Upload release artifact
|
||||||
uses: actions/upload-artifact@v4
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: release
|
name: release
|
||||||
path: dist/paperless-ngx.tar.xz
|
path: dist/paperless-ngx.tar.xz
|
||||||
retention-days: 7
|
retention-days: 7
|
||||||
|
|
||||||
publish-release:
|
publish-release:
|
||||||
name: "Publish Release"
|
name: "Publish Release"
|
||||||
runs-on: ubuntu-24.04
|
runs-on: ubuntu-24.04
|
||||||
@ -533,12 +565,14 @@ jobs:
|
|||||||
- build-release
|
- build-release
|
||||||
if: github.ref_type == 'tag' && (startsWith(github.ref_name, 'v') || contains(github.ref_name, '-beta.rc'))
|
if: github.ref_type == 'tag' && (startsWith(github.ref_name, 'v') || contains(github.ref_name, '-beta.rc'))
|
||||||
steps:
|
steps:
|
||||||
- name: Download release artifact
|
-
|
||||||
|
name: Download release artifact
|
||||||
uses: actions/download-artifact@v4
|
uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: release
|
name: release
|
||||||
path: ./
|
path: ./
|
||||||
- name: Get version
|
-
|
||||||
|
name: Get version
|
||||||
id: get_version
|
id: get_version
|
||||||
run: |
|
run: |
|
||||||
echo "version=${{ github.ref_name }}" >> $GITHUB_OUTPUT
|
echo "version=${{ github.ref_name }}" >> $GITHUB_OUTPUT
|
||||||
@ -547,7 +581,8 @@ jobs:
|
|||||||
else
|
else
|
||||||
echo "prerelease=false" >> $GITHUB_OUTPUT
|
echo "prerelease=false" >> $GITHUB_OUTPUT
|
||||||
fi
|
fi
|
||||||
- name: Create Release and Changelog
|
-
|
||||||
|
name: Create Release and Changelog
|
||||||
id: create-release
|
id: create-release
|
||||||
uses: release-drafter/release-drafter@v6
|
uses: release-drafter/release-drafter@v6
|
||||||
with:
|
with:
|
||||||
@ -558,7 +593,8 @@ jobs:
|
|||||||
publish: true # ensures release is not marked as draft
|
publish: true # ensures release is not marked as draft
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
- name: Upload release archive
|
-
|
||||||
|
name: Upload release archive
|
||||||
id: upload-release-asset
|
id: upload-release-asset
|
||||||
uses: shogo82148/actions-upload-release-asset@v1
|
uses: shogo82148/actions-upload-release-asset@v1
|
||||||
with:
|
with:
|
||||||
@ -567,6 +603,7 @@ jobs:
|
|||||||
asset_path: ./paperless-ngx.tar.xz
|
asset_path: ./paperless-ngx.tar.xz
|
||||||
asset_name: paperless-ngx-${{ steps.get_version.outputs.version }}.tar.xz
|
asset_name: paperless-ngx-${{ steps.get_version.outputs.version }}.tar.xz
|
||||||
asset_content_type: application/x-xz
|
asset_content_type: application/x-xz
|
||||||
|
|
||||||
append-changelog:
|
append-changelog:
|
||||||
name: "Append Changelog"
|
name: "Append Changelog"
|
||||||
runs-on: ubuntu-24.04
|
runs-on: ubuntu-24.04
|
||||||
@ -574,22 +611,26 @@ jobs:
|
|||||||
- publish-release
|
- publish-release
|
||||||
if: needs.publish-release.outputs.prerelease == 'false'
|
if: needs.publish-release.outputs.prerelease == 'false'
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
-
|
||||||
|
name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
ref: main
|
ref: main
|
||||||
- name: Set up Python
|
-
|
||||||
|
name: Set up Python
|
||||||
id: setup-python
|
id: setup-python
|
||||||
uses: actions/setup-python@v5
|
uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
|
python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
|
||||||
- name: Install uv
|
-
|
||||||
uses: astral-sh/setup-uv@v6
|
name: Install uv
|
||||||
|
uses: astral-sh/setup-uv@v5
|
||||||
with:
|
with:
|
||||||
version: ${{ env.DEFAULT_UV_VERSION }}
|
version: ${{ env.DEFAULT_UV_VERSION }}
|
||||||
enable-cache: true
|
enable-cache: true
|
||||||
python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
|
python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
|
||||||
- name: Append Changelog to docs
|
-
|
||||||
|
name: Append Changelog to docs
|
||||||
id: append-Changelog
|
id: append-Changelog
|
||||||
working-directory: docs
|
working-directory: docs
|
||||||
run: |
|
run: |
|
||||||
@ -611,7 +652,8 @@ jobs:
|
|||||||
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
||||||
git commit -am "Changelog ${{ needs.publish-release.outputs.version }} - GHA"
|
git commit -am "Changelog ${{ needs.publish-release.outputs.version }} - GHA"
|
||||||
git push origin ${{ needs.publish-release.outputs.version }}-changelog
|
git push origin ${{ needs.publish-release.outputs.version }}-changelog
|
||||||
- name: Create Pull Request
|
-
|
||||||
|
name: Create Pull Request
|
||||||
uses: actions/github-script@v7
|
uses: actions/github-script@v7
|
||||||
with:
|
with:
|
||||||
script: |
|
script: |
|
||||||
|
10
.github/workflows/cleanup-tags.yml
vendored
10
.github/workflows/cleanup-tags.yml
vendored
@ -6,14 +6,17 @@
|
|||||||
# This workflow will not trigger runs on forked repos.
|
# This workflow will not trigger runs on forked repos.
|
||||||
|
|
||||||
name: Cleanup Image Tags
|
name: Cleanup Image Tags
|
||||||
|
|
||||||
on:
|
on:
|
||||||
delete:
|
delete:
|
||||||
push:
|
push:
|
||||||
paths:
|
paths:
|
||||||
- ".github/workflows/cleanup-tags.yml"
|
- ".github/workflows/cleanup-tags.yml"
|
||||||
|
|
||||||
concurrency:
|
concurrency:
|
||||||
group: registry-tags-cleanup
|
group: registry-tags-cleanup
|
||||||
cancel-in-progress: false
|
cancel-in-progress: false
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
cleanup-images:
|
cleanup-images:
|
||||||
name: Cleanup Image Tags for ${{ matrix.primary-name }}
|
name: Cleanup Image Tags for ${{ matrix.primary-name }}
|
||||||
@ -27,7 +30,8 @@ jobs:
|
|||||||
# Requires a personal access token with the OAuth scope delete:packages
|
# Requires a personal access token with the OAuth scope delete:packages
|
||||||
TOKEN: ${{ secrets.GHA_CONTAINER_DELETE_TOKEN }}
|
TOKEN: ${{ secrets.GHA_CONTAINER_DELETE_TOKEN }}
|
||||||
steps:
|
steps:
|
||||||
- name: Clean temporary images
|
-
|
||||||
|
name: Clean temporary images
|
||||||
if: "${{ env.TOKEN != '' }}"
|
if: "${{ env.TOKEN != '' }}"
|
||||||
uses: stumpylog/image-cleaner-action/ephemeral@v0.10.0
|
uses: stumpylog/image-cleaner-action/ephemeral@v0.10.0
|
||||||
with:
|
with:
|
||||||
@ -39,6 +43,7 @@ jobs:
|
|||||||
repo_name: "paperless-ngx"
|
repo_name: "paperless-ngx"
|
||||||
match_regex: "(feature|fix)"
|
match_regex: "(feature|fix)"
|
||||||
do_delete: "true"
|
do_delete: "true"
|
||||||
|
|
||||||
cleanup-untagged-images:
|
cleanup-untagged-images:
|
||||||
name: Cleanup Untagged Images Tags for ${{ matrix.primary-name }}
|
name: Cleanup Untagged Images Tags for ${{ matrix.primary-name }}
|
||||||
if: github.repository_owner == 'paperless-ngx'
|
if: github.repository_owner == 'paperless-ngx'
|
||||||
@ -53,7 +58,8 @@ jobs:
|
|||||||
# Requires a personal access token with the OAuth scope delete:packages
|
# Requires a personal access token with the OAuth scope delete:packages
|
||||||
TOKEN: ${{ secrets.GHA_CONTAINER_DELETE_TOKEN }}
|
TOKEN: ${{ secrets.GHA_CONTAINER_DELETE_TOKEN }}
|
||||||
steps:
|
steps:
|
||||||
- name: Clean untagged images
|
-
|
||||||
|
name: Clean untagged images
|
||||||
if: "${{ env.TOKEN != '' }}"
|
if: "${{ env.TOKEN != '' }}"
|
||||||
uses: stumpylog/image-cleaner-action/untagged@v0.10.0
|
uses: stumpylog/image-cleaner-action/untagged@v0.10.0
|
||||||
with:
|
with:
|
||||||
|
38
.github/workflows/codeql-analysis.yml
vendored
38
.github/workflows/codeql-analysis.yml
vendored
@ -10,14 +10,16 @@
|
|||||||
# supported CodeQL languages.
|
# supported CodeQL languages.
|
||||||
#
|
#
|
||||||
name: "CodeQL"
|
name: "CodeQL"
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [main, dev]
|
branches: [ main, dev ]
|
||||||
pull_request:
|
pull_request:
|
||||||
# The branches below must be a subset of the branches above
|
# The branches below must be a subset of the branches above
|
||||||
branches: [dev]
|
branches: [ dev ]
|
||||||
schedule:
|
schedule:
|
||||||
- cron: '28 13 * * 5'
|
- cron: '28 13 * * 5'
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
analyze:
|
analyze:
|
||||||
name: Analyze
|
name: Analyze
|
||||||
@ -26,23 +28,27 @@ jobs:
|
|||||||
actions: read
|
actions: read
|
||||||
contents: read
|
contents: read
|
||||||
security-events: write
|
security-events: write
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
language: ['javascript', 'python']
|
language: [ 'javascript', 'python' ]
|
||||||
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
|
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
|
||||||
# Learn more about CodeQL language support at https://git.io/codeql-language-support
|
# Learn more about CodeQL language support at https://git.io/codeql-language-support
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
# Initializes the CodeQL tools for scanning.
|
|
||||||
- name: Initialize CodeQL
|
# Initializes the CodeQL tools for scanning.
|
||||||
uses: github/codeql-action/init@v3
|
- name: Initialize CodeQL
|
||||||
with:
|
uses: github/codeql-action/init@v3
|
||||||
languages: ${{ matrix.language }}
|
with:
|
||||||
# If you wish to specify custom queries, you can do so here or in a config file.
|
languages: ${{ matrix.language }}
|
||||||
# By default, queries listed here will override any specified in a config file.
|
# If you wish to specify custom queries, you can do so here or in a config file.
|
||||||
# Prefix the list here with "+" to use these queries and those in the config file.
|
# By default, queries listed here will override any specified in a config file.
|
||||||
# queries: ./path/to/local/query, your-org/your-repo/queries@main
|
# Prefix the list here with "+" to use these queries and those in the config file.
|
||||||
- name: Perform CodeQL Analysis
|
# queries: ./path/to/local/query, your-org/your-repo/queries@main
|
||||||
uses: github/codeql-action/analyze@v3
|
|
||||||
|
- name: Perform CodeQL Analysis
|
||||||
|
uses: github/codeql-action/analyze@v3
|
||||||
|
39
.github/workflows/crowdin.yml
vendored
39
.github/workflows/crowdin.yml
vendored
@ -1,28 +1,35 @@
|
|||||||
name: Crowdin Action
|
name: Crowdin Action
|
||||||
|
|
||||||
on:
|
on:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
schedule:
|
schedule:
|
||||||
- cron: '2 */12 * * *'
|
- cron: '2 */12 * * *'
|
||||||
push:
|
push:
|
||||||
paths: ['src/locale/**', 'src-ui/messages.xlf', 'src-ui/src/locale/**']
|
paths: [
|
||||||
branches: [dev]
|
'src/locale/**',
|
||||||
|
'src-ui/messages.xlf',
|
||||||
|
'src-ui/src/locale/**'
|
||||||
|
]
|
||||||
|
branches: [ dev ]
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
synchronize-with-crowdin:
|
synchronize-with-crowdin:
|
||||||
name: Crowdin Sync
|
name: Crowdin Sync
|
||||||
if: github.repository_owner == 'paperless-ngx'
|
if: github.repository_owner == 'paperless-ngx'
|
||||||
runs-on: ubuntu-24.04
|
runs-on: ubuntu-24.04
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
- name: crowdin action
|
- name: crowdin action
|
||||||
uses: crowdin/github-action@v2
|
uses: crowdin/github-action@v2
|
||||||
with:
|
with:
|
||||||
upload_translations: false
|
upload_translations: false
|
||||||
download_translations: true
|
download_translations: true
|
||||||
crowdin_branch_name: 'dev'
|
crowdin_branch_name: 'dev'
|
||||||
localization_branch_name: l10n_dev
|
localization_branch_name: l10n_dev
|
||||||
pull_request_labels: 'skip-changelog, translation'
|
pull_request_labels: 'skip-changelog, translation'
|
||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
|
CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
|
||||||
CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
|
CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
|
||||||
|
86
.github/workflows/pr-bot.yml
vendored
86
.github/workflows/pr-bot.yml
vendored
@ -1,86 +0,0 @@
|
|||||||
name: PR Bot
|
|
||||||
on:
|
|
||||||
pull_request_target:
|
|
||||||
types: [opened]
|
|
||||||
permissions:
|
|
||||||
contents: read
|
|
||||||
pull-requests: write
|
|
||||||
jobs:
|
|
||||||
pr-bot:
|
|
||||||
name: Automated PR Bot
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Label by file path
|
|
||||||
uses: actions/labeler@v5
|
|
||||||
with:
|
|
||||||
repo-token: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
- name: Label by size
|
|
||||||
uses: Gascon1/pr-size-labeler@v1.3.0
|
|
||||||
with:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
xs_label: 'small-change'
|
|
||||||
xs_diff: '9'
|
|
||||||
s_label: 'non-trivial'
|
|
||||||
s_diff: '99999'
|
|
||||||
fail_if_xl: 'false'
|
|
||||||
excluded_files: /\.lock$/ /\.txt$/ ^src-ui/pnpm-lock\.yaml$ ^src-ui/messages\.xlf$ ^src/locale/en_US/LC_MESSAGES/django\.po$
|
|
||||||
- name: Label bot-generated PRs
|
|
||||||
if: ${{ contains(github.actor, 'dependabot') || contains(github.actor, 'crowdin-bot') }}
|
|
||||||
uses: actions/github-script@v7
|
|
||||||
with:
|
|
||||||
script: |
|
|
||||||
const pr = context.payload.pull_request;
|
|
||||||
const user = pr.user.login.toLowerCase();
|
|
||||||
const labels = [];
|
|
||||||
|
|
||||||
if (user.includes('dependabot')) {
|
|
||||||
labels.push('dependencies');
|
|
||||||
}
|
|
||||||
|
|
||||||
if (user.includes('crowdin-bot')) {
|
|
||||||
labels.push('translation', 'skip-changelog');
|
|
||||||
}
|
|
||||||
|
|
||||||
if (labels.length) {
|
|
||||||
await github.rest.issues.addLabels({
|
|
||||||
owner: context.repo.owner,
|
|
||||||
repo: context.repo.repo,
|
|
||||||
issue_number: pr.number,
|
|
||||||
labels,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
- name: Welcome comment
|
|
||||||
if: ${{ !contains(github.actor, 'bot') }}
|
|
||||||
uses: actions/github-script@v7
|
|
||||||
with:
|
|
||||||
script: |
|
|
||||||
const pr = context.payload.pull_request;
|
|
||||||
const user = pr.user.login;
|
|
||||||
|
|
||||||
const { data: members } = await github.rest.orgs.listMembers({
|
|
||||||
org: 'paperless-ngx',
|
|
||||||
});
|
|
||||||
|
|
||||||
const memberLogins = members.map(m => m.login.toLowerCase());
|
|
||||||
if (memberLogins.includes(user.toLowerCase())) {
|
|
||||||
core.info('Skipping comment: user is org member');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const body =
|
|
||||||
"Hello @" + user + ",\n\n" +
|
|
||||||
"Thank you very much for submitting this PR to us!\n\n" +
|
|
||||||
"This is what will happen next:\n\n" +
|
|
||||||
"1. CI tests will run against your PR to ensure quality and consistency.\n" +
|
|
||||||
"2. Next, human contributors from paperless-ngx review your changes.\n" +
|
|
||||||
"3. Please address any issues that come up during the review as soon as you are able to.\n" +
|
|
||||||
"4. If accepted, your pull request will be merged into the `dev` branch and changes there will be tested further.\n" +
|
|
||||||
"5. Eventually, changes from you and other contributors will be merged into `main` and a new release will be made.\n\n" +
|
|
||||||
"You'll be hearing from us soon, and thank you again for contributing to our project.";
|
|
||||||
|
|
||||||
await github.rest.issues.createComment({
|
|
||||||
issue_number: pr.number,
|
|
||||||
owner: context.repo.owner,
|
|
||||||
repo: context.repo.repo,
|
|
||||||
body,
|
|
||||||
});
|
|
3
.github/workflows/project-actions.yml
vendored
3
.github/workflows/project-actions.yml
vendored
@ -1,4 +1,5 @@
|
|||||||
name: Project Automations
|
name: Project Automations
|
||||||
|
|
||||||
on:
|
on:
|
||||||
pull_request_target: #_target allows access to secrets
|
pull_request_target: #_target allows access to secrets
|
||||||
types:
|
types:
|
||||||
@ -7,8 +8,10 @@ on:
|
|||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
- dev
|
- dev
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: read
|
contents: read
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
pr_opened_or_reopened:
|
pr_opened_or_reopened:
|
||||||
name: pr_opened_or_reopened
|
name: pr_opened_or_reopened
|
||||||
|
27
.github/workflows/repo-maintenance.yml
vendored
27
.github/workflows/repo-maintenance.yml
vendored
@ -1,14 +1,18 @@
|
|||||||
name: 'Repository Maintenance'
|
name: 'Repository Maintenance'
|
||||||
|
|
||||||
on:
|
on:
|
||||||
schedule:
|
schedule:
|
||||||
- cron: '0 3 * * *'
|
- cron: '0 3 * * *'
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
issues: write
|
issues: write
|
||||||
pull-requests: write
|
pull-requests: write
|
||||||
discussions: write
|
discussions: write
|
||||||
|
|
||||||
concurrency:
|
concurrency:
|
||||||
group: lock
|
group: lock
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
stale:
|
stale:
|
||||||
name: 'Stale'
|
name: 'Stale'
|
||||||
@ -23,8 +27,9 @@ jobs:
|
|||||||
stale-issue-label: stale
|
stale-issue-label: stale
|
||||||
stale-pr-label: stale
|
stale-pr-label: stale
|
||||||
stale-issue-message: >
|
stale-issue-message: >
|
||||||
This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions. See our [contributing guidelines](https://github.com/paperless-ngx/paperless-ngx/blob/dev/CONTRIBUTING.md#automatic-repository-maintenance) for more details.
|
This issue has been automatically marked as stale because it has not had
|
||||||
|
recent activity. It will be closed if no further activity occurs. Thank you
|
||||||
|
for your contributions. See our [contributing guidelines](https://github.com/paperless-ngx/paperless-ngx/blob/dev/CONTRIBUTING.md#automatic-repository-maintenance) for more details.
|
||||||
lock-threads:
|
lock-threads:
|
||||||
name: 'Lock Old Threads'
|
name: 'Lock Old Threads'
|
||||||
if: github.repository_owner == 'paperless-ngx'
|
if: github.repository_owner == 'paperless-ngx'
|
||||||
@ -37,14 +42,20 @@ jobs:
|
|||||||
discussion-inactive-days: '30'
|
discussion-inactive-days: '30'
|
||||||
log-output: true
|
log-output: true
|
||||||
issue-comment: >
|
issue-comment: >
|
||||||
This issue has been automatically locked since there has not been any recent activity after it was closed. Please open a new discussion or issue for related concerns. See our [contributing guidelines](https://github.com/paperless-ngx/paperless-ngx/blob/dev/CONTRIBUTING.md#automatic-repository-maintenance) for more details.
|
This issue has been automatically locked since there
|
||||||
|
has not been any recent activity after it was closed.
|
||||||
|
Please open a new discussion or issue for related concerns.
|
||||||
|
See our [contributing guidelines](https://github.com/paperless-ngx/paperless-ngx/blob/dev/CONTRIBUTING.md#automatic-repository-maintenance) for more details.
|
||||||
pr-comment: >
|
pr-comment: >
|
||||||
This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new discussion or issue for related concerns. See our [contributing guidelines](https://github.com/paperless-ngx/paperless-ngx/blob/dev/CONTRIBUTING.md#automatic-repository-maintenance) for more details.
|
This pull request has been automatically locked since there
|
||||||
|
has not been any recent activity after it was closed.
|
||||||
|
Please open a new discussion or issue for related concerns.
|
||||||
|
See our [contributing guidelines](https://github.com/paperless-ngx/paperless-ngx/blob/dev/CONTRIBUTING.md#automatic-repository-maintenance) for more details.
|
||||||
discussion-comment: >
|
discussion-comment: >
|
||||||
This discussion has been automatically locked since there has not been any recent activity after it was closed. Please open a new discussion for related concerns. See our [contributing guidelines](https://github.com/paperless-ngx/paperless-ngx/blob/dev/CONTRIBUTING.md#automatic-repository-maintenance) for more details.
|
This discussion has been automatically locked since there
|
||||||
|
has not been any recent activity after it was closed.
|
||||||
|
Please open a new discussion for related concerns.
|
||||||
|
See our [contributing guidelines](https://github.com/paperless-ngx/paperless-ngx/blob/dev/CONTRIBUTING.md#automatic-repository-maintenance) for more details.
|
||||||
close-answered-discussions:
|
close-answered-discussions:
|
||||||
name: 'Close Answered Discussions'
|
name: 'Close Answered Discussions'
|
||||||
if: github.repository_owner == 'paperless-ngx'
|
if: github.repository_owner == 'paperless-ngx'
|
||||||
|
69
.github/workflows/translate-strings.yml
vendored
69
.github/workflows/translate-strings.yml
vendored
@ -1,69 +0,0 @@
|
|||||||
name: Generate Translation Strings
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- dev
|
|
||||||
jobs:
|
|
||||||
generate-translate-strings:
|
|
||||||
name: Generate Translation Strings
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
permissions:
|
|
||||||
contents: write
|
|
||||||
steps:
|
|
||||||
- name: Checkout code
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
token: ${{ secrets.PNGX_BOT_PAT }}
|
|
||||||
ref: ${{ github.head_ref }}
|
|
||||||
- name: Set up Python
|
|
||||||
id: setup-python
|
|
||||||
uses: actions/setup-python@v5
|
|
||||||
- name: Install system dependencies
|
|
||||||
run: |
|
|
||||||
sudo apt-get update -qq
|
|
||||||
sudo apt-get install -qq --no-install-recommends gettext
|
|
||||||
- name: Install uv
|
|
||||||
uses: astral-sh/setup-uv@v6
|
|
||||||
with:
|
|
||||||
enable-cache: true
|
|
||||||
- name: Install backend python dependencies
|
|
||||||
run: |
|
|
||||||
uv sync \
|
|
||||||
--group dev \
|
|
||||||
--frozen
|
|
||||||
- name: Generate backend translation strings
|
|
||||||
run: cd src/ && uv run manage.py makemessages -l en_US -i "samples*"
|
|
||||||
- name: Install pnpm
|
|
||||||
uses: pnpm/action-setup@v4
|
|
||||||
with:
|
|
||||||
version: 10
|
|
||||||
- name: Use Node.js 20
|
|
||||||
uses: actions/setup-node@v4
|
|
||||||
with:
|
|
||||||
node-version: 20.x
|
|
||||||
cache: 'pnpm'
|
|
||||||
cache-dependency-path: 'src-ui/pnpm-lock.yaml'
|
|
||||||
- name: Cache frontend dependencies
|
|
||||||
id: cache-frontend-deps
|
|
||||||
uses: actions/cache@v4
|
|
||||||
with:
|
|
||||||
path: |
|
|
||||||
~/.pnpm-store
|
|
||||||
~/.cache
|
|
||||||
key: ${{ runner.os }}-frontenddeps-${{ hashFiles('src-ui/pnpm-lock.yaml') }}
|
|
||||||
- name: Install frontend dependencies
|
|
||||||
if: steps.cache-frontend-deps.outputs.cache-hit != 'true'
|
|
||||||
run: cd src-ui && pnpm install
|
|
||||||
- name: Re-link Angular cli
|
|
||||||
run: cd src-ui && pnpm link @angular/cli
|
|
||||||
- name: Generate frontend translation strings
|
|
||||||
run: |
|
|
||||||
cd src-ui
|
|
||||||
pnpm run ng extract-i18n
|
|
||||||
- name: Commit changes
|
|
||||||
uses: stefanzweifel/git-auto-commit-action@v5
|
|
||||||
with:
|
|
||||||
file_pattern: 'src-ui/messages.xlf src/locale/en_US/LC_MESSAGES/django.po'
|
|
||||||
commit_message: "Auto translate strings"
|
|
||||||
commit_user_name: "GitHub Actions"
|
|
||||||
commit_author: "GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com>"
|
|
@ -76,8 +76,3 @@ repos:
|
|||||||
rev: "v0.10.0.1"
|
rev: "v0.10.0.1"
|
||||||
hooks:
|
hooks:
|
||||||
- id: shellcheck
|
- id: shellcheck
|
||||||
- repo: https://github.com/google/yamlfmt
|
|
||||||
rev: v0.14.0
|
|
||||||
hooks:
|
|
||||||
- id: yamlfmt
|
|
||||||
exclude: "^src-ui/pnpm-lock.yaml"
|
|
||||||
|
@ -81,7 +81,7 @@ Some notes about translation:
|
|||||||
|
|
||||||
If a language has already been added, and you would like to contribute new translations or change existing translations, please read the "Translation" section in the README.md file for further details on that.
|
If a language has already been added, and you would like to contribute new translations or change existing translations, please read the "Translation" section in the README.md file for further details on that.
|
||||||
|
|
||||||
If you would like the project to be translated to another language, first head over to https://crowdin.com/project/paperless-ngx to check if that language has already been enabled for translation.
|
If you would like the project to be translated to another language, first head over to https://crwd.in/paperless-ngx to check if that language has already been enabled for translation.
|
||||||
If not, please request the language to be added by creating an issue on GitHub. The issue should contain:
|
If not, please request the language to be added by creating an issue on GitHub. The issue should contain:
|
||||||
|
|
||||||
- English name of the language (the localized name can be added on Crowdin).
|
- English name of the language (the localized name can be added on Crowdin).
|
||||||
|
@ -32,7 +32,7 @@ RUN set -eux \
|
|||||||
# Purpose: Installs s6-overlay and rootfs
|
# Purpose: Installs s6-overlay and rootfs
|
||||||
# Comments:
|
# Comments:
|
||||||
# - Don't leave anything extra in here either
|
# - Don't leave anything extra in here either
|
||||||
FROM ghcr.io/astral-sh/uv:0.6.16-python3.12-bookworm-slim AS s6-overlay-base
|
FROM ghcr.io/astral-sh/uv:0.6.5-python3.12-bookworm-slim AS s6-overlay-base
|
||||||
|
|
||||||
WORKDIR /usr/src/s6
|
WORKDIR /usr/src/s6
|
||||||
|
|
||||||
@ -47,7 +47,7 @@ ENV \
|
|||||||
ARG TARGETARCH
|
ARG TARGETARCH
|
||||||
ARG TARGETVARIANT
|
ARG TARGETVARIANT
|
||||||
# Lock this version
|
# Lock this version
|
||||||
ARG S6_OVERLAY_VERSION=3.2.1.0
|
ARG S6_OVERLAY_VERSION=3.2.0.2
|
||||||
|
|
||||||
ARG S6_BUILD_TIME_PKGS="curl \
|
ARG S6_BUILD_TIME_PKGS="curl \
|
||||||
xz-utils"
|
xz-utils"
|
||||||
@ -239,7 +239,6 @@ COPY --from=compile-frontend --chown=1000:1000 /src/src/documents/static/fronten
|
|||||||
# add users, setup scripts
|
# add users, setup scripts
|
||||||
# Mount the compiled frontend to expected location
|
# Mount the compiled frontend to expected location
|
||||||
RUN set -eux \
|
RUN set -eux \
|
||||||
&& sed -i '1s|^#!/usr/bin/env python3|#!/command/with-contenv python3|' manage.py \
|
|
||||||
&& echo "Setting up user/group" \
|
&& echo "Setting up user/group" \
|
||||||
&& addgroup --gid 1000 paperless \
|
&& addgroup --gid 1000 paperless \
|
||||||
&& useradd --uid 1000 --gid paperless --home-dir /usr/src/paperless paperless \
|
&& useradd --uid 1000 --gid paperless --home-dir /usr/src/paperless paperless \
|
||||||
|
@ -83,7 +83,7 @@ People interested in continuing the work on paperless-ngx are encouraged to reac
|
|||||||
|
|
||||||
## Translation
|
## Translation
|
||||||
|
|
||||||
Paperless-ngx is available in many languages that are coordinated on Crowdin. If you want to help out by translating paperless-ngx into your language, please head over to https://crowdin.com/project/paperless-ngx, and thank you! More details can be found in [CONTRIBUTING.md](https://github.com/paperless-ngx/paperless-ngx/blob/main/CONTRIBUTING.md#translating-paperless-ngx).
|
Paperless-ngx is available in many languages that are coordinated on Crowdin. If you want to help out by translating paperless-ngx into your language, please head over to https://crwd.in/paperless-ngx, and thank you! More details can be found in [CONTRIBUTING.md](https://github.com/paperless-ngx/paperless-ngx/blob/main/CONTRIBUTING.md#translating-paperless-ngx).
|
||||||
|
|
||||||
## Feature Requests
|
## Feature Requests
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
gotenberg:
|
gotenberg:
|
||||||
image: docker.io/gotenberg/gotenberg:8.20
|
image: docker.io/gotenberg/gotenberg:8.17
|
||||||
hostname: gotenberg
|
hostname: gotenberg
|
||||||
container_name: gotenberg
|
container_name: gotenberg
|
||||||
network_mode: host
|
network_mode: host
|
||||||
|
@ -24,18 +24,19 @@
|
|||||||
# - Copy this file as 'docker-compose.yml' and the files 'docker-compose.env'
|
# - Copy this file as 'docker-compose.yml' and the files 'docker-compose.env'
|
||||||
# and '.env' into a folder.
|
# and '.env' into a folder.
|
||||||
# - Run 'docker compose pull'.
|
# - Run 'docker compose pull'.
|
||||||
|
# - Run 'docker compose run --rm webserver createsuperuser' to create a user.
|
||||||
# - Run 'docker compose up -d'.
|
# - Run 'docker compose up -d'.
|
||||||
|
|
||||||
#
|
#
|
||||||
# For more extensive installation and update instructions, refer to the
|
# For more extensive installation and update instructions, refer to the
|
||||||
# documentation.
|
# documentation.
|
||||||
|
|
||||||
services:
|
services:
|
||||||
broker:
|
broker:
|
||||||
image: docker.io/library/redis:8
|
image: docker.io/library/redis:7
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- redisdata:/data
|
- redisdata:/data
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: docker.io/library/mariadb:11
|
image: docker.io/library/mariadb:11
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
@ -47,6 +48,7 @@ services:
|
|||||||
MARIADB_USER: paperless
|
MARIADB_USER: paperless
|
||||||
MARIADB_PASSWORD: paperless
|
MARIADB_PASSWORD: paperless
|
||||||
MARIADB_ROOT_PASSWORD: paperless
|
MARIADB_ROOT_PASSWORD: paperless
|
||||||
|
|
||||||
webserver:
|
webserver:
|
||||||
image: ghcr.io/paperless-ngx/paperless-ngx:latest
|
image: ghcr.io/paperless-ngx/paperless-ngx:latest
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
@ -73,8 +75,9 @@ services:
|
|||||||
PAPERLESS_TIKA_ENABLED: 1
|
PAPERLESS_TIKA_ENABLED: 1
|
||||||
PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000
|
PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000
|
||||||
PAPERLESS_TIKA_ENDPOINT: http://tika:9998
|
PAPERLESS_TIKA_ENDPOINT: http://tika:9998
|
||||||
|
|
||||||
gotenberg:
|
gotenberg:
|
||||||
image: docker.io/gotenberg/gotenberg:8.20
|
image: docker.io/gotenberg/gotenberg:8.17
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
# The gotenberg chromium route is used to convert .eml files. We do not
|
# The gotenberg chromium route is used to convert .eml files. We do not
|
||||||
# want to allow external content like tracking pixels or even javascript.
|
# want to allow external content like tracking pixels or even javascript.
|
||||||
@ -82,9 +85,11 @@ services:
|
|||||||
- "gotenberg"
|
- "gotenberg"
|
||||||
- "--chromium-disable-javascript=true"
|
- "--chromium-disable-javascript=true"
|
||||||
- "--chromium-allow-list=file:///tmp/.*"
|
- "--chromium-allow-list=file:///tmp/.*"
|
||||||
|
|
||||||
tika:
|
tika:
|
||||||
image: docker.io/apache/tika:latest
|
image: docker.io/apache/tika:latest
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
data:
|
data:
|
||||||
media:
|
media:
|
||||||
|
@ -20,6 +20,7 @@
|
|||||||
# - Copy this file as 'docker-compose.yml' and the files 'docker-compose.env'
|
# - Copy this file as 'docker-compose.yml' and the files 'docker-compose.env'
|
||||||
# and '.env' into a folder.
|
# and '.env' into a folder.
|
||||||
# - Run 'docker compose pull'.
|
# - Run 'docker compose pull'.
|
||||||
|
# - Run 'docker compose run --rm webserver createsuperuser' to create a user.
|
||||||
# - Run 'docker compose up -d'.
|
# - Run 'docker compose up -d'.
|
||||||
#
|
#
|
||||||
# For more extensive installation and update instructions, refer to the
|
# For more extensive installation and update instructions, refer to the
|
||||||
@ -27,10 +28,11 @@
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
broker:
|
broker:
|
||||||
image: docker.io/library/redis:8
|
image: docker.io/library/redis:7
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- redisdata:/data
|
- redisdata:/data
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: docker.io/library/mariadb:11
|
image: docker.io/library/mariadb:11
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
@ -42,6 +44,7 @@ services:
|
|||||||
MARIADB_USER: paperless
|
MARIADB_USER: paperless
|
||||||
MARIADB_PASSWORD: paperless
|
MARIADB_PASSWORD: paperless
|
||||||
MARIADB_ROOT_PASSWORD: paperless
|
MARIADB_ROOT_PASSWORD: paperless
|
||||||
|
|
||||||
webserver:
|
webserver:
|
||||||
image: ghcr.io/paperless-ngx/paperless-ngx:latest
|
image: ghcr.io/paperless-ngx/paperless-ngx:latest
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
@ -63,6 +66,7 @@ services:
|
|||||||
PAPERLESS_DBUSER: paperless # only needed if non-default username
|
PAPERLESS_DBUSER: paperless # only needed if non-default username
|
||||||
PAPERLESS_DBPASS: paperless # only needed if non-default password
|
PAPERLESS_DBPASS: paperless # only needed if non-default password
|
||||||
PAPERLESS_DBPORT: 3306
|
PAPERLESS_DBPORT: 3306
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
data:
|
data:
|
||||||
media:
|
media:
|
||||||
|
@ -22,16 +22,21 @@
|
|||||||
# - Upload 'docker-compose.env' by clicking on 'Load variables from .env file'
|
# - Upload 'docker-compose.env' by clicking on 'Load variables from .env file'
|
||||||
# - Modify the environment variables as needed
|
# - Modify the environment variables as needed
|
||||||
# - Click 'Deploy the stack' and wait for it to be deployed
|
# - Click 'Deploy the stack' and wait for it to be deployed
|
||||||
|
# - Open the list of containers, select paperless_webserver_1
|
||||||
|
# - Click 'Console' and then 'Connect' to open the command line inside the container
|
||||||
|
# - Run 'python3 manage.py createsuperuser' to create a user
|
||||||
|
# - Exit the console
|
||||||
#
|
#
|
||||||
# For more extensive installation and update instructions, refer to the
|
# For more extensive installation and update instructions, refer to the
|
||||||
# documentation.
|
# documentation.
|
||||||
|
|
||||||
services:
|
services:
|
||||||
broker:
|
broker:
|
||||||
image: docker.io/library/redis:8
|
image: docker.io/library/redis:7
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- redisdata:/data
|
- redisdata:/data
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: docker.io/library/postgres:17
|
image: docker.io/library/postgres:17
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
@ -41,6 +46,7 @@ services:
|
|||||||
POSTGRES_DB: paperless
|
POSTGRES_DB: paperless
|
||||||
POSTGRES_USER: paperless
|
POSTGRES_USER: paperless
|
||||||
POSTGRES_PASSWORD: paperless
|
POSTGRES_PASSWORD: paperless
|
||||||
|
|
||||||
webserver:
|
webserver:
|
||||||
image: ghcr.io/paperless-ngx/paperless-ngx:latest
|
image: ghcr.io/paperless-ngx/paperless-ngx:latest
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
@ -59,6 +65,7 @@ services:
|
|||||||
PAPERLESS_DBHOST: db
|
PAPERLESS_DBHOST: db
|
||||||
env_file:
|
env_file:
|
||||||
- stack.env
|
- stack.env
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
data:
|
data:
|
||||||
media:
|
media:
|
||||||
|
@ -24,6 +24,7 @@
|
|||||||
# - Copy this file as 'docker-compose.yml' and the files 'docker-compose.env'
|
# - Copy this file as 'docker-compose.yml' and the files 'docker-compose.env'
|
||||||
# and '.env' into a folder.
|
# and '.env' into a folder.
|
||||||
# - Run 'docker compose pull'.
|
# - Run 'docker compose pull'.
|
||||||
|
# - Run 'docker compose run --rm webserver createsuperuser' to create a user.
|
||||||
# - Run 'docker compose up -d'.
|
# - Run 'docker compose up -d'.
|
||||||
#
|
#
|
||||||
# For more extensive installation and update instructions, refer to the
|
# For more extensive installation and update instructions, refer to the
|
||||||
@ -31,10 +32,11 @@
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
broker:
|
broker:
|
||||||
image: docker.io/library/redis:8
|
image: docker.io/library/redis:7
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- redisdata:/data
|
- redisdata:/data
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: docker.io/library/postgres:17
|
image: docker.io/library/postgres:17
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
@ -44,6 +46,7 @@ services:
|
|||||||
POSTGRES_DB: paperless
|
POSTGRES_DB: paperless
|
||||||
POSTGRES_USER: paperless
|
POSTGRES_USER: paperless
|
||||||
POSTGRES_PASSWORD: paperless
|
POSTGRES_PASSWORD: paperless
|
||||||
|
|
||||||
webserver:
|
webserver:
|
||||||
image: ghcr.io/paperless-ngx/paperless-ngx:latest
|
image: ghcr.io/paperless-ngx/paperless-ngx:latest
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
@ -66,18 +69,22 @@ services:
|
|||||||
PAPERLESS_TIKA_ENABLED: 1
|
PAPERLESS_TIKA_ENABLED: 1
|
||||||
PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000
|
PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000
|
||||||
PAPERLESS_TIKA_ENDPOINT: http://tika:9998
|
PAPERLESS_TIKA_ENDPOINT: http://tika:9998
|
||||||
|
|
||||||
gotenberg:
|
gotenberg:
|
||||||
image: docker.io/gotenberg/gotenberg:8.20
|
image: docker.io/gotenberg/gotenberg:8.17
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
# The gotenberg chromium route is used to convert .eml files. We do not
|
# The gotenberg chromium route is used to convert .eml files. We do not
|
||||||
# want to allow external content like tracking pixels or even javascript.
|
# want to allow external content like tracking pixels or even javascript.
|
||||||
command:
|
command:
|
||||||
- "gotenberg"
|
- "gotenberg"
|
||||||
- "--chromium-disable-javascript=true"
|
- "--chromium-disable-javascript=true"
|
||||||
- "--chromium-allow-list=file:///tmp/.*"
|
- "--chromium-allow-list=file:///tmp/.*"
|
||||||
|
|
||||||
tika:
|
tika:
|
||||||
image: docker.io/apache/tika:latest
|
image: docker.io/apache/tika:latest
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
data:
|
data:
|
||||||
media:
|
media:
|
||||||
|
@ -20,6 +20,7 @@
|
|||||||
# - Copy this file as 'docker-compose.yml' and the files 'docker-compose.env'
|
# - Copy this file as 'docker-compose.yml' and the files 'docker-compose.env'
|
||||||
# and '.env' into a folder.
|
# and '.env' into a folder.
|
||||||
# - Run 'docker compose pull'.
|
# - Run 'docker compose pull'.
|
||||||
|
# - Run 'docker compose run --rm webserver createsuperuser' to create a user.
|
||||||
# - Run 'docker compose up -d'.
|
# - Run 'docker compose up -d'.
|
||||||
#
|
#
|
||||||
# For more extensive installation and update instructions, refer to the
|
# For more extensive installation and update instructions, refer to the
|
||||||
@ -27,10 +28,11 @@
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
broker:
|
broker:
|
||||||
image: docker.io/library/redis:8
|
image: docker.io/library/redis:7
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- redisdata:/data
|
- redisdata:/data
|
||||||
|
|
||||||
db:
|
db:
|
||||||
image: docker.io/library/postgres:17
|
image: docker.io/library/postgres:17
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
@ -40,6 +42,7 @@ services:
|
|||||||
POSTGRES_DB: paperless
|
POSTGRES_DB: paperless
|
||||||
POSTGRES_USER: paperless
|
POSTGRES_USER: paperless
|
||||||
POSTGRES_PASSWORD: paperless
|
POSTGRES_PASSWORD: paperless
|
||||||
|
|
||||||
webserver:
|
webserver:
|
||||||
image: ghcr.io/paperless-ngx/paperless-ngx:latest
|
image: ghcr.io/paperless-ngx/paperless-ngx:latest
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
@ -57,6 +60,7 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
PAPERLESS_REDIS: redis://broker:6379
|
PAPERLESS_REDIS: redis://broker:6379
|
||||||
PAPERLESS_DBHOST: db
|
PAPERLESS_DBHOST: db
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
data:
|
data:
|
||||||
media:
|
media:
|
||||||
|
@ -24,6 +24,7 @@
|
|||||||
# - Copy this file as 'docker-compose.yml' and the files 'docker-compose.env'
|
# - Copy this file as 'docker-compose.yml' and the files 'docker-compose.env'
|
||||||
# and '.env' into a folder.
|
# and '.env' into a folder.
|
||||||
# - Run 'docker compose pull'.
|
# - Run 'docker compose pull'.
|
||||||
|
# - Run 'docker compose run --rm webserver createsuperuser' to create a user.
|
||||||
# - Run 'docker compose up -d'.
|
# - Run 'docker compose up -d'.
|
||||||
#
|
#
|
||||||
# For more extensive installation and update instructions, refer to the
|
# For more extensive installation and update instructions, refer to the
|
||||||
@ -31,10 +32,11 @@
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
broker:
|
broker:
|
||||||
image: docker.io/library/redis:8
|
image: docker.io/library/redis:7
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- redisdata:/data
|
- redisdata:/data
|
||||||
|
|
||||||
webserver:
|
webserver:
|
||||||
image: ghcr.io/paperless-ngx/paperless-ngx:latest
|
image: ghcr.io/paperless-ngx/paperless-ngx:latest
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
@ -55,18 +57,22 @@ services:
|
|||||||
PAPERLESS_TIKA_ENABLED: 1
|
PAPERLESS_TIKA_ENABLED: 1
|
||||||
PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000
|
PAPERLESS_TIKA_GOTENBERG_ENDPOINT: http://gotenberg:3000
|
||||||
PAPERLESS_TIKA_ENDPOINT: http://tika:9998
|
PAPERLESS_TIKA_ENDPOINT: http://tika:9998
|
||||||
|
|
||||||
gotenberg:
|
gotenberg:
|
||||||
image: docker.io/gotenberg/gotenberg:8.20
|
image: docker.io/gotenberg/gotenberg:8.17
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
# The gotenberg chromium route is used to convert .eml files. We do not
|
# The gotenberg chromium route is used to convert .eml files. We do not
|
||||||
# want to allow external content like tracking pixels or even javascript.
|
# want to allow external content like tracking pixels or even javascript.
|
||||||
command:
|
command:
|
||||||
- "gotenberg"
|
- "gotenberg"
|
||||||
- "--chromium-disable-javascript=true"
|
- "--chromium-disable-javascript=true"
|
||||||
- "--chromium-allow-list=file:///tmp/.*"
|
- "--chromium-allow-list=file:///tmp/.*"
|
||||||
|
|
||||||
tika:
|
tika:
|
||||||
image: docker.io/apache/tika:latest
|
image: docker.io/apache/tika:latest
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
data:
|
data:
|
||||||
media:
|
media:
|
||||||
|
@ -17,6 +17,7 @@
|
|||||||
# - Copy this file as 'docker-compose.yml' and the files 'docker-compose.env'
|
# - Copy this file as 'docker-compose.yml' and the files 'docker-compose.env'
|
||||||
# and '.env' into a folder.
|
# and '.env' into a folder.
|
||||||
# - Run 'docker compose pull'.
|
# - Run 'docker compose pull'.
|
||||||
|
# - Run 'docker compose run --rm webserver createsuperuser' to create a user.
|
||||||
# - Run 'docker compose up -d'.
|
# - Run 'docker compose up -d'.
|
||||||
#
|
#
|
||||||
# For more extensive installation and update instructions, refer to the
|
# For more extensive installation and update instructions, refer to the
|
||||||
@ -24,10 +25,11 @@
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
broker:
|
broker:
|
||||||
image: docker.io/library/redis:8
|
image: docker.io/library/redis:7
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- redisdata:/data
|
- redisdata:/data
|
||||||
|
|
||||||
webserver:
|
webserver:
|
||||||
image: ghcr.io/paperless-ngx/paperless-ngx:latest
|
image: ghcr.io/paperless-ngx/paperless-ngx:latest
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
@ -43,6 +45,7 @@ services:
|
|||||||
env_file: docker-compose.env
|
env_file: docker-compose.env
|
||||||
environment:
|
environment:
|
||||||
PAPERLESS_REDIS: redis://broker:6379
|
PAPERLESS_REDIS: redis://broker:6379
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
data:
|
data:
|
||||||
media:
|
media:
|
||||||
|
179
docker/docker-entrypoint.sh
Executable file
179
docker/docker-entrypoint.sh
Executable file
@ -0,0 +1,179 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
# Source: https://github.com/sameersbn/docker-gitlab/
|
||||||
|
map_uidgid() {
|
||||||
|
local -r usermap_original_uid=$(id -u paperless)
|
||||||
|
local -r usermap_original_gid=$(id -g paperless)
|
||||||
|
local -r usermap_new_uid=${USERMAP_UID:-$usermap_original_uid}
|
||||||
|
local -r usermap_new_gid=${USERMAP_GID:-${usermap_original_gid:-$usermap_new_uid}}
|
||||||
|
if [[ ${usermap_new_uid} != "${usermap_original_uid}" || ${usermap_new_gid} != "${usermap_original_gid}" ]]; then
|
||||||
|
echo "Mapping UID and GID for paperless:paperless to $usermap_new_uid:$usermap_new_gid"
|
||||||
|
usermod --non-unique --uid "${usermap_new_uid}" paperless
|
||||||
|
groupmod --non-unique --gid "${usermap_new_gid}" paperless
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
map_folders() {
|
||||||
|
# Export these so they can be used in docker-prepare.sh
|
||||||
|
export DATA_DIR="${PAPERLESS_DATA_DIR:-/usr/src/paperless/data}"
|
||||||
|
export MEDIA_ROOT_DIR="${PAPERLESS_MEDIA_ROOT:-/usr/src/paperless/media}"
|
||||||
|
export CONSUME_DIR="${PAPERLESS_CONSUMPTION_DIR:-/usr/src/paperless/consume}"
|
||||||
|
}
|
||||||
|
|
||||||
|
custom_container_init() {
|
||||||
|
# Mostly borrowed from the LinuxServer.io base image
|
||||||
|
# https://github.com/linuxserver/docker-baseimage-ubuntu/tree/bionic/root/etc/cont-init.d
|
||||||
|
local -r custom_script_dir="/custom-cont-init.d"
|
||||||
|
# Tamper checking.
|
||||||
|
# Don't run files which are owned by anyone except root
|
||||||
|
# Don't run files which are writeable by others
|
||||||
|
if [ -d "${custom_script_dir}" ]; then
|
||||||
|
if [ -n "$(/usr/bin/find "${custom_script_dir}" -maxdepth 1 ! -user root)" ]; then
|
||||||
|
echo "**** Potential tampering with custom scripts detected ****"
|
||||||
|
echo "**** The folder '${custom_script_dir}' must be owned by root ****"
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
if [ -n "$(/usr/bin/find "${custom_script_dir}" -maxdepth 1 -perm -o+w)" ]; then
|
||||||
|
echo "**** The folder '${custom_script_dir}' or some of contents have write permissions for others, which is a security risk. ****"
|
||||||
|
echo "**** Please review the permissions and their contents to make sure they are owned by root, and can only be modified by root. ****"
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Make sure custom init directory has files in it
|
||||||
|
if [ -n "$(/bin/ls --almost-all "${custom_script_dir}" 2>/dev/null)" ]; then
|
||||||
|
echo "[custom-init] files found in ${custom_script_dir} executing"
|
||||||
|
# Loop over files in the directory
|
||||||
|
for SCRIPT in "${custom_script_dir}"/*; do
|
||||||
|
NAME="$(basename "${SCRIPT}")"
|
||||||
|
if [ -f "${SCRIPT}" ]; then
|
||||||
|
echo "[custom-init] ${NAME}: executing..."
|
||||||
|
/bin/bash "${SCRIPT}"
|
||||||
|
echo "[custom-init] ${NAME}: exited $?"
|
||||||
|
elif [ ! -f "${SCRIPT}" ]; then
|
||||||
|
echo "[custom-init] ${NAME}: is not a file"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
else
|
||||||
|
echo "[custom-init] no custom files found exiting..."
|
||||||
|
fi
|
||||||
|
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
initialize() {
|
||||||
|
|
||||||
|
# Setup environment from secrets before anything else
|
||||||
|
# Check for a version of this var with _FILE appended
|
||||||
|
# and convert the contents to the env var value
|
||||||
|
# Source it so export is persistent
|
||||||
|
# shellcheck disable=SC1091
|
||||||
|
source /sbin/env-from-file.sh
|
||||||
|
|
||||||
|
# Change the user and group IDs if needed
|
||||||
|
map_uidgid
|
||||||
|
|
||||||
|
# Check for overrides of certain folders
|
||||||
|
map_folders
|
||||||
|
|
||||||
|
local -r export_dir="/usr/src/paperless/export"
|
||||||
|
|
||||||
|
for dir in \
|
||||||
|
"${export_dir}" \
|
||||||
|
"${DATA_DIR}" "${DATA_DIR}/index" \
|
||||||
|
"${MEDIA_ROOT_DIR}" "${MEDIA_ROOT_DIR}/documents" "${MEDIA_ROOT_DIR}/documents/originals" "${MEDIA_ROOT_DIR}/documents/thumbnails" \
|
||||||
|
"${CONSUME_DIR}"; do
|
||||||
|
if [[ ! -d "${dir}" ]]; then
|
||||||
|
echo "Creating directory ${dir}"
|
||||||
|
mkdir --parents --verbose "${dir}"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
local -r tmp_dir="${PAPERLESS_SCRATCH_DIR:=/tmp/paperless}"
|
||||||
|
echo "Creating directory scratch directory ${tmp_dir}"
|
||||||
|
mkdir --parents --verbose "${tmp_dir}"
|
||||||
|
|
||||||
|
set +e
|
||||||
|
echo "Adjusting permissions of paperless files. This may take a while."
|
||||||
|
chown -R paperless:paperless "${tmp_dir}"
|
||||||
|
for dir in \
|
||||||
|
"${export_dir}" \
|
||||||
|
"${DATA_DIR}" \
|
||||||
|
"${MEDIA_ROOT_DIR}" \
|
||||||
|
"${CONSUME_DIR}"; do
|
||||||
|
find "${dir}" -not \( -user paperless -and -group paperless \) -exec chown --changes paperless:paperless {} +
|
||||||
|
done
|
||||||
|
set -e
|
||||||
|
|
||||||
|
"${gosu_cmd[@]}" /sbin/docker-prepare.sh
|
||||||
|
|
||||||
|
# Leave this last thing
|
||||||
|
custom_container_init
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
install_languages() {
|
||||||
|
echo "Installing languages..."
|
||||||
|
|
||||||
|
read -ra langs <<<"$1"
|
||||||
|
|
||||||
|
# Check that it is not empty
|
||||||
|
if [ ${#langs[@]} -eq 0 ]; then
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Build list of packages to install
|
||||||
|
to_install=()
|
||||||
|
for lang in "${langs[@]}"; do
|
||||||
|
pkg="tesseract-ocr-$lang"
|
||||||
|
|
||||||
|
if dpkg --status "$pkg" &>/dev/null; then
|
||||||
|
echo "Package $pkg already installed!"
|
||||||
|
continue
|
||||||
|
else
|
||||||
|
to_install+=("$pkg")
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
# Use apt only when we install packages
|
||||||
|
if [ ${#to_install[@]} -gt 0 ]; then
|
||||||
|
apt-get update
|
||||||
|
|
||||||
|
for pkg in "${to_install[@]}"; do
|
||||||
|
|
||||||
|
if ! apt-cache show "$pkg" &>/dev/null; then
|
||||||
|
echo "Skipped $pkg: Package not found! :("
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Installing package $pkg..."
|
||||||
|
if ! apt-get --assume-yes install "$pkg" &>/dev/null; then
|
||||||
|
echo "Could not install $pkg"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
echo "Paperless-ngx docker container starting..."
|
||||||
|
|
||||||
|
gosu_cmd=(gosu paperless)
|
||||||
|
if [ "$(id --user)" == "$(id --user paperless)" ]; then
|
||||||
|
gosu_cmd=()
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Install additional languages if specified
|
||||||
|
if [[ -n "$PAPERLESS_OCR_LANGUAGES" ]]; then
|
||||||
|
install_languages "$PAPERLESS_OCR_LANGUAGES"
|
||||||
|
fi
|
||||||
|
|
||||||
|
initialize
|
||||||
|
|
||||||
|
if [[ "$1" != "/"* ]]; then
|
||||||
|
echo Executing management command "$@"
|
||||||
|
exec "${gosu_cmd[@]}" python3 manage.py "$@"
|
||||||
|
else
|
||||||
|
echo Executing "$@"
|
||||||
|
exec "$@"
|
||||||
|
fi
|
@ -18,10 +18,9 @@ for command in decrypt_documents \
|
|||||||
document_fuzzy_match \
|
document_fuzzy_match \
|
||||||
manage_superuser \
|
manage_superuser \
|
||||||
convert_mariadb_uuid \
|
convert_mariadb_uuid \
|
||||||
prune_audit_logs \
|
prune_audit_logs;
|
||||||
createsuperuser;
|
|
||||||
do
|
do
|
||||||
echo "installing $command..."
|
echo "installing $command..."
|
||||||
sed "s/management_command/$command/g" management_script.sh >"$PWD/rootfs/usr/local/bin/$command"
|
sed "s/management_command/$command/g" management_script.sh >"$PWD/rootfs/usr/local/bin/$command"
|
||||||
chmod u=rwx,g=rwx,o=rx "$PWD/rootfs/usr/local/bin/$command"
|
chmod +x "$PWD/rootfs/usr/local/bin/$command"
|
||||||
done
|
done
|
||||||
|
@ -9,7 +9,7 @@ if find /run/s6/container_environment/*"_FILE" -maxdepth 1 > /dev/null 2>&1; the
|
|||||||
for FILENAME in /run/s6/container_environment/*; do
|
for FILENAME in /run/s6/container_environment/*; do
|
||||||
if [[ "${FILENAME##*/}" == PAPERLESS_*_FILE ]]; then
|
if [[ "${FILENAME##*/}" == PAPERLESS_*_FILE ]]; then
|
||||||
# This should have been named different..
|
# This should have been named different..
|
||||||
if [[ "${FILENAME##*/}" == "PAPERLESS_OCR_SKIP_ARCHIVE_FILE" || "${FILENAME##*/}" == "PAPERLESS_MODEL_FILE" ]]; then
|
if [[ ${FILENAME} == "PAPERLESS_OCR_SKIP_ARCHIVE_FILE" || ${FILENAME} == "PAPERLESS_MODEL_FILE" ]]; then
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
SECRETFILE=$(cat "${FILENAME}")
|
SECRETFILE=$(cat "${FILENAME}")
|
||||||
@ -17,9 +17,6 @@ if find /run/s6/container_environment/*"_FILE" -maxdepth 1 > /dev/null 2>&1; the
|
|||||||
if [[ -f ${SECRETFILE} ]]; then
|
if [[ -f ${SECRETFILE} ]]; then
|
||||||
# Trim off trailing _FILE
|
# Trim off trailing _FILE
|
||||||
FILESTRIP=${FILENAME//_FILE/}
|
FILESTRIP=${FILENAME//_FILE/}
|
||||||
if [[ $(tail -n1 "${SECRETFILE}" | wc -l) != 0 ]]; then
|
|
||||||
echo "${log_prefix} Your secret: ${FILENAME##*/} contains a trailing newline and may not work as expected"
|
|
||||||
fi
|
|
||||||
# Set environment variable
|
# Set environment variable
|
||||||
cat "${SECRETFILE}" > "${FILESTRIP}"
|
cat "${SECRETFILE}" > "${FILESTRIP}"
|
||||||
echo "${log_prefix} ${FILESTRIP##*/} set from ${FILENAME##*/}"
|
echo "${log_prefix} ${FILESTRIP##*/} set from ${FILENAME##*/}"
|
||||||
|
@ -9,57 +9,25 @@ declare -r media_root_dir="${PAPERLESS_MEDIA_ROOT:-/usr/src/paperless/media}"
|
|||||||
declare -r consume_dir="${PAPERLESS_CONSUMPTION_DIR:-/usr/src/paperless/consume}"
|
declare -r consume_dir="${PAPERLESS_CONSUMPTION_DIR:-/usr/src/paperless/consume}"
|
||||||
declare -r tmp_dir="${PAPERLESS_SCRATCH_DIR:=/tmp/paperless}"
|
declare -r tmp_dir="${PAPERLESS_SCRATCH_DIR:=/tmp/paperless}"
|
||||||
|
|
||||||
declare -r main_dirs=(
|
echo "${log_prefix} Checking for folder existence"
|
||||||
"${export_dir}"
|
|
||||||
"${data_dir}"
|
|
||||||
"${media_root_dir}"
|
|
||||||
"${consume_dir}"
|
|
||||||
"${tmp_dir}"
|
|
||||||
)
|
|
||||||
|
|
||||||
declare -r extra_dirs=(
|
for dir in \
|
||||||
"${main_dirs[@]}"
|
"${export_dir}" \
|
||||||
"${data_dir}/index"
|
"${data_dir}" "${data_dir}/index" \
|
||||||
"${media_root_dir}/documents"
|
"${media_root_dir}" "${media_root_dir}/documents" "${media_root_dir}/documents/originals" "${media_root_dir}/documents/thumbnails" \
|
||||||
"${media_root_dir}/documents/originals"
|
"${consume_dir}" \
|
||||||
"${media_root_dir}/documents/thumbnails"
|
"${tmp_dir}"; do
|
||||||
)
|
if [[ ! -d "${dir}" ]]; then
|
||||||
|
mkdir --parents --verbose "${dir}"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
if [[ -n "${USER_IS_NON_ROOT}" ]]; then
|
echo "${log_prefix} Adjusting file and folder permissions"
|
||||||
# Non-root mode: Create directories as current user, warn about permission issues
|
for dir in \
|
||||||
echo "${log_prefix} Running in non-root mode, checking directories"
|
"${export_dir}" \
|
||||||
current_uid=$(id --user)
|
"${data_dir}" \
|
||||||
current_gid=$(id --group)
|
"${media_root_dir}" \
|
||||||
|
"${consume_dir}" \
|
||||||
for dir in "${extra_dirs[@]}"; do
|
"${tmp_dir}"; do
|
||||||
if [[ ! -d "${dir}" ]]; then
|
find "${dir}" -not \( -user paperless -and -group paperless \) -exec chown --changes paperless:paperless {} +
|
||||||
mkdir --parents --verbose "${dir}" || echo "${log_prefix} WARNING: Could not create ${dir} - permission denied"
|
done
|
||||||
fi
|
|
||||||
# Check permissions on existing directories too
|
|
||||||
if [[ -d "${dir}" && ! -w "${dir}" ]]; then
|
|
||||||
echo "${log_prefix} WARNING: No write permission to ${dir}"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
# Warn about ownership issues
|
|
||||||
for dir in "${main_dirs[@]}"; do
|
|
||||||
if [[ -d "${dir}" ]]; then
|
|
||||||
find "${dir}" -not \( -user ${current_uid} -and -group ${current_gid} \) -exec echo "${log_prefix} WARNING: Permission issue on {}: not owned by current user (${current_uid}:${current_gid})" \; 2>/dev/null || echo "${log_prefix} WARNING: Cannot check permissions on ${dir}"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
else
|
|
||||||
# Root mode: Create and fix permissions as needed
|
|
||||||
echo "${log_prefix} Running with root privileges, adjusting directories and permissions"
|
|
||||||
|
|
||||||
# First create directories
|
|
||||||
for dir in "${extra_dirs[@]}"; do
|
|
||||||
if [[ ! -d "${dir}" ]]; then
|
|
||||||
mkdir --parents --verbose "${dir}"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
# Then fix permissions on all directories
|
|
||||||
for dir in "${main_dirs[@]}"; do
|
|
||||||
find "${dir}" -not \( -user paperless -and -group paperless \) -exec chown --changes paperless:paperless {} +
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
@ -1,18 +1,20 @@
|
|||||||
#!/command/with-contenv /usr/bin/bash
|
#!/command/with-contenv /usr/bin/bash
|
||||||
# shellcheck shell=bash
|
# shellcheck shell=bash
|
||||||
declare -r log_prefix="[init-migrations]"
|
declare -r log_prefix="[init-migrations]"
|
||||||
|
|
||||||
declare -r data_dir="${PAPERLESS_DATA_DIR:-/usr/src/paperless/data}"
|
declare -r data_dir="${PAPERLESS_DATA_DIR:-/usr/src/paperless/data}"
|
||||||
|
|
||||||
echo "${log_prefix} Apply database migrations..."
|
(
|
||||||
|
# flock is in place to prevent multiple containers from doing migrations
|
||||||
|
# simultaneously. This also ensures that the db is ready when the command
|
||||||
|
# of the current container starts.
|
||||||
|
flock 200
|
||||||
|
echo "${log_prefix} Apply database migrations..."
|
||||||
|
cd "${PAPERLESS_SRC_DIR}"
|
||||||
|
|
||||||
cd "${PAPERLESS_SRC_DIR}"
|
if [[ -n "${USER_IS_NON_ROOT}" ]]; then
|
||||||
|
exec python3 manage.py migrate --skip-checks --no-input
|
||||||
|
else
|
||||||
|
exec s6-setuidgid paperless python3 manage.py migrate --skip-checks --no-input
|
||||||
|
fi
|
||||||
|
|
||||||
# The whole migrate, with flock, needs to run as the right user
|
) 200>"${data_dir}/migration_lock"
|
||||||
if [[ -n "${USER_IS_NON_ROOT}" ]]; then
|
|
||||||
exec s6-setlock -n "${data_dir}/migration_lock" python3 manage.py migrate --skip-checks --no-input
|
|
||||||
else
|
|
||||||
exec s6-setuidgid paperless \
|
|
||||||
s6-setlock -n "${data_dir}/migration_lock" \
|
|
||||||
python3 manage.py migrate --skip-checks --no-input
|
|
||||||
fi
|
|
||||||
|
@ -11,10 +11,9 @@ printf "/usr/src/paperless/src" > /var/run/s6/container_environment/PAPERLESS_SR
|
|||||||
echo $(date +%s) > /var/run/s6/container_environment/PAPERLESS_START_TIME_S
|
echo $(date +%s) > /var/run/s6/container_environment/PAPERLESS_START_TIME_S
|
||||||
|
|
||||||
# Check if we're starting as a non-root user
|
# Check if we're starting as a non-root user
|
||||||
if [ "$(id --user)" != "0" ]; then
|
if [ $(id -u) == $(id -u paperless) ]; then
|
||||||
printf "true" > /var/run/s6/container_environment/USER_IS_NON_ROOT
|
printf "true" > /var/run/s6/container_environment/USER_IS_NON_ROOT
|
||||||
echo "${log_prefix} paperless-ngx docker container running under a user ($(id --user):$(id --group))"
|
echo "${log_prefix} paperless-ngx docker container running under a user"
|
||||||
else
|
else
|
||||||
printf "/usr/src/paperless" > /var/run/s6/container_environment/HOME
|
|
||||||
echo "${log_prefix} paperless-ngx docker container starting init as root"
|
echo "${log_prefix} paperless-ngx docker container starting init as root"
|
||||||
fi
|
fi
|
||||||
|
@ -14,7 +14,7 @@ if [[ -n "${PAPERLESS_FORCE_SCRIPT_NAME}" ]]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -n "${USER_IS_NON_ROOT}" ]]; then
|
if [[ -n "${USER_IS_NON_ROOT}" ]]; then
|
||||||
exec granian --interface asginl --ws --loop uvloop "paperless.asgi:application"
|
exec granian --interface asginl --ws "paperless.asgi:application"
|
||||||
else
|
else
|
||||||
exec s6-setuidgid paperless granian --interface asginl --ws --loop uvloop "paperless.asgi:application"
|
exec s6-setuidgid paperless granian --interface asginl --ws "paperless.asgi:application"
|
||||||
fi
|
fi
|
||||||
|
@ -1,14 +0,0 @@
|
|||||||
#!/command/with-contenv /usr/bin/bash
|
|
||||||
# shellcheck shell=bash
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
cd "${PAPERLESS_SRC_DIR}"
|
|
||||||
|
|
||||||
if [[ $(id -u) == 0 ]]; then
|
|
||||||
s6-setuidgid paperless python3 manage.py createsuperuser "$@"
|
|
||||||
elif [[ $(id -un) == "paperless" ]]; then
|
|
||||||
python3 manage.py createsuperuser "$@"
|
|
||||||
else
|
|
||||||
echo "Unknown user."
|
|
||||||
fi
|
|
@ -565,15 +565,19 @@ document.
|
|||||||
|
|
||||||
### Managing encryption {#encryption}
|
### Managing encryption {#encryption}
|
||||||
|
|
||||||
|
Documents can be stored in Paperless using GnuPG encryption.
|
||||||
|
|
||||||
!!! warning
|
!!! warning
|
||||||
|
|
||||||
Encryption was removed in [paperless-ng 0.9](changelog.md#paperless-ng-090)
|
Encryption is deprecated since [paperless-ng 0.9](changelog.md#paperless-ng-090) and doesn't really
|
||||||
because it did not really provide any additional security, the passphrase
|
provide any additional security, since you have to store the passphrase
|
||||||
was stored in a configuration file on the same system as the documents.
|
in a configuration file on the same system as the encrypted documents
|
||||||
Furthermore, the entire text content of the documents is stored plain in
|
for paperless to work. Furthermore, the entire text content of the
|
||||||
the database, even if your documents are encrypted. Filenames are not
|
documents is stored plain in the database, even if your documents are
|
||||||
encrypted as well. Finally, the web server provides transparent access to
|
encrypted. Filenames are not encrypted as well.
|
||||||
your encrypted documents.
|
|
||||||
|
Also, the web server provides transparent access to your encrypted
|
||||||
|
documents.
|
||||||
|
|
||||||
Consider running paperless on an encrypted filesystem instead, which
|
Consider running paperless on an encrypted filesystem instead, which
|
||||||
will then at least provide security against physical hardware theft.
|
will then at least provide security against physical hardware theft.
|
||||||
@ -629,11 +633,3 @@ entries created prior to this are not removed. This command allows you to prune
|
|||||||
```shell
|
```shell
|
||||||
prune_audit_logs
|
prune_audit_logs
|
||||||
```
|
```
|
||||||
|
|
||||||
### Create superuser {#create-superuser}
|
|
||||||
|
|
||||||
If you need to create a superuser, use the following command:
|
|
||||||
|
|
||||||
```shell
|
|
||||||
createsuperuser
|
|
||||||
```
|
|
||||||
|
@ -270,7 +270,7 @@ The following methods are supported:
|
|||||||
- `remove_tag`
|
- `remove_tag`
|
||||||
- Requires `parameters`: `{ "tag": TAG_ID }`
|
- Requires `parameters`: `{ "tag": TAG_ID }`
|
||||||
- `modify_tags`
|
- `modify_tags`
|
||||||
- Requires `parameters`: `{ "add_tags": [LIST_OF_TAG_IDS] }` and `{ "remove_tags": [LIST_OF_TAG_IDS] }`
|
- Requires `parameters`: `{ "add_tags": [LIST_OF_TAG_IDS] }` and / or `{ "remove_tags": [LIST_OF_TAG_IDS] }`
|
||||||
- `delete`
|
- `delete`
|
||||||
- No `parameters` required
|
- No `parameters` required
|
||||||
- `reprocess`
|
- `reprocess`
|
||||||
@ -413,8 +413,3 @@ Initial API version.
|
|||||||
list of strings. When creating or updating a custom field value of a
|
list of strings. When creating or updating a custom field value of a
|
||||||
document for a select type custom field, the value should be the `id` of
|
document for a select type custom field, the value should be the `id` of
|
||||||
the option whereas previously was the index of the option.
|
the option whereas previously was the index of the option.
|
||||||
|
|
||||||
#### Version 8
|
|
||||||
|
|
||||||
- The user field of document notes now returns a simplified user object
|
|
||||||
rather than just the user ID.
|
|
||||||
|
@ -1,318 +1,5 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## paperless-ngx 2.15.3
|
|
||||||
|
|
||||||
### Bug Fixes
|
|
||||||
|
|
||||||
- Fix: do not try deleting original file that was moved to trash dir [@shamoon](https://github.com/shamoon) ([#9684](https://github.com/paperless-ngx/paperless-ngx/pull/9684))
|
|
||||||
- Fix: preserve non-ASCII filenames in document downloads [@shamoon](https://github.com/shamoon) ([#9702](https://github.com/paperless-ngx/paperless-ngx/pull/9702))
|
|
||||||
- Fix: fix breaking api change to document notes user field [@shamoon](https://github.com/shamoon) ([#9714](https://github.com/paperless-ngx/paperless-ngx/pull/9714))
|
|
||||||
- Fix: another doc link fix [@shamoon](https://github.com/shamoon) ([#9700](https://github.com/paperless-ngx/paperless-ngx/pull/9700))
|
|
||||||
- Fix: correctly handle dict data with webhook [@shamoon](https://github.com/shamoon) ([#9674](https://github.com/paperless-ngx/paperless-ngx/pull/9674))
|
|
||||||
|
|
||||||
### All App Changes
|
|
||||||
|
|
||||||
<details>
|
|
||||||
<summary>5 changes</summary>
|
|
||||||
|
|
||||||
- Fix: do not try deleting original file that was moved to trash dir [@shamoon](https://github.com/shamoon) ([#9684](https://github.com/paperless-ngx/paperless-ngx/pull/9684))
|
|
||||||
- Fix: preserve non-ASCII filenames in document downloads [@shamoon](https://github.com/shamoon) ([#9702](https://github.com/paperless-ngx/paperless-ngx/pull/9702))
|
|
||||||
- Fix: fix breaking api change to document notes user field [@shamoon](https://github.com/shamoon) ([#9714](https://github.com/paperless-ngx/paperless-ngx/pull/9714))
|
|
||||||
- Fix: another doc link fix [@shamoon](https://github.com/shamoon) ([#9700](https://github.com/paperless-ngx/paperless-ngx/pull/9700))
|
|
||||||
- Fix: correctly handle dict data with webhook [@shamoon](https://github.com/shamoon) ([#9674](https://github.com/paperless-ngx/paperless-ngx/pull/9674))
|
|
||||||
</details>
|
|
||||||
|
|
||||||
## paperless-ngx 2.15.2
|
|
||||||
|
|
||||||
### Bug Fixes
|
|
||||||
|
|
||||||
- Fix: Adds better handling during folder checking/creation/permissions for non-root [@stumpylog](https://github.com/stumpylog) ([#9616](https://github.com/paperless-ngx/paperless-ngx/pull/9616))
|
|
||||||
- Fix: Explicitly set the HOME environment to resolve issues running as root with database certificates [@stumpylog](https://github.com/stumpylog) ([#9643](https://github.com/paperless-ngx/paperless-ngx/pull/9643))
|
|
||||||
- Fix: prevent self-linking when bulk edit doc link [@shamoon](https://github.com/shamoon) ([#9629](https://github.com/paperless-ngx/paperless-ngx/pull/9629))
|
|
||||||
|
|
||||||
### Dependencies
|
|
||||||
|
|
||||||
- Chore: Bump celery to 5.5.1 [@hannesortmeier](https://github.com/hannesortmeier) ([#9642](https://github.com/paperless-ngx/paperless-ngx/pull/9642))
|
|
||||||
|
|
||||||
### All App Changes
|
|
||||||
|
|
||||||
<details>
|
|
||||||
<summary>4 changes</summary>
|
|
||||||
|
|
||||||
- Tweak: consistently use created date when displaying doc in list [@shamoon](https://github.com/shamoon) ([#9651](https://github.com/paperless-ngx/paperless-ngx/pull/9651))
|
|
||||||
- Fix: Adds better handling during folder checking/creation/permissions for non-root [@stumpylog](https://github.com/stumpylog) ([#9616](https://github.com/paperless-ngx/paperless-ngx/pull/9616))
|
|
||||||
- Fix: Explicitly set the HOME environment to resolve issues running as root with database certificates [@stumpylog](https://github.com/stumpylog) ([#9643](https://github.com/paperless-ngx/paperless-ngx/pull/9643))
|
|
||||||
- Fix: prevent self-linking when bulk edit doc link [@shamoon](https://github.com/shamoon) ([#9629](https://github.com/paperless-ngx/paperless-ngx/pull/9629))
|
|
||||||
</details>
|
|
||||||
|
|
||||||
## paperless-ngx 2.15.1
|
|
||||||
|
|
||||||
### Bug Fixes
|
|
||||||
|
|
||||||
- Fix: Run migration lock as the correct user [@stumpylog](https://github.com/stumpylog) ([#9604](https://github.com/paperless-ngx/paperless-ngx/pull/9604))
|
|
||||||
- Fix: Adds a warning to the user if their secret file includes a trailing newline [@stumpylog](https://github.com/stumpylog) ([#9601](https://github.com/paperless-ngx/paperless-ngx/pull/9601))
|
|
||||||
- Fix: correct download filename in 2.15.0 [@shamoon](https://github.com/shamoon) ([#9599](https://github.com/paperless-ngx/paperless-ngx/pull/9599))
|
|
||||||
- Fix: dont exclude matching check for scheduled workflows [@shamoon](https://github.com/shamoon) ([#9594](https://github.com/paperless-ngx/paperless-ngx/pull/9594))
|
|
||||||
|
|
||||||
### Maintenance
|
|
||||||
|
|
||||||
- docker(deps): Bump astral-sh/uv from 0.6.9-python3.12-bookworm-slim to 0.6.13-python3.12-bookworm-slim @[dependabot[bot]](https://github.com/apps/dependabot) ([#9573](https://github.com/paperless-ngx/paperless-ngx/pull/9573))
|
|
||||||
|
|
||||||
### Dependencies
|
|
||||||
|
|
||||||
- docker(deps): Bump astral-sh/uv from 0.6.9-python3.12-bookworm-slim to 0.6.13-python3.12-bookworm-slim @[dependabot[bot]](https://github.com/apps/dependabot) ([#9573](https://github.com/paperless-ngx/paperless-ngx/pull/9573))
|
|
||||||
- Chore: move to whoosh-reloaded, for now [@shamoon](https://github.com/shamoon) ([#9605](https://github.com/paperless-ngx/paperless-ngx/pull/9605))
|
|
||||||
|
|
||||||
### All App Changes
|
|
||||||
|
|
||||||
<details>
|
|
||||||
<summary>4 changes</summary>
|
|
||||||
|
|
||||||
- Fix: Run migration lock as the correct user [@stumpylog](https://github.com/stumpylog) ([#9604](https://github.com/paperless-ngx/paperless-ngx/pull/9604))
|
|
||||||
- Fix: Adds a warning to the user if their secret file includes a trailing newline [@stumpylog](https://github.com/stumpylog) ([#9601](https://github.com/paperless-ngx/paperless-ngx/pull/9601))
|
|
||||||
- Fix: correct download filename in 2.15.0 [@shamoon](https://github.com/shamoon) ([#9599](https://github.com/paperless-ngx/paperless-ngx/pull/9599))
|
|
||||||
- Fix: dont exclude matching check for scheduled workflows [@shamoon](https://github.com/shamoon) ([#9594](https://github.com/paperless-ngx/paperless-ngx/pull/9594))
|
|
||||||
</details>
|
|
||||||
|
|
||||||
## paperless-ngx 2.15.0
|
|
||||||
|
|
||||||
### Features
|
|
||||||
|
|
||||||
- Enhancement: allow webUI first account signup [@shamoon](https://github.com/shamoon) ([#9500](https://github.com/paperless-ngx/paperless-ngx/pull/9500))
|
|
||||||
- Enhancement: support more 'not assigned' filtering, refactor [@shamoon](https://github.com/shamoon) ([#9429](https://github.com/paperless-ngx/paperless-ngx/pull/9429))
|
|
||||||
- Enhancement: reorganize dates dropdown, add more relative options [@shamoon](https://github.com/shamoon) ([#9307](https://github.com/paperless-ngx/paperless-ngx/pull/9307))
|
|
||||||
- Enhancement: add switch to allow merging non-PDFs with archive version [@shamoon](https://github.com/shamoon) ([#9305](https://github.com/paperless-ngx/paperless-ngx/pull/9305))
|
|
||||||
- Enhancement: support assigning custom field values in workflows [@shamoon](https://github.com/shamoon) ([#9272](https://github.com/paperless-ngx/paperless-ngx/pull/9272))
|
|
||||||
- Enhancement: Add slugify filter in templating [@hwaterke](https://github.com/hwaterke) ([#9269](https://github.com/paperless-ngx/paperless-ngx/pull/9269))
|
|
||||||
- Feature: Switch webserver to granian [@stumpylog](https://github.com/stumpylog) ([#9218](https://github.com/paperless-ngx/paperless-ngx/pull/9218))
|
|
||||||
- Enhancement: relocate and smaller upload widget, dont limit upload list [@shamoon](https://github.com/shamoon) ([#9244](https://github.com/paperless-ngx/paperless-ngx/pull/9244))
|
|
||||||
- Enhancement: run tasks from system status, report sanity check, simpler classifier check, styling updates [@shamoon](https://github.com/shamoon) ([#9106](https://github.com/paperless-ngx/paperless-ngx/pull/9106))
|
|
||||||
- Enhancement: include celery log in logs view [@shamoon](https://github.com/shamoon) ([#9214](https://github.com/paperless-ngx/paperless-ngx/pull/9214))
|
|
||||||
- Enhancement: support default groups for regular and social account signup, syncing on login [@shamoon](https://github.com/shamoon) ([#9039](https://github.com/paperless-ngx/paperless-ngx/pull/9039))
|
|
||||||
- Enhancement: allow disabling the filesystem consumer [@shamoon](https://github.com/shamoon) ([#9199](https://github.com/paperless-ngx/paperless-ngx/pull/9199))
|
|
||||||
- Feature: email document [@shamoon](https://github.com/shamoon) ([#8950](https://github.com/paperless-ngx/paperless-ngx/pull/8950))
|
|
||||||
- Enhancement: webui workflowtrigger source option [@shamoon](https://github.com/shamoon) ([#9170](https://github.com/paperless-ngx/paperless-ngx/pull/9170))
|
|
||||||
- Enhancement: use charfield for webhook url, custom validation [@shamoon](https://github.com/shamoon) ([#9128](https://github.com/paperless-ngx/paperless-ngx/pull/9128))
|
|
||||||
- Feature: Chinese Traditional translation [@LokiHung](https://github.com/LokiHung) ([#9076](https://github.com/paperless-ngx/paperless-ngx/pull/9076))
|
|
||||||
- Enhancement: Use cached sessions for a minor performance improvement [@stumpylog](https://github.com/stumpylog) ([#9074](https://github.com/paperless-ngx/paperless-ngx/pull/9074))
|
|
||||||
- Feature: openapi spec, full api browser [@shamoon](https://github.com/shamoon) ([#8948](https://github.com/paperless-ngx/paperless-ngx/pull/8948))
|
|
||||||
- Enhancement: filter by file type [@shamoon](https://github.com/shamoon) ([#8946](https://github.com/paperless-ngx/paperless-ngx/pull/8946))
|
|
||||||
- Feature: Transition Docker to use s6 overlay [@stumpylog](https://github.com/stumpylog) ([#8886](https://github.com/paperless-ngx/paperless-ngx/pull/8886))
|
|
||||||
- Feature: better toast notifications management [@shamoon](https://github.com/shamoon) ([#8980](https://github.com/paperless-ngx/paperless-ngx/pull/8980))
|
|
||||||
- Enhancement: date picker and date filter dropdown improvements [@shamoon](https://github.com/shamoon) ([#9033](https://github.com/paperless-ngx/paperless-ngx/pull/9033))
|
|
||||||
- Tweak: more accurate classifier last trained time [@shamoon](https://github.com/shamoon) ([#9004](https://github.com/paperless-ngx/paperless-ngx/pull/9004))
|
|
||||||
- Enhancement: allow setting default pdf zoom [@shamoon](https://github.com/shamoon) ([#9017](https://github.com/paperless-ngx/paperless-ngx/pull/9017))
|
|
||||||
|
|
||||||
### Bug Fixes
|
|
||||||
|
|
||||||
- Fix: ensure only matched scheduled workflows are applied [@shamoon](https://github.com/shamoon) ([#9580](https://github.com/paperless-ngx/paperless-ngx/pull/9580))
|
|
||||||
- Fix: fix large doc thumb hidden at unexpected screen sizes [@shamoon](https://github.com/shamoon) ([#9559](https://github.com/paperless-ngx/paperless-ngx/pull/9559))
|
|
||||||
- Fix: fix potential race condition when creating new cf from doc details [@shamoon](https://github.com/shamoon) ([#9542](https://github.com/paperless-ngx/paperless-ngx/pull/9542))
|
|
||||||
- Fix: fix doc link input [@shamoon](https://github.com/shamoon) ([#9533](https://github.com/paperless-ngx/paperless-ngx/pull/9533))
|
|
||||||
- Fix: only overwrite existing cf values in workflow if set [@shamoon](https://github.com/shamoon) ([#9459](https://github.com/paperless-ngx/paperless-ngx/pull/9459))
|
|
||||||
- Fix: fix auto-close when doc update no longer has permissions [@shamoon](https://github.com/shamoon) ([#9453](https://github.com/paperless-ngx/paperless-ngx/pull/9453))
|
|
||||||
- Change: better handle permissions in patch requests [@shamoon](https://github.com/shamoon) ([#9393](https://github.com/paperless-ngx/paperless-ngx/pull/9393))
|
|
||||||
- Fix: use correct filename with webhook [@shamoon](https://github.com/shamoon) ([#9392](https://github.com/paperless-ngx/paperless-ngx/pull/9392))
|
|
||||||
- Change: sync OIDC groups on first login too [@shamoon](https://github.com/shamoon) ([#9387](https://github.com/paperless-ngx/paperless-ngx/pull/9387))
|
|
||||||
- Fix: only parse custom field queries when valid [@shamoon](https://github.com/shamoon) ([#9384](https://github.com/paperless-ngx/paperless-ngx/pull/9384))
|
|
||||||
- Fix: Allow setting of other Granian options [@stumpylog](https://github.com/stumpylog) ([#9360](https://github.com/paperless-ngx/paperless-ngx/pull/9360))
|
|
||||||
- Fix: Always clean up INotify [@stumpylog](https://github.com/stumpylog) ([#9359](https://github.com/paperless-ngx/paperless-ngx/pull/9359))
|
|
||||||
- Fix typo in inactive account template [@ocean90](https://github.com/ocean90) ([#9356](https://github.com/paperless-ngx/paperless-ngx/pull/9356))
|
|
||||||
- Fix: fix notes serializing in API document response [@shamoon](https://github.com/shamoon) ([#9336](https://github.com/paperless-ngx/paperless-ngx/pull/9336))
|
|
||||||
- Fix: correct all results with whoosh queries [@shamoon](https://github.com/shamoon) ([#9331](https://github.com/paperless-ngx/paperless-ngx/pull/9331))
|
|
||||||
- Fix: fix typo in altered migration [@gothicVI](https://github.com/gothicVI) ([#9321](https://github.com/paperless-ngx/paperless-ngx/pull/9321))
|
|
||||||
- Fix: add account_inactive template / url [@shamoon](https://github.com/shamoon) ([#9322](https://github.com/paperless-ngx/paperless-ngx/pull/9322))
|
|
||||||
- Fix: Switches data to content to upload raw bytes/text content [@stumpylog](https://github.com/stumpylog) ([#9293](https://github.com/paperless-ngx/paperless-ngx/pull/9293))
|
|
||||||
- Fix: handle null workflow body and email subject [@shamoon](https://github.com/shamoon) ([#9271](https://github.com/paperless-ngx/paperless-ngx/pull/9271))
|
|
||||||
- Fix: cleanup saved view references on custom field deletion, auto-refresh views, show error on saved view save [@shamoon](https://github.com/shamoon) ([#9225](https://github.com/paperless-ngx/paperless-ngx/pull/9225))
|
|
||||||
- Fix: revert thumbnail CSS workaround in favor of GPU workaround [@shamoon](https://github.com/shamoon) ([#9219](https://github.com/paperless-ngx/paperless-ngx/pull/9219))
|
|
||||||
- Fix: correct split confirm removal [@shamoon](https://github.com/shamoon) ([#9195](https://github.com/paperless-ngx/paperless-ngx/pull/9195))
|
|
||||||
- Fix: saved views do not return to default display fields after setting and then removing [@shamoon](https://github.com/shamoon) ([#9168](https://github.com/paperless-ngx/paperless-ngx/pull/9168))
|
|
||||||
- Fix: correct logged number of deleted documents on trash empty [@shamoon](https://github.com/shamoon) ([#9148](https://github.com/paperless-ngx/paperless-ngx/pull/9148))
|
|
||||||
- Fix: include account confirm email allauth URL [@shamoon](https://github.com/shamoon) ([#9147](https://github.com/paperless-ngx/paperless-ngx/pull/9147))
|
|
||||||
- Fix: remove additional scrollbar from popup preview [@shamoon](https://github.com/shamoon) ([#9140](https://github.com/paperless-ngx/paperless-ngx/pull/9140))
|
|
||||||
- Fix: wrap selected display fields [@shamoon](https://github.com/shamoon) ([#9139](https://github.com/paperless-ngx/paperless-ngx/pull/9139))
|
|
||||||
- Fix: reset documents sort field if user deletes the custom field [@shamoon](https://github.com/shamoon) ([#9127](https://github.com/paperless-ngx/paperless-ngx/pull/9127))
|
|
||||||
- Fix: limit document title length in workflows [@shamoon](https://github.com/shamoon) ([#9085](https://github.com/paperless-ngx/paperless-ngx/pull/9085))
|
|
||||||
- Fix: include doc link input import in custom fields query dropdown [@shamoon](https://github.com/shamoon) ([#9058](https://github.com/paperless-ngx/paperless-ngx/pull/9058))
|
|
||||||
- Fix: deselect and trigger refresh for deleted documents from bulk operations with delete originals [@shamoon](https://github.com/shamoon) ([#8996](https://github.com/paperless-ngx/paperless-ngx/pull/8996))
|
|
||||||
- Fix: allow empty email in profile [@shamoon](https://github.com/shamoon) ([#9012](https://github.com/paperless-ngx/paperless-ngx/pull/9012))
|
|
||||||
|
|
||||||
### Maintenance
|
|
||||||
|
|
||||||
- docker(deps): Bump astral-sh/uv from 0.6.5-python3.12-bookworm-slim to 0.6.9-python3.12-bookworm-slim @[dependabot[bot]](https://github.com/apps/dependabot) ([#9488](https://github.com/paperless-ngx/paperless-ngx/pull/9488))
|
|
||||||
- Chore: Enables dependabot for Dockerfile and our Compose files [@stumpylog](https://github.com/stumpylog) ([#9342](https://github.com/paperless-ngx/paperless-ngx/pull/9342))
|
|
||||||
- Chore: ensure codecov upload gets attempted [@shamoon](https://github.com/shamoon) ([#9308](https://github.com/paperless-ngx/paperless-ngx/pull/9308))
|
|
||||||
- Chore: Split out some items into extras [@stumpylog](https://github.com/stumpylog) ([#9297](https://github.com/paperless-ngx/paperless-ngx/pull/9297))
|
|
||||||
- Chore: Enables Codecov test reporting for the backend [@stumpylog](https://github.com/stumpylog) ([#9295](https://github.com/paperless-ngx/paperless-ngx/pull/9295))
|
|
||||||
- Chore: Combine Python settings files [@stumpylog](https://github.com/stumpylog) ([#9292](https://github.com/paperless-ngx/paperless-ngx/pull/9292))
|
|
||||||
|
|
||||||
### Dependencies
|
|
||||||
|
|
||||||
<details>
|
|
||||||
<summary>43 changes</summary>
|
|
||||||
|
|
||||||
- Chore(deps): Bump the frontend-angular-dependencies group in /src-ui with 20 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#9536](https://github.com/paperless-ngx/paperless-ngx/pull/9536))
|
|
||||||
- Chore(deps-dev): Bump the frontend-eslint-dependencies group in /src-ui with 4 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#9538](https://github.com/paperless-ngx/paperless-ngx/pull/9538))
|
|
||||||
- Chore(deps-dev): Bump @types/node from 22.13.9 to 22.13.17 in /src-ui @[dependabot[bot]](https://github.com/apps/dependabot) ([#9539](https://github.com/paperless-ngx/paperless-ngx/pull/9539))
|
|
||||||
- Chore(deps-dev): Bump jest-preset-angular from 14.5.3 to 14.5.4 in /src-ui in the frontend-jest-dependencies group @[dependabot[bot]](https://github.com/apps/dependabot) ([#9537](https://github.com/paperless-ngx/paperless-ngx/pull/9537))
|
|
||||||
- Chore(deps-dev): Bump @playwright/test from 1.50.1 to 1.51.1 in /src-ui @[dependabot[bot]](https://github.com/apps/dependabot) ([#9540](https://github.com/paperless-ngx/paperless-ngx/pull/9540))
|
|
||||||
- Chore(deps): Bump django from 5.1.6 to 5.1.7 in the django group @[dependabot[bot]](https://github.com/apps/dependabot) ([#9486](https://github.com/paperless-ngx/paperless-ngx/pull/9486))
|
|
||||||
- docker(deps): Bump astral-sh/uv from 0.6.5-python3.12-bookworm-slim to 0.6.9-python3.12-bookworm-slim @[dependabot[bot]](https://github.com/apps/dependabot) ([#9488](https://github.com/paperless-ngx/paperless-ngx/pull/9488))
|
|
||||||
- Chore(deps-dev): Bump the frontend-eslint-dependencies group in /src-ui with 4 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#9372](https://github.com/paperless-ngx/paperless-ngx/pull/9372))
|
|
||||||
- Chore(deps): Bump the frontend-angular-dependencies group in /src-ui with 20 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#9371](https://github.com/paperless-ngx/paperless-ngx/pull/9371))
|
|
||||||
- Chore(deps): Update ocrmypdf requirement from ~=16.9.0 to ~=16.10.0 @[dependabot[bot]](https://github.com/apps/dependabot) ([#9348](https://github.com/paperless-ngx/paperless-ngx/pull/9348))
|
|
||||||
- Chore(deps): Update drf-spectacular-sidecar requirement from ~=2025.2.1 to ~=2025.3.1 @[dependabot[bot]](https://github.com/apps/dependabot) ([#9347](https://github.com/paperless-ngx/paperless-ngx/pull/9347))
|
|
||||||
- Chore(deps): Bump the small-changes group with 2 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#9345](https://github.com/paperless-ngx/paperless-ngx/pull/9345))
|
|
||||||
- docker-compose(deps): Bump library/postgres from 16 to 17 in /docker/compose @[dependabot[bot]](https://github.com/apps/dependabot) ([#9353](https://github.com/paperless-ngx/paperless-ngx/pull/9353))
|
|
||||||
- docker(deps): Bump astral-sh/uv from 0.6.3-python3.12-bookworm-slim to 0.6.5-python3.12-bookworm-slim @[dependabot[bot]](https://github.com/apps/dependabot) ([#9344](https://github.com/paperless-ngx/paperless-ngx/pull/9344))
|
|
||||||
- Chore(deps-dev): Bump the frontend-angular-dependencies group in /src-ui with 5 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#9288](https://github.com/paperless-ngx/paperless-ngx/pull/9288))
|
|
||||||
- Chore(deps-dev): Bump @types/node from 22.13.8 to 22.13.9 in /src-ui @[dependabot[bot]](https://github.com/apps/dependabot) ([#9290](https://github.com/paperless-ngx/paperless-ngx/pull/9290))
|
|
||||||
- Chore(deps-dev): Bump the frontend-eslint-dependencies group in /src-ui with 3 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#9289](https://github.com/paperless-ngx/paperless-ngx/pull/9289))
|
|
||||||
- Chore(deps-dev): Bump @types/node from 22.13.5 to 22.13.8 in /src-ui @[dependabot[bot]](https://github.com/apps/dependabot) ([#9267](https://github.com/paperless-ngx/paperless-ngx/pull/9267))
|
|
||||||
- Chore(deps): Bump stumpylog/image-cleaner-action from 0.9.0 to 0.10.0 in the actions group @[dependabot[bot]](https://github.com/apps/dependabot) ([#9252](https://github.com/paperless-ngx/paperless-ngx/pull/9252))
|
|
||||||
- Chore(deps-dev): Bump the development group with 2 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#9253](https://github.com/paperless-ngx/paperless-ngx/pull/9253))
|
|
||||||
- Chore(deps-dev): Bump @codecov/webpack-plugin from 1.8.0 to 1.9.0 in /src-ui @[dependabot[bot]](https://github.com/apps/dependabot) ([#9260](https://github.com/paperless-ngx/paperless-ngx/pull/9260))
|
|
||||||
- Chore(deps-dev): Bump the frontend-eslint-dependencies group in /src-ui with 4 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#9256](https://github.com/paperless-ngx/paperless-ngx/pull/9256))
|
|
||||||
- Chore(deps): Bump uuid from 11.0.5 to 11.1.0 in /src-ui @[dependabot[bot]](https://github.com/apps/dependabot) ([#9259](https://github.com/paperless-ngx/paperless-ngx/pull/9259))
|
|
||||||
- Chore(deps-dev): Bump jest-preset-angular from 14.5.1 to 14.5.3 in /src-ui in the frontend-jest-dependencies group @[dependabot[bot]](https://github.com/apps/dependabot) ([#9255](https://github.com/paperless-ngx/paperless-ngx/pull/9255))
|
|
||||||
- Chore(deps): Bump rxjs from 7.8.1 to 7.8.2 in /src-ui @[dependabot[bot]](https://github.com/apps/dependabot) ([#9258](https://github.com/paperless-ngx/paperless-ngx/pull/9258))
|
|
||||||
- Chore(deps-dev): Bump @types/node from 22.13.0 to 22.13.5 in /src-ui @[dependabot[bot]](https://github.com/apps/dependabot) ([#9257](https://github.com/paperless-ngx/paperless-ngx/pull/9257))
|
|
||||||
- Chore(deps): Bump the frontend-angular-dependencies group in /src-ui with 22 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#9254](https://github.com/paperless-ngx/paperless-ngx/pull/9254))
|
|
||||||
- Chore(deps): Bump django-filter from 24.3 to 25.1 in the django group @[dependabot[bot]](https://github.com/apps/dependabot) ([#9143](https://github.com/paperless-ngx/paperless-ngx/pull/9143))
|
|
||||||
- Chore(deps-dev): Bump mkdocs-material from 9.6.3 to 9.6.4 in the development group @[dependabot[bot]](https://github.com/apps/dependabot) ([#9142](https://github.com/paperless-ngx/paperless-ngx/pull/9142))
|
|
||||||
- Dependencies: Updates to jbig2enc 0.30 [@stumpylog](https://github.com/stumpylog) ([#9092](https://github.com/paperless-ngx/paperless-ngx/pull/9092))
|
|
||||||
- Chore(deps): Bump cryptography from 44.0.0 to 44.0.1 @[dependabot[bot]](https://github.com/apps/dependabot) ([#9080](https://github.com/paperless-ngx/paperless-ngx/pull/9080))
|
|
||||||
- Chore(deps): Bump the small-changes group with 7 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#9064](https://github.com/paperless-ngx/paperless-ngx/pull/9064))
|
|
||||||
- Chore(deps-dev): Bump the development group with 3 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#9061](https://github.com/paperless-ngx/paperless-ngx/pull/9061))
|
|
||||||
- Chore(deps): Bump the django group across 1 directory with 2 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#9065](https://github.com/paperless-ngx/paperless-ngx/pull/9065))
|
|
||||||
- Chore(deps): Bump drf-spectacular-sidecar from 2024.11.1 to 2025.2.1 in the major-versions group @[dependabot[bot]](https://github.com/apps/dependabot) ([#9063](https://github.com/paperless-ngx/paperless-ngx/pull/9063))
|
|
||||||
- Chore(deps-dev): Bump the development group with 2 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#9013](https://github.com/paperless-ngx/paperless-ngx/pull/9013))
|
|
||||||
- Chore(deps): Bump django-soft-delete from 1.0.16 to 1.0.18 in the django group @[dependabot[bot]](https://github.com/apps/dependabot) ([#9014](https://github.com/paperless-ngx/paperless-ngx/pull/9014))
|
|
||||||
- Chore(deps): Bump uuid from 11.0.2 to 11.0.5 in /src-ui @[dependabot[bot]](https://github.com/apps/dependabot) ([#8992](https://github.com/paperless-ngx/paperless-ngx/pull/8992))
|
|
||||||
- Chore(deps-dev): Bump @codecov/webpack-plugin from 1.2.1 to 1.8.0 in /src-ui @[dependabot[bot]](https://github.com/apps/dependabot) ([#8991](https://github.com/paperless-ngx/paperless-ngx/pull/8991))
|
|
||||||
- Chore(deps-dev): Bump @playwright/test from 1.48.2 to 1.50.1 in /src-ui @[dependabot[bot]](https://github.com/apps/dependabot) ([#8993](https://github.com/paperless-ngx/paperless-ngx/pull/8993))
|
|
||||||
- Chore(deps-dev): Bump @types/node from 22.8.6 to 22.13.0 in /src-ui @[dependabot[bot]](https://github.com/apps/dependabot) ([#8989](https://github.com/paperless-ngx/paperless-ngx/pull/8989))
|
|
||||||
- Chore(deps-dev): Bump the frontend-eslint-dependencies group in /src-ui with 4 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#8988](https://github.com/paperless-ngx/paperless-ngx/pull/8988))
|
|
||||||
- Chore(deps): Bump the frontend-angular-dependencies group in /src-ui with 23 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#8986](https://github.com/paperless-ngx/paperless-ngx/pull/8986))
|
|
||||||
</details>
|
|
||||||
|
|
||||||
### All App Changes
|
|
||||||
|
|
||||||
<details>
|
|
||||||
<summary>109 changes</summary>
|
|
||||||
|
|
||||||
- Fix: ensure only matched scheduled workflows are applied [@shamoon](https://github.com/shamoon) ([#9580](https://github.com/paperless-ngx/paperless-ngx/pull/9580))
|
|
||||||
- Fix: fix large doc thumb hidden at unexpected screen sizes [@shamoon](https://github.com/shamoon) ([#9559](https://github.com/paperless-ngx/paperless-ngx/pull/9559))
|
|
||||||
- Fix: fix potential race condition when creating new cf from doc details [@shamoon](https://github.com/shamoon) ([#9542](https://github.com/paperless-ngx/paperless-ngx/pull/9542))
|
|
||||||
- Chore(deps): Bump the frontend-angular-dependencies group in /src-ui with 20 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#9536](https://github.com/paperless-ngx/paperless-ngx/pull/9536))
|
|
||||||
- Chore(deps-dev): Bump the frontend-eslint-dependencies group in /src-ui with 4 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#9538](https://github.com/paperless-ngx/paperless-ngx/pull/9538))
|
|
||||||
- Chore(deps-dev): Bump @types/node from 22.13.9 to 22.13.17 in /src-ui @[dependabot[bot]](https://github.com/apps/dependabot) ([#9539](https://github.com/paperless-ngx/paperless-ngx/pull/9539))
|
|
||||||
- Chore(deps-dev): Bump jest-preset-angular from 14.5.3 to 14.5.4 in /src-ui in the frontend-jest-dependencies group @[dependabot[bot]](https://github.com/apps/dependabot) ([#9537](https://github.com/paperless-ngx/paperless-ngx/pull/9537))
|
|
||||||
- Chore(deps-dev): Bump @playwright/test from 1.50.1 to 1.51.1 in /src-ui @[dependabot[bot]](https://github.com/apps/dependabot) ([#9540](https://github.com/paperless-ngx/paperless-ngx/pull/9540))
|
|
||||||
- Fix: fix doc link input [@shamoon](https://github.com/shamoon) ([#9533](https://github.com/paperless-ngx/paperless-ngx/pull/9533))
|
|
||||||
- Enhancement: allow webUI first account signup [@shamoon](https://github.com/shamoon) ([#9500](https://github.com/paperless-ngx/paperless-ngx/pull/9500))
|
|
||||||
- Fix: fix cf dropdown placement on mobile [@shamoon](https://github.com/shamoon) ([#9508](https://github.com/paperless-ngx/paperless-ngx/pull/9508))
|
|
||||||
- Chore(deps): Bump django from 5.1.6 to 5.1.7 in the django group @[dependabot[bot]](https://github.com/apps/dependabot) ([#9486](https://github.com/paperless-ngx/paperless-ngx/pull/9486))
|
|
||||||
- Fix: only overwrite existing cf values in workflow if set [@shamoon](https://github.com/shamoon) ([#9459](https://github.com/paperless-ngx/paperless-ngx/pull/9459))
|
|
||||||
- Fix: fix auto-close when doc update no longer has permissions [@shamoon](https://github.com/shamoon) ([#9453](https://github.com/paperless-ngx/paperless-ngx/pull/9453))
|
|
||||||
- Enhancement: support more 'not assigned' filtering, refactor [@shamoon](https://github.com/shamoon) ([#9429](https://github.com/paperless-ngx/paperless-ngx/pull/9429))
|
|
||||||
- Change: better handle permissions in patch requests [@shamoon](https://github.com/shamoon) ([#9393](https://github.com/paperless-ngx/paperless-ngx/pull/9393))
|
|
||||||
- Fix: use correct filename with webhook [@shamoon](https://github.com/shamoon) ([#9392](https://github.com/paperless-ngx/paperless-ngx/pull/9392))
|
|
||||||
- Change: sync OIDC groups on first login too [@shamoon](https://github.com/shamoon) ([#9387](https://github.com/paperless-ngx/paperless-ngx/pull/9387))
|
|
||||||
- Fix: only parse custom field queries when valid [@shamoon](https://github.com/shamoon) ([#9384](https://github.com/paperless-ngx/paperless-ngx/pull/9384))
|
|
||||||
- Chore(deps-dev): Bump the frontend-eslint-dependencies group in /src-ui with 4 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#9372](https://github.com/paperless-ngx/paperless-ngx/pull/9372))
|
|
||||||
- Chore(deps): Bump the frontend-angular-dependencies group in /src-ui with 20 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#9371](https://github.com/paperless-ngx/paperless-ngx/pull/9371))
|
|
||||||
- Development: change frontend package manager to pnpm [@shamoon](https://github.com/shamoon) ([#9363](https://github.com/paperless-ngx/paperless-ngx/pull/9363))
|
|
||||||
- Fix: Allow setting of other Granian options [@stumpylog](https://github.com/stumpylog) ([#9360](https://github.com/paperless-ngx/paperless-ngx/pull/9360))
|
|
||||||
- Fix: Always clean up INotify [@stumpylog](https://github.com/stumpylog) ([#9359](https://github.com/paperless-ngx/paperless-ngx/pull/9359))
|
|
||||||
- Tweak: add saved views hint to dashboard [@shamoon](https://github.com/shamoon) ([#9362](https://github.com/paperless-ngx/paperless-ngx/pull/9362))
|
|
||||||
- Chore(deps): Update ocrmypdf requirement from ~=16.9.0 to ~=16.10.0 @[dependabot[bot]](https://github.com/apps/dependabot) ([#9348](https://github.com/paperless-ngx/paperless-ngx/pull/9348))
|
|
||||||
- Chore(deps): Update drf-spectacular-sidecar requirement from ~=2025.2.1 to ~=2025.3.1 @[dependabot[bot]](https://github.com/apps/dependabot) ([#9347](https://github.com/paperless-ngx/paperless-ngx/pull/9347))
|
|
||||||
- Chore(deps): Bump the small-changes group with 2 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#9345](https://github.com/paperless-ngx/paperless-ngx/pull/9345))
|
|
||||||
- Ensure the directories have been overridden and created for this test [@stumpylog](https://github.com/stumpylog) ([#9354](https://github.com/paperless-ngx/paperless-ngx/pull/9354))
|
|
||||||
- Fix typo in inactive account template [@ocean90](https://github.com/ocean90) ([#9356](https://github.com/paperless-ngx/paperless-ngx/pull/9356))
|
|
||||||
- Fix: fix notes serializing in API document response [@shamoon](https://github.com/shamoon) ([#9336](https://github.com/paperless-ngx/paperless-ngx/pull/9336))
|
|
||||||
- Fix: correct all results with whoosh queries [@shamoon](https://github.com/shamoon) ([#9331](https://github.com/paperless-ngx/paperless-ngx/pull/9331))
|
|
||||||
- Fix: fix typo in altered migration [@gothicVI](https://github.com/gothicVI) ([#9321](https://github.com/paperless-ngx/paperless-ngx/pull/9321))
|
|
||||||
- Fix: add account_inactive template / url [@shamoon](https://github.com/shamoon) ([#9322](https://github.com/paperless-ngx/paperless-ngx/pull/9322))
|
|
||||||
- Chore: Switch from os.path to pathlib.Path [@gothicVI](https://github.com/gothicVI) ([#9060](https://github.com/paperless-ngx/paperless-ngx/pull/9060))
|
|
||||||
- Enhancement: reorganize dates dropdown, add more relative options [@shamoon](https://github.com/shamoon) ([#9307](https://github.com/paperless-ngx/paperless-ngx/pull/9307))
|
|
||||||
- Chore: remove popper preventOverflow fix [@shamoon](https://github.com/shamoon) ([#9306](https://github.com/paperless-ngx/paperless-ngx/pull/9306))
|
|
||||||
- Enhancement: add switch to allow merging non-PDFs with archive version [@shamoon](https://github.com/shamoon) ([#9305](https://github.com/paperless-ngx/paperless-ngx/pull/9305))
|
|
||||||
- Enhancement: support assigning custom field values in workflows [@shamoon](https://github.com/shamoon) ([#9272](https://github.com/paperless-ngx/paperless-ngx/pull/9272))
|
|
||||||
- Chore: add codecov frontend test results [@shamoon](https://github.com/shamoon) ([#9296](https://github.com/paperless-ngx/paperless-ngx/pull/9296))
|
|
||||||
- Chore: Removes undocumented FileInfo [@stumpylog](https://github.com/stumpylog) ([#9298](https://github.com/paperless-ngx/paperless-ngx/pull/9298))
|
|
||||||
- Chore(deps-dev): Bump the frontend-angular-dependencies group in /src-ui with 5 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#9288](https://github.com/paperless-ngx/paperless-ngx/pull/9288))
|
|
||||||
- Fix: Switches data to content to upload raw bytes/text content [@stumpylog](https://github.com/stumpylog) ([#9293](https://github.com/paperless-ngx/paperless-ngx/pull/9293))
|
|
||||||
- Chore: Removes the unused Log model and LogFilterSet [@stumpylog](https://github.com/stumpylog) ([#9294](https://github.com/paperless-ngx/paperless-ngx/pull/9294))
|
|
||||||
- Chore: Combine Python settings files [@stumpylog](https://github.com/stumpylog) ([#9292](https://github.com/paperless-ngx/paperless-ngx/pull/9292))
|
|
||||||
- Chore(deps-dev): Bump @types/node from 22.13.8 to 22.13.9 in /src-ui @[dependabot[bot]](https://github.com/apps/dependabot) ([#9290](https://github.com/paperless-ngx/paperless-ngx/pull/9290))
|
|
||||||
- Chore(deps-dev): Bump the frontend-eslint-dependencies group in /src-ui with 3 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#9289](https://github.com/paperless-ngx/paperless-ngx/pull/9289))
|
|
||||||
- Chore: Switch from pipenv to uv [@stumpylog](https://github.com/stumpylog) ([#9251](https://github.com/paperless-ngx/paperless-ngx/pull/9251))
|
|
||||||
- Enhancement: Add slugify filter in templating [@hwaterke](https://github.com/hwaterke) ([#9269](https://github.com/paperless-ngx/paperless-ngx/pull/9269))
|
|
||||||
- Fix: handle null workflow body and email subject [@shamoon](https://github.com/shamoon) ([#9271](https://github.com/paperless-ngx/paperless-ngx/pull/9271))
|
|
||||||
- Chore(deps-dev): Bump @types/node from 22.13.5 to 22.13.8 in /src-ui @[dependabot[bot]](https://github.com/apps/dependabot) ([#9267](https://github.com/paperless-ngx/paperless-ngx/pull/9267))
|
|
||||||
- Chore(deps-dev): Bump the development group with 2 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#9253](https://github.com/paperless-ngx/paperless-ngx/pull/9253))
|
|
||||||
- Chore(deps-dev): Bump @codecov/webpack-plugin from 1.8.0 to 1.9.0 in /src-ui @[dependabot[bot]](https://github.com/apps/dependabot) ([#9260](https://github.com/paperless-ngx/paperless-ngx/pull/9260))
|
|
||||||
- Chore(deps-dev): Bump the frontend-eslint-dependencies group in /src-ui with 4 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#9256](https://github.com/paperless-ngx/paperless-ngx/pull/9256))
|
|
||||||
- Chore(deps): Bump uuid from 11.0.5 to 11.1.0 in /src-ui @[dependabot[bot]](https://github.com/apps/dependabot) ([#9259](https://github.com/paperless-ngx/paperless-ngx/pull/9259))
|
|
||||||
- Chore(deps-dev): Bump jest-preset-angular from 14.5.1 to 14.5.3 in /src-ui in the frontend-jest-dependencies group @[dependabot[bot]](https://github.com/apps/dependabot) ([#9255](https://github.com/paperless-ngx/paperless-ngx/pull/9255))
|
|
||||||
- Chore(deps): Bump rxjs from 7.8.1 to 7.8.2 in /src-ui @[dependabot[bot]](https://github.com/apps/dependabot) ([#9258](https://github.com/paperless-ngx/paperless-ngx/pull/9258))
|
|
||||||
- Chore(deps-dev): Bump @types/node from 22.13.0 to 22.13.5 in /src-ui @[dependabot[bot]](https://github.com/apps/dependabot) ([#9257](https://github.com/paperless-ngx/paperless-ngx/pull/9257))
|
|
||||||
- Chore(deps): Bump the frontend-angular-dependencies group in /src-ui with 22 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#9254](https://github.com/paperless-ngx/paperless-ngx/pull/9254))
|
|
||||||
- Feature: Switch webserver to granian [@stumpylog](https://github.com/stumpylog) ([#9218](https://github.com/paperless-ngx/paperless-ngx/pull/9218))
|
|
||||||
- Enhancement: relocate and smaller upload widget, dont limit upload list [@shamoon](https://github.com/shamoon) ([#9244](https://github.com/paperless-ngx/paperless-ngx/pull/9244))
|
|
||||||
- Enhancement: run tasks from system status, report sanity check, simpler classifier check, styling updates [@shamoon](https://github.com/shamoon) ([#9106](https://github.com/paperless-ngx/paperless-ngx/pull/9106))
|
|
||||||
- Chore: Switch remote version check to HTTPx [@stumpylog](https://github.com/stumpylog) ([#9232](https://github.com/paperless-ngx/paperless-ngx/pull/9232))
|
|
||||||
- Fix: cleanup saved view references on custom field deletion, auto-refresh views, show error on saved view save [@shamoon](https://github.com/shamoon) ([#9225](https://github.com/paperless-ngx/paperless-ngx/pull/9225))
|
|
||||||
- Fix: revert thumbnail CSS workaround in favor of GPU workaround [@shamoon](https://github.com/shamoon) ([#9219](https://github.com/paperless-ngx/paperless-ngx/pull/9219))
|
|
||||||
- Chore: Reduce imports for a slight memory improvement [@stumpylog](https://github.com/stumpylog) ([#9217](https://github.com/paperless-ngx/paperless-ngx/pull/9217))
|
|
||||||
- Enhancement: include celery log in logs view [@shamoon](https://github.com/shamoon) ([#9214](https://github.com/paperless-ngx/paperless-ngx/pull/9214))
|
|
||||||
- Enhancement: support default groups for regular and social account signup, syncing on login [@shamoon](https://github.com/shamoon) ([#9039](https://github.com/paperless-ngx/paperless-ngx/pull/9039))
|
|
||||||
- Enhancement: allow disabling the filesystem consumer [@shamoon](https://github.com/shamoon) ([#9199](https://github.com/paperless-ngx/paperless-ngx/pull/9199))
|
|
||||||
- Fix: correct split confirm removal [@shamoon](https://github.com/shamoon) ([#9195](https://github.com/paperless-ngx/paperless-ngx/pull/9195))
|
|
||||||
- Feature: email document [@shamoon](https://github.com/shamoon) ([#8950](https://github.com/paperless-ngx/paperless-ngx/pull/8950))
|
|
||||||
- Enhancement: webui workflowtrigger source option [@shamoon](https://github.com/shamoon) ([#9170](https://github.com/paperless-ngx/paperless-ngx/pull/9170))
|
|
||||||
- Fix: saved views do not return to default display fields after setting and then removing [@shamoon](https://github.com/shamoon) ([#9168](https://github.com/paperless-ngx/paperless-ngx/pull/9168))
|
|
||||||
- Chore(deps): Bump django-filter from 24.3 to 25.1 in the django group @[dependabot[bot]](https://github.com/apps/dependabot) ([#9143](https://github.com/paperless-ngx/paperless-ngx/pull/9143))
|
|
||||||
- Chore(deps-dev): Bump mkdocs-material from 9.6.3 to 9.6.4 in the development group @[dependabot[bot]](https://github.com/apps/dependabot) ([#9142](https://github.com/paperless-ngx/paperless-ngx/pull/9142))
|
|
||||||
- Fix: correct logged number of deleted documents on trash empty [@shamoon](https://github.com/shamoon) ([#9148](https://github.com/paperless-ngx/paperless-ngx/pull/9148))
|
|
||||||
- Fix: include account confirm email allauth URL [@shamoon](https://github.com/shamoon) ([#9147](https://github.com/paperless-ngx/paperless-ngx/pull/9147))
|
|
||||||
- Fix: remove additional scrollbar from popup preview [@shamoon](https://github.com/shamoon) ([#9140](https://github.com/paperless-ngx/paperless-ngx/pull/9140))
|
|
||||||
- Fix: wrap selected display fields [@shamoon](https://github.com/shamoon) ([#9139](https://github.com/paperless-ngx/paperless-ngx/pull/9139))
|
|
||||||
- Enhancement: use charfield for webhook url, custom validation [@shamoon](https://github.com/shamoon) ([#9128](https://github.com/paperless-ngx/paperless-ngx/pull/9128))
|
|
||||||
- Fix: reset documents sort field if user deletes the custom field [@shamoon](https://github.com/shamoon) ([#9127](https://github.com/paperless-ngx/paperless-ngx/pull/9127))
|
|
||||||
- Chore: more efficient select cf update handler [@shamoon](https://github.com/shamoon) ([#9099](https://github.com/paperless-ngx/paperless-ngx/pull/9099))
|
|
||||||
- Fix: limit document title length in workflows [@shamoon](https://github.com/shamoon) ([#9085](https://github.com/paperless-ngx/paperless-ngx/pull/9085))
|
|
||||||
- Feature: Chinese Traditional translation [@LokiHung](https://github.com/LokiHung) ([#9076](https://github.com/paperless-ngx/paperless-ngx/pull/9076))
|
|
||||||
- Enhancement: Use cached sessions for a minor performance improvement [@stumpylog](https://github.com/stumpylog) ([#9074](https://github.com/paperless-ngx/paperless-ngx/pull/9074))
|
|
||||||
- Chore(deps): Bump the small-changes group with 7 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#9064](https://github.com/paperless-ngx/paperless-ngx/pull/9064))
|
|
||||||
- Chore(deps-dev): Bump the development group with 3 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#9061](https://github.com/paperless-ngx/paperless-ngx/pull/9061))
|
|
||||||
- Chore(deps): Bump the django group across 1 directory with 2 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#9065](https://github.com/paperless-ngx/paperless-ngx/pull/9065))
|
|
||||||
- Chore(deps): Bump drf-spectacular-sidecar from 2024.11.1 to 2025.2.1 in the major-versions group @[dependabot[bot]](https://github.com/apps/dependabot) ([#9063](https://github.com/paperless-ngx/paperless-ngx/pull/9063))
|
|
||||||
- Feature: openapi spec, full api browser [@shamoon](https://github.com/shamoon) ([#8948](https://github.com/paperless-ngx/paperless-ngx/pull/8948))
|
|
||||||
- Fix: include doc link input import in custom fields query dropdown [@shamoon](https://github.com/shamoon) ([#9058](https://github.com/paperless-ngx/paperless-ngx/pull/9058))
|
|
||||||
- Enhancement: filter by file type [@shamoon](https://github.com/shamoon) ([#8946](https://github.com/paperless-ngx/paperless-ngx/pull/8946))
|
|
||||||
- Enhancement: add layout options for email conversion [@RazielleS](https://github.com/RazielleS) ([#8907](https://github.com/paperless-ngx/paperless-ngx/pull/8907))
|
|
||||||
- Chore: Enable ruff FBT [@gothicVI](https://github.com/gothicVI) ([#8645](https://github.com/paperless-ngx/paperless-ngx/pull/8645))
|
|
||||||
- Feature: better toast notifications management [@shamoon](https://github.com/shamoon) ([#8980](https://github.com/paperless-ngx/paperless-ngx/pull/8980))
|
|
||||||
- Enhancement: date picker and date filter dropdown improvements [@shamoon](https://github.com/shamoon) ([#9033](https://github.com/paperless-ngx/paperless-ngx/pull/9033))
|
|
||||||
- Fix: deselect and trigger refresh for deleted documents from bulk operations with delete originals [@shamoon](https://github.com/shamoon) ([#8996](https://github.com/paperless-ngx/paperless-ngx/pull/8996))
|
|
||||||
- Tweak: improve date matching regex for dates after numbers [@XstreamGit](https://github.com/XstreamGit) ([#8964](https://github.com/paperless-ngx/paperless-ngx/pull/8964))
|
|
||||||
- Tweak: more accurate classifier last trained time [@shamoon](https://github.com/shamoon) ([#9004](https://github.com/paperless-ngx/paperless-ngx/pull/9004))
|
|
||||||
- Enhancement: allow setting default pdf zoom [@shamoon](https://github.com/shamoon) ([#9017](https://github.com/paperless-ngx/paperless-ngx/pull/9017))
|
|
||||||
- Chore(deps-dev): Bump the development group with 2 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#9013](https://github.com/paperless-ngx/paperless-ngx/pull/9013))
|
|
||||||
- Chore(deps): Bump django-soft-delete from 1.0.16 to 1.0.18 in the django group @[dependabot[bot]](https://github.com/apps/dependabot) ([#9014](https://github.com/paperless-ngx/paperless-ngx/pull/9014))
|
|
||||||
- Fix: allow empty email in profile [@shamoon](https://github.com/shamoon) ([#9012](https://github.com/paperless-ngx/paperless-ngx/pull/9012))
|
|
||||||
- Chore(deps): Bump uuid from 11.0.2 to 11.0.5 in /src-ui @[dependabot[bot]](https://github.com/apps/dependabot) ([#8992](https://github.com/paperless-ngx/paperless-ngx/pull/8992))
|
|
||||||
- Chore(deps-dev): Bump @codecov/webpack-plugin from 1.2.1 to 1.8.0 in /src-ui @[dependabot[bot]](https://github.com/apps/dependabot) ([#8991](https://github.com/paperless-ngx/paperless-ngx/pull/8991))
|
|
||||||
- Chore(deps-dev): Bump @playwright/test from 1.48.2 to 1.50.1 in /src-ui @[dependabot[bot]](https://github.com/apps/dependabot) ([#8993](https://github.com/paperless-ngx/paperless-ngx/pull/8993))
|
|
||||||
- Chore(deps-dev): Bump @types/node from 22.8.6 to 22.13.0 in /src-ui @[dependabot[bot]](https://github.com/apps/dependabot) ([#8989](https://github.com/paperless-ngx/paperless-ngx/pull/8989))
|
|
||||||
- Chore(deps-dev): Bump the frontend-eslint-dependencies group in /src-ui with 4 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#8988](https://github.com/paperless-ngx/paperless-ngx/pull/8988))
|
|
||||||
- Chore(deps): Bump the frontend-angular-dependencies group in /src-ui with 23 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#8986](https://github.com/paperless-ngx/paperless-ngx/pull/8986))
|
|
||||||
</details>
|
|
||||||
|
|
||||||
## paperless-ngx 2.14.7
|
## paperless-ngx 2.14.7
|
||||||
|
|
||||||
### Features
|
### Features
|
||||||
|
@ -404,7 +404,7 @@ set this value to /paperless. No trailing slash!
|
|||||||
#### [`PAPERLESS_STATIC_URL=<path>`](#PAPERLESS_STATIC_URL) {#PAPERLESS_STATIC_URL}
|
#### [`PAPERLESS_STATIC_URL=<path>`](#PAPERLESS_STATIC_URL) {#PAPERLESS_STATIC_URL}
|
||||||
|
|
||||||
: Override the STATIC_URL here. Unless you're hosting Paperless off a
|
: Override the STATIC_URL here. Unless you're hosting Paperless off a
|
||||||
specific path like /paperless/, you probably don't need to change this.
|
subdomain like /paperless/, you probably don't need to change this.
|
||||||
If you do change it, be sure to include the trailing slash.
|
If you do change it, be sure to include the trailing slash.
|
||||||
|
|
||||||
Defaults to "/static/".
|
Defaults to "/static/".
|
||||||
@ -631,12 +631,6 @@ If both the [PAPERLESS_ACCOUNT_DEFAULT_GROUPS](#PAPERLESS_ACCOUNT_DEFAULT_GROUPS
|
|||||||
|
|
||||||
If you do not have a working email server set up you should set this to 'none'.
|
If you do not have a working email server set up you should set this to 'none'.
|
||||||
|
|
||||||
#### [`PAPERLESS_ACCOUNT_EMAIL_UNKNOWN_ACCOUNTS=<bool>`](#PAPERLESS_ACCOUNT_EMAIL_UNKNOWN_ACCOUNTS) {#PAPERLESS_ACCOUNT_EMAIL_UNKNOWN_ACCOUNTS}
|
|
||||||
|
|
||||||
: See the relevant [django-allauth documentation](https://docs.allauth.org/en/latest/account/configuration.html)
|
|
||||||
|
|
||||||
Defaults to True (from allauth)
|
|
||||||
|
|
||||||
#### [`PAPERLESS_DISABLE_REGULAR_LOGIN=<bool>`](#PAPERLESS_DISABLE_REGULAR_LOGIN) {#PAPERLESS_DISABLE_REGULAR_LOGIN}
|
#### [`PAPERLESS_DISABLE_REGULAR_LOGIN=<bool>`](#PAPERLESS_DISABLE_REGULAR_LOGIN) {#PAPERLESS_DISABLE_REGULAR_LOGIN}
|
||||||
|
|
||||||
: Disables the regular frontend username / password login, i.e. once you have setup SSO. Note that this setting does not disable the Django admin login nor logging in with local credentials via the API. To prevent access to the Django admin, consider blocking `/admin/` in your [web server or reverse proxy configuration](https://github.com/paperless-ngx/paperless-ngx/wiki/Using-a-Reverse-Proxy-with-Paperless-ngx).
|
: Disables the regular frontend username / password login, i.e. once you have setup SSO. Note that this setting does not disable the Django admin login nor logging in with local credentials via the API. To prevent access to the Django admin, consider blocking `/admin/` in your [web server or reverse proxy configuration](https://github.com/paperless-ngx/paperless-ngx/wiki/Using-a-Reverse-Proxy-with-Paperless-ngx).
|
||||||
@ -1065,7 +1059,7 @@ be used with caution!
|
|||||||
|
|
||||||
#### [`PAPERLESS_CONSUMER_DISABLE=<bool>`](#PAPERLESS_CONSUMER_DISABLE) {#PAPERLESS_CONSUMER_DISABLE}
|
#### [`PAPERLESS_CONSUMER_DISABLE=<bool>`](#PAPERLESS_CONSUMER_DISABLE) {#PAPERLESS_CONSUMER_DISABLE}
|
||||||
|
|
||||||
: If set (to anything), this completely disables the directory-based consumer in docker. If you don't plan to consume documents
|
: Completely disable the directory-based consumer in docker. If you don't plan to consume documents
|
||||||
via the consumption directory, you can disable the consumer to save resources.
|
via the consumption directory, you can disable the consumer to save resources.
|
||||||
|
|
||||||
#### [`PAPERLESS_CONSUMER_DELETE_DUPLICATES=<bool>`](#PAPERLESS_CONSUMER_DELETE_DUPLICATES) {#PAPERLESS_CONSUMER_DELETE_DUPLICATES}
|
#### [`PAPERLESS_CONSUMER_DELETE_DUPLICATES=<bool>`](#PAPERLESS_CONSUMER_DELETE_DUPLICATES) {#PAPERLESS_CONSUMER_DELETE_DUPLICATES}
|
||||||
@ -1676,7 +1670,7 @@ started by the container.
|
|||||||
|
|
||||||
## Email sending
|
## Email sending
|
||||||
|
|
||||||
Setting an SMTP server for the backend will allow you to use the Email workflow action, send documents from the UI as well as reset your
|
Setting an SMTP server for the backend will allow you to reset your
|
||||||
password. All of these options come from their similarly-named [Django settings](https://docs.djangoproject.com/en/4.2/ref/settings/#email-host)
|
password. All of these options come from their similarly-named [Django settings](https://docs.djangoproject.com/en/4.2/ref/settings/#email-host)
|
||||||
|
|
||||||
#### [`PAPERLESS_EMAIL_HOST=<str>`](#PAPERLESS_EMAIL_HOST) {#PAPERLESS_EMAIL_HOST}
|
#### [`PAPERLESS_EMAIL_HOST=<str>`](#PAPERLESS_EMAIL_HOST) {#PAPERLESS_EMAIL_HOST}
|
||||||
|
@ -84,7 +84,7 @@ first-time setup.
|
|||||||
$ uv run pre-commit install
|
$ uv run pre-commit install
|
||||||
```
|
```
|
||||||
|
|
||||||
6. Apply migrations and create a superuser (also can be done via the web UI) for your development instance:
|
6. Apply migrations and create a superuser for your development instance:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# src/
|
# src/
|
||||||
|
24
docs/faq.md
24
docs/faq.md
@ -112,6 +112,30 @@ able to run paperless, you're a bit on your own. If you can't run the
|
|||||||
docker image, the documentation has instructions for bare metal
|
docker image, the documentation has instructions for bare metal
|
||||||
installs.
|
installs.
|
||||||
|
|
||||||
|
## _How do I proxy this with NGINX?_
|
||||||
|
|
||||||
|
**A:** See [the wiki](https://github.com/paperless-ngx/paperless-ngx/wiki/Using-a-Reverse-Proxy-with-Paperless-ngx#nginx).
|
||||||
|
|
||||||
|
## _How do I get WebSocket support with Apache mod_wsgi_?
|
||||||
|
|
||||||
|
**A:** `mod_wsgi` by itself does not support ASGI. Paperless will
|
||||||
|
continue to work with WSGI, but certain features such as status
|
||||||
|
notifications about document consumption won't be available.
|
||||||
|
|
||||||
|
If you want to continue using `mod_wsgi`, you will have to run an
|
||||||
|
ASGI-enabled web server as well that processes WebSocket connections,
|
||||||
|
and configure Apache to redirect WebSocket connections to this server.
|
||||||
|
Multiple options for ASGI servers exist:
|
||||||
|
|
||||||
|
- `gunicorn` with `uvicorn` as the worker implementation (the default
|
||||||
|
of paperless)
|
||||||
|
- `daphne` as a standalone server, which is the reference
|
||||||
|
implementation for ASGI.
|
||||||
|
- `uvicorn` as a standalone server
|
||||||
|
|
||||||
|
You may also find the [Django documentation](https://docs.djangoproject.com/en/5.1/howto/deployment/asgi/) on ASGI
|
||||||
|
useful to review.
|
||||||
|
|
||||||
## _What about the Redis licensing change and using one of the open source forks_?
|
## _What about the Redis licensing change and using one of the open source forks_?
|
||||||
|
|
||||||
Currently (October 2024), forks of Redis such as Valkey or Redirect are not officially supported by our upstream
|
Currently (October 2024), forks of Redis such as Valkey or Redirect are not officially supported by our upstream
|
||||||
|
@ -197,7 +197,7 @@ People interested in continuing the work on paperless-ngx are encouraged to reac
|
|||||||
|
|
||||||
### Translation
|
### Translation
|
||||||
|
|
||||||
Paperless-ngx is available in many languages that are coordinated on [Crowdin](https://crowdin.com/project/paperless-ngx). If you want to help out by translating paperless-ngx into your language, please head over to the [Paperless-ngx project at Crowdin](https://crowdin.com/project/paperless-ngx), and thank you!
|
Paperless-ngx is available in many languages that are coordinated on [Crowdin](https://crwd.in/paperless-ngx). If you want to help out by translating paperless-ngx into your language, please head over to the [Paperless-ngx project at Crowdin](https://crwd.in/paperless-ngx), and thank you!
|
||||||
|
|
||||||
## Scanners & Software
|
## Scanners & Software
|
||||||
|
|
||||||
|
@ -131,11 +131,26 @@ account. The script essentially automatically performs the steps described in [D
|
|||||||
by default but you can change the image to pull from Docker Hub by changing the `image`
|
by default but you can change the image to pull from Docker Hub by changing the `image`
|
||||||
line to `image: paperlessngx/paperless-ngx:latest`.
|
line to `image: paperlessngx/paperless-ngx:latest`.
|
||||||
|
|
||||||
6. Run `docker compose up -d`. This will create and start the necessary containers.
|
6. To be able to login, you will need a "superuser". To create it,
|
||||||
|
execute the following command:
|
||||||
|
|
||||||
7. Congratulations! Your Paperless-ngx instance should now be accessible at `http://127.0.0.1:8000`
|
```shell-session
|
||||||
(or similar, depending on your configuration). When you first access the web interface, you will be
|
docker compose run --rm webserver createsuperuser
|
||||||
prompted to create a superuser account.
|
```
|
||||||
|
|
||||||
|
or using docker exec from within the container:
|
||||||
|
|
||||||
|
```shell-session
|
||||||
|
python3 manage.py createsuperuser
|
||||||
|
```
|
||||||
|
|
||||||
|
This will guide you through the superuser setup.
|
||||||
|
|
||||||
|
7. Run `docker compose up -d`. This will create and start the necessary containers.
|
||||||
|
|
||||||
|
8. Congratulations! Your Paperless-ngx instance should now be accessible at `http://127.0.0.1:8000`
|
||||||
|
(or similar, depending on your configuration). Use the superuser credentials you have
|
||||||
|
created in the previous step to login.
|
||||||
|
|
||||||
### Build the Docker image yourself {#docker_build}
|
### Build the Docker image yourself {#docker_build}
|
||||||
|
|
||||||
@ -371,14 +386,15 @@ are released, dependency support is confirmed, etc.
|
|||||||
dependencies for Postgres or Mariadb. You can select those extras with `--extra <EXTRA>`
|
dependencies for Postgres or Mariadb. You can select those extras with `--extra <EXTRA>`
|
||||||
or all with `--all-extras`
|
or all with `--all-extras`
|
||||||
|
|
||||||
9. Go to `/opt/paperless/src`, and execute the following command:
|
9. Go to `/opt/paperless/src`, and execute the following commands:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
# This creates the database schema.
|
# This creates the database schema.
|
||||||
sudo -Hu paperless python3 manage.py migrate
|
sudo -Hu paperless python3 manage.py migrate
|
||||||
```
|
|
||||||
|
|
||||||
When you first access the web interface you will be prompted to create a superuser account.
|
# This creates your first paperless user
|
||||||
|
sudo -Hu paperless python3 manage.py createsuperuser
|
||||||
|
```
|
||||||
|
|
||||||
10. Optional: Test that paperless is working by executing
|
10. Optional: Test that paperless is working by executing
|
||||||
|
|
||||||
@ -692,8 +708,7 @@ Paperless runs on Raspberry Pi. However, some things are rather slow on
|
|||||||
the Pi and configuring some options in paperless can help improve
|
the Pi and configuring some options in paperless can help improve
|
||||||
performance immensely:
|
performance immensely:
|
||||||
|
|
||||||
- Stick with SQLite to save some resources. See [troubleshooting](troubleshooting.md#log-reports-creating-paperlesstask-failed)
|
- Stick with SQLite to save some resources.
|
||||||
if you encounter issues with SQLite locking.
|
|
||||||
- If you do not need the filesystem-based consumer, consider disabling it
|
- If you do not need the filesystem-based consumer, consider disabling it
|
||||||
entirely by setting [`PAPERLESS_CONSUMER_DISABLE`](configuration.md#PAPERLESS_CONSUMER_DISABLE) to `true`.
|
entirely by setting [`PAPERLESS_CONSUMER_DISABLE`](configuration.md#PAPERLESS_CONSUMER_DISABLE) to `true`.
|
||||||
- Consider setting [`PAPERLESS_OCR_PAGES`](configuration.md#PAPERLESS_OCR_PAGES) to 1, so that paperless will
|
- Consider setting [`PAPERLESS_OCR_PAGES`](configuration.md#PAPERLESS_OCR_PAGES) to 1, so that paperless will
|
||||||
|
@ -292,9 +292,7 @@ many workers attempting to access the database simultaneously.
|
|||||||
Consider changing to the PostgreSQL database if you will be processing
|
Consider changing to the PostgreSQL database if you will be processing
|
||||||
many documents at once often. Otherwise, try tweaking the
|
many documents at once often. Otherwise, try tweaking the
|
||||||
[`PAPERLESS_DB_TIMEOUT`](configuration.md#PAPERLESS_DB_TIMEOUT) setting to allow more time for the database to
|
[`PAPERLESS_DB_TIMEOUT`](configuration.md#PAPERLESS_DB_TIMEOUT) setting to allow more time for the database to
|
||||||
unlock. Additionally, you can change your SQLite database to use ["Write-Ahead Logging"](https://sqlite.org/wal.html).
|
unlock. This may have minor performance implications.
|
||||||
These changes may have minor performance implications but can help
|
|
||||||
prevent database locking issues.
|
|
||||||
|
|
||||||
## granian fails to start with "is not a valid port number"
|
## granian fails to start with "is not a valid port number"
|
||||||
|
|
||||||
|
@ -89,7 +89,7 @@ and more. These areas allow you to view, add, edit, delete and manage permission
|
|||||||
for these objects. You can also manage saved views, mail accounts, mail rules,
|
for these objects. You can also manage saved views, mail accounts, mail rules,
|
||||||
workflows and more from the management sections.
|
workflows and more from the management sections.
|
||||||
|
|
||||||
## Adding documents to Paperless-ngx
|
## Adding documents to paperless
|
||||||
|
|
||||||
Once you've got Paperless setup, you need to start feeding documents
|
Once you've got Paperless setup, you need to start feeding documents
|
||||||
into it. When adding documents to paperless, it will perform the
|
into it. When adding documents to paperless, it will perform the
|
||||||
@ -159,7 +159,7 @@ process.
|
|||||||
Please see [the wiki](https://github.com/paperless-ngx/paperless-ngx/wiki/Related-Projects) for a user-maintained list of related projects and
|
Please see [the wiki](https://github.com/paperless-ngx/paperless-ngx/wiki/Related-Projects) for a user-maintained list of related projects and
|
||||||
software (e.g. for mobile devices) that is compatible with Paperless-ngx.
|
software (e.g. for mobile devices) that is compatible with Paperless-ngx.
|
||||||
|
|
||||||
### Incoming Email {#incoming-mail}
|
### Email {#usage-email}
|
||||||
|
|
||||||
You can tell paperless-ngx to consume documents from your email
|
You can tell paperless-ngx to consume documents from your email
|
||||||
accounts. This is a very flexible and powerful feature, if you regularly
|
accounts. This is a very flexible and powerful feature, if you regularly
|
||||||
@ -260,31 +260,6 @@ Once setup, navigating to the email settings page in Paperless-ngx will allow yo
|
|||||||
You can also submit a document using the REST API, see [POSTing documents](api.md#file-uploads)
|
You can also submit a document using the REST API, see [POSTing documents](api.md#file-uploads)
|
||||||
for details.
|
for details.
|
||||||
|
|
||||||
## Sharing documents from Paperless-ngx
|
|
||||||
|
|
||||||
Paperless-ngx supports sharing documents with other users by assigning them [permissions](#object-permissions)
|
|
||||||
to the document. Document files can also be shared externally via [share links](#share-links), [email](#email-sharing)
|
|
||||||
or using [email](#workflow-action-email) or [webhook](#workflow-action-webhook) actions in workflows.
|
|
||||||
|
|
||||||
### Share Links
|
|
||||||
|
|
||||||
"Share links" are shareable public links to files and can be created and managed under the 'Send' button on the document detail screen.
|
|
||||||
|
|
||||||
- Share links do not require a user to login and thus link directly to a file.
|
|
||||||
- Links are unique and are of the form `{paperless-url}/share/{randomly-generated-slug}`.
|
|
||||||
- Links can optionally have an expiration time set.
|
|
||||||
- After a link expires or is deleted users will be redirected to the regular paperless-ngx login.
|
|
||||||
|
|
||||||
!!! tip
|
|
||||||
|
|
||||||
If your paperless-ngx instance is behind a reverse-proxy you may want to create an exception to bypass any authentication layers that are part of your setup in order to make links truly publicly-accessible. Of course, do so with caution.
|
|
||||||
|
|
||||||
### Email Sharing {#email-sharing}
|
|
||||||
|
|
||||||
Paperless-ngx supports directly sending documents via email. If an email server has been [configured](configuration.md#email-sending)
|
|
||||||
the "Send" button on the document detail page will include an "Email" option. You can also share files via email automatically by using
|
|
||||||
a [workflow action](#workflow-action-email).
|
|
||||||
|
|
||||||
## Permissions
|
## Permissions
|
||||||
|
|
||||||
Permissions in Paperless-ngx are based around ['global' permissions](#global-permissions) as well as
|
Permissions in Paperless-ngx are based around ['global' permissions](#global-permissions) as well as
|
||||||
@ -394,7 +369,7 @@ fields and permissions, which will be merged.
|
|||||||
|
|
||||||
### Workflow Triggers
|
### Workflow Triggers
|
||||||
|
|
||||||
#### Types {#workflow-trigger-types}
|
#### Types
|
||||||
|
|
||||||
Currently, there are three events that correspond to workflow trigger 'types':
|
Currently, there are three events that correspond to workflow trigger 'types':
|
||||||
|
|
||||||
@ -454,11 +429,11 @@ Workflows allow you to filter by:
|
|||||||
|
|
||||||
### Workflow Actions
|
### Workflow Actions
|
||||||
|
|
||||||
#### Types {#workflow-action-types}
|
#### Types
|
||||||
|
|
||||||
The following workflow action types are available:
|
The following workflow action types are available:
|
||||||
|
|
||||||
##### Assignment {#workflow-action-assignment}
|
##### Assignment
|
||||||
|
|
||||||
"Assignment" actions can assign:
|
"Assignment" actions can assign:
|
||||||
|
|
||||||
@ -468,7 +443,7 @@ The following workflow action types are available:
|
|||||||
- View and / or edit permissions to users or groups
|
- View and / or edit permissions to users or groups
|
||||||
- Custom fields. Note that no value for the field will be set
|
- Custom fields. Note that no value for the field will be set
|
||||||
|
|
||||||
##### Removal {#workflow-action-removal}
|
##### Removal
|
||||||
|
|
||||||
"Removal" actions can remove either all of or specific sets of the following:
|
"Removal" actions can remove either all of or specific sets of the following:
|
||||||
|
|
||||||
@ -477,7 +452,7 @@ The following workflow action types are available:
|
|||||||
- View and / or edit permissions
|
- View and / or edit permissions
|
||||||
- Custom fields
|
- Custom fields
|
||||||
|
|
||||||
##### Email {#workflow-action-email}
|
##### Email
|
||||||
|
|
||||||
"Email" actions can send documents via email. This action requires a mail server to be [configured](configuration.md#email-sending). You can specify:
|
"Email" actions can send documents via email. This action requires a mail server to be [configured](configuration.md#email-sending). You can specify:
|
||||||
|
|
||||||
@ -485,7 +460,7 @@ The following workflow action types are available:
|
|||||||
- The subject and body of the email, which can include placeholders, see [placeholders](usage.md#workflow-placeholders) below
|
- The subject and body of the email, which can include placeholders, see [placeholders](usage.md#workflow-placeholders) below
|
||||||
- Whether to include the document as an attachment
|
- Whether to include the document as an attachment
|
||||||
|
|
||||||
##### Webhook {#workflow-action-webhook}
|
##### Webhook
|
||||||
|
|
||||||
"Webhook" actions send a POST request to a specified URL. You can specify:
|
"Webhook" actions send a POST request to a specified URL. You can specify:
|
||||||
|
|
||||||
@ -569,6 +544,19 @@ The following custom field types are supported:
|
|||||||
- `Document Link`: reference(s) to other document(s) displayed as links, automatically creates a symmetrical link in reverse
|
- `Document Link`: reference(s) to other document(s) displayed as links, automatically creates a symmetrical link in reverse
|
||||||
- `Select`: a pre-defined list of strings from which the user can choose
|
- `Select`: a pre-defined list of strings from which the user can choose
|
||||||
|
|
||||||
|
## Share Links
|
||||||
|
|
||||||
|
Paperless-ngx added the ability to create shareable links to files in version 2.0. You can find the button for this on the document detail screen.
|
||||||
|
|
||||||
|
- Share links do not require a user to login and thus link directly to a file.
|
||||||
|
- Links are unique and are of the form `{paperless-url}/share/{randomly-generated-slug}`.
|
||||||
|
- Links can optionally have an expiration time set.
|
||||||
|
- After a link expires or is deleted users will be redirected to the regular paperless-ngx login.
|
||||||
|
|
||||||
|
!!! tip
|
||||||
|
|
||||||
|
If your paperless-ngx instance is behind a reverse-proxy you may want to create an exception to bypass any authentication layers that are part of your setup in order to make links truly publicly-accessible. Of course, do so with caution.
|
||||||
|
|
||||||
## PDF Actions
|
## PDF Actions
|
||||||
|
|
||||||
Paperless-ngx supports four basic editing operations for PDFs (these operations currently cannot be performed on non-PDF files):
|
Paperless-ngx supports four basic editing operations for PDFs (these operations currently cannot be performed on non-PDF files):
|
||||||
|
28
mkdocs.yml
28
mkdocs.yml
@ -11,12 +11,14 @@ theme:
|
|||||||
toggle:
|
toggle:
|
||||||
icon: material/brightness-auto
|
icon: material/brightness-auto
|
||||||
name: Switch to light mode
|
name: Switch to light mode
|
||||||
|
|
||||||
# Palette toggle for light mode
|
# Palette toggle for light mode
|
||||||
- media: "(prefers-color-scheme: light)"
|
- media: "(prefers-color-scheme: light)"
|
||||||
scheme: default
|
scheme: default
|
||||||
toggle:
|
toggle:
|
||||||
icon: material/brightness-7
|
icon: material/brightness-7
|
||||||
name: Switch to dark mode
|
name: Switch to dark mode
|
||||||
|
|
||||||
# Palette toggle for dark mode
|
# Palette toggle for dark mode
|
||||||
- media: "(prefers-color-scheme: dark)"
|
- media: "(prefers-color-scheme: dark)"
|
||||||
scheme: slate
|
scheme: slate
|
||||||
@ -58,17 +60,17 @@ markdown_extensions:
|
|||||||
emoji_generator: !!python/name:material.extensions.emoji.to_svg
|
emoji_generator: !!python/name:material.extensions.emoji.to_svg
|
||||||
strict: true
|
strict: true
|
||||||
nav:
|
nav:
|
||||||
- index.md
|
- index.md
|
||||||
- setup.md
|
- setup.md
|
||||||
- 'Basic Usage': usage.md
|
- 'Basic Usage': usage.md
|
||||||
- configuration.md
|
- configuration.md
|
||||||
- administration.md
|
- administration.md
|
||||||
- advanced_usage.md
|
- advanced_usage.md
|
||||||
- 'REST API': api.md
|
- 'REST API': api.md
|
||||||
- development.md
|
- development.md
|
||||||
- 'FAQs': faq.md
|
- 'FAQs': faq.md
|
||||||
- troubleshooting.md
|
- troubleshooting.md
|
||||||
- changelog.md
|
- changelog.md
|
||||||
copyright: Copyright © 2016 - 2023 Daniel Quinn, Jonas Winkler, and the Paperless-ngx team
|
copyright: Copyright © 2016 - 2023 Daniel Quinn, Jonas Winkler, and the Paperless-ngx team
|
||||||
extra:
|
extra:
|
||||||
social:
|
social:
|
||||||
@ -81,5 +83,5 @@ extra:
|
|||||||
plugins:
|
plugins:
|
||||||
- search
|
- search
|
||||||
- glightbox:
|
- glightbox:
|
||||||
skip_classes:
|
skip_classes:
|
||||||
- no-lightbox
|
- no-lightbox
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[project]
|
[project]
|
||||||
name = "paperless-ngx"
|
name = "paperless-ngx"
|
||||||
version = "2.15.3"
|
version = "2.15.0"
|
||||||
description = "A community-supported supercharged version of paperless: scan, index and archive all your physical documents"
|
description = "A community-supported supercharged version of paperless: scan, index and archive all your physical documents"
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
requires-python = ">=3.10"
|
requires-python = ">=3.10"
|
||||||
@ -16,20 +16,20 @@ classifiers = [
|
|||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bleach~=6.2.0",
|
"bleach~=6.2.0",
|
||||||
"celery[redis]~=5.5.1",
|
"celery[redis]~=5.4.0",
|
||||||
"channels~=4.2",
|
"channels~=4.2",
|
||||||
"channels-redis~=4.2",
|
"channels-redis~=4.2",
|
||||||
"concurrent-log-handler~=0.9.25",
|
"concurrent-log-handler~=0.9.25",
|
||||||
"dateparser~=1.2",
|
"dateparser~=1.2",
|
||||||
# WARNING: django does not use semver.
|
# WARNING: django does not use semver.
|
||||||
# Only patch versions are guaranteed to not introduce breaking changes.
|
# Only patch versions are guaranteed to not introduce breaking changes.
|
||||||
"django~=5.1.7",
|
"django~=5.1.6",
|
||||||
"django-allauth[socialaccount,mfa]~=65.4.0",
|
"django-allauth[socialaccount,mfa]~=65.4.0",
|
||||||
"django-auditlog~=3.0.0",
|
"django-auditlog~=3.0.0",
|
||||||
"django-celery-results~=2.6.0",
|
"django-celery-results~=2.5.1",
|
||||||
"django-compression-middleware~=0.5.0",
|
"django-compression-middleware~=0.5.0",
|
||||||
"django-cors-headers~=4.7.0",
|
"django-cors-headers~=4.7.0",
|
||||||
"django-extensions~=4.1",
|
"django-extensions~=3.2.3",
|
||||||
"django-filter~=25.1",
|
"django-filter~=25.1",
|
||||||
"django-guardian~=2.4.0",
|
"django-guardian~=2.4.0",
|
||||||
"django-multiselectfield~=0.1.13",
|
"django-multiselectfield~=0.1.13",
|
||||||
@ -37,11 +37,11 @@ dependencies = [
|
|||||||
"djangorestframework~=3.15",
|
"djangorestframework~=3.15",
|
||||||
"djangorestframework-guardian~=0.3.0",
|
"djangorestframework-guardian~=0.3.0",
|
||||||
"drf-spectacular~=0.28",
|
"drf-spectacular~=0.28",
|
||||||
"drf-spectacular-sidecar~=2025.4.1",
|
"drf-spectacular-sidecar~=2025.3.1",
|
||||||
"drf-writable-nested~=0.7.1",
|
"drf-writable-nested~=0.7.1",
|
||||||
"filelock~=3.18.0",
|
"filelock~=3.17.0",
|
||||||
"flower~=2.0.1",
|
"flower~=2.0.1",
|
||||||
"gotenberg-client~=0.10.0",
|
"gotenberg-client~=0.9.0",
|
||||||
"httpx-oauth~=0.16",
|
"httpx-oauth~=0.16",
|
||||||
"imap-tools~=1.10.0",
|
"imap-tools~=1.10.0",
|
||||||
"inotifyrecursive~=0.3",
|
"inotifyrecursive~=0.3",
|
||||||
@ -52,12 +52,12 @@ dependencies = [
|
|||||||
"pathvalidate~=3.2.3",
|
"pathvalidate~=3.2.3",
|
||||||
"pdf2image~=1.17.0",
|
"pdf2image~=1.17.0",
|
||||||
"python-dateutil~=2.9.0",
|
"python-dateutil~=2.9.0",
|
||||||
"python-dotenv~=1.1.0",
|
"python-dotenv~=1.0.1",
|
||||||
"python-gnupg~=0.5.4",
|
"python-gnupg~=0.5.4",
|
||||||
"python-ipware~=3.0.0",
|
"python-ipware~=3.0.0",
|
||||||
"python-magic~=0.4.27",
|
"python-magic~=0.4.27",
|
||||||
"pyzbar~=0.1.9",
|
"pyzbar~=0.1.9",
|
||||||
"rapidfuzz~=3.13.0",
|
"rapidfuzz~=3.12.1",
|
||||||
"redis[hiredis]~=5.2.1",
|
"redis[hiredis]~=5.2.1",
|
||||||
"scikit-learn~=1.6.1",
|
"scikit-learn~=1.6.1",
|
||||||
"setproctitle~=1.3.4",
|
"setproctitle~=1.3.4",
|
||||||
@ -65,7 +65,7 @@ dependencies = [
|
|||||||
"tqdm~=4.67.1",
|
"tqdm~=4.67.1",
|
||||||
"watchdog~=6.0",
|
"watchdog~=6.0",
|
||||||
"whitenoise~=6.9",
|
"whitenoise~=6.9",
|
||||||
"whoosh-reloaded>=2.7.5",
|
"whoosh~=2.7",
|
||||||
"zxing-cpp~=2.3.0",
|
"zxing-cpp~=2.3.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
@ -78,7 +78,7 @@ optional-dependencies.postgres = [
|
|||||||
"psycopg-c==3.2.5",
|
"psycopg-c==3.2.5",
|
||||||
]
|
]
|
||||||
optional-dependencies.webserver = [
|
optional-dependencies.webserver = [
|
||||||
"granian[uvloop]~=2.2.0",
|
"granian~=2.0.1",
|
||||||
]
|
]
|
||||||
|
|
||||||
[dependency-groups]
|
[dependency-groups]
|
||||||
@ -227,9 +227,27 @@ lint.per-file-ignores."src/documents/tests/test_consumer.py" = [
|
|||||||
lint.per-file-ignores."src/documents/tests/test_file_handling.py" = [
|
lint.per-file-ignores."src/documents/tests/test_file_handling.py" = [
|
||||||
"PTH",
|
"PTH",
|
||||||
] # TODO Enable & remove
|
] # TODO Enable & remove
|
||||||
|
lint.per-file-ignores."src/documents/tests/test_management.py" = [
|
||||||
|
"PTH",
|
||||||
|
] # TODO Enable & remove
|
||||||
|
lint.per-file-ignores."src/documents/tests/test_management_consumer.py" = [
|
||||||
|
"PTH",
|
||||||
|
] # TODO Enable & remove
|
||||||
|
lint.per-file-ignores."src/documents/tests/test_management_exporter.py" = [
|
||||||
|
"PTH",
|
||||||
|
] # TODO Enable & remove
|
||||||
lint.per-file-ignores."src/documents/tests/test_migration_archive_files.py" = [
|
lint.per-file-ignores."src/documents/tests/test_migration_archive_files.py" = [
|
||||||
"PTH",
|
"PTH",
|
||||||
] # TODO Enable & remove
|
] # TODO Enable & remove
|
||||||
|
lint.per-file-ignores."src/documents/tests/test_migration_document_pages_count.py" = [
|
||||||
|
"PTH",
|
||||||
|
] # TODO Enable & remove
|
||||||
|
lint.per-file-ignores."src/documents/tests/test_migration_mime_type.py" = [
|
||||||
|
"PTH",
|
||||||
|
] # TODO Enable & remove
|
||||||
|
lint.per-file-ignores."src/documents/tests/test_sanity_check.py" = [
|
||||||
|
"PTH",
|
||||||
|
] # TODO Enable & remove
|
||||||
lint.per-file-ignores."src/documents/views.py" = [
|
lint.per-file-ignores."src/documents/views.py" = [
|
||||||
"PTH",
|
"PTH",
|
||||||
] # TODO Enable & remove
|
] # TODO Enable & remove
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "paperless-ngx-ui",
|
"name": "paperless-ui",
|
||||||
"version": "2.15.3",
|
"version": "0.0.0",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"preinstall": "npx only-allow pnpm",
|
"preinstall": "npx only-allow pnpm",
|
||||||
"ng": "ng",
|
"ng": "ng",
|
||||||
@ -12,17 +12,17 @@
|
|||||||
},
|
},
|
||||||
"private": true,
|
"private": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@angular/cdk": "^19.2.14",
|
"@angular/cdk": "^19.2.2",
|
||||||
"@angular/common": "~19.2.9",
|
"@angular/common": "~19.2.1",
|
||||||
"@angular/compiler": "~19.2.9",
|
"@angular/compiler": "~19.2.1",
|
||||||
"@angular/core": "~19.2.9",
|
"@angular/core": "~19.2.1",
|
||||||
"@angular/forms": "~19.2.9",
|
"@angular/forms": "~19.2.1",
|
||||||
"@angular/localize": "~19.2.9",
|
"@angular/localize": "~19.2.1",
|
||||||
"@angular/platform-browser": "~19.2.9",
|
"@angular/platform-browser": "~19.2.1",
|
||||||
"@angular/platform-browser-dynamic": "~19.2.9",
|
"@angular/platform-browser-dynamic": "~19.2.1",
|
||||||
"@angular/router": "~19.2.9",
|
"@angular/router": "~19.2.1",
|
||||||
"@ng-bootstrap/ng-bootstrap": "^18.0.0",
|
"@ng-bootstrap/ng-bootstrap": "^18.0.0",
|
||||||
"@ng-select/ng-select": "^14.7.0",
|
"@ng-select/ng-select": "^14.2.3",
|
||||||
"@ngneat/dirty-check-forms": "^3.0.3",
|
"@ngneat/dirty-check-forms": "^3.0.3",
|
||||||
"@popperjs/core": "^2.11.8",
|
"@popperjs/core": "^2.11.8",
|
||||||
"bootstrap": "^5.3.3",
|
"bootstrap": "^5.3.3",
|
||||||
@ -42,30 +42,30 @@
|
|||||||
"zone.js": "^0.15.0"
|
"zone.js": "^0.15.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@angular-builders/custom-webpack": "^19.0.1",
|
"@angular-builders/custom-webpack": "^19.0.0",
|
||||||
"@angular-builders/jest": "^19.0.1",
|
"@angular-builders/jest": "^19.0.0",
|
||||||
"@angular-devkit/build-angular": "^19.2.10",
|
"@angular-devkit/build-angular": "^19.2.1",
|
||||||
"@angular-devkit/core": "^19.2.10",
|
"@angular-devkit/core": "^19.2.1",
|
||||||
"@angular-devkit/schematics": "^19.2.10",
|
"@angular-devkit/schematics": "^19.2.1",
|
||||||
"@angular-eslint/builder": "19.3.0",
|
"@angular-eslint/builder": "19.2.1",
|
||||||
"@angular-eslint/eslint-plugin": "19.3.0",
|
"@angular-eslint/eslint-plugin": "19.2.1",
|
||||||
"@angular-eslint/eslint-plugin-template": "19.3.0",
|
"@angular-eslint/eslint-plugin-template": "19.2.1",
|
||||||
"@angular-eslint/schematics": "19.3.0",
|
"@angular-eslint/schematics": "19.2.1",
|
||||||
"@angular-eslint/template-parser": "19.3.0",
|
"@angular-eslint/template-parser": "19.2.1",
|
||||||
"@angular/cli": "~19.2.10",
|
"@angular/cli": "~19.2.1",
|
||||||
"@angular/compiler-cli": "~19.2.9",
|
"@angular/compiler-cli": "~19.2.1",
|
||||||
"@codecov/webpack-plugin": "^1.9.0",
|
"@codecov/webpack-plugin": "^1.9.0",
|
||||||
"@playwright/test": "^1.51.1",
|
"@playwright/test": "^1.50.1",
|
||||||
"@types/jest": "^29.5.14",
|
"@types/jest": "^29.5.14",
|
||||||
"@types/node": "^22.15.3",
|
"@types/node": "^22.13.9",
|
||||||
"@typescript-eslint/eslint-plugin": "^8.31.1",
|
"@typescript-eslint/eslint-plugin": "^8.26.1",
|
||||||
"@typescript-eslint/parser": "^8.31.1",
|
"@typescript-eslint/parser": "^8.26.1",
|
||||||
"@typescript-eslint/utils": "^8.31.1",
|
"@typescript-eslint/utils": "^8.26.1",
|
||||||
"eslint": "^9.25.1",
|
"eslint": "^9.22.0",
|
||||||
"jest": "29.7.0",
|
"jest": "29.7.0",
|
||||||
"jest-environment-jsdom": "^29.7.0",
|
"jest-environment-jsdom": "^29.7.0",
|
||||||
"jest-junit": "^16.0.0",
|
"jest-junit": "^16.0.0",
|
||||||
"jest-preset-angular": "^14.5.5",
|
"jest-preset-angular": "^14.5.3",
|
||||||
"jest-websocket-mock": "^2.5.0",
|
"jest-websocket-mock": "^2.5.0",
|
||||||
"patch-package": "^8.0.0",
|
"patch-package": "^8.0.0",
|
||||||
"prettier-plugin-organize-imports": "^4.1.0",
|
"prettier-plugin-organize-imports": "^4.1.0",
|
||||||
|
3659
src-ui/pnpm-lock.yaml
generated
3659
src-ui/pnpm-lock.yaml
generated
File diff suppressed because it is too large
Load Diff
@ -15,7 +15,7 @@
|
|||||||
</svg>
|
</svg>
|
||||||
<div class="ms-2 ms-md-3 d-inline-block" [class.d-md-none]="slimSidebarEnabled">
|
<div class="ms-2 ms-md-3 d-inline-block" [class.d-md-none]="slimSidebarEnabled">
|
||||||
@if (customAppTitle?.length) {
|
@if (customAppTitle?.length) {
|
||||||
<div class="d-flex flex-column align-items-start custom-title">
|
<div class="d-flex flex-column align-items-start">
|
||||||
<span class="title">{{customAppTitle}}</span>
|
<span class="title">{{customAppTitle}}</span>
|
||||||
<span class="byline text-uppercase font-monospace" i18n>by Paperless-ngx</span>
|
<span class="byline text-uppercase font-monospace" i18n>by Paperless-ngx</span>
|
||||||
</div>
|
</div>
|
||||||
|
@ -244,7 +244,7 @@ main {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@media screen and (min-width: 366px) and (max-width: 768px) {
|
@media screen and (max-width: 768px) {
|
||||||
.navbar-toggler {
|
.navbar-toggler {
|
||||||
// compensate for 2 buttons on the right
|
// compensate for 2 buttons on the right
|
||||||
margin-right: 45px;
|
margin-right: 45px;
|
||||||
@ -257,13 +257,6 @@ main {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@media screen and (max-width: 345px) {
|
|
||||||
.custom-title {
|
|
||||||
max-width: 110px;
|
|
||||||
overflow: hidden;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
:host ::ng-deep .dropdown.show .dropdown-toggle,
|
:host ::ng-deep .dropdown.show .dropdown-toggle,
|
||||||
:host ::ng-deep .dropdown-toggle:hover {
|
:host ::ng-deep .dropdown-toggle:hover {
|
||||||
opacity: 0.7;
|
opacity: 0.7;
|
||||||
|
@ -89,7 +89,7 @@
|
|||||||
@if (searchResults?.documents.length) {
|
@if (searchResults?.documents.length) {
|
||||||
<h6 class="dropdown-header" i18n="@@searchResults.documents">Documents</h6>
|
<h6 class="dropdown-header" i18n="@@searchResults.documents">Documents</h6>
|
||||||
@for (document of searchResults.documents; track document.id) {
|
@for (document of searchResults.documents; track document.id) {
|
||||||
<ng-container *ngTemplateOutlet="resultItemTemplate; context: {item: document, nameProp: 'title', type: DataType.Document, icon: 'file-text', date: document.created}"></ng-container>
|
<ng-container *ngTemplateOutlet="resultItemTemplate; context: {item: document, nameProp: 'title', type: DataType.Document, icon: 'file-text', date: document.added}"></ng-container>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@if (searchResults?.saved_views.length) {
|
@if (searchResults?.saved_views.length) {
|
||||||
|
@ -405,7 +405,7 @@ describe('GlobalSearchComponent', () => {
|
|||||||
expect(toastErrorSpy).toHaveBeenCalled()
|
expect(toastErrorSpy).toHaveBeenCalled()
|
||||||
|
|
||||||
// succeed
|
// succeed
|
||||||
editDialog.succeeded.emit(object as any)
|
editDialog.succeeded.emit(true)
|
||||||
expect(toastInfoSpy).toHaveBeenCalled()
|
expect(toastInfoSpy).toHaveBeenCalled()
|
||||||
})
|
})
|
||||||
|
|
||||||
@ -456,7 +456,7 @@ describe('GlobalSearchComponent', () => {
|
|||||||
expect(toastErrorSpy).toHaveBeenCalled()
|
expect(toastErrorSpy).toHaveBeenCalled()
|
||||||
|
|
||||||
// succeed
|
// succeed
|
||||||
editDialog.succeeded.emit(searchResults.tags[0] as any)
|
editDialog.succeeded.emit(true)
|
||||||
expect(toastInfoSpy).toHaveBeenCalled()
|
expect(toastInfoSpy).toHaveBeenCalled()
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
<div ngbDropdown #fieldDropdown="ngbDropdown" (openChange)="onOpenClose($event)" [popperOptions]="popperOptions" placement="bottom-end">
|
<div ngbDropdown #fieldDropdown="ngbDropdown" (openChange)="onOpenClose($event)">
|
||||||
<button class="btn btn-sm btn-outline-primary" id="customFieldsDropdown" [disabled]="disabled" ngbDropdownToggle>
|
<button class="btn btn-sm btn-outline-primary" id="customFieldsDropdown" [disabled]="disabled" ngbDropdownToggle>
|
||||||
<i-bs name="ui-radios"></i-bs>
|
<i-bs name="ui-radios"></i-bs>
|
||||||
<div class="d-none d-sm-inline"> <ng-container i18n>Custom Fields</ng-container></div>
|
<div class="d-none d-sm-inline"> <ng-container i18n>Custom Fields</ng-container></div>
|
||||||
|
@ -21,7 +21,6 @@ import {
|
|||||||
} from 'src/app/services/permissions.service'
|
} from 'src/app/services/permissions.service'
|
||||||
import { CustomFieldsService } from 'src/app/services/rest/custom-fields.service'
|
import { CustomFieldsService } from 'src/app/services/rest/custom-fields.service'
|
||||||
import { ToastService } from 'src/app/services/toast.service'
|
import { ToastService } from 'src/app/services/toast.service'
|
||||||
import { pngxPopperOptions } from 'src/app/utils/popper-options'
|
|
||||||
import { LoadingComponentWithPermissions } from '../../loading-component/loading.component'
|
import { LoadingComponentWithPermissions } from '../../loading-component/loading.component'
|
||||||
import { CustomFieldEditDialogComponent } from '../edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component'
|
import { CustomFieldEditDialogComponent } from '../edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component'
|
||||||
|
|
||||||
@ -37,8 +36,6 @@ import { CustomFieldEditDialogComponent } from '../edit-dialog/custom-field-edit
|
|||||||
],
|
],
|
||||||
})
|
})
|
||||||
export class CustomFieldsDropdownComponent extends LoadingComponentWithPermissions {
|
export class CustomFieldsDropdownComponent extends LoadingComponentWithPermissions {
|
||||||
public popperOptions = pngxPopperOptions
|
|
||||||
|
|
||||||
@Input()
|
@Input()
|
||||||
documentId: number
|
documentId: number
|
||||||
|
|
||||||
|
@ -47,7 +47,7 @@ export abstract class EditDialogComponent<
|
|||||||
object: T
|
object: T
|
||||||
|
|
||||||
@Output()
|
@Output()
|
||||||
succeeded = new EventEmitter<T>()
|
succeeded = new EventEmitter()
|
||||||
|
|
||||||
@Output()
|
@Output()
|
||||||
failed = new EventEmitter()
|
failed = new EventEmitter()
|
||||||
|
@ -62,7 +62,6 @@ export class EmailDocumentDialogComponent extends LoadingComponentWithPermission
|
|||||||
this.emailAddress = ''
|
this.emailAddress = ''
|
||||||
this.emailSubject = ''
|
this.emailSubject = ''
|
||||||
this.emailMessage = ''
|
this.emailMessage = ''
|
||||||
this.close()
|
|
||||||
this.toastService.showInfo($localize`Email sent`)
|
this.toastService.showInfo($localize`Email sent`)
|
||||||
},
|
},
|
||||||
error: (e) => {
|
error: (e) => {
|
||||||
|
@ -7,7 +7,6 @@ import {
|
|||||||
tick,
|
tick,
|
||||||
} from '@angular/core/testing'
|
} from '@angular/core/testing'
|
||||||
import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
|
import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
|
||||||
import { NEGATIVE_NULL_FILTER_VALUE } from 'src/app/data/filter-rule-type'
|
|
||||||
import {
|
import {
|
||||||
DEFAULT_MATCHING_ALGORITHM,
|
DEFAULT_MATCHING_ALGORITHM,
|
||||||
MATCH_ALL,
|
MATCH_ALL,
|
||||||
@ -45,11 +44,6 @@ const nullItem = {
|
|||||||
name: 'Not assigned',
|
name: 'Not assigned',
|
||||||
}
|
}
|
||||||
|
|
||||||
const negativeNullItem = {
|
|
||||||
id: NEGATIVE_NULL_FILTER_VALUE,
|
|
||||||
name: 'Not assigned',
|
|
||||||
}
|
|
||||||
|
|
||||||
let selectionModel: FilterableDropdownSelectionModel
|
let selectionModel: FilterableDropdownSelectionModel
|
||||||
|
|
||||||
describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () => {
|
describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () => {
|
||||||
@ -70,7 +64,6 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
|
|||||||
hotkeyService = TestBed.inject(HotKeyService)
|
hotkeyService = TestBed.inject(HotKeyService)
|
||||||
fixture = TestBed.createComponent(FilterableDropdownComponent)
|
fixture = TestBed.createComponent(FilterableDropdownComponent)
|
||||||
component = fixture.componentInstance
|
component = fixture.componentInstance
|
||||||
component.selectionModel = new FilterableDropdownSelectionModel()
|
|
||||||
selectionModel = new FilterableDropdownSelectionModel()
|
selectionModel = new FilterableDropdownSelectionModel()
|
||||||
})
|
})
|
||||||
|
|
||||||
@ -81,7 +74,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
|
|||||||
})
|
})
|
||||||
|
|
||||||
it('should support reset', () => {
|
it('should support reset', () => {
|
||||||
component.selectionModel.items = items
|
component.items = items
|
||||||
component.selectionModel = selectionModel
|
component.selectionModel = selectionModel
|
||||||
selectionModel.set(items[0].id, ToggleableItemState.Selected)
|
selectionModel.set(items[0].id, ToggleableItemState.Selected)
|
||||||
expect(selectionModel.getSelectedItems()).toHaveLength(1)
|
expect(selectionModel.getSelectedItems()).toHaveLength(1)
|
||||||
@ -103,7 +96,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
|
|||||||
})
|
})
|
||||||
|
|
||||||
it('should emit change when items selected', () => {
|
it('should emit change when items selected', () => {
|
||||||
component.selectionModel.items = items
|
component.items = items
|
||||||
component.selectionModel = selectionModel
|
component.selectionModel = selectionModel
|
||||||
let newModel: FilterableDropdownSelectionModel
|
let newModel: FilterableDropdownSelectionModel
|
||||||
component.selectionModelChange.subscribe((model) => (newModel = model))
|
component.selectionModelChange.subscribe((model) => (newModel = model))
|
||||||
@ -117,11 +110,11 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
|
|||||||
selectionModel.set(items[0].id, ToggleableItemState.NotSelected)
|
selectionModel.set(items[0].id, ToggleableItemState.NotSelected)
|
||||||
expect(newModel.getSelectedItems()).toEqual([])
|
expect(newModel.getSelectedItems()).toEqual([])
|
||||||
|
|
||||||
expect(component.selectionModel.items).toEqual([nullItem, ...items])
|
expect(component.items).toEqual([nullItem, ...items])
|
||||||
})
|
})
|
||||||
|
|
||||||
it('should emit change when items excluded', () => {
|
it('should emit change when items excluded', () => {
|
||||||
component.selectionModel.items = items
|
component.items = items
|
||||||
component.selectionModel = selectionModel
|
component.selectionModel = selectionModel
|
||||||
let newModel: FilterableDropdownSelectionModel
|
let newModel: FilterableDropdownSelectionModel
|
||||||
component.selectionModelChange.subscribe((model) => (newModel = model))
|
component.selectionModelChange.subscribe((model) => (newModel = model))
|
||||||
@ -131,7 +124,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
|
|||||||
})
|
})
|
||||||
|
|
||||||
it('should emit change when items excluded', () => {
|
it('should emit change when items excluded', () => {
|
||||||
component.selectionModel.items = items
|
component.items = items
|
||||||
component.selectionModel = selectionModel
|
component.selectionModel = selectionModel
|
||||||
let newModel: FilterableDropdownSelectionModel
|
let newModel: FilterableDropdownSelectionModel
|
||||||
component.selectionModelChange.subscribe((model) => (newModel = model))
|
component.selectionModelChange.subscribe((model) => (newModel = model))
|
||||||
@ -146,8 +139,8 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
|
|||||||
})
|
})
|
||||||
|
|
||||||
it('should exclude items when excluded and not editing', () => {
|
it('should exclude items when excluded and not editing', () => {
|
||||||
component.selectionModel.items = items
|
component.items = items
|
||||||
component.selectionModel.manyToOne = true
|
component.manyToOne = true
|
||||||
component.selectionModel = selectionModel
|
component.selectionModel = selectionModel
|
||||||
selectionModel.set(items[0].id, ToggleableItemState.Selected)
|
selectionModel.set(items[0].id, ToggleableItemState.Selected)
|
||||||
component.excludeClicked(items[0].id)
|
component.excludeClicked(items[0].id)
|
||||||
@ -156,8 +149,8 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
|
|||||||
})
|
})
|
||||||
|
|
||||||
it('should toggle when items excluded and editing', () => {
|
it('should toggle when items excluded and editing', () => {
|
||||||
component.selectionModel.items = items
|
component.items = items
|
||||||
component.selectionModel.manyToOne = true
|
component.manyToOne = true
|
||||||
component.editing = true
|
component.editing = true
|
||||||
component.selectionModel = selectionModel
|
component.selectionModel = selectionModel
|
||||||
selectionModel.set(items[0].id, ToggleableItemState.NotSelected)
|
selectionModel.set(items[0].id, ToggleableItemState.NotSelected)
|
||||||
@ -167,8 +160,8 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
|
|||||||
})
|
})
|
||||||
|
|
||||||
it('should hide count for item if adding will increase size of set', () => {
|
it('should hide count for item if adding will increase size of set', () => {
|
||||||
component.selectionModel.items = items
|
component.items = items
|
||||||
component.selectionModel.manyToOne = true
|
component.manyToOne = true
|
||||||
component.selectionModel = selectionModel
|
component.selectionModel = selectionModel
|
||||||
expect(component.hideCount(items[0])).toBeFalsy()
|
expect(component.hideCount(items[0])).toBeFalsy()
|
||||||
selectionModel.logicalOperator = LogicalOperator.Or
|
selectionModel.logicalOperator = LogicalOperator.Or
|
||||||
@ -177,7 +170,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
|
|||||||
|
|
||||||
it('should enforce single select when editing', () => {
|
it('should enforce single select when editing', () => {
|
||||||
component.editing = true
|
component.editing = true
|
||||||
component.selectionModel.items = items
|
component.items = items
|
||||||
component.selectionModel = selectionModel
|
component.selectionModel = selectionModel
|
||||||
let newModel: FilterableDropdownSelectionModel
|
let newModel: FilterableDropdownSelectionModel
|
||||||
component.selectionModelChange.subscribe((model) => (newModel = model))
|
component.selectionModelChange.subscribe((model) => (newModel = model))
|
||||||
@ -189,11 +182,11 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
|
|||||||
})
|
})
|
||||||
|
|
||||||
it('should support manyToOne selecting', () => {
|
it('should support manyToOne selecting', () => {
|
||||||
component.selectionModel.items = items
|
component.items = items
|
||||||
selectionModel.manyToOne = false
|
selectionModel.manyToOne = false
|
||||||
component.selectionModel = selectionModel
|
component.selectionModel = selectionModel
|
||||||
component.selectionModel.manyToOne = true
|
component.manyToOne = true
|
||||||
expect(component.selectionModel.manyToOne).toBeTruthy()
|
expect(component.manyToOne).toBeTruthy()
|
||||||
let newModel: FilterableDropdownSelectionModel
|
let newModel: FilterableDropdownSelectionModel
|
||||||
component.selectionModelChange.subscribe((model) => (newModel = model))
|
component.selectionModelChange.subscribe((model) => (newModel = model))
|
||||||
|
|
||||||
@ -204,10 +197,12 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
|
|||||||
})
|
})
|
||||||
|
|
||||||
it('should dynamically enable / disable modifier toggle', () => {
|
it('should dynamically enable / disable modifier toggle', () => {
|
||||||
component.selectionModel.items = items
|
component.items = items
|
||||||
component.selectionModel = selectionModel
|
component.selectionModel = selectionModel
|
||||||
expect(component.modifierToggleEnabled).toBeTruthy()
|
expect(component.modifierToggleEnabled).toBeTruthy()
|
||||||
component.selectionModel.manyToOne = true
|
selectionModel.toggle(null)
|
||||||
|
expect(component.modifierToggleEnabled).toBeFalsy()
|
||||||
|
component.manyToOne = true
|
||||||
expect(component.modifierToggleEnabled).toBeFalsy()
|
expect(component.modifierToggleEnabled).toBeFalsy()
|
||||||
selectionModel.toggle(items[0].id)
|
selectionModel.toggle(items[0].id)
|
||||||
selectionModel.toggle(items[1].id)
|
selectionModel.toggle(items[1].id)
|
||||||
@ -215,7 +210,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
|
|||||||
})
|
})
|
||||||
|
|
||||||
it('should apply changes and close when apply button clicked', () => {
|
it('should apply changes and close when apply button clicked', () => {
|
||||||
component.selectionModel.items = items
|
component.items = items
|
||||||
component.icon = 'tag-fill'
|
component.icon = 'tag-fill'
|
||||||
component.editing = true
|
component.editing = true
|
||||||
component.selectionModel = selectionModel
|
component.selectionModel = selectionModel
|
||||||
@ -237,7 +232,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
|
|||||||
})
|
})
|
||||||
|
|
||||||
it('should apply on close if enabled', () => {
|
it('should apply on close if enabled', () => {
|
||||||
component.selectionModel.items = items
|
component.items = items
|
||||||
component.icon = 'tag-fill'
|
component.icon = 'tag-fill'
|
||||||
component.editing = true
|
component.editing = true
|
||||||
component.applyOnClose = true
|
component.applyOnClose = true
|
||||||
@ -255,7 +250,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
|
|||||||
})
|
})
|
||||||
|
|
||||||
it('should focus text filter on open, support filtering, clear on close', fakeAsync(() => {
|
it('should focus text filter on open, support filtering, clear on close', fakeAsync(() => {
|
||||||
component.selectionModel.items = items
|
component.items = items
|
||||||
component.icon = 'tag-fill'
|
component.icon = 'tag-fill'
|
||||||
fixture.nativeElement
|
fixture.nativeElement
|
||||||
.querySelector('button')
|
.querySelector('button')
|
||||||
@ -282,7 +277,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
|
|||||||
}))
|
}))
|
||||||
|
|
||||||
it('should toggle & close on enter inside filter field if 1 item remains', fakeAsync(() => {
|
it('should toggle & close on enter inside filter field if 1 item remains', fakeAsync(() => {
|
||||||
component.selectionModel.items = items
|
component.items = items
|
||||||
component.icon = 'tag-fill'
|
component.icon = 'tag-fill'
|
||||||
expect(component.selectionModel.getSelectedItems()).toEqual([])
|
expect(component.selectionModel.getSelectedItems()).toEqual([])
|
||||||
fixture.nativeElement
|
fixture.nativeElement
|
||||||
@ -302,7 +297,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
|
|||||||
}))
|
}))
|
||||||
|
|
||||||
it('should apply & close on enter inside filter field if 1 item remains if editing', fakeAsync(() => {
|
it('should apply & close on enter inside filter field if 1 item remains if editing', fakeAsync(() => {
|
||||||
component.selectionModel.items = items
|
component.items = items
|
||||||
component.icon = 'tag-fill'
|
component.icon = 'tag-fill'
|
||||||
component.editing = true
|
component.editing = true
|
||||||
let applyResult: ChangedItems
|
let applyResult: ChangedItems
|
||||||
@ -324,7 +319,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
|
|||||||
}))
|
}))
|
||||||
|
|
||||||
it('should support arrow keyboard navigation', fakeAsync(() => {
|
it('should support arrow keyboard navigation', fakeAsync(() => {
|
||||||
component.selectionModel.items = items
|
component.items = items
|
||||||
component.icon = 'tag-fill'
|
component.icon = 'tag-fill'
|
||||||
fixture.nativeElement
|
fixture.nativeElement
|
||||||
.querySelector('button')
|
.querySelector('button')
|
||||||
@ -369,7 +364,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
|
|||||||
}))
|
}))
|
||||||
|
|
||||||
it('should support arrow keyboard navigation after tab keyboard navigation', fakeAsync(() => {
|
it('should support arrow keyboard navigation after tab keyboard navigation', fakeAsync(() => {
|
||||||
component.selectionModel.items = items
|
component.items = items
|
||||||
component.icon = 'tag-fill'
|
component.icon = 'tag-fill'
|
||||||
fixture.nativeElement
|
fixture.nativeElement
|
||||||
.querySelector('button')
|
.querySelector('button')
|
||||||
@ -405,7 +400,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
|
|||||||
}))
|
}))
|
||||||
|
|
||||||
it('should support arrow keyboard navigation after click', fakeAsync(() => {
|
it('should support arrow keyboard navigation after click', fakeAsync(() => {
|
||||||
component.selectionModel.items = items
|
component.items = items
|
||||||
component.icon = 'tag-fill'
|
component.icon = 'tag-fill'
|
||||||
fixture.nativeElement
|
fixture.nativeElement
|
||||||
.querySelector('button')
|
.querySelector('button')
|
||||||
@ -430,9 +425,9 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
|
|||||||
}))
|
}))
|
||||||
|
|
||||||
it('should toggle logical operator', fakeAsync(() => {
|
it('should toggle logical operator', fakeAsync(() => {
|
||||||
component.selectionModel.items = items
|
component.items = items
|
||||||
component.icon = 'tag-fill'
|
component.icon = 'tag-fill'
|
||||||
component.selectionModel.manyToOne = true
|
component.manyToOne = true
|
||||||
selectionModel.set(items[0].id, ToggleableItemState.Selected)
|
selectionModel.set(items[0].id, ToggleableItemState.Selected)
|
||||||
selectionModel.set(items[1].id, ToggleableItemState.Selected)
|
selectionModel.set(items[1].id, ToggleableItemState.Selected)
|
||||||
component.selectionModel = selectionModel
|
component.selectionModel = selectionModel
|
||||||
@ -459,7 +454,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
|
|||||||
}))
|
}))
|
||||||
|
|
||||||
it('should toggle intersection include / exclude', fakeAsync(() => {
|
it('should toggle intersection include / exclude', fakeAsync(() => {
|
||||||
component.selectionModel.items = items
|
component.items = items
|
||||||
component.icon = 'tag-fill'
|
component.icon = 'tag-fill'
|
||||||
selectionModel.set(items[0].id, ToggleableItemState.Selected)
|
selectionModel.set(items[0].id, ToggleableItemState.Selected)
|
||||||
selectionModel.set(items[1].id, ToggleableItemState.Selected)
|
selectionModel.set(items[1].id, ToggleableItemState.Selected)
|
||||||
@ -488,53 +483,22 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
|
|||||||
expect(changedResult.getExcludedItems()).toEqual(items)
|
expect(changedResult.getExcludedItems()).toEqual(items)
|
||||||
}))
|
}))
|
||||||
|
|
||||||
it('should update null item selection on toggleIntersection', () => {
|
|
||||||
component.selectionModel.items = items
|
|
||||||
component.selectionModel = selectionModel
|
|
||||||
component.selectionModel.intersection = Intersection.Include
|
|
||||||
component.selectionModel.set(null, ToggleableItemState.Selected)
|
|
||||||
component.selectionModel.intersection = Intersection.Exclude
|
|
||||||
component.selectionModel.toggleIntersection()
|
|
||||||
expect(component.selectionModel.getExcludedItems()).toEqual([
|
|
||||||
negativeNullItem,
|
|
||||||
])
|
|
||||||
|
|
||||||
component.selectionModel.intersection = Intersection.Include
|
|
||||||
component.selectionModel.toggleIntersection()
|
|
||||||
expect(component.selectionModel.getSelectedItems()).toEqual([nullItem])
|
|
||||||
})
|
|
||||||
|
|
||||||
it('selection model should sort items by state', () => {
|
it('selection model should sort items by state', () => {
|
||||||
|
component.items = items.concat([{ id: null, name: 'Null B' }])
|
||||||
component.selectionModel = selectionModel
|
component.selectionModel = selectionModel
|
||||||
component.selectionModel.items = items.concat([{ id: 3, name: 'Item3' }])
|
|
||||||
selectionModel.toggle(items[1].id)
|
selectionModel.toggle(items[1].id)
|
||||||
selectionModel.apply()
|
selectionModel.apply()
|
||||||
expect(selectionModel.items.length).toEqual(4)
|
|
||||||
expect(selectionModel.items).toEqual([
|
expect(selectionModel.items).toEqual([
|
||||||
nullItem,
|
nullItem,
|
||||||
|
{ id: null, name: 'Null B' },
|
||||||
items[1],
|
items[1],
|
||||||
{ id: 3, name: 'Item3' },
|
|
||||||
items[0],
|
items[0],
|
||||||
])
|
])
|
||||||
|
|
||||||
selectionModel.intersection = Intersection.Exclude
|
|
||||||
selectionModel.toggleIntersection()
|
|
||||||
selectionModel.apply()
|
|
||||||
expect(selectionModel.items).toEqual([
|
|
||||||
negativeNullItem,
|
|
||||||
items[1],
|
|
||||||
{ id: 3, name: 'Item3' },
|
|
||||||
items[0],
|
|
||||||
])
|
|
||||||
|
|
||||||
// coverage
|
|
||||||
selectionModel.items = selectionModel.items.reverse()
|
|
||||||
selectionModel.apply()
|
|
||||||
})
|
})
|
||||||
|
|
||||||
it('selection model should sort items by state and document counts = 0, if set', () => {
|
it('selection model should sort items by state and document counts = 0, if set', () => {
|
||||||
const tagA = { id: 4, name: 'Tag A' }
|
const tagA = { id: 4, name: 'Tag A' }
|
||||||
component.selectionModel.items = items.concat([tagA])
|
component.items = items.concat([tagA])
|
||||||
component.selectionModel = selectionModel
|
component.selectionModel = selectionModel
|
||||||
component.documentCounts = [
|
component.documentCounts = [
|
||||||
{ id: 1, document_count: 0 }, // Tag1
|
{ id: 1, document_count: 0 }, // Tag1
|
||||||
@ -565,7 +529,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
|
|||||||
})
|
})
|
||||||
|
|
||||||
it('should set support create, keep open model and call createRef method', fakeAsync(() => {
|
it('should set support create, keep open model and call createRef method', fakeAsync(() => {
|
||||||
component.selectionModel.items = items
|
component.items = items
|
||||||
component.icon = 'tag-fill'
|
component.icon = 'tag-fill'
|
||||||
component.selectionModel = selectionModel
|
component.selectionModel = selectionModel
|
||||||
fixture.nativeElement
|
fixture.nativeElement
|
||||||
@ -585,7 +549,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
|
|||||||
}))
|
}))
|
||||||
|
|
||||||
it('should call create on enter inside filter field if 0 items remain while editing', fakeAsync(() => {
|
it('should call create on enter inside filter field if 0 items remain while editing', fakeAsync(() => {
|
||||||
component.selectionModel.items = items
|
component.items = items
|
||||||
component.icon = 'tag-fill'
|
component.icon = 'tag-fill'
|
||||||
component.editing = true
|
component.editing = true
|
||||||
component.createRef = jest.fn()
|
component.createRef = jest.fn()
|
||||||
@ -605,7 +569,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
|
|||||||
const id = 1
|
const id = 1
|
||||||
const state = ToggleableItemState.Selected
|
const state = ToggleableItemState.Selected
|
||||||
component.selectionModel = selectionModel
|
component.selectionModel = selectionModel
|
||||||
component.selectionModel.manyToOne = true
|
component.manyToOne = true
|
||||||
component.selectionModel.singleSelect = true
|
component.selectionModel.singleSelect = true
|
||||||
component.selectionModel.intersection = Intersection.Include
|
component.selectionModel.intersection = Intersection.Include
|
||||||
component.selectionModel['temporarySelectionStates'].set(id, state)
|
component.selectionModel['temporarySelectionStates'].set(id, state)
|
||||||
@ -632,7 +596,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
|
|||||||
})
|
})
|
||||||
|
|
||||||
it('should support shortcut keys', () => {
|
it('should support shortcut keys', () => {
|
||||||
component.selectionModel.items = items
|
component.items = items
|
||||||
component.icon = 'tag-fill'
|
component.icon = 'tag-fill'
|
||||||
component.shortcutKey = 't'
|
component.shortcutKey = 't'
|
||||||
fixture.detectChanges()
|
fixture.detectChanges()
|
||||||
@ -642,7 +606,7 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () =>
|
|||||||
})
|
})
|
||||||
|
|
||||||
it('should support an extra button and not apply changes when clicked', () => {
|
it('should support an extra button and not apply changes when clicked', () => {
|
||||||
component.selectionModel.items = items
|
component.items = items
|
||||||
component.icon = 'tag-fill'
|
component.icon = 'tag-fill'
|
||||||
component.extraButtonTitle = 'Extra'
|
component.extraButtonTitle = 'Extra'
|
||||||
component.selectionModel = selectionModel
|
component.selectionModel = selectionModel
|
||||||
|
@ -12,7 +12,6 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'
|
|||||||
import { NgbDropdown, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'
|
import { NgbDropdown, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'
|
||||||
import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
|
import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
|
||||||
import { Subject, filter, takeUntil } from 'rxjs'
|
import { Subject, filter, takeUntil } from 'rxjs'
|
||||||
import { NEGATIVE_NULL_FILTER_VALUE } from 'src/app/data/filter-rule-type'
|
|
||||||
import { MatchingModel } from 'src/app/data/matching-model'
|
import { MatchingModel } from 'src/app/data/matching-model'
|
||||||
import { ObjectWithPermissions } from 'src/app/data/object-with-permissions'
|
import { ObjectWithPermissions } from 'src/app/data/object-with-permissions'
|
||||||
import { FilterPipe } from 'src/app/pipes/filter.pipe'
|
import { FilterPipe } from 'src/app/pipes/filter.pipe'
|
||||||
@ -62,56 +61,15 @@ export class FilterableDropdownSelectionModel {
|
|||||||
}
|
}
|
||||||
|
|
||||||
set items(items: MatchingModel[]) {
|
set items(items: MatchingModel[]) {
|
||||||
if (items) {
|
this._items = items
|
||||||
this._items = Array.from(items)
|
this.sortItems()
|
||||||
this.sortItems()
|
|
||||||
this.setNullItem()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private setNullItem() {
|
|
||||||
if (this.manyToOne && this.logicalOperator === LogicalOperator.Or) {
|
|
||||||
if (this._items[0]?.id === null) {
|
|
||||||
this._items.shift()
|
|
||||||
}
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
const item = {
|
|
||||||
name: $localize`:Filter drop down element to filter for documents with no correspondent/type/tag assigned:Not assigned`,
|
|
||||||
id:
|
|
||||||
this.manyToOne || this.intersection === Intersection.Include
|
|
||||||
? null
|
|
||||||
: NEGATIVE_NULL_FILTER_VALUE,
|
|
||||||
}
|
|
||||||
|
|
||||||
if (
|
|
||||||
this._items[0]?.id === null ||
|
|
||||||
this._items[0]?.id === NEGATIVE_NULL_FILTER_VALUE
|
|
||||||
) {
|
|
||||||
this._items[0] = item
|
|
||||||
} else if (this._items) {
|
|
||||||
this._items.unshift(item)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
constructor(manyToOne: boolean = false) {
|
|
||||||
this.manyToOne = manyToOne
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private sortItems() {
|
private sortItems() {
|
||||||
this._items.sort((a, b) => {
|
this._items.sort((a, b) => {
|
||||||
if (
|
if (a.id == null && b.id != null) {
|
||||||
(a.id == null && b.id != null) ||
|
|
||||||
(a.id == NEGATIVE_NULL_FILTER_VALUE &&
|
|
||||||
b.id != NEGATIVE_NULL_FILTER_VALUE)
|
|
||||||
) {
|
|
||||||
return -1
|
return -1
|
||||||
} else if (
|
} else if (a.id != null && b.id == null) {
|
||||||
(a.id != null && b.id == null) ||
|
|
||||||
(a.id != NEGATIVE_NULL_FILTER_VALUE &&
|
|
||||||
b.id == NEGATIVE_NULL_FILTER_VALUE)
|
|
||||||
) {
|
|
||||||
return 1
|
return 1
|
||||||
} else if (
|
} else if (
|
||||||
this.getNonTemporary(a.id) == ToggleableItemState.NotSelected &&
|
this.getNonTemporary(a.id) == ToggleableItemState.NotSelected &&
|
||||||
@ -272,7 +230,6 @@ export class FilterableDropdownSelectionModel {
|
|||||||
|
|
||||||
set logicalOperator(operator: LogicalOperator) {
|
set logicalOperator(operator: LogicalOperator) {
|
||||||
this.temporaryLogicalOperator = operator
|
this.temporaryLogicalOperator = operator
|
||||||
this.setNullItem()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
toggleOperator() {
|
toggleOperator() {
|
||||||
@ -285,7 +242,6 @@ export class FilterableDropdownSelectionModel {
|
|||||||
|
|
||||||
set intersection(intersection: Intersection) {
|
set intersection(intersection: Intersection) {
|
||||||
this.temporaryIntersection = intersection
|
this.temporaryIntersection = intersection
|
||||||
this.setNullItem()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
toggleIntersection() {
|
toggleIntersection() {
|
||||||
@ -294,20 +250,9 @@ export class FilterableDropdownSelectionModel {
|
|||||||
this.intersection == Intersection.Include
|
this.intersection == Intersection.Include
|
||||||
? ToggleableItemState.Selected
|
? ToggleableItemState.Selected
|
||||||
: ToggleableItemState.Excluded
|
: ToggleableItemState.Excluded
|
||||||
|
|
||||||
this.temporarySelectionStates.forEach((state, key) => {
|
this.temporarySelectionStates.forEach((state, key) => {
|
||||||
if (key === null && this.intersection === Intersection.Exclude) {
|
this.temporarySelectionStates.set(key, newState)
|
||||||
this.temporarySelectionStates.set(NEGATIVE_NULL_FILTER_VALUE, newState)
|
|
||||||
} else if (
|
|
||||||
key === NEGATIVE_NULL_FILTER_VALUE &&
|
|
||||||
this.intersection === Intersection.Include
|
|
||||||
) {
|
|
||||||
this.temporarySelectionStates.set(null, newState)
|
|
||||||
} else {
|
|
||||||
this.temporarySelectionStates.set(key, newState)
|
|
||||||
}
|
|
||||||
})
|
})
|
||||||
|
|
||||||
this.changed.next(this)
|
this.changed.next(this)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -329,7 +274,6 @@ export class FilterableDropdownSelectionModel {
|
|||||||
this.temporarySelectionStates.clear()
|
this.temporarySelectionStates.clear()
|
||||||
this.temporaryLogicalOperator = this._logicalOperator = LogicalOperator.And
|
this.temporaryLogicalOperator = this._logicalOperator = LogicalOperator.And
|
||||||
this.temporaryIntersection = this._intersection = Intersection.Include
|
this.temporaryIntersection = this._intersection = Intersection.Include
|
||||||
this.setNullItem()
|
|
||||||
if (fireEvent) {
|
if (fireEvent) {
|
||||||
this.changed.next(this)
|
this.changed.next(this)
|
||||||
}
|
}
|
||||||
@ -361,10 +305,8 @@ export class FilterableDropdownSelectionModel {
|
|||||||
|
|
||||||
isNoneSelected() {
|
isNoneSelected() {
|
||||||
return (
|
return (
|
||||||
(this.selectionSize() == 1 &&
|
this.selectionSize() == 1 &&
|
||||||
this.get(null) == ToggleableItemState.Selected) ||
|
this.get(null) == ToggleableItemState.Selected
|
||||||
(this.intersection == Intersection.Exclude &&
|
|
||||||
this.get(NEGATIVE_NULL_FILTER_VALUE) == ToggleableItemState.Excluded)
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -442,13 +384,25 @@ export class FilterableDropdownComponent
|
|||||||
|
|
||||||
filterText: string
|
filterText: string
|
||||||
|
|
||||||
_selectionModel: FilterableDropdownSelectionModel
|
@Input()
|
||||||
|
set items(items: MatchingModel[]) {
|
||||||
|
if (items) {
|
||||||
|
this._selectionModel.items = Array.from(items)
|
||||||
|
this._selectionModel.items.unshift({
|
||||||
|
name: $localize`:Filter drop down element to filter for documents with no correspondent/type/tag assigned:Not assigned`,
|
||||||
|
id: null,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
get items(): MatchingModel[] {
|
get items(): MatchingModel[] {
|
||||||
return this._selectionModel.items
|
return this._selectionModel.items
|
||||||
}
|
}
|
||||||
|
|
||||||
@Input({ required: true })
|
_selectionModel: FilterableDropdownSelectionModel =
|
||||||
|
new FilterableDropdownSelectionModel()
|
||||||
|
|
||||||
|
@Input()
|
||||||
set selectionModel(model: FilterableDropdownSelectionModel) {
|
set selectionModel(model: FilterableDropdownSelectionModel) {
|
||||||
if (this.selectionModel) {
|
if (this.selectionModel) {
|
||||||
this.selectionModel.changed.complete()
|
this.selectionModel.changed.complete()
|
||||||
@ -469,6 +423,11 @@ export class FilterableDropdownComponent
|
|||||||
@Output()
|
@Output()
|
||||||
selectionModelChange = new EventEmitter<FilterableDropdownSelectionModel>()
|
selectionModelChange = new EventEmitter<FilterableDropdownSelectionModel>()
|
||||||
|
|
||||||
|
@Input()
|
||||||
|
set manyToOne(manyToOne: boolean) {
|
||||||
|
this.selectionModel.manyToOne = manyToOne
|
||||||
|
}
|
||||||
|
|
||||||
get manyToOne() {
|
get manyToOne() {
|
||||||
return this.selectionModel.manyToOne
|
return this.selectionModel.manyToOne
|
||||||
}
|
}
|
||||||
@ -525,7 +484,7 @@ export class FilterableDropdownComponent
|
|||||||
return this.manyToOne
|
return this.manyToOne
|
||||||
? this.selectionModel.selectionSize() > 1 &&
|
? this.selectionModel.selectionSize() > 1 &&
|
||||||
this.selectionModel.getExcludedItems().length == 0
|
this.selectionModel.getExcludedItems().length == 0
|
||||||
: true
|
: !this.selectionModel.isNoneSelected()
|
||||||
}
|
}
|
||||||
|
|
||||||
get name(): string {
|
get name(): string {
|
||||||
@ -586,8 +545,6 @@ export class FilterableDropdownComponent
|
|||||||
this.selectionModel.reset()
|
this.selectionModel.reset()
|
||||||
this.modelIsDirty = false
|
this.modelIsDirty = false
|
||||||
}
|
}
|
||||||
this.selectionModel.singleSelect =
|
|
||||||
this.editing && !this.selectionModel.manyToOne
|
|
||||||
this.opened.next(this)
|
this.opened.next(this)
|
||||||
} else {
|
} else {
|
||||||
if (this.creating) {
|
if (this.creating) {
|
||||||
|
@ -30,24 +30,25 @@
|
|||||||
[placeholder]="placeholder"
|
[placeholder]="placeholder"
|
||||||
[notFoundText]="notFoundText"
|
[notFoundText]="notFoundText"
|
||||||
[multiple]="true"
|
[multiple]="true"
|
||||||
|
bindValue="id"
|
||||||
[compareWith]="compareDocuments"
|
[compareWith]="compareDocuments"
|
||||||
[trackByFn]="trackByFn"
|
[trackByFn]="trackByFn"
|
||||||
[minTermLength]="2"
|
[minTermLength]="2"
|
||||||
[loading]="loading"
|
[loading]="loading"
|
||||||
[typeahead]="documentsInput$"
|
[typeahead]="documentsInput$"
|
||||||
(mousedown)="$event.stopImmediatePropagation()"
|
(mousedown)="$event.stopImmediatePropagation()"
|
||||||
(change)="onChange(selectedDocumentIDs)">
|
(change)="onChange(selectedDocuments)">
|
||||||
<ng-template ng-label-tmp let-document="item">
|
<ng-template ng-label-tmp let-document="item">
|
||||||
<div class="d-flex align-items-center">
|
<div class="d-flex align-items-center">
|
||||||
@if (!disabled) {
|
@if (!disabled) {
|
||||||
<button class="btn p-0 lh-1" (click)="unselect(document)" (mousedown)="$event.stopImmediatePropagation()" type="button" title="Remove link" i18n-title><i-bs name="x"></i-bs></button>
|
<button class="btn p-0 lh-1" (click)="unselect(document)" title="Remove link" i18n-title><i-bs name="x"></i-bs></button>
|
||||||
}
|
}
|
||||||
@if (document.title) {
|
@if (document.title) {
|
||||||
<a routerLink="/documents/{{document.id}}" class="badge bg-light text-primary" (mousedown)="$event.stopImmediatePropagation();" title="Open link" i18n-title>
|
<a routerLink="/documents/{{document.id}}" class="badge bg-light text-primary" (mousedown)="$event.stopImmediatePropagation();" title="Open link" i18n-title>
|
||||||
<i-bs width="0.9em" height="0.9em" name="file-text"></i-bs> <span>{{document.title}}</span>
|
<i-bs width="0.9em" height="0.9em" name="file-text"></i-bs> <span>{{document.title}}</span>
|
||||||
</a>
|
</a>
|
||||||
} @else {
|
} @else {
|
||||||
<span class="badge bg-light text-muted" (click)="unselect(document)" (mousedown)="$event.stopImmediatePropagation()" type="button" title="Remove link" i18n-title>
|
<span class="badge bg-light text-muted" (click)="unselect(document)" title="Remove link" i18n-title>
|
||||||
<i-bs width="0.9em" height="0.9em" name="exclamation-triangle-fill"></i-bs> <span i18n>Not found</span>
|
<i-bs width="0.9em" height="0.9em" name="exclamation-triangle-fill"></i-bs> <span i18n>Not found</span>
|
||||||
</span>
|
</span>
|
||||||
}
|
}
|
||||||
|
@ -74,11 +74,6 @@ describe('DocumentLinkComponent', () => {
|
|||||||
expect(component.selectedDocuments).toEqual([documents[1], documents[0]])
|
expect(component.selectedDocuments).toEqual([documents[1], documents[0]])
|
||||||
})
|
})
|
||||||
|
|
||||||
it('should retrieve document IDs from selected documents', () => {
|
|
||||||
component.selectedDocuments = documents
|
|
||||||
expect(component.selectedDocumentIDs).toEqual([1, 12, 16, 23])
|
|
||||||
})
|
|
||||||
|
|
||||||
it('should search API on select text input', () => {
|
it('should search API on select text input', () => {
|
||||||
const listSpy = jest.spyOn(documentService, 'listFiltered')
|
const listSpy = jest.spyOn(documentService, 'listFiltered')
|
||||||
listSpy.mockImplementation(
|
listSpy.mockImplementation(
|
||||||
|
@ -71,10 +71,6 @@ export class DocumentLinkComponent
|
|||||||
@Input()
|
@Input()
|
||||||
placeholder: string = $localize`Search for documents`
|
placeholder: string = $localize`Search for documents`
|
||||||
|
|
||||||
get selectedDocumentIDs(): number[] {
|
|
||||||
return this.selectedDocuments.map((d) => d.id)
|
|
||||||
}
|
|
||||||
|
|
||||||
constructor(private documentsService: DocumentService) {
|
constructor(private documentsService: DocumentService) {
|
||||||
super()
|
super()
|
||||||
}
|
}
|
||||||
@ -94,8 +90,8 @@ export class DocumentLinkComponent
|
|||||||
.pipe(takeUntil(this.unsubscribeNotifier))
|
.pipe(takeUntil(this.unsubscribeNotifier))
|
||||||
.subscribe((documentResults) => {
|
.subscribe((documentResults) => {
|
||||||
this.loading = false
|
this.loading = false
|
||||||
this.selectedDocuments = documentIDs.map(
|
this.selectedDocuments = documentIDs.map((id) =>
|
||||||
(id) => documentResults.results.find((d) => d.id === id) ?? {}
|
documentResults.results.find((d) => d.id === id)
|
||||||
)
|
)
|
||||||
super.writeValue(documentIDs)
|
super.writeValue(documentIDs)
|
||||||
})
|
})
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
(change)="onChange(value)">
|
(change)="onChange(value)">
|
||||||
|
|
||||||
<ng-template ng-label-tmp let-item="item">
|
<ng-template ng-label-tmp let-item="item">
|
||||||
<button class="tag-wrap btn p-0 d-flex align-items-center" (click)="removeTag(item.id)" (mousedown)="$event.stopImmediatePropagation()" type="button" title="Remove tag" i18n-title>
|
<button class="tag-wrap btn p-0 d-flex align-items-center" (click)="removeTag($event, item.id)" title="Remove tag" i18n-title>
|
||||||
<i-bs name="x" style="margin-inline-end: 1px;"></i-bs>
|
<i-bs name="x" style="margin-inline-end: 1px;"></i-bs>
|
||||||
@if (item.id && tags) {
|
@if (item.id && tags) {
|
||||||
<pngx-tag style="background-color: none;" [tag]="getTag(item.id)"></pngx-tag>
|
<pngx-tag style="background-color: none;" [tag]="getTag(item.id)"></pngx-tag>
|
||||||
@ -33,7 +33,7 @@
|
|||||||
</ng-template>
|
</ng-template>
|
||||||
</ng-select>
|
</ng-select>
|
||||||
@if (allowCreate && !hideAddButton) {
|
@if (allowCreate && !hideAddButton) {
|
||||||
<button class="btn btn-outline-secondary" type="button" (click)="createTag(null, true)" [disabled]="disabled">
|
<button class="btn btn-outline-secondary" type="button" (click)="createTag()" [disabled]="disabled">
|
||||||
<i-bs width="1.2em" height="1.2em" name="plus"></i-bs>
|
<i-bs width="1.2em" height="1.2em" name="plus"></i-bs>
|
||||||
</button>
|
</button>
|
||||||
}
|
}
|
||||||
|
@ -154,11 +154,11 @@ describe('TagsComponent', () => {
|
|||||||
it('support remove tags', () => {
|
it('support remove tags', () => {
|
||||||
component.tags = tags
|
component.tags = tags
|
||||||
component.value = [1, 2]
|
component.value = [1, 2]
|
||||||
component.removeTag(2)
|
component.removeTag(new PointerEvent('point'), 2)
|
||||||
expect(component.value).toEqual([1])
|
expect(component.value).toEqual([1])
|
||||||
|
|
||||||
component.disabled = true
|
component.disabled = true
|
||||||
component.removeTag(1)
|
component.removeTag(new PointerEvent('point'), 1)
|
||||||
expect(component.value).toEqual([1])
|
expect(component.value).toEqual([1])
|
||||||
})
|
})
|
||||||
|
|
||||||
|
@ -118,10 +118,13 @@ export class TagsComponent implements OnInit, ControlValueAccessor {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
removeTag(tagID: number) {
|
removeTag(event: PointerEvent, id: number) {
|
||||||
if (this.disabled) return
|
if (this.disabled) return
|
||||||
|
|
||||||
let index = this.value.indexOf(tagID)
|
// prevent opening dropdown
|
||||||
|
event.stopImmediatePropagation()
|
||||||
|
|
||||||
|
let index = this.value.indexOf(id)
|
||||||
if (index > -1) {
|
if (index > -1) {
|
||||||
let oldValue = this.value
|
let oldValue = this.value
|
||||||
oldValue.splice(index, 1)
|
oldValue.splice(index, 1)
|
||||||
@ -130,7 +133,7 @@ export class TagsComponent implements OnInit, ControlValueAccessor {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
createTag(name: string = null, add: boolean = false) {
|
createTag(name: string = null) {
|
||||||
var modal = this.modalService.open(TagEditDialogComponent, {
|
var modal = this.modalService.open(TagEditDialogComponent, {
|
||||||
backdrop: 'static',
|
backdrop: 'static',
|
||||||
})
|
})
|
||||||
@ -143,10 +146,9 @@ export class TagsComponent implements OnInit, ControlValueAccessor {
|
|||||||
return firstValueFrom(
|
return firstValueFrom(
|
||||||
(modal.componentInstance as TagEditDialogComponent).succeeded.pipe(
|
(modal.componentInstance as TagEditDialogComponent).succeeded.pipe(
|
||||||
first(),
|
first(),
|
||||||
tap((newTag) => {
|
tap(() => {
|
||||||
this.tagService.listAll().subscribe((tags) => {
|
this.tagService.listAll().subscribe((tags) => {
|
||||||
this.tags = tags.results
|
this.tags = tags.results
|
||||||
add && this.addTag(newTag.id)
|
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
)
|
)
|
||||||
|
@ -9,9 +9,9 @@
|
|||||||
}
|
}
|
||||||
<div class="input-group input-group-sm me-md-5 d-none d-md-flex">
|
<div class="input-group input-group-sm me-md-5 d-none d-md-flex">
|
||||||
<button class="btn btn-outline-secondary" (click)="decreaseZoom()" i18n>-</button>
|
<button class="btn btn-outline-secondary" (click)="decreaseZoom()" i18n>-</button>
|
||||||
<select class="form-select" (change)="setZoom($event.target.value)" [ngModel]="currentZoom">
|
<select class="form-select" (change)="setZoom($event.target.value)">
|
||||||
@for (setting of zoomSettings; track setting) {
|
@for (setting of zoomSettings; track setting) {
|
||||||
<option [value]="setting">
|
<option [value]="setting" [attr.selected]="isZoomSelected(setting) ? 'selected' : null">
|
||||||
{{ getZoomSettingTitle(setting) }}
|
{{ getZoomSettingTitle(setting) }}
|
||||||
</option>
|
</option>
|
||||||
}
|
}
|
||||||
|
@ -1,10 +1,5 @@
|
|||||||
import { DatePipe } from '@angular/common'
|
import { DatePipe } from '@angular/common'
|
||||||
import {
|
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
|
||||||
HttpHeaders,
|
|
||||||
HttpResponse,
|
|
||||||
provideHttpClient,
|
|
||||||
withInterceptorsFromDi,
|
|
||||||
} from '@angular/common/http'
|
|
||||||
import {
|
import {
|
||||||
HttpTestingController,
|
HttpTestingController,
|
||||||
provideHttpClientTesting,
|
provideHttpClientTesting,
|
||||||
@ -456,11 +451,11 @@ describe('DocumentDetailComponent', () => {
|
|||||||
initNormally()
|
initNormally()
|
||||||
component.title = 'Foo Bar'
|
component.title = 'Foo Bar'
|
||||||
const closeSpy = jest.spyOn(component, 'close')
|
const closeSpy = jest.spyOn(component, 'close')
|
||||||
const patchSpy = jest.spyOn(documentService, 'patch')
|
const updateSpy = jest.spyOn(documentService, 'update')
|
||||||
const toastSpy = jest.spyOn(toastService, 'showInfo')
|
const toastSpy = jest.spyOn(toastService, 'showInfo')
|
||||||
patchSpy.mockImplementation((o) => of(doc))
|
updateSpy.mockImplementation((o) => of(doc))
|
||||||
component.save(true)
|
component.save(true)
|
||||||
expect(patchSpy).toHaveBeenCalled()
|
expect(updateSpy).toHaveBeenCalled()
|
||||||
expect(closeSpy).toHaveBeenCalled()
|
expect(closeSpy).toHaveBeenCalled()
|
||||||
expect(toastSpy).toHaveBeenCalledWith(
|
expect(toastSpy).toHaveBeenCalledWith(
|
||||||
'Document "Doc 3" saved successfully.'
|
'Document "Doc 3" saved successfully.'
|
||||||
@ -471,11 +466,11 @@ describe('DocumentDetailComponent', () => {
|
|||||||
initNormally()
|
initNormally()
|
||||||
component.title = 'Foo Bar'
|
component.title = 'Foo Bar'
|
||||||
const closeSpy = jest.spyOn(component, 'close')
|
const closeSpy = jest.spyOn(component, 'close')
|
||||||
const patchSpy = jest.spyOn(documentService, 'patch')
|
const updateSpy = jest.spyOn(documentService, 'update')
|
||||||
const toastSpy = jest.spyOn(toastService, 'showInfo')
|
const toastSpy = jest.spyOn(toastService, 'showInfo')
|
||||||
patchSpy.mockImplementation((o) => of(doc))
|
updateSpy.mockImplementation((o) => of(doc))
|
||||||
component.save()
|
component.save()
|
||||||
expect(patchSpy).toHaveBeenCalled()
|
expect(updateSpy).toHaveBeenCalled()
|
||||||
expect(closeSpy).not.toHaveBeenCalled()
|
expect(closeSpy).not.toHaveBeenCalled()
|
||||||
expect(toastSpy).toHaveBeenCalledWith(
|
expect(toastSpy).toHaveBeenCalledWith(
|
||||||
'Document "Doc 3" saved successfully.'
|
'Document "Doc 3" saved successfully.'
|
||||||
@ -487,12 +482,12 @@ describe('DocumentDetailComponent', () => {
|
|||||||
initNormally()
|
initNormally()
|
||||||
component.title = 'Foo Bar'
|
component.title = 'Foo Bar'
|
||||||
const closeSpy = jest.spyOn(component, 'close')
|
const closeSpy = jest.spyOn(component, 'close')
|
||||||
const patchSpy = jest.spyOn(documentService, 'patch')
|
const updateSpy = jest.spyOn(documentService, 'update')
|
||||||
const toastSpy = jest.spyOn(toastService, 'showError')
|
const toastSpy = jest.spyOn(toastService, 'showError')
|
||||||
const error = new Error('failed to save')
|
const error = new Error('failed to save')
|
||||||
patchSpy.mockImplementation(() => throwError(() => error))
|
updateSpy.mockImplementation(() => throwError(() => error))
|
||||||
component.save()
|
component.save()
|
||||||
expect(patchSpy).toHaveBeenCalled()
|
expect(updateSpy).toHaveBeenCalled()
|
||||||
expect(closeSpy).not.toHaveBeenCalled()
|
expect(closeSpy).not.toHaveBeenCalled()
|
||||||
expect(toastSpy).toHaveBeenCalledWith(
|
expect(toastSpy).toHaveBeenCalledWith(
|
||||||
'Error saving document "Doc 3"',
|
'Error saving document "Doc 3"',
|
||||||
@ -505,13 +500,13 @@ describe('DocumentDetailComponent', () => {
|
|||||||
initNormally()
|
initNormally()
|
||||||
component.title = 'Foo Bar'
|
component.title = 'Foo Bar'
|
||||||
const closeSpy = jest.spyOn(component, 'close')
|
const closeSpy = jest.spyOn(component, 'close')
|
||||||
const patchSpy = jest.spyOn(documentService, 'patch')
|
const updateSpy = jest.spyOn(documentService, 'update')
|
||||||
const toastSpy = jest.spyOn(toastService, 'showInfo')
|
const toastSpy = jest.spyOn(toastService, 'showInfo')
|
||||||
patchSpy.mockImplementation(() =>
|
updateSpy.mockImplementation(() =>
|
||||||
throwError(() => new Error('failed to save'))
|
throwError(() => new Error('failed to save'))
|
||||||
)
|
)
|
||||||
component.save(true)
|
component.save(true)
|
||||||
expect(patchSpy).toHaveBeenCalled()
|
expect(updateSpy).toHaveBeenCalled()
|
||||||
expect(closeSpy).toHaveBeenCalled()
|
expect(closeSpy).toHaveBeenCalled()
|
||||||
expect(toastSpy).toHaveBeenCalledWith(
|
expect(toastSpy).toHaveBeenCalledWith(
|
||||||
'Document "Doc 3" saved successfully.'
|
'Document "Doc 3" saved successfully.'
|
||||||
@ -522,8 +517,8 @@ describe('DocumentDetailComponent', () => {
|
|||||||
initNormally()
|
initNormally()
|
||||||
const nextDocId = 100
|
const nextDocId = 100
|
||||||
component.title = 'Foo Bar'
|
component.title = 'Foo Bar'
|
||||||
const patchSpy = jest.spyOn(documentService, 'patch')
|
const updateSpy = jest.spyOn(documentService, 'update')
|
||||||
patchSpy.mockReturnValue(of(doc))
|
updateSpy.mockReturnValue(of(doc))
|
||||||
const nextSpy = jest.spyOn(documentListViewService, 'getNext')
|
const nextSpy = jest.spyOn(documentListViewService, 'getNext')
|
||||||
nextSpy.mockReturnValue(of(nextDocId))
|
nextSpy.mockReturnValue(of(nextDocId))
|
||||||
const closeSpy = jest.spyOn(openDocumentsService, 'closeDocument')
|
const closeSpy = jest.spyOn(openDocumentsService, 'closeDocument')
|
||||||
@ -531,7 +526,7 @@ describe('DocumentDetailComponent', () => {
|
|||||||
const navigateSpy = jest.spyOn(router, 'navigate')
|
const navigateSpy = jest.spyOn(router, 'navigate')
|
||||||
|
|
||||||
component.saveEditNext()
|
component.saveEditNext()
|
||||||
expect(patchSpy).toHaveBeenCalled()
|
expect(updateSpy).toHaveBeenCalled()
|
||||||
expect(navigateSpy).toHaveBeenCalledWith(['documents', nextDocId])
|
expect(navigateSpy).toHaveBeenCalledWith(['documents', nextDocId])
|
||||||
expect
|
expect
|
||||||
})
|
})
|
||||||
@ -541,12 +536,12 @@ describe('DocumentDetailComponent', () => {
|
|||||||
initNormally()
|
initNormally()
|
||||||
component.title = 'Foo Bar'
|
component.title = 'Foo Bar'
|
||||||
const closeSpy = jest.spyOn(component, 'close')
|
const closeSpy = jest.spyOn(component, 'close')
|
||||||
const patchSpy = jest.spyOn(documentService, 'patch')
|
const updateSpy = jest.spyOn(documentService, 'update')
|
||||||
const toastSpy = jest.spyOn(toastService, 'showError')
|
const toastSpy = jest.spyOn(toastService, 'showError')
|
||||||
const error = new Error('failed to save')
|
const error = new Error('failed to save')
|
||||||
patchSpy.mockImplementation(() => throwError(() => error))
|
updateSpy.mockImplementation(() => throwError(() => error))
|
||||||
component.saveEditNext()
|
component.saveEditNext()
|
||||||
expect(patchSpy).toHaveBeenCalled()
|
expect(updateSpy).toHaveBeenCalled()
|
||||||
expect(closeSpy).not.toHaveBeenCalled()
|
expect(closeSpy).not.toHaveBeenCalled()
|
||||||
expect(toastSpy).toHaveBeenCalledWith('Error saving document', error)
|
expect(toastSpy).toHaveBeenCalledWith('Error saving document', error)
|
||||||
})
|
})
|
||||||
@ -791,9 +786,14 @@ describe('DocumentDetailComponent', () => {
|
|||||||
it('should select correct zoom setting in dropdown', () => {
|
it('should select correct zoom setting in dropdown', () => {
|
||||||
initNormally()
|
initNormally()
|
||||||
component.setZoom(ZoomSetting.PageFit)
|
component.setZoom(ZoomSetting.PageFit)
|
||||||
expect(component.currentZoom).toEqual(ZoomSetting.PageFit)
|
expect(component.isZoomSelected(ZoomSetting.PageFit)).toBeTruthy()
|
||||||
|
expect(component.isZoomSelected(ZoomSetting.One)).toBeFalsy()
|
||||||
|
component.setZoom(ZoomSetting.PageWidth)
|
||||||
|
expect(component.isZoomSelected(ZoomSetting.One)).toBeTruthy()
|
||||||
|
expect(component.isZoomSelected(ZoomSetting.PageFit)).toBeFalsy()
|
||||||
component.setZoom(ZoomSetting.Quarter)
|
component.setZoom(ZoomSetting.Quarter)
|
||||||
expect(component.currentZoom).toEqual(ZoomSetting.Quarter)
|
expect(component.isZoomSelected(ZoomSetting.Quarter)).toBeTruthy()
|
||||||
|
expect(component.isZoomSelected(ZoomSetting.PageFit)).toBeFalsy()
|
||||||
})
|
})
|
||||||
|
|
||||||
it('should support updating notes dynamically', () => {
|
it('should support updating notes dynamically', () => {
|
||||||
@ -965,10 +965,10 @@ describe('DocumentDetailComponent', () => {
|
|||||||
expect(fixture.debugElement.nativeElement.textContent).toContain(
|
expect(fixture.debugElement.nativeElement.textContent).toContain(
|
||||||
customFields[1].name
|
customFields[1].name
|
||||||
)
|
)
|
||||||
const patchSpy = jest.spyOn(documentService, 'patch')
|
const updateSpy = jest.spyOn(documentService, 'update')
|
||||||
component.save(true)
|
component.save(true)
|
||||||
expect(patchSpy.mock.lastCall[0].custom_fields).toHaveLength(2)
|
expect(updateSpy.mock.lastCall[0].custom_fields).toHaveLength(2)
|
||||||
expect(patchSpy.mock.lastCall[0].custom_fields[1]).toEqual({
|
expect(updateSpy.mock.lastCall[0].custom_fields[1]).toEqual({
|
||||||
field: customFields[1].id,
|
field: customFields[1].id,
|
||||||
value: null,
|
value: null,
|
||||||
})
|
})
|
||||||
@ -985,51 +985,13 @@ describe('DocumentDetailComponent', () => {
|
|||||||
expect(
|
expect(
|
||||||
fixture.debugElement.query(By.css('form')).nativeElement.textContent
|
fixture.debugElement.query(By.css('form')).nativeElement.textContent
|
||||||
).not.toContain('Field 1')
|
).not.toContain('Field 1')
|
||||||
const patchSpy = jest.spyOn(documentService, 'patch')
|
const updateSpy = jest.spyOn(documentService, 'update')
|
||||||
component.save(true)
|
component.save(true)
|
||||||
expect(patchSpy.mock.lastCall[0].custom_fields).toHaveLength(
|
expect(updateSpy.mock.lastCall[0].custom_fields).toHaveLength(
|
||||||
initialLength - 1
|
initialLength - 1
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
|
|
||||||
it('should correctly determine changed fields', () => {
|
|
||||||
initNormally()
|
|
||||||
expect(component['getChangedFields']()).toEqual({
|
|
||||||
id: doc.id,
|
|
||||||
})
|
|
||||||
component.documentForm.get('title').setValue('Foo Bar')
|
|
||||||
component.documentForm.get('permissions_form').setValue({
|
|
||||||
owner: 1,
|
|
||||||
set_permissions: {
|
|
||||||
view: {
|
|
||||||
users: [2],
|
|
||||||
groups: [],
|
|
||||||
},
|
|
||||||
change: {
|
|
||||||
users: [3],
|
|
||||||
groups: [],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
component.documentForm.get('title').markAsDirty()
|
|
||||||
component.documentForm.get('permissions_form').markAsDirty()
|
|
||||||
expect(component['getChangedFields']()).toEqual({
|
|
||||||
id: doc.id,
|
|
||||||
title: 'Foo Bar',
|
|
||||||
owner: 1,
|
|
||||||
set_permissions: {
|
|
||||||
view: {
|
|
||||||
users: [2],
|
|
||||||
groups: [],
|
|
||||||
},
|
|
||||||
change: {
|
|
||||||
users: [3],
|
|
||||||
groups: [],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
it('should show custom field errors', () => {
|
it('should show custom field errors', () => {
|
||||||
initNormally()
|
initNormally()
|
||||||
component.error = {
|
component.error = {
|
||||||
@ -1369,34 +1331,6 @@ describe('DocumentDetailComponent', () => {
|
|||||||
expect(urlRevokeSpy).toHaveBeenCalled()
|
expect(urlRevokeSpy).toHaveBeenCalled()
|
||||||
})
|
})
|
||||||
|
|
||||||
it('should download a file with the correct filename', () => {
|
|
||||||
const mockBlob = new Blob(['test content'], { type: 'text/plain' })
|
|
||||||
const mockResponse = new HttpResponse({
|
|
||||||
body: mockBlob,
|
|
||||||
headers: new HttpHeaders({
|
|
||||||
'Content-Disposition': 'attachment; filename="test-file.txt"',
|
|
||||||
}),
|
|
||||||
})
|
|
||||||
|
|
||||||
const downloadUrl = 'http://example.com/download'
|
|
||||||
component.documentId = 123
|
|
||||||
jest.spyOn(documentService, 'getDownloadUrl').mockReturnValue(downloadUrl)
|
|
||||||
|
|
||||||
const createSpy = jest.spyOn(document, 'createElement')
|
|
||||||
const anchor: HTMLAnchorElement = {} as HTMLAnchorElement
|
|
||||||
createSpy.mockReturnValueOnce(anchor)
|
|
||||||
|
|
||||||
component.download(false)
|
|
||||||
|
|
||||||
httpTestingController
|
|
||||||
.expectOne(downloadUrl)
|
|
||||||
.flush(mockBlob, { headers: mockResponse.headers })
|
|
||||||
|
|
||||||
expect(createSpy).toHaveBeenCalledWith('a')
|
|
||||||
expect(anchor.download).toBe('test-file.txt')
|
|
||||||
createSpy.mockClear()
|
|
||||||
})
|
|
||||||
|
|
||||||
it('should get email enabled status from settings', () => {
|
it('should get email enabled status from settings', () => {
|
||||||
jest.spyOn(settingsService, 'get').mockReturnValue(true)
|
jest.spyOn(settingsService, 'get').mockReturnValue(true)
|
||||||
expect(component.emailEnabled).toBeTruthy()
|
expect(component.emailEnabled).toBeTruthy()
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
import { AsyncPipe, NgTemplateOutlet } from '@angular/common'
|
import { AsyncPipe, NgTemplateOutlet } from '@angular/common'
|
||||||
import { HttpClient, HttpResponse } from '@angular/common/http'
|
import { HttpClient } from '@angular/common/http'
|
||||||
import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'
|
import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'
|
||||||
import {
|
import {
|
||||||
FormArray,
|
FormArray,
|
||||||
@ -77,7 +77,6 @@ import { StoragePathService } from 'src/app/services/rest/storage-path.service'
|
|||||||
import { UserService } from 'src/app/services/rest/user.service'
|
import { UserService } from 'src/app/services/rest/user.service'
|
||||||
import { SettingsService } from 'src/app/services/settings.service'
|
import { SettingsService } from 'src/app/services/settings.service'
|
||||||
import { ToastService } from 'src/app/services/toast.service'
|
import { ToastService } from 'src/app/services/toast.service'
|
||||||
import { getFilenameFromContentDisposition } from 'src/app/utils/http'
|
|
||||||
import { ISODateAdapter } from 'src/app/utils/ngb-iso-date-adapter'
|
import { ISODateAdapter } from 'src/app/utils/ngb-iso-date-adapter'
|
||||||
import * as UTIF from 'utif'
|
import * as UTIF from 'utif'
|
||||||
import { ConfirmDialogComponent } from '../common/confirm-dialog/confirm-dialog.component'
|
import { ConfirmDialogComponent } from '../common/confirm-dialog/confirm-dialog.component'
|
||||||
@ -784,7 +783,6 @@ export class DocumentDetailComponent
|
|||||||
this.title = doc.title
|
this.title = doc.title
|
||||||
this.updateFormForCustomFields()
|
this.updateFormForCustomFields()
|
||||||
this.documentForm.patchValue(doc)
|
this.documentForm.patchValue(doc)
|
||||||
this.documentForm.markAsPristine()
|
|
||||||
this.openDocumentService.setDirty(doc, false)
|
this.openDocumentService.setDirty(doc, false)
|
||||||
},
|
},
|
||||||
error: () => {
|
error: () => {
|
||||||
@ -795,30 +793,11 @@ export class DocumentDetailComponent
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
private getChangedFields(): any {
|
|
||||||
const changes = {
|
|
||||||
id: this.document.id,
|
|
||||||
}
|
|
||||||
Object.keys(this.documentForm.controls).forEach((key) => {
|
|
||||||
if (this.documentForm.get(key).dirty) {
|
|
||||||
if (key === 'permissions_form') {
|
|
||||||
changes['owner'] =
|
|
||||||
this.documentForm.get('permissions_form').value['owner']
|
|
||||||
changes['set_permissions'] =
|
|
||||||
this.documentForm.get('permissions_form').value['set_permissions']
|
|
||||||
} else {
|
|
||||||
changes[key] = this.documentForm.get(key).value
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
return changes
|
|
||||||
}
|
|
||||||
|
|
||||||
save(close: boolean = false) {
|
save(close: boolean = false) {
|
||||||
this.networkActive = true
|
this.networkActive = true
|
||||||
;(document.activeElement as HTMLElement)?.dispatchEvent(new Event('change'))
|
;(document.activeElement as HTMLElement)?.dispatchEvent(new Event('change'))
|
||||||
this.documentsService
|
this.documentsService
|
||||||
.patch(this.getChangedFields())
|
.update(this.document)
|
||||||
.pipe(first())
|
.pipe(first())
|
||||||
.subscribe({
|
.subscribe({
|
||||||
next: (docValues) => {
|
next: (docValues) => {
|
||||||
@ -845,18 +824,11 @@ export class DocumentDetailComponent
|
|||||||
},
|
},
|
||||||
error: (error) => {
|
error: (error) => {
|
||||||
this.networkActive = false
|
this.networkActive = false
|
||||||
const canEdit =
|
if (!this.userCanEdit) {
|
||||||
this.permissionsService.currentUserHasObjectPermissions(
|
|
||||||
PermissionAction.Change,
|
|
||||||
this.document
|
|
||||||
)
|
|
||||||
if (!canEdit) {
|
|
||||||
// document was 'given away'
|
|
||||||
this.openDocumentService.setDirty(this.document, false)
|
|
||||||
this.toastService.showInfo(
|
this.toastService.showInfo(
|
||||||
$localize`Document "${this.document.title}" saved successfully.`
|
$localize`Document "${this.document.title}" saved successfully.`
|
||||||
)
|
)
|
||||||
this.close()
|
close && this.close()
|
||||||
} else {
|
} else {
|
||||||
this.error = error.error
|
this.error = error.error
|
||||||
this.toastService.showError(
|
this.toastService.showError(
|
||||||
@ -872,7 +844,7 @@ export class DocumentDetailComponent
|
|||||||
this.networkActive = true
|
this.networkActive = true
|
||||||
this.store.next(this.documentForm.value)
|
this.store.next(this.documentForm.value)
|
||||||
this.documentsService
|
this.documentsService
|
||||||
.patch(this.getChangedFields())
|
.update(this.document)
|
||||||
.pipe(
|
.pipe(
|
||||||
switchMap((updateResult) => {
|
switchMap((updateResult) => {
|
||||||
return this.documentListViewService
|
return this.documentListViewService
|
||||||
@ -1016,46 +988,44 @@ export class DocumentDetailComponent
|
|||||||
this.documentId,
|
this.documentId,
|
||||||
original
|
original
|
||||||
)
|
)
|
||||||
this.http
|
this.http.get(downloadUrl, { responseType: 'blob' }).subscribe({
|
||||||
.get(downloadUrl, { observe: 'response', responseType: 'blob' })
|
next: (blob) => {
|
||||||
.subscribe({
|
this.downloading = false
|
||||||
next: (response: HttpResponse<Blob>) => {
|
const blobParts = [blob]
|
||||||
const contentDisposition = response.headers.get('Content-Disposition')
|
const file = new File(
|
||||||
const filename =
|
blobParts,
|
||||||
getFilenameFromContentDisposition(contentDisposition) ||
|
original
|
||||||
this.document.title
|
? this.document.original_file_name
|
||||||
const blob = new Blob([response.body], {
|
: this.document.archived_file_name,
|
||||||
type: response.body.type,
|
{
|
||||||
})
|
type: original ? this.document.mime_type : 'application/pdf',
|
||||||
this.downloading = false
|
|
||||||
const file = new File([blob], filename, {
|
|
||||||
type: response.body.type,
|
|
||||||
})
|
|
||||||
if (
|
|
||||||
!this.deviceDetectorService.isDesktop() &&
|
|
||||||
navigator.canShare &&
|
|
||||||
navigator.canShare({ files: [file] })
|
|
||||||
) {
|
|
||||||
navigator.share({
|
|
||||||
files: [file],
|
|
||||||
})
|
|
||||||
} else {
|
|
||||||
const url = URL.createObjectURL(blob)
|
|
||||||
const a = document.createElement('a')
|
|
||||||
a.href = url
|
|
||||||
a.download = filename
|
|
||||||
a.click()
|
|
||||||
URL.revokeObjectURL(url)
|
|
||||||
}
|
}
|
||||||
},
|
)
|
||||||
error: (error) => {
|
if (
|
||||||
this.downloading = false
|
!this.deviceDetectorService.isDesktop() &&
|
||||||
this.toastService.showError(
|
navigator.canShare &&
|
||||||
$localize`Error downloading document`,
|
navigator.canShare({ files: [file] })
|
||||||
error
|
) {
|
||||||
)
|
navigator.share({
|
||||||
},
|
files: [file],
|
||||||
})
|
})
|
||||||
|
} else {
|
||||||
|
const url = URL.createObjectURL(blob)
|
||||||
|
const a = document.createElement('a')
|
||||||
|
a.href = url
|
||||||
|
a.download = this.document.title
|
||||||
|
a.click()
|
||||||
|
URL.revokeObjectURL(url)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
error: (error) => {
|
||||||
|
this.downloading = false
|
||||||
|
this.toastService.showError(
|
||||||
|
$localize`Error downloading document`,
|
||||||
|
error
|
||||||
|
)
|
||||||
|
},
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
hasNext() {
|
hasNext() {
|
||||||
@ -1119,10 +1089,12 @@ export class DocumentDetailComponent
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
get currentZoom() {
|
isZoomSelected(setting: ZoomSetting): boolean {
|
||||||
if (this.previewZoomScale === ZoomSetting.PageFit) {
|
if (this.previewZoomScale === ZoomSetting.PageFit) {
|
||||||
return ZoomSetting.PageFit
|
return setting === ZoomSetting.PageFit
|
||||||
} else return this.previewZoomSetting
|
}
|
||||||
|
|
||||||
|
return this.previewZoomSetting === setting
|
||||||
}
|
}
|
||||||
|
|
||||||
getZoomSettingTitle(setting: ZoomSetting): string {
|
getZoomSettingTitle(setting: ZoomSetting): string {
|
||||||
@ -1307,7 +1279,9 @@ export class DocumentDetailComponent
|
|||||||
this.document.custom_fields?.forEach((fieldInstance) => {
|
this.document.custom_fields?.forEach((fieldInstance) => {
|
||||||
this.customFieldFormFields.push(
|
this.customFieldFormFields.push(
|
||||||
new FormGroup({
|
new FormGroup({
|
||||||
field: new FormControl(fieldInstance.field),
|
field: new FormControl(
|
||||||
|
this.getCustomFieldFromInstance(fieldInstance)?.id
|
||||||
|
),
|
||||||
value: new FormControl(fieldInstance.value),
|
value: new FormControl(fieldInstance.value),
|
||||||
}),
|
}),
|
||||||
{ emitEvent }
|
{ emitEvent }
|
||||||
@ -1323,8 +1297,6 @@ export class DocumentDetailComponent
|
|||||||
created: new Date(),
|
created: new Date(),
|
||||||
})
|
})
|
||||||
this.updateFormForCustomFields(true)
|
this.updateFormForCustomFields(true)
|
||||||
this.documentForm.get('custom_fields').markAsDirty()
|
|
||||||
this.documentForm.updateValueAndValidity()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public removeField(fieldInstance: CustomFieldInstance) {
|
public removeField(fieldInstance: CustomFieldInstance) {
|
||||||
@ -1333,7 +1305,6 @@ export class DocumentDetailComponent
|
|||||||
1
|
1
|
||||||
)
|
)
|
||||||
this.updateFormForCustomFields(true)
|
this.updateFormForCustomFields(true)
|
||||||
this.documentForm.get('custom_fields').markAsDirty()
|
|
||||||
this.documentForm.updateValueAndValidity()
|
this.documentForm.updateValueAndValidity()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -20,8 +20,10 @@
|
|||||||
@if (permissionService.currentUserCan(PermissionAction.View, PermissionType.Tag)) {
|
@if (permissionService.currentUserCan(PermissionAction.View, PermissionType.Tag)) {
|
||||||
<pngx-filterable-dropdown title="Tags" icon="tag-fill" i18n-title
|
<pngx-filterable-dropdown title="Tags" icon="tag-fill" i18n-title
|
||||||
filterPlaceholder="Filter tags" i18n-filterPlaceholder
|
filterPlaceholder="Filter tags" i18n-filterPlaceholder
|
||||||
|
[items]="tags"
|
||||||
[disabled]="!userCanEditAll || disabled"
|
[disabled]="!userCanEditAll || disabled"
|
||||||
[editing]="true"
|
[editing]="true"
|
||||||
|
[manyToOne]="true"
|
||||||
[applyOnClose]="applyOnClose"
|
[applyOnClose]="applyOnClose"
|
||||||
[createRef]="createTag.bind(this)"
|
[createRef]="createTag.bind(this)"
|
||||||
(opened)="openTagsDropdown()"
|
(opened)="openTagsDropdown()"
|
||||||
@ -34,6 +36,7 @@
|
|||||||
@if (permissionService.currentUserCan(PermissionAction.View, PermissionType.Correspondent)) {
|
@if (permissionService.currentUserCan(PermissionAction.View, PermissionType.Correspondent)) {
|
||||||
<pngx-filterable-dropdown title="Correspondent" icon="person-fill" i18n-title
|
<pngx-filterable-dropdown title="Correspondent" icon="person-fill" i18n-title
|
||||||
filterPlaceholder="Filter correspondents" i18n-filterPlaceholder
|
filterPlaceholder="Filter correspondents" i18n-filterPlaceholder
|
||||||
|
[items]="correspondents"
|
||||||
[disabled]="!userCanEditAll || disabled"
|
[disabled]="!userCanEditAll || disabled"
|
||||||
[editing]="true"
|
[editing]="true"
|
||||||
[applyOnClose]="applyOnClose"
|
[applyOnClose]="applyOnClose"
|
||||||
@ -48,6 +51,7 @@
|
|||||||
@if (permissionService.currentUserCan(PermissionAction.View, PermissionType.DocumentType)) {
|
@if (permissionService.currentUserCan(PermissionAction.View, PermissionType.DocumentType)) {
|
||||||
<pngx-filterable-dropdown title="Document type" icon="file-earmark-fill" i18n-title
|
<pngx-filterable-dropdown title="Document type" icon="file-earmark-fill" i18n-title
|
||||||
filterPlaceholder="Filter document types" i18n-filterPlaceholder
|
filterPlaceholder="Filter document types" i18n-filterPlaceholder
|
||||||
|
[items]="documentTypes"
|
||||||
[disabled]="!userCanEditAll || disabled"
|
[disabled]="!userCanEditAll || disabled"
|
||||||
[editing]="true"
|
[editing]="true"
|
||||||
[applyOnClose]="applyOnClose"
|
[applyOnClose]="applyOnClose"
|
||||||
@ -62,6 +66,7 @@
|
|||||||
@if (permissionService.currentUserCan(PermissionAction.View, PermissionType.StoragePath)) {
|
@if (permissionService.currentUserCan(PermissionAction.View, PermissionType.StoragePath)) {
|
||||||
<pngx-filterable-dropdown title="Storage path" icon="folder-fill" i18n-title
|
<pngx-filterable-dropdown title="Storage path" icon="folder-fill" i18n-title
|
||||||
filterPlaceholder="Filter storage paths" i18n-filterPlaceholder
|
filterPlaceholder="Filter storage paths" i18n-filterPlaceholder
|
||||||
|
[items]="storagePaths"
|
||||||
[disabled]="!userCanEditAll || disabled"
|
[disabled]="!userCanEditAll || disabled"
|
||||||
[editing]="true"
|
[editing]="true"
|
||||||
[applyOnClose]="applyOnClose"
|
[applyOnClose]="applyOnClose"
|
||||||
@ -76,8 +81,10 @@
|
|||||||
@if (permissionService.currentUserCan(PermissionAction.View, PermissionType.CustomField)) {
|
@if (permissionService.currentUserCan(PermissionAction.View, PermissionType.CustomField)) {
|
||||||
<pngx-filterable-dropdown title="Custom fields" icon="ui-radios" i18n-title
|
<pngx-filterable-dropdown title="Custom fields" icon="ui-radios" i18n-title
|
||||||
filterPlaceholder="Filter custom fields" i18n-filterPlaceholder
|
filterPlaceholder="Filter custom fields" i18n-filterPlaceholder
|
||||||
|
[items]="customFields"
|
||||||
[disabled]="!userCanEditAll"
|
[disabled]="!userCanEditAll"
|
||||||
[editing]="true"
|
[editing]="true"
|
||||||
|
[manyToOne]="true"
|
||||||
[applyOnClose]="applyOnClose"
|
[applyOnClose]="applyOnClose"
|
||||||
[createRef]="createCustomField.bind(this)"
|
[createRef]="createCustomField.bind(this)"
|
||||||
(opened)="openCustomFieldsDropdown()"
|
(opened)="openCustomFieldsDropdown()"
|
||||||
|
@ -1150,10 +1150,10 @@ describe('BulkEditorComponent', () => {
|
|||||||
|
|
||||||
it('should not attempt to retrieve objects if user does not have permissions', () => {
|
it('should not attempt to retrieve objects if user does not have permissions', () => {
|
||||||
jest.spyOn(permissionsService, 'currentUserCan').mockReturnValue(true)
|
jest.spyOn(permissionsService, 'currentUserCan').mockReturnValue(true)
|
||||||
expect(component.tagSelectionModel.items.length).toEqual(0)
|
expect(component.tags).toBeUndefined()
|
||||||
expect(component.correspondentSelectionModel.items.length).toEqual(0)
|
expect(component.correspondents).toBeUndefined()
|
||||||
expect(component.documentTypeSelectionModel.items.length).toEqual(0)
|
expect(component.documentTypes).toBeUndefined()
|
||||||
expect(component.storagePathsSelectionModel.items.length).toEqual(0)
|
expect(component.storagePaths).toBeUndefined()
|
||||||
httpTestingController.expectNone(`${environment.apiBaseUrl}documents/tags/`)
|
httpTestingController.expectNone(`${environment.apiBaseUrl}documents/tags/`)
|
||||||
httpTestingController.expectNone(
|
httpTestingController.expectNone(
|
||||||
`${environment.apiBaseUrl}documents/correspondents/`
|
`${environment.apiBaseUrl}documents/correspondents/`
|
||||||
@ -1204,9 +1204,7 @@ describe('BulkEditorComponent', () => {
|
|||||||
expect(tagListAllSpy).toHaveBeenCalled()
|
expect(tagListAllSpy).toHaveBeenCalled()
|
||||||
|
|
||||||
expect(tagSelectionModelToggleSpy).toHaveBeenCalledWith(newTag.id)
|
expect(tagSelectionModelToggleSpy).toHaveBeenCalledWith(newTag.id)
|
||||||
expect(component.tagSelectionModel.items).toEqual(
|
expect(component.tags).toEqual(tags.results)
|
||||||
[{ id: null, name: 'Not assigned' }].concat(tags.results as any)
|
|
||||||
)
|
|
||||||
})
|
})
|
||||||
|
|
||||||
it('should support create new correspondent', () => {
|
it('should support create new correspondent', () => {
|
||||||
@ -1253,9 +1251,7 @@ describe('BulkEditorComponent', () => {
|
|||||||
expect(correspondentSelectionModelToggleSpy).toHaveBeenCalledWith(
|
expect(correspondentSelectionModelToggleSpy).toHaveBeenCalledWith(
|
||||||
newCorrespondent.id
|
newCorrespondent.id
|
||||||
)
|
)
|
||||||
expect(component.correspondentSelectionModel.items).toEqual(
|
expect(component.correspondents).toEqual(correspondents.results)
|
||||||
[{ id: null, name: 'Not assigned' }].concat(correspondents.results as any)
|
|
||||||
)
|
|
||||||
})
|
})
|
||||||
|
|
||||||
it('should support create new document type', () => {
|
it('should support create new document type', () => {
|
||||||
@ -1299,9 +1295,7 @@ describe('BulkEditorComponent', () => {
|
|||||||
expect(documentTypeSelectionModelToggleSpy).toHaveBeenCalledWith(
|
expect(documentTypeSelectionModelToggleSpy).toHaveBeenCalledWith(
|
||||||
newDocumentType.id
|
newDocumentType.id
|
||||||
)
|
)
|
||||||
expect(component.documentTypeSelectionModel.items).toEqual(
|
expect(component.documentTypes).toEqual(documentTypes.results)
|
||||||
[{ id: null, name: 'Not assigned' }].concat(documentTypes.results as any)
|
|
||||||
)
|
|
||||||
})
|
})
|
||||||
|
|
||||||
it('should support create new storage path', () => {
|
it('should support create new storage path', () => {
|
||||||
@ -1345,9 +1339,7 @@ describe('BulkEditorComponent', () => {
|
|||||||
expect(storagePathsSelectionModelToggleSpy).toHaveBeenCalledWith(
|
expect(storagePathsSelectionModelToggleSpy).toHaveBeenCalledWith(
|
||||||
newStoragePath.id
|
newStoragePath.id
|
||||||
)
|
)
|
||||||
expect(component.storagePathsSelectionModel.items).toEqual(
|
expect(component.storagePaths).toEqual(storagePaths.results)
|
||||||
[{ id: null, name: 'Not assigned' }].concat(storagePaths.results as any)
|
|
||||||
)
|
|
||||||
})
|
})
|
||||||
|
|
||||||
it('should support create new custom field', () => {
|
it('should support create new custom field', () => {
|
||||||
@ -1399,9 +1391,7 @@ describe('BulkEditorComponent', () => {
|
|||||||
expect(customFieldsSelectionModelToggleSpy).toHaveBeenCalledWith(
|
expect(customFieldsSelectionModelToggleSpy).toHaveBeenCalledWith(
|
||||||
newCustomField.id
|
newCustomField.id
|
||||||
)
|
)
|
||||||
expect(component.customFieldsSelectionModel.items).toEqual(
|
expect(component.customFields).toEqual(customFields.results)
|
||||||
[{ id: null, name: 'Not assigned' }].concat(customFields.results as any)
|
|
||||||
)
|
|
||||||
})
|
})
|
||||||
|
|
||||||
it('should open the bulk edit custom field values dialog with correct parameters', () => {
|
it('should open the bulk edit custom field values dialog with correct parameters', () => {
|
||||||
@ -1426,17 +1416,17 @@ describe('BulkEditorComponent', () => {
|
|||||||
const toastServiceShowErrorSpy = jest.spyOn(toastService, 'showError')
|
const toastServiceShowErrorSpy = jest.spyOn(toastService, 'showError')
|
||||||
const listReloadSpy = jest.spyOn(documentListViewService, 'reload')
|
const listReloadSpy = jest.spyOn(documentListViewService, 'reload')
|
||||||
|
|
||||||
component.customFieldsSelectionModel.items = [
|
component.customFields = [
|
||||||
{ id: 1, name: 'Custom Field 1', data_type: CustomFieldDataType.String },
|
{ id: 1, name: 'Custom Field 1', data_type: CustomFieldDataType.String },
|
||||||
{ id: 2, name: 'Custom Field 2', data_type: CustomFieldDataType.String },
|
{ id: 2, name: 'Custom Field 2', data_type: CustomFieldDataType.String },
|
||||||
] as any
|
]
|
||||||
|
|
||||||
component.setCustomFieldValues({
|
component.setCustomFieldValues({
|
||||||
itemsToAdd: [{ id: 1 }, { id: 2 }],
|
itemsToAdd: [{ id: 1 }, { id: 2 }],
|
||||||
itemsToRemove: [1],
|
itemsToRemove: [1],
|
||||||
} as any)
|
} as any)
|
||||||
|
|
||||||
expect(modal.componentInstance.customFields.length).toEqual(2)
|
expect(modal.componentInstance.customFields).toEqual(component.customFields)
|
||||||
expect(modal.componentInstance.fieldsToAddIds).toEqual([1, 2])
|
expect(modal.componentInstance.fieldsToAddIds).toEqual([1, 2])
|
||||||
expect(modal.componentInstance.documents).toEqual([3, 4])
|
expect(modal.componentInstance.documents).toEqual([3, 4])
|
||||||
|
|
||||||
|
@ -14,8 +14,12 @@ import { saveAs } from 'file-saver'
|
|||||||
import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
|
import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
|
||||||
import { first, map, Subject, switchMap, takeUntil } from 'rxjs'
|
import { first, map, Subject, switchMap, takeUntil } from 'rxjs'
|
||||||
import { ConfirmDialogComponent } from 'src/app/components/common/confirm-dialog/confirm-dialog.component'
|
import { ConfirmDialogComponent } from 'src/app/components/common/confirm-dialog/confirm-dialog.component'
|
||||||
|
import { Correspondent } from 'src/app/data/correspondent'
|
||||||
import { CustomField } from 'src/app/data/custom-field'
|
import { CustomField } from 'src/app/data/custom-field'
|
||||||
|
import { DocumentType } from 'src/app/data/document-type'
|
||||||
import { MatchingModel } from 'src/app/data/matching-model'
|
import { MatchingModel } from 'src/app/data/matching-model'
|
||||||
|
import { StoragePath } from 'src/app/data/storage-path'
|
||||||
|
import { Tag } from 'src/app/data/tag'
|
||||||
import { SETTINGS_KEYS } from 'src/app/data/ui-settings'
|
import { SETTINGS_KEYS } from 'src/app/data/ui-settings'
|
||||||
import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
|
import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
|
||||||
import { DocumentListViewService } from 'src/app/services/document-list-view.service'
|
import { DocumentListViewService } from 'src/app/services/document-list-view.service'
|
||||||
@ -71,11 +75,17 @@ export class BulkEditorComponent
|
|||||||
extends ComponentWithPermissions
|
extends ComponentWithPermissions
|
||||||
implements OnInit, OnDestroy
|
implements OnInit, OnDestroy
|
||||||
{
|
{
|
||||||
tagSelectionModel = new FilterableDropdownSelectionModel(true)
|
tags: Tag[]
|
||||||
|
correspondents: Correspondent[]
|
||||||
|
documentTypes: DocumentType[]
|
||||||
|
storagePaths: StoragePath[]
|
||||||
|
customFields: CustomField[]
|
||||||
|
|
||||||
|
tagSelectionModel = new FilterableDropdownSelectionModel()
|
||||||
correspondentSelectionModel = new FilterableDropdownSelectionModel()
|
correspondentSelectionModel = new FilterableDropdownSelectionModel()
|
||||||
documentTypeSelectionModel = new FilterableDropdownSelectionModel()
|
documentTypeSelectionModel = new FilterableDropdownSelectionModel()
|
||||||
storagePathsSelectionModel = new FilterableDropdownSelectionModel()
|
storagePathsSelectionModel = new FilterableDropdownSelectionModel()
|
||||||
customFieldsSelectionModel = new FilterableDropdownSelectionModel(true)
|
customFieldsSelectionModel = new FilterableDropdownSelectionModel()
|
||||||
tagDocumentCounts: SelectionDataItem[]
|
tagDocumentCounts: SelectionDataItem[]
|
||||||
correspondentDocumentCounts: SelectionDataItem[]
|
correspondentDocumentCounts: SelectionDataItem[]
|
||||||
documentTypeDocumentCounts: SelectionDataItem[]
|
documentTypeDocumentCounts: SelectionDataItem[]
|
||||||
@ -166,7 +176,7 @@ export class BulkEditorComponent
|
|||||||
this.tagService
|
this.tagService
|
||||||
.listAll()
|
.listAll()
|
||||||
.pipe(first())
|
.pipe(first())
|
||||||
.subscribe((result) => (this.tagSelectionModel.items = result.results))
|
.subscribe((result) => (this.tags = result.results))
|
||||||
}
|
}
|
||||||
if (
|
if (
|
||||||
this.permissionService.currentUserCan(
|
this.permissionService.currentUserCan(
|
||||||
@ -177,9 +187,7 @@ export class BulkEditorComponent
|
|||||||
this.correspondentService
|
this.correspondentService
|
||||||
.listAll()
|
.listAll()
|
||||||
.pipe(first())
|
.pipe(first())
|
||||||
.subscribe(
|
.subscribe((result) => (this.correspondents = result.results))
|
||||||
(result) => (this.correspondentSelectionModel.items = result.results)
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
if (
|
if (
|
||||||
this.permissionService.currentUserCan(
|
this.permissionService.currentUserCan(
|
||||||
@ -190,9 +198,7 @@ export class BulkEditorComponent
|
|||||||
this.documentTypeService
|
this.documentTypeService
|
||||||
.listAll()
|
.listAll()
|
||||||
.pipe(first())
|
.pipe(first())
|
||||||
.subscribe(
|
.subscribe((result) => (this.documentTypes = result.results))
|
||||||
(result) => (this.documentTypeSelectionModel.items = result.results)
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
if (
|
if (
|
||||||
this.permissionService.currentUserCan(
|
this.permissionService.currentUserCan(
|
||||||
@ -203,9 +209,7 @@ export class BulkEditorComponent
|
|||||||
this.storagePathService
|
this.storagePathService
|
||||||
.listAll()
|
.listAll()
|
||||||
.pipe(first())
|
.pipe(first())
|
||||||
.subscribe(
|
.subscribe((result) => (this.storagePaths = result.results))
|
||||||
(result) => (this.storagePathsSelectionModel.items = result.results)
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
if (
|
if (
|
||||||
this.permissionService.currentUserCan(
|
this.permissionService.currentUserCan(
|
||||||
@ -216,9 +220,7 @@ export class BulkEditorComponent
|
|||||||
this.customFieldService
|
this.customFieldService
|
||||||
.listAll()
|
.listAll()
|
||||||
.pipe(first())
|
.pipe(first())
|
||||||
.subscribe(
|
.subscribe((result) => (this.customFields = result.results))
|
||||||
(result) => (this.customFieldsSelectionModel.items = result.results)
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
this.downloadForm
|
this.downloadForm
|
||||||
@ -649,7 +651,7 @@ export class BulkEditorComponent
|
|||||||
)
|
)
|
||||||
.pipe(takeUntil(this.unsubscribeNotifier))
|
.pipe(takeUntil(this.unsubscribeNotifier))
|
||||||
.subscribe(({ newTag, tags }) => {
|
.subscribe(({ newTag, tags }) => {
|
||||||
this.tagSelectionModel.items = tags.results
|
this.tags = tags.results
|
||||||
this.tagSelectionModel.toggle(newTag.id)
|
this.tagSelectionModel.toggle(newTag.id)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@ -672,7 +674,7 @@ export class BulkEditorComponent
|
|||||||
)
|
)
|
||||||
.pipe(takeUntil(this.unsubscribeNotifier))
|
.pipe(takeUntil(this.unsubscribeNotifier))
|
||||||
.subscribe(({ newCorrespondent, correspondents }) => {
|
.subscribe(({ newCorrespondent, correspondents }) => {
|
||||||
this.correspondentSelectionModel.items = correspondents.results
|
this.correspondents = correspondents.results
|
||||||
this.correspondentSelectionModel.toggle(newCorrespondent.id)
|
this.correspondentSelectionModel.toggle(newCorrespondent.id)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@ -693,7 +695,7 @@ export class BulkEditorComponent
|
|||||||
)
|
)
|
||||||
.pipe(takeUntil(this.unsubscribeNotifier))
|
.pipe(takeUntil(this.unsubscribeNotifier))
|
||||||
.subscribe(({ newDocumentType, documentTypes }) => {
|
.subscribe(({ newDocumentType, documentTypes }) => {
|
||||||
this.documentTypeSelectionModel.items = documentTypes.results
|
this.documentTypes = documentTypes.results
|
||||||
this.documentTypeSelectionModel.toggle(newDocumentType.id)
|
this.documentTypeSelectionModel.toggle(newDocumentType.id)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@ -714,7 +716,7 @@ export class BulkEditorComponent
|
|||||||
)
|
)
|
||||||
.pipe(takeUntil(this.unsubscribeNotifier))
|
.pipe(takeUntil(this.unsubscribeNotifier))
|
||||||
.subscribe(({ newStoragePath, storagePaths }) => {
|
.subscribe(({ newStoragePath, storagePaths }) => {
|
||||||
this.storagePathsSelectionModel.items = storagePaths.results
|
this.storagePaths = storagePaths.results
|
||||||
this.storagePathsSelectionModel.toggle(newStoragePath.id)
|
this.storagePathsSelectionModel.toggle(newStoragePath.id)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@ -735,7 +737,7 @@ export class BulkEditorComponent
|
|||||||
)
|
)
|
||||||
.pipe(takeUntil(this.unsubscribeNotifier))
|
.pipe(takeUntil(this.unsubscribeNotifier))
|
||||||
.subscribe(({ newCustomField, customFields }) => {
|
.subscribe(({ newCustomField, customFields }) => {
|
||||||
this.customFieldsSelectionModel.items = customFields.results
|
this.customFields = customFields.results
|
||||||
this.customFieldsSelectionModel.toggle(newCustomField.id)
|
this.customFieldsSelectionModel.toggle(newCustomField.id)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@ -873,9 +875,7 @@ export class BulkEditorComponent
|
|||||||
})
|
})
|
||||||
const dialog =
|
const dialog =
|
||||||
modal.componentInstance as CustomFieldsBulkEditDialogComponent
|
modal.componentInstance as CustomFieldsBulkEditDialogComponent
|
||||||
dialog.customFields = (
|
dialog.customFields = this.customFields
|
||||||
this.customFieldsSelectionModel.items as CustomField[]
|
|
||||||
).filter((f) => f.id !== null)
|
|
||||||
dialog.fieldsToAddIds = changedCustomFields.itemsToAdd.map(
|
dialog.fieldsToAddIds = changedCustomFields.itemsToAdd.map(
|
||||||
(item) => item.id
|
(item) => item.id
|
||||||
)
|
)
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="col col-md-10">
|
<div class="col">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<div class="d-flex justify-content-between align-items-center">
|
<div class="d-flex justify-content-between align-items-center">
|
||||||
<h5 class="card-title w-100">
|
<h5 class="card-title w-100">
|
||||||
|
@ -35,9 +35,11 @@
|
|||||||
<div class="col-auto">
|
<div class="col-auto">
|
||||||
<div class="d-flex flex-wrap gap-3">
|
<div class="d-flex flex-wrap gap-3">
|
||||||
<div class="d-flex flex-wrap gap-2">
|
<div class="d-flex flex-wrap gap-2">
|
||||||
@if (permissionsService.currentUserCan(PermissionAction.View, PermissionType.Tag) && tagSelectionModel.items.length > 0) {
|
@if (permissionsService.currentUserCan(PermissionAction.View, PermissionType.Tag) && tags.length > 0) {
|
||||||
<pngx-filterable-dropdown class="flex-fill fade" [class.show]="show" title="Tags" icon="tag-fill" i18n-title
|
<pngx-filterable-dropdown class="flex-fill fade" [class.show]="show" title="Tags" icon="tag-fill" i18n-title
|
||||||
filterPlaceholder="Filter tags" i18n-filterPlaceholder
|
filterPlaceholder="Filter tags" i18n-filterPlaceholder
|
||||||
|
[items]="tags"
|
||||||
|
[manyToOne]="true"
|
||||||
[(selectionModel)]="tagSelectionModel"
|
[(selectionModel)]="tagSelectionModel"
|
||||||
(selectionModelChange)="updateRules()"
|
(selectionModelChange)="updateRules()"
|
||||||
(opened)="onTagsDropdownOpen()"
|
(opened)="onTagsDropdownOpen()"
|
||||||
@ -46,9 +48,10 @@
|
|||||||
[disabled]="disabled"
|
[disabled]="disabled"
|
||||||
shortcutKey="t"></pngx-filterable-dropdown>
|
shortcutKey="t"></pngx-filterable-dropdown>
|
||||||
}
|
}
|
||||||
@if (permissionsService.currentUserCan(PermissionAction.View, PermissionType.Correspondent) && correspondentSelectionModel.items.length > 0) {
|
@if (permissionsService.currentUserCan(PermissionAction.View, PermissionType.Correspondent) && correspondents.length > 0) {
|
||||||
<pngx-filterable-dropdown class="flex-fill fade" [class.show]="show" title="Correspondent" icon="person-fill" i18n-title
|
<pngx-filterable-dropdown class="flex-fill fade" [class.show]="show" title="Correspondent" icon="person-fill" i18n-title
|
||||||
filterPlaceholder="Filter correspondents" i18n-filterPlaceholder
|
filterPlaceholder="Filter correspondents" i18n-filterPlaceholder
|
||||||
|
[items]="correspondents"
|
||||||
[(selectionModel)]="correspondentSelectionModel"
|
[(selectionModel)]="correspondentSelectionModel"
|
||||||
(selectionModelChange)="updateRules()"
|
(selectionModelChange)="updateRules()"
|
||||||
(opened)="onCorrespondentDropdownOpen()"
|
(opened)="onCorrespondentDropdownOpen()"
|
||||||
@ -57,9 +60,10 @@
|
|||||||
[disabled]="disabled"
|
[disabled]="disabled"
|
||||||
shortcutKey="y"></pngx-filterable-dropdown>
|
shortcutKey="y"></pngx-filterable-dropdown>
|
||||||
}
|
}
|
||||||
@if (permissionsService.currentUserCan(PermissionAction.View, PermissionType.DocumentType) && documentTypeSelectionModel.items.length > 0) {
|
@if (permissionsService.currentUserCan(PermissionAction.View, PermissionType.DocumentType) && documentTypes.length > 0) {
|
||||||
<pngx-filterable-dropdown class="flex-fill fade" [class.show]="show" title="Document type" icon="file-earmark-fill" i18n-title
|
<pngx-filterable-dropdown class="flex-fill fade" [class.show]="show" title="Document type" icon="file-earmark-fill" i18n-title
|
||||||
filterPlaceholder="Filter document types" i18n-filterPlaceholder
|
filterPlaceholder="Filter document types" i18n-filterPlaceholder
|
||||||
|
[items]="documentTypes"
|
||||||
[(selectionModel)]="documentTypeSelectionModel"
|
[(selectionModel)]="documentTypeSelectionModel"
|
||||||
(selectionModelChange)="updateRules()"
|
(selectionModelChange)="updateRules()"
|
||||||
(opened)="onDocumentTypeDropdownOpen()"
|
(opened)="onDocumentTypeDropdownOpen()"
|
||||||
@ -68,9 +72,10 @@
|
|||||||
[disabled]="disabled"
|
[disabled]="disabled"
|
||||||
shortcutKey="u"></pngx-filterable-dropdown>
|
shortcutKey="u"></pngx-filterable-dropdown>
|
||||||
}
|
}
|
||||||
@if (permissionsService.currentUserCan(PermissionAction.View, PermissionType.StoragePath) && storagePathSelectionModel.items.length > 0) {
|
@if (permissionsService.currentUserCan(PermissionAction.View, PermissionType.StoragePath) && storagePaths.length > 0) {
|
||||||
<pngx-filterable-dropdown class="flex-fill fade" [class.show]="show" title="Storage path" icon="folder-fill" i18n-title
|
<pngx-filterable-dropdown class="flex-fill fade" [class.show]="show" title="Storage path" icon="folder-fill" i18n-title
|
||||||
filterPlaceholder="Filter storage paths" i18n-filterPlaceholder
|
filterPlaceholder="Filter storage paths" i18n-filterPlaceholder
|
||||||
|
[items]="storagePaths"
|
||||||
[(selectionModel)]="storagePathSelectionModel"
|
[(selectionModel)]="storagePathSelectionModel"
|
||||||
(selectionModelChange)="updateRules()"
|
(selectionModelChange)="updateRules()"
|
||||||
(opened)="onStoragePathDropdownOpen()"
|
(opened)="onStoragePathDropdownOpen()"
|
||||||
|
@ -69,7 +69,6 @@ import {
|
|||||||
FILTER_STORAGE_PATH,
|
FILTER_STORAGE_PATH,
|
||||||
FILTER_TITLE,
|
FILTER_TITLE,
|
||||||
FILTER_TITLE_CONTENT,
|
FILTER_TITLE_CONTENT,
|
||||||
NEGATIVE_NULL_FILTER_VALUE,
|
|
||||||
} from 'src/app/data/filter-rule-type'
|
} from 'src/app/data/filter-rule-type'
|
||||||
import { StoragePath } from 'src/app/data/storage-path'
|
import { StoragePath } from 'src/app/data/storage-path'
|
||||||
import { Tag } from 'src/app/data/tag'
|
import { Tag } from 'src/app/data/tag'
|
||||||
@ -672,6 +671,9 @@ describe('FilterEditorComponent', () => {
|
|||||||
value: '12',
|
value: '12',
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
expect(component.correspondentSelectionModel.logicalOperator).toEqual(
|
||||||
|
LogicalOperator.Or
|
||||||
|
)
|
||||||
expect(component.correspondentSelectionModel.intersection).toEqual(
|
expect(component.correspondentSelectionModel.intersection).toEqual(
|
||||||
Intersection.Include
|
Intersection.Include
|
||||||
)
|
)
|
||||||
@ -679,19 +681,6 @@ describe('FilterEditorComponent', () => {
|
|||||||
correspondents[0],
|
correspondents[0],
|
||||||
])
|
])
|
||||||
component.toggleCorrespondent(12) // coverage
|
component.toggleCorrespondent(12) // coverage
|
||||||
|
|
||||||
component.filterRules = [
|
|
||||||
{
|
|
||||||
rule_type: FILTER_CORRESPONDENT,
|
|
||||||
value: NEGATIVE_NULL_FILTER_VALUE.toString(),
|
|
||||||
},
|
|
||||||
]
|
|
||||||
expect(component.correspondentSelectionModel.intersection).toEqual(
|
|
||||||
Intersection.Exclude
|
|
||||||
)
|
|
||||||
expect(component.correspondentSelectionModel.getExcludedItems()).toEqual([
|
|
||||||
{ id: NEGATIVE_NULL_FILTER_VALUE, name: 'Not assigned' },
|
|
||||||
])
|
|
||||||
}))
|
}))
|
||||||
|
|
||||||
it('should ingest filter rules for has any of correspondents', fakeAsync(() => {
|
it('should ingest filter rules for has any of correspondents', fakeAsync(() => {
|
||||||
@ -765,6 +754,9 @@ describe('FilterEditorComponent', () => {
|
|||||||
value: '22',
|
value: '22',
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
expect(component.documentTypeSelectionModel.logicalOperator).toEqual(
|
||||||
|
LogicalOperator.Or
|
||||||
|
)
|
||||||
expect(component.documentTypeSelectionModel.intersection).toEqual(
|
expect(component.documentTypeSelectionModel.intersection).toEqual(
|
||||||
Intersection.Include
|
Intersection.Include
|
||||||
)
|
)
|
||||||
@ -772,19 +764,6 @@ describe('FilterEditorComponent', () => {
|
|||||||
document_types[0],
|
document_types[0],
|
||||||
])
|
])
|
||||||
component.toggleDocumentType(22) // coverage
|
component.toggleDocumentType(22) // coverage
|
||||||
|
|
||||||
component.filterRules = [
|
|
||||||
{
|
|
||||||
rule_type: FILTER_DOCUMENT_TYPE,
|
|
||||||
value: NEGATIVE_NULL_FILTER_VALUE.toString(),
|
|
||||||
},
|
|
||||||
]
|
|
||||||
expect(component.documentTypeSelectionModel.intersection).toEqual(
|
|
||||||
Intersection.Exclude
|
|
||||||
)
|
|
||||||
expect(component.documentTypeSelectionModel.getExcludedItems()).toEqual([
|
|
||||||
{ id: NEGATIVE_NULL_FILTER_VALUE, name: 'Not assigned' },
|
|
||||||
])
|
|
||||||
}))
|
}))
|
||||||
|
|
||||||
it('should ingest filter rules for has any of document types', fakeAsync(() => {
|
it('should ingest filter rules for has any of document types', fakeAsync(() => {
|
||||||
@ -801,6 +780,9 @@ describe('FilterEditorComponent', () => {
|
|||||||
value: '23',
|
value: '23',
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
expect(component.documentTypeSelectionModel.logicalOperator).toEqual(
|
||||||
|
LogicalOperator.Or
|
||||||
|
)
|
||||||
expect(component.documentTypeSelectionModel.intersection).toEqual(
|
expect(component.documentTypeSelectionModel.intersection).toEqual(
|
||||||
Intersection.Include
|
Intersection.Include
|
||||||
)
|
)
|
||||||
@ -855,6 +837,9 @@ describe('FilterEditorComponent', () => {
|
|||||||
value: '32',
|
value: '32',
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
|
expect(component.storagePathSelectionModel.logicalOperator).toEqual(
|
||||||
|
LogicalOperator.Or
|
||||||
|
)
|
||||||
expect(component.storagePathSelectionModel.intersection).toEqual(
|
expect(component.storagePathSelectionModel.intersection).toEqual(
|
||||||
Intersection.Include
|
Intersection.Include
|
||||||
)
|
)
|
||||||
@ -862,19 +847,6 @@ describe('FilterEditorComponent', () => {
|
|||||||
storage_paths[0],
|
storage_paths[0],
|
||||||
])
|
])
|
||||||
component.toggleStoragePath(32) // coverage
|
component.toggleStoragePath(32) // coverage
|
||||||
|
|
||||||
component.filterRules = [
|
|
||||||
{
|
|
||||||
rule_type: FILTER_STORAGE_PATH,
|
|
||||||
value: NEGATIVE_NULL_FILTER_VALUE.toString(),
|
|
||||||
},
|
|
||||||
]
|
|
||||||
expect(component.storagePathSelectionModel.intersection).toEqual(
|
|
||||||
Intersection.Exclude
|
|
||||||
)
|
|
||||||
expect(component.storagePathSelectionModel.getExcludedItems()).toEqual([
|
|
||||||
{ id: NEGATIVE_NULL_FILTER_VALUE, name: 'Not assigned' },
|
|
||||||
])
|
|
||||||
}))
|
}))
|
||||||
|
|
||||||
it('should ingest filter rules for has any of storage paths', fakeAsync(() => {
|
it('should ingest filter rules for has any of storage paths', fakeAsync(() => {
|
||||||
@ -1426,19 +1398,6 @@ describe('FilterEditorComponent', () => {
|
|||||||
value: null,
|
value: null,
|
||||||
},
|
},
|
||||||
])
|
])
|
||||||
|
|
||||||
const excludeButton = correspondentsFilterableDropdown.queryAll(
|
|
||||||
By.css('input[value=exclude]')
|
|
||||||
)[0]
|
|
||||||
excludeButton.nativeElement.checked = true
|
|
||||||
excludeButton.triggerEventHandler('change')
|
|
||||||
fixture.detectChanges()
|
|
||||||
expect(component.filterRules).toEqual([
|
|
||||||
{
|
|
||||||
rule_type: FILTER_CORRESPONDENT,
|
|
||||||
value: NEGATIVE_NULL_FILTER_VALUE.toString(),
|
|
||||||
},
|
|
||||||
])
|
|
||||||
}))
|
}))
|
||||||
|
|
||||||
it('should convert user input to correct filter rules on document type selections', fakeAsync(() => {
|
it('should convert user input to correct filter rules on document type selections', fakeAsync(() => {
|
||||||
@ -1496,19 +1455,6 @@ describe('FilterEditorComponent', () => {
|
|||||||
value: null,
|
value: null,
|
||||||
},
|
},
|
||||||
])
|
])
|
||||||
|
|
||||||
const excludeButton = docTypesFilterableDropdown.queryAll(
|
|
||||||
By.css('input[value=exclude]')
|
|
||||||
)[0]
|
|
||||||
excludeButton.nativeElement.checked = true
|
|
||||||
excludeButton.triggerEventHandler('change')
|
|
||||||
fixture.detectChanges()
|
|
||||||
expect(component.filterRules).toEqual([
|
|
||||||
{
|
|
||||||
rule_type: FILTER_DOCUMENT_TYPE,
|
|
||||||
value: NEGATIVE_NULL_FILTER_VALUE.toString(),
|
|
||||||
},
|
|
||||||
])
|
|
||||||
}))
|
}))
|
||||||
|
|
||||||
it('should convert user input to correct filter rules on storage path selections', fakeAsync(() => {
|
it('should convert user input to correct filter rules on storage path selections', fakeAsync(() => {
|
||||||
@ -1566,19 +1512,6 @@ describe('FilterEditorComponent', () => {
|
|||||||
value: null,
|
value: null,
|
||||||
},
|
},
|
||||||
])
|
])
|
||||||
|
|
||||||
const excludeButton = storagePathsFilterableDropdown.queryAll(
|
|
||||||
By.css('input[value=exclude]')
|
|
||||||
)[0]
|
|
||||||
excludeButton.nativeElement.checked = true
|
|
||||||
excludeButton.triggerEventHandler('change')
|
|
||||||
fixture.detectChanges()
|
|
||||||
expect(component.filterRules).toEqual([
|
|
||||||
{
|
|
||||||
rule_type: FILTER_STORAGE_PATH,
|
|
||||||
value: NEGATIVE_NULL_FILTER_VALUE.toString(),
|
|
||||||
},
|
|
||||||
])
|
|
||||||
}))
|
}))
|
||||||
|
|
||||||
it('should convert user input to correct filter rules on custom field selections', fakeAsync(() => {
|
it('should convert user input to correct filter rules on custom field selections', fakeAsync(() => {
|
||||||
|
@ -26,12 +26,14 @@ import {
|
|||||||
switchMap,
|
switchMap,
|
||||||
takeUntil,
|
takeUntil,
|
||||||
} from 'rxjs/operators'
|
} from 'rxjs/operators'
|
||||||
|
import { Correspondent } from 'src/app/data/correspondent'
|
||||||
import { CustomField } from 'src/app/data/custom-field'
|
import { CustomField } from 'src/app/data/custom-field'
|
||||||
import {
|
import {
|
||||||
CustomFieldQueryLogicalOperator,
|
CustomFieldQueryLogicalOperator,
|
||||||
CustomFieldQueryOperator,
|
CustomFieldQueryOperator,
|
||||||
} from 'src/app/data/custom-field-query'
|
} from 'src/app/data/custom-field-query'
|
||||||
import { Document } from 'src/app/data/document'
|
import { Document } from 'src/app/data/document'
|
||||||
|
import { DocumentType } from 'src/app/data/document-type'
|
||||||
import { FilterRule } from 'src/app/data/filter-rule'
|
import { FilterRule } from 'src/app/data/filter-rule'
|
||||||
import {
|
import {
|
||||||
FILTER_ADDED_AFTER,
|
FILTER_ADDED_AFTER,
|
||||||
@ -73,8 +75,9 @@ import {
|
|||||||
FILTER_STORAGE_PATH,
|
FILTER_STORAGE_PATH,
|
||||||
FILTER_TITLE,
|
FILTER_TITLE,
|
||||||
FILTER_TITLE_CONTENT,
|
FILTER_TITLE_CONTENT,
|
||||||
NEGATIVE_NULL_FILTER_VALUE,
|
|
||||||
} from 'src/app/data/filter-rule-type'
|
} from 'src/app/data/filter-rule-type'
|
||||||
|
import { StoragePath } from 'src/app/data/storage-path'
|
||||||
|
import { Tag } from 'src/app/data/tag'
|
||||||
import {
|
import {
|
||||||
PermissionAction,
|
PermissionAction,
|
||||||
PermissionType,
|
PermissionType,
|
||||||
@ -248,9 +251,7 @@ export class FilterEditorComponent
|
|||||||
case FILTER_HAS_CORRESPONDENT_ANY:
|
case FILTER_HAS_CORRESPONDENT_ANY:
|
||||||
if (rule.value) {
|
if (rule.value) {
|
||||||
return $localize`Correspondent: ${
|
return $localize`Correspondent: ${
|
||||||
this.correspondentSelectionModel.items.find(
|
this.correspondents.find((c) => c.id == +rule.value)?.name
|
||||||
(c) => c.id == +rule.value
|
|
||||||
)?.name
|
|
||||||
}`
|
}`
|
||||||
} else {
|
} else {
|
||||||
return $localize`Without correspondent`
|
return $localize`Without correspondent`
|
||||||
@ -260,9 +261,7 @@ export class FilterEditorComponent
|
|||||||
case FILTER_HAS_DOCUMENT_TYPE_ANY:
|
case FILTER_HAS_DOCUMENT_TYPE_ANY:
|
||||||
if (rule.value) {
|
if (rule.value) {
|
||||||
return $localize`Document type: ${
|
return $localize`Document type: ${
|
||||||
this.documentTypeSelectionModel.items.find(
|
this.documentTypes.find((dt) => dt.id == +rule.value)?.name
|
||||||
(dt) => dt.id == +rule.value
|
|
||||||
)?.name
|
|
||||||
}`
|
}`
|
||||||
} else {
|
} else {
|
||||||
return $localize`Without document type`
|
return $localize`Without document type`
|
||||||
@ -272,9 +271,7 @@ export class FilterEditorComponent
|
|||||||
case FILTER_HAS_STORAGE_PATH_ANY:
|
case FILTER_HAS_STORAGE_PATH_ANY:
|
||||||
if (rule.value) {
|
if (rule.value) {
|
||||||
return $localize`Storage path: ${
|
return $localize`Storage path: ${
|
||||||
this.storagePathSelectionModel.items.find(
|
this.storagePaths.find((sp) => sp.id == +rule.value)?.name
|
||||||
(sp) => sp.id == +rule.value
|
|
||||||
)?.name
|
|
||||||
}`
|
}`
|
||||||
} else {
|
} else {
|
||||||
return $localize`Without storage path`
|
return $localize`Without storage path`
|
||||||
@ -282,7 +279,7 @@ export class FilterEditorComponent
|
|||||||
|
|
||||||
case FILTER_HAS_TAGS_ALL:
|
case FILTER_HAS_TAGS_ALL:
|
||||||
return $localize`Tag: ${
|
return $localize`Tag: ${
|
||||||
this.tagSelectionModel.items.find((t) => t.id == +rule.value)?.name
|
this.tags.find((t) => t.id == +rule.value)?.name
|
||||||
}`
|
}`
|
||||||
|
|
||||||
case FILTER_HAS_ANY_TAG:
|
case FILTER_HAS_ANY_TAG:
|
||||||
@ -329,6 +326,10 @@ export class FilterEditorComponent
|
|||||||
@ViewChild('textFilterInput')
|
@ViewChild('textFilterInput')
|
||||||
textFilterInput: ElementRef
|
textFilterInput: ElementRef
|
||||||
|
|
||||||
|
tags: Tag[] = []
|
||||||
|
correspondents: Correspondent[] = []
|
||||||
|
documentTypes: DocumentType[] = []
|
||||||
|
storagePaths: StoragePath[] = []
|
||||||
customFields: CustomField[] = []
|
customFields: CustomField[] = []
|
||||||
|
|
||||||
tagDocumentCounts: SelectionDataItem[]
|
tagDocumentCounts: SelectionDataItem[]
|
||||||
@ -369,7 +370,7 @@ export class FilterEditorComponent
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
tagSelectionModel = new FilterableDropdownSelectionModel(true)
|
tagSelectionModel = new FilterableDropdownSelectionModel()
|
||||||
correspondentSelectionModel = new FilterableDropdownSelectionModel()
|
correspondentSelectionModel = new FilterableDropdownSelectionModel()
|
||||||
documentTypeSelectionModel = new FilterableDropdownSelectionModel()
|
documentTypeSelectionModel = new FilterableDropdownSelectionModel()
|
||||||
storagePathSelectionModel = new FilterableDropdownSelectionModel()
|
storagePathSelectionModel = new FilterableDropdownSelectionModel()
|
||||||
@ -550,19 +551,6 @@ export class FilterEditorComponent
|
|||||||
)
|
)
|
||||||
break
|
break
|
||||||
case FILTER_CORRESPONDENT:
|
case FILTER_CORRESPONDENT:
|
||||||
this.correspondentSelectionModel.intersection =
|
|
||||||
rule.value == NEGATIVE_NULL_FILTER_VALUE.toString()
|
|
||||||
? Intersection.Exclude
|
|
||||||
: Intersection.Include
|
|
||||||
this.correspondentSelectionModel.set(
|
|
||||||
rule.value ? +rule.value : null,
|
|
||||||
this.correspondentSelectionModel.intersection ==
|
|
||||||
Intersection.Include
|
|
||||||
? ToggleableItemState.Selected
|
|
||||||
: ToggleableItemState.Excluded,
|
|
||||||
false
|
|
||||||
)
|
|
||||||
break
|
|
||||||
case FILTER_HAS_CORRESPONDENT_ANY:
|
case FILTER_HAS_CORRESPONDENT_ANY:
|
||||||
this.correspondentSelectionModel.logicalOperator = LogicalOperator.Or
|
this.correspondentSelectionModel.logicalOperator = LogicalOperator.Or
|
||||||
this.correspondentSelectionModel.intersection = Intersection.Include
|
this.correspondentSelectionModel.intersection = Intersection.Include
|
||||||
@ -581,18 +569,6 @@ export class FilterEditorComponent
|
|||||||
)
|
)
|
||||||
break
|
break
|
||||||
case FILTER_DOCUMENT_TYPE:
|
case FILTER_DOCUMENT_TYPE:
|
||||||
this.documentTypeSelectionModel.intersection =
|
|
||||||
rule.value == NEGATIVE_NULL_FILTER_VALUE.toString()
|
|
||||||
? Intersection.Exclude
|
|
||||||
: Intersection.Include
|
|
||||||
this.documentTypeSelectionModel.set(
|
|
||||||
rule.value ? +rule.value : null,
|
|
||||||
this.documentTypeSelectionModel.intersection == Intersection.Include
|
|
||||||
? ToggleableItemState.Selected
|
|
||||||
: ToggleableItemState.Excluded,
|
|
||||||
false
|
|
||||||
)
|
|
||||||
break
|
|
||||||
case FILTER_HAS_DOCUMENT_TYPE_ANY:
|
case FILTER_HAS_DOCUMENT_TYPE_ANY:
|
||||||
this.documentTypeSelectionModel.logicalOperator = LogicalOperator.Or
|
this.documentTypeSelectionModel.logicalOperator = LogicalOperator.Or
|
||||||
this.documentTypeSelectionModel.intersection = Intersection.Include
|
this.documentTypeSelectionModel.intersection = Intersection.Include
|
||||||
@ -611,18 +587,6 @@ export class FilterEditorComponent
|
|||||||
)
|
)
|
||||||
break
|
break
|
||||||
case FILTER_STORAGE_PATH:
|
case FILTER_STORAGE_PATH:
|
||||||
this.storagePathSelectionModel.intersection =
|
|
||||||
rule.value == NEGATIVE_NULL_FILTER_VALUE.toString()
|
|
||||||
? Intersection.Exclude
|
|
||||||
: Intersection.Include
|
|
||||||
this.storagePathSelectionModel.set(
|
|
||||||
rule.value ? +rule.value : null,
|
|
||||||
this.storagePathSelectionModel.intersection == Intersection.Include
|
|
||||||
? ToggleableItemState.Selected
|
|
||||||
: ToggleableItemState.Excluded,
|
|
||||||
false
|
|
||||||
)
|
|
||||||
break
|
|
||||||
case FILTER_HAS_STORAGE_PATH_ANY:
|
case FILTER_HAS_STORAGE_PATH_ANY:
|
||||||
this.storagePathSelectionModel.logicalOperator = LogicalOperator.Or
|
this.storagePathSelectionModel.logicalOperator = LogicalOperator.Or
|
||||||
this.storagePathSelectionModel.intersection = Intersection.Include
|
this.storagePathSelectionModel.intersection = Intersection.Include
|
||||||
@ -845,21 +809,9 @@ export class FilterEditorComponent
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
if (
|
if (this.correspondentSelectionModel.isNoneSelected()) {
|
||||||
this.correspondentSelectionModel.isNoneSelected() &&
|
|
||||||
this.correspondentSelectionModel.intersection == Intersection.Include
|
|
||||||
) {
|
|
||||||
filterRules.push({ rule_type: FILTER_CORRESPONDENT, value: null })
|
filterRules.push({ rule_type: FILTER_CORRESPONDENT, value: null })
|
||||||
} else {
|
} else {
|
||||||
if (
|
|
||||||
this.correspondentSelectionModel.isNoneSelected() &&
|
|
||||||
this.correspondentSelectionModel.intersection == Intersection.Exclude
|
|
||||||
) {
|
|
||||||
filterRules.push({
|
|
||||||
rule_type: FILTER_CORRESPONDENT,
|
|
||||||
value: NEGATIVE_NULL_FILTER_VALUE.toString(),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
this.correspondentSelectionModel
|
this.correspondentSelectionModel
|
||||||
.getSelectedItems()
|
.getSelectedItems()
|
||||||
.forEach((correspondent) => {
|
.forEach((correspondent) => {
|
||||||
@ -870,7 +822,6 @@ export class FilterEditorComponent
|
|||||||
})
|
})
|
||||||
this.correspondentSelectionModel
|
this.correspondentSelectionModel
|
||||||
.getExcludedItems()
|
.getExcludedItems()
|
||||||
.filter((correspondent) => correspondent.id > 0)
|
|
||||||
.forEach((correspondent) => {
|
.forEach((correspondent) => {
|
||||||
filterRules.push({
|
filterRules.push({
|
||||||
rule_type: FILTER_DOES_NOT_HAVE_CORRESPONDENT,
|
rule_type: FILTER_DOES_NOT_HAVE_CORRESPONDENT,
|
||||||
@ -878,21 +829,9 @@ export class FilterEditorComponent
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
if (
|
if (this.documentTypeSelectionModel.isNoneSelected()) {
|
||||||
this.documentTypeSelectionModel.isNoneSelected() &&
|
|
||||||
this.documentTypeSelectionModel.intersection === Intersection.Include
|
|
||||||
) {
|
|
||||||
filterRules.push({ rule_type: FILTER_DOCUMENT_TYPE, value: null })
|
filterRules.push({ rule_type: FILTER_DOCUMENT_TYPE, value: null })
|
||||||
} else {
|
} else {
|
||||||
if (
|
|
||||||
this.documentTypeSelectionModel.isNoneSelected() &&
|
|
||||||
this.documentTypeSelectionModel.intersection == Intersection.Exclude
|
|
||||||
) {
|
|
||||||
filterRules.push({
|
|
||||||
rule_type: FILTER_DOCUMENT_TYPE,
|
|
||||||
value: NEGATIVE_NULL_FILTER_VALUE.toString(),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
this.documentTypeSelectionModel
|
this.documentTypeSelectionModel
|
||||||
.getSelectedItems()
|
.getSelectedItems()
|
||||||
.forEach((documentType) => {
|
.forEach((documentType) => {
|
||||||
@ -903,7 +842,6 @@ export class FilterEditorComponent
|
|||||||
})
|
})
|
||||||
this.documentTypeSelectionModel
|
this.documentTypeSelectionModel
|
||||||
.getExcludedItems()
|
.getExcludedItems()
|
||||||
.filter((documentType) => documentType.id > 0)
|
|
||||||
.forEach((documentType) => {
|
.forEach((documentType) => {
|
||||||
filterRules.push({
|
filterRules.push({
|
||||||
rule_type: FILTER_DOES_NOT_HAVE_DOCUMENT_TYPE,
|
rule_type: FILTER_DOES_NOT_HAVE_DOCUMENT_TYPE,
|
||||||
@ -911,21 +849,9 @@ export class FilterEditorComponent
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
if (
|
if (this.storagePathSelectionModel.isNoneSelected()) {
|
||||||
this.storagePathSelectionModel.isNoneSelected() &&
|
|
||||||
this.storagePathSelectionModel.intersection == Intersection.Include
|
|
||||||
) {
|
|
||||||
filterRules.push({ rule_type: FILTER_STORAGE_PATH, value: null })
|
filterRules.push({ rule_type: FILTER_STORAGE_PATH, value: null })
|
||||||
} else {
|
} else {
|
||||||
if (
|
|
||||||
this.storagePathSelectionModel.isNoneSelected() &&
|
|
||||||
this.storagePathSelectionModel.intersection == Intersection.Exclude
|
|
||||||
) {
|
|
||||||
filterRules.push({
|
|
||||||
rule_type: FILTER_STORAGE_PATH,
|
|
||||||
value: NEGATIVE_NULL_FILTER_VALUE.toString(),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
this.storagePathSelectionModel
|
this.storagePathSelectionModel
|
||||||
.getSelectedItems()
|
.getSelectedItems()
|
||||||
.forEach((storagePath) => {
|
.forEach((storagePath) => {
|
||||||
@ -936,7 +862,6 @@ export class FilterEditorComponent
|
|||||||
})
|
})
|
||||||
this.storagePathSelectionModel
|
this.storagePathSelectionModel
|
||||||
.getExcludedItems()
|
.getExcludedItems()
|
||||||
.filter((storagePath) => storagePath.id > 0)
|
|
||||||
.forEach((storagePath) => {
|
.forEach((storagePath) => {
|
||||||
filterRules.push({
|
filterRules.push({
|
||||||
rule_type: FILTER_DOES_NOT_HAVE_STORAGE_PATH,
|
rule_type: FILTER_DOES_NOT_HAVE_STORAGE_PATH,
|
||||||
@ -1137,7 +1062,7 @@ export class FilterEditorComponent
|
|||||||
) {
|
) {
|
||||||
this.loadingCountTotal++
|
this.loadingCountTotal++
|
||||||
this.tagService.listAll().subscribe((result) => {
|
this.tagService.listAll().subscribe((result) => {
|
||||||
this.tagSelectionModel.items = result.results
|
this.tags = result.results
|
||||||
this.maybeCompleteLoading()
|
this.maybeCompleteLoading()
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@ -1149,7 +1074,7 @@ export class FilterEditorComponent
|
|||||||
) {
|
) {
|
||||||
this.loadingCountTotal++
|
this.loadingCountTotal++
|
||||||
this.correspondentService.listAll().subscribe((result) => {
|
this.correspondentService.listAll().subscribe((result) => {
|
||||||
this.correspondentSelectionModel.items = result.results
|
this.correspondents = result.results
|
||||||
this.maybeCompleteLoading()
|
this.maybeCompleteLoading()
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@ -1161,7 +1086,7 @@ export class FilterEditorComponent
|
|||||||
) {
|
) {
|
||||||
this.loadingCountTotal++
|
this.loadingCountTotal++
|
||||||
this.documentTypeService.listAll().subscribe((result) => {
|
this.documentTypeService.listAll().subscribe((result) => {
|
||||||
this.documentTypeSelectionModel.items = result.results
|
this.documentTypes = result.results
|
||||||
this.maybeCompleteLoading()
|
this.maybeCompleteLoading()
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@ -1173,7 +1098,7 @@ export class FilterEditorComponent
|
|||||||
) {
|
) {
|
||||||
this.loadingCountTotal++
|
this.loadingCountTotal++
|
||||||
this.storagePathService.listAll().subscribe((result) => {
|
this.storagePathService.listAll().subscribe((result) => {
|
||||||
this.storagePathSelectionModel.items = result.results
|
this.storagePaths = result.results
|
||||||
this.maybeCompleteLoading()
|
this.maybeCompleteLoading()
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@ -188,7 +188,7 @@ describe('MailComponent', () => {
|
|||||||
const toastInfoSpy = jest.spyOn(toastService, 'showInfo')
|
const toastInfoSpy = jest.spyOn(toastService, 'showInfo')
|
||||||
editDialog.failed.emit()
|
editDialog.failed.emit()
|
||||||
expect(toastErrorSpy).toBeCalled()
|
expect(toastErrorSpy).toBeCalled()
|
||||||
editDialog.succeeded.emit(mailAccounts[0] as any)
|
editDialog.succeeded.emit(mailAccounts[0])
|
||||||
expect(toastInfoSpy).toHaveBeenCalledWith(
|
expect(toastInfoSpy).toHaveBeenCalledWith(
|
||||||
`Saved account "${mailAccounts[0].name}".`
|
`Saved account "${mailAccounts[0].name}".`
|
||||||
)
|
)
|
||||||
@ -246,7 +246,7 @@ describe('MailComponent', () => {
|
|||||||
const toastInfoSpy = jest.spyOn(toastService, 'showInfo')
|
const toastInfoSpy = jest.spyOn(toastService, 'showInfo')
|
||||||
editDialog.failed.emit()
|
editDialog.failed.emit()
|
||||||
expect(toastErrorSpy).toBeCalled()
|
expect(toastErrorSpy).toBeCalled()
|
||||||
editDialog.succeeded.emit(mailRules[0] as any)
|
editDialog.succeeded.emit(mailRules[0])
|
||||||
expect(toastInfoSpy).toHaveBeenCalledWith(
|
expect(toastInfoSpy).toHaveBeenCalledWith(
|
||||||
`Saved rule "${mailRules[0].name}".`
|
`Saved rule "${mailRules[0].name}".`
|
||||||
)
|
)
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
import { DataType } from './datatype'
|
import { DataType } from './datatype'
|
||||||
|
|
||||||
export const NEGATIVE_NULL_FILTER_VALUE = -1
|
|
||||||
|
|
||||||
// These correspond to src/documents/models.py and changes here require a DB migration (and vice versa)
|
// These correspond to src/documents/models.py and changes here require a DB migration (and vice versa)
|
||||||
export const FILTER_TITLE = 0
|
export const FILTER_TITLE = 0
|
||||||
export const FILTER_CONTENT = 1
|
export const FILTER_CONTENT = 1
|
||||||
|
@ -7,6 +7,4 @@ export interface WebsocketProgressMessage {
|
|||||||
message?: string
|
message?: string
|
||||||
document_id: number
|
document_id: number
|
||||||
owner_id?: number
|
owner_id?: number
|
||||||
users_can_view?: number[]
|
|
||||||
groups_can_view?: number[]
|
|
||||||
}
|
}
|
||||||
|
@ -50,7 +50,7 @@ describe('ObjectNamePipe', () => {
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
it('should return Private string if object not found', (done) => {
|
it('should return empty string if object not found', (done) => {
|
||||||
const mockObjects = {
|
const mockObjects = {
|
||||||
results: [{ id: 2, name: 'Object 2' }],
|
results: [{ id: 2, name: 'Object 2' }],
|
||||||
count: 1,
|
count: 1,
|
||||||
@ -60,7 +60,7 @@ describe('ObjectNamePipe', () => {
|
|||||||
jest.spyOn(objectService, 'listAll').mockReturnValue(of(mockObjects))
|
jest.spyOn(objectService, 'listAll').mockReturnValue(of(mockObjects))
|
||||||
|
|
||||||
pipe.transform(1).subscribe((result) => {
|
pipe.transform(1).subscribe((result) => {
|
||||||
expect(result).toBe('Private')
|
expect(result).toBe('')
|
||||||
done()
|
done()
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
@ -35,10 +35,7 @@ export abstract class ObjectNamePipe implements PipeTransform {
|
|||||||
return this.objectService.listAll().pipe(
|
return this.objectService.listAll().pipe(
|
||||||
map((objects) => {
|
map((objects) => {
|
||||||
this.objects = objects.results
|
this.objects = objects.results
|
||||||
return (
|
return this.objects.find((o) => o.id === obejctId)?.name || ''
|
||||||
this.objects.find((o) => o.id === obejctId)?.name ||
|
|
||||||
$localize`Private`
|
|
||||||
)
|
|
||||||
}),
|
}),
|
||||||
catchError(() => of(''))
|
catchError(() => of(''))
|
||||||
)
|
)
|
||||||
|
@ -268,15 +268,15 @@ describe(`DocumentService`, () => {
|
|||||||
expect(req.request.method).toEqual('GET')
|
expect(req.request.method).toEqual('GET')
|
||||||
})
|
})
|
||||||
|
|
||||||
it('should pass remove_inbox_tags setting to patch', () => {
|
it('should pass remove_inbox_tags setting to update', () => {
|
||||||
subscription = service.patch(documents[0]).subscribe()
|
subscription = service.update(documents[0]).subscribe()
|
||||||
let req = httpTestingController.expectOne(
|
let req = httpTestingController.expectOne(
|
||||||
`${environment.apiBaseUrl}${endpoint}/${documents[0].id}/`
|
`${environment.apiBaseUrl}${endpoint}/${documents[0].id}/`
|
||||||
)
|
)
|
||||||
expect(req.request.body.remove_inbox_tags).toEqual(false)
|
expect(req.request.body.remove_inbox_tags).toEqual(false)
|
||||||
|
|
||||||
settingsService.set(SETTINGS_KEYS.DOCUMENT_EDITING_REMOVE_INBOX_TAGS, true)
|
settingsService.set(SETTINGS_KEYS.DOCUMENT_EDITING_REMOVE_INBOX_TAGS, true)
|
||||||
subscription = service.patch(documents[0]).subscribe()
|
subscription = service.update(documents[0]).subscribe()
|
||||||
req = httpTestingController.expectOne(
|
req = httpTestingController.expectOne(
|
||||||
`${environment.apiBaseUrl}${endpoint}/${documents[0].id}/`
|
`${environment.apiBaseUrl}${endpoint}/${documents[0].id}/`
|
||||||
)
|
)
|
||||||
|
@ -189,13 +189,13 @@ export class DocumentService extends AbstractPaperlessService<Document> {
|
|||||||
return this.http.get<number>(this.getResourceUrl(null, 'next_asn'))
|
return this.http.get<number>(this.getResourceUrl(null, 'next_asn'))
|
||||||
}
|
}
|
||||||
|
|
||||||
patch(o: Document): Observable<Document> {
|
update(o: Document): Observable<Document> {
|
||||||
// we want to only set created_date
|
// we want to only set created_date
|
||||||
delete o.created
|
o.created = undefined
|
||||||
o.remove_inbox_tags = !!this.settingsService.get(
|
o.remove_inbox_tags = !!this.settingsService.get(
|
||||||
SETTINGS_KEYS.DOCUMENT_EDITING_REMOVE_INBOX_TAGS
|
SETTINGS_KEYS.DOCUMENT_EDITING_REMOVE_INBOX_TAGS
|
||||||
)
|
)
|
||||||
return super.patch(o)
|
return super.update(o)
|
||||||
}
|
}
|
||||||
|
|
||||||
uploadDocument(formData) {
|
uploadDocument(formData) {
|
||||||
|
@ -156,72 +156,6 @@ describe(`Additional service tests for SavedViewService`, () => {
|
|||||||
httpTestingController.verify() // no reload
|
httpTestingController.verify() // no reload
|
||||||
})
|
})
|
||||||
|
|
||||||
it('should reload after create, delete, patch and patchMany', () => {
|
|
||||||
const reloadSpy = jest.spyOn(service, 'reload')
|
|
||||||
service
|
|
||||||
.create({
|
|
||||||
name: 'New Saved View',
|
|
||||||
show_on_dashboard: true,
|
|
||||||
show_in_sidebar: true,
|
|
||||||
sort_field: 'name',
|
|
||||||
sort_reverse: true,
|
|
||||||
filter_rules: [],
|
|
||||||
})
|
|
||||||
.subscribe()
|
|
||||||
httpTestingController
|
|
||||||
.expectOne(`${environment.apiBaseUrl}${endpoint}/`)
|
|
||||||
.flush({})
|
|
||||||
expect(reloadSpy).toHaveBeenCalled()
|
|
||||||
reloadSpy.mockClear()
|
|
||||||
httpTestingController
|
|
||||||
.expectOne(
|
|
||||||
`${environment.apiBaseUrl}${endpoint}/?page=1&page_size=100000`
|
|
||||||
)
|
|
||||||
.flush({
|
|
||||||
results: saved_views,
|
|
||||||
})
|
|
||||||
service.delete(saved_views[0]).subscribe()
|
|
||||||
httpTestingController
|
|
||||||
.expectOne(`${environment.apiBaseUrl}${endpoint}/1/`)
|
|
||||||
.flush({})
|
|
||||||
expect(reloadSpy).toHaveBeenCalled()
|
|
||||||
reloadSpy.mockClear()
|
|
||||||
httpTestingController
|
|
||||||
.expectOne(
|
|
||||||
`${environment.apiBaseUrl}${endpoint}/?page=1&page_size=100000`
|
|
||||||
)
|
|
||||||
.flush({
|
|
||||||
results: saved_views,
|
|
||||||
})
|
|
||||||
service.patch(saved_views[0], true).subscribe()
|
|
||||||
httpTestingController
|
|
||||||
.expectOne(`${environment.apiBaseUrl}${endpoint}/1/`)
|
|
||||||
.flush({})
|
|
||||||
expect(reloadSpy).toHaveBeenCalled()
|
|
||||||
httpTestingController
|
|
||||||
.expectOne(
|
|
||||||
`${environment.apiBaseUrl}${endpoint}/?page=1&page_size=100000`
|
|
||||||
)
|
|
||||||
.flush({
|
|
||||||
results: saved_views,
|
|
||||||
})
|
|
||||||
service.patchMany(saved_views).subscribe()
|
|
||||||
saved_views.forEach((saved_view) => {
|
|
||||||
const req = httpTestingController.expectOne(
|
|
||||||
`${environment.apiBaseUrl}${endpoint}/${saved_view.id}/`
|
|
||||||
)
|
|
||||||
req.flush({})
|
|
||||||
})
|
|
||||||
expect(reloadSpy).toHaveBeenCalled()
|
|
||||||
httpTestingController
|
|
||||||
.expectOne(
|
|
||||||
`${environment.apiBaseUrl}${endpoint}/?page=1&page_size=100000`
|
|
||||||
)
|
|
||||||
.flush({
|
|
||||||
results: saved_views,
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
// Dont need to setup again
|
// Dont need to setup again
|
||||||
|
|
||||||
|
@ -602,6 +602,7 @@ export class SettingsService {
|
|||||||
)
|
)
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
this.toastService.showError(errorMessage)
|
this.toastService.showError(errorMessage)
|
||||||
|
console.log(error)
|
||||||
}
|
}
|
||||||
|
|
||||||
this.storeSettings()
|
this.storeSettings()
|
||||||
@ -613,6 +614,7 @@ export class SettingsService {
|
|||||||
},
|
},
|
||||||
error: (e) => {
|
error: (e) => {
|
||||||
this.toastService.showError(errorMessage)
|
this.toastService.showError(errorMessage)
|
||||||
|
console.log(e)
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@ -634,6 +636,7 @@ export class SettingsService {
|
|||||||
this.toastService.showError(
|
this.toastService.showError(
|
||||||
'Error migrating update checking setting'
|
'Error migrating update checking setting'
|
||||||
)
|
)
|
||||||
|
console.log(e)
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@ -355,50 +355,6 @@ describe('ConsumerStatusService', () => {
|
|||||||
)
|
)
|
||||||
})
|
})
|
||||||
|
|
||||||
it('should notify user if user can view or is in group', () => {
|
|
||||||
settingsService.currentUser = {
|
|
||||||
id: 1,
|
|
||||||
username: 'testuser',
|
|
||||||
is_superuser: false,
|
|
||||||
groups: [1],
|
|
||||||
}
|
|
||||||
websocketStatusService.connect()
|
|
||||||
server.send({
|
|
||||||
type: WebsocketStatusType.STATUS_UPDATE,
|
|
||||||
data: {
|
|
||||||
task_id: '1234',
|
|
||||||
filename: 'file1.pdf',
|
|
||||||
current_progress: 50,
|
|
||||||
max_progress: 100,
|
|
||||||
docuement_id: 12,
|
|
||||||
owner_id: 2,
|
|
||||||
status: 'WORKING',
|
|
||||||
users_can_view: [1],
|
|
||||||
groups_can_view: [],
|
|
||||||
},
|
|
||||||
})
|
|
||||||
expect(websocketStatusService.getConsumerStatusNotCompleted()).toHaveLength(
|
|
||||||
1
|
|
||||||
)
|
|
||||||
server.send({
|
|
||||||
type: WebsocketStatusType.STATUS_UPDATE,
|
|
||||||
data: {
|
|
||||||
task_id: '5678',
|
|
||||||
filename: 'file2.pdf',
|
|
||||||
current_progress: 50,
|
|
||||||
max_progress: 100,
|
|
||||||
docuement_id: 13,
|
|
||||||
owner_id: 2,
|
|
||||||
status: 'WORKING',
|
|
||||||
users_can_view: [],
|
|
||||||
groups_can_view: [1],
|
|
||||||
},
|
|
||||||
})
|
|
||||||
expect(websocketStatusService.getConsumerStatusNotCompleted()).toHaveLength(
|
|
||||||
2
|
|
||||||
)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('should trigger deleted subject on document deleted', () => {
|
it('should trigger deleted subject on document deleted', () => {
|
||||||
let deleted = false
|
let deleted = false
|
||||||
websocketStatusService.onDocumentDeleted().subscribe(() => {
|
websocketStatusService.onDocumentDeleted().subscribe(() => {
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
import { Injectable } from '@angular/core'
|
import { Injectable } from '@angular/core'
|
||||||
import { Subject } from 'rxjs'
|
import { Subject } from 'rxjs'
|
||||||
import { environment } from 'src/environments/environment'
|
import { environment } from 'src/environments/environment'
|
||||||
import { User } from '../data/user'
|
|
||||||
import { WebsocketDocumentsDeletedMessage } from '../data/websocket-documents-deleted-message'
|
import { WebsocketDocumentsDeletedMessage } from '../data/websocket-documents-deleted-message'
|
||||||
import { WebsocketProgressMessage } from '../data/websocket-progress-message'
|
import { WebsocketProgressMessage } from '../data/websocket-progress-message'
|
||||||
import { SettingsService } from './settings.service'
|
import { SettingsService } from './settings.service'
|
||||||
@ -174,25 +173,13 @@ export class WebsocketStatusService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private canViewMessage(messageData: WebsocketProgressMessage): boolean {
|
|
||||||
// see paperless.consumers.StatusConsumer._can_view
|
|
||||||
const user: User = this.settingsService.currentUser
|
|
||||||
return (
|
|
||||||
!messageData.owner_id ||
|
|
||||||
user.is_superuser ||
|
|
||||||
(messageData.owner_id && messageData.owner_id === user.id) ||
|
|
||||||
(messageData.users_can_view &&
|
|
||||||
messageData.users_can_view.includes(user.id)) ||
|
|
||||||
(messageData.groups_can_view &&
|
|
||||||
messageData.groups_can_view.some((groupId) =>
|
|
||||||
user.groups?.includes(groupId)
|
|
||||||
))
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
handleProgressUpdate(messageData: WebsocketProgressMessage) {
|
handleProgressUpdate(messageData: WebsocketProgressMessage) {
|
||||||
// fallback if backend didn't restrict message
|
// fallback if backend didn't restrict message
|
||||||
if (!this.canViewMessage(messageData)) {
|
if (
|
||||||
|
messageData.owner_id &&
|
||||||
|
messageData.owner_id !== this.settingsService.currentUser?.id &&
|
||||||
|
!this.settingsService.currentUser?.is_superuser
|
||||||
|
) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,31 +0,0 @@
|
|||||||
import { getFilenameFromContentDisposition } from './http'
|
|
||||||
|
|
||||||
describe('getFilenameFromContentDisposition', () => {
|
|
||||||
it('should extract filename from Content-Disposition header with filename*', () => {
|
|
||||||
const header = "attachment; filename*=UTF-8''example%20file.txt"
|
|
||||||
expect(getFilenameFromContentDisposition(header)).toBe('example file.txt')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('should extract filename from Content-Disposition header with filename=', () => {
|
|
||||||
const header = 'attachment; filename="example-file.txt"'
|
|
||||||
expect(getFilenameFromContentDisposition(header)).toBe('example-file.txt')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('should prioritize filename* over filename if both are present', () => {
|
|
||||||
const header =
|
|
||||||
'attachment; filename="fallback.txt"; filename*=UTF-8\'\'preferred%20file.txt'
|
|
||||||
const result = getFilenameFromContentDisposition(header)
|
|
||||||
expect(result).toBe('preferred file.txt')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('should gracefully fall back to null', () => {
|
|
||||||
// invalid UTF-8 sequence
|
|
||||||
expect(
|
|
||||||
getFilenameFromContentDisposition("attachment; filename*=UTF-8''%E0%A4%A")
|
|
||||||
).toBeNull()
|
|
||||||
// missing filename
|
|
||||||
expect(getFilenameFromContentDisposition('attachment;')).toBeNull()
|
|
||||||
// empty header
|
|
||||||
expect(getFilenameFromContentDisposition(null)).toBeNull()
|
|
||||||
})
|
|
||||||
})
|
|
@ -1,23 +0,0 @@
|
|||||||
export function getFilenameFromContentDisposition(header: string): string {
|
|
||||||
if (!header) {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
|
|
||||||
// Try filename* (RFC 5987)
|
|
||||||
const filenameStar = header.match(/filename\*=(?:UTF-\d['']*)?([^;]+)/i)
|
|
||||||
if (filenameStar?.[1]) {
|
|
||||||
try {
|
|
||||||
return decodeURIComponent(filenameStar[1])
|
|
||||||
} catch (e) {
|
|
||||||
// Ignore decoding errors and fall through
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fallback to filename=
|
|
||||||
const filenameMatch = header.match(/filename="?([^"]+)"?/)
|
|
||||||
if (filenameMatch?.[1]) {
|
|
||||||
return filenameMatch[1]
|
|
||||||
}
|
|
||||||
|
|
||||||
return null
|
|
||||||
}
|
|
@ -8,7 +8,6 @@ import {
|
|||||||
FILTER_HAS_CUSTOM_FIELDS_ALL,
|
FILTER_HAS_CUSTOM_FIELDS_ALL,
|
||||||
FILTER_HAS_CUSTOM_FIELDS_ANY,
|
FILTER_HAS_CUSTOM_FIELDS_ANY,
|
||||||
FILTER_HAS_TAGS_ALL,
|
FILTER_HAS_TAGS_ALL,
|
||||||
NEGATIVE_NULL_FILTER_VALUE,
|
|
||||||
} from '../data/filter-rule-type'
|
} from '../data/filter-rule-type'
|
||||||
import {
|
import {
|
||||||
filterRulesFromQueryParams,
|
filterRulesFromQueryParams,
|
||||||
@ -98,16 +97,6 @@ describe('QueryParams Utils', () => {
|
|||||||
correspondent__isnull: 1,
|
correspondent__isnull: 1,
|
||||||
})
|
})
|
||||||
|
|
||||||
params = queryParamsFromFilterRules([
|
|
||||||
{
|
|
||||||
rule_type: FILTER_CORRESPONDENT,
|
|
||||||
value: NEGATIVE_NULL_FILTER_VALUE.toString(),
|
|
||||||
},
|
|
||||||
])
|
|
||||||
expect(params).toEqual({
|
|
||||||
correspondent__isnull: 0,
|
|
||||||
})
|
|
||||||
|
|
||||||
params = queryParamsFromFilterRules([
|
params = queryParamsFromFilterRules([
|
||||||
{
|
{
|
||||||
rule_type: FILTER_HAS_ANY_TAG,
|
rule_type: FILTER_HAS_ANY_TAG,
|
||||||
|
@ -10,7 +10,6 @@ import {
|
|||||||
FILTER_HAS_CUSTOM_FIELDS_ANY,
|
FILTER_HAS_CUSTOM_FIELDS_ANY,
|
||||||
FILTER_RULE_TYPES,
|
FILTER_RULE_TYPES,
|
||||||
FilterRuleType,
|
FilterRuleType,
|
||||||
NEGATIVE_NULL_FILTER_VALUE,
|
|
||||||
} from '../data/filter-rule-type'
|
} from '../data/filter-rule-type'
|
||||||
import { ListViewState } from '../services/document-list-view.service'
|
import { ListViewState } from '../services/document-list-view.service'
|
||||||
|
|
||||||
@ -114,10 +113,6 @@ export function filterRulesFromQueryParams(
|
|||||||
rt.isnull_filtervar == filterQueryParamName
|
rt.isnull_filtervar == filterQueryParamName
|
||||||
)
|
)
|
||||||
const isNullRuleType = rule_type.isnull_filtervar == filterQueryParamName
|
const isNullRuleType = rule_type.isnull_filtervar == filterQueryParamName
|
||||||
const nullRuleValue =
|
|
||||||
queryParams.get(filterQueryParamName) == '1'
|
|
||||||
? null
|
|
||||||
: NEGATIVE_NULL_FILTER_VALUE.toString()
|
|
||||||
const valueURIComponent: string = queryParams.get(filterQueryParamName)
|
const valueURIComponent: string = queryParams.get(filterQueryParamName)
|
||||||
const filterQueryParamValues: string[] = rule_type.multi
|
const filterQueryParamValues: string[] = rule_type.multi
|
||||||
? valueURIComponent.split(',')
|
? valueURIComponent.split(',')
|
||||||
@ -130,7 +125,7 @@ export function filterRulesFromQueryParams(
|
|||||||
val = val.replace('1', 'true').replace('0', 'false')
|
val = val.replace('1', 'true').replace('0', 'false')
|
||||||
return {
|
return {
|
||||||
rule_type: rule_type.id,
|
rule_type: rule_type.id,
|
||||||
value: isNullRuleType ? nullRuleValue : val,
|
value: isNullRuleType ? null : val,
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
)
|
)
|
||||||
@ -148,11 +143,6 @@ export function queryParamsFromFilterRules(filterRules: FilterRule[]): Params {
|
|||||||
let ruleType = FILTER_RULE_TYPES.find((t) => t.id == rule.rule_type)
|
let ruleType = FILTER_RULE_TYPES.find((t) => t.id == rule.rule_type)
|
||||||
if (ruleType.isnull_filtervar && rule.value == null) {
|
if (ruleType.isnull_filtervar && rule.value == null) {
|
||||||
params[ruleType.isnull_filtervar] = 1
|
params[ruleType.isnull_filtervar] = 1
|
||||||
} else if (
|
|
||||||
ruleType.isnull_filtervar &&
|
|
||||||
rule.value == NEGATIVE_NULL_FILTER_VALUE.toString()
|
|
||||||
) {
|
|
||||||
params[ruleType.isnull_filtervar] = 0
|
|
||||||
} else if (ruleType.multi) {
|
} else if (ruleType.multi) {
|
||||||
params[ruleType.filtervar] = params[ruleType.filtervar]
|
params[ruleType.filtervar] = params[ruleType.filtervar]
|
||||||
? params[ruleType.filtervar] + ',' + rule.value
|
? params[ruleType.filtervar] + ',' + rule.value
|
||||||
|
@ -3,9 +3,9 @@ const base_url = new URL(document.baseURI)
|
|||||||
export const environment = {
|
export const environment = {
|
||||||
production: true,
|
production: true,
|
||||||
apiBaseUrl: document.baseURI + 'api/',
|
apiBaseUrl: document.baseURI + 'api/',
|
||||||
apiVersion: '8', // match src/paperless/settings.py
|
apiVersion: '7',
|
||||||
appTitle: 'Paperless-ngx',
|
appTitle: 'Paperless-ngx',
|
||||||
version: '2.15.3',
|
version: '2.15.0',
|
||||||
webSocketHost: window.location.host,
|
webSocketHost: window.location.host,
|
||||||
webSocketProtocol: window.location.protocol == 'https:' ? 'wss:' : 'ws:',
|
webSocketProtocol: window.location.protocol == 'https:' ? 'wss:' : 'ws:',
|
||||||
webSocketBaseUrl: base_url.pathname + 'ws/',
|
webSocketBaseUrl: base_url.pathname + 'ws/',
|
||||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user