mirror of
https://github.com/paperless-ngx/paperless-ngx.git
synced 2025-04-19 10:19: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
@ -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.13-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
|
||||||
|
|
||||||
@ -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.19
|
image: docker.io/gotenberg/gotenberg:8.17
|
||||||
hostname: gotenberg
|
hostname: gotenberg
|
||||||
container_name: gotenberg
|
container_name: gotenberg
|
||||||
network_mode: host
|
network_mode: host
|
||||||
|
@ -24,8 +24,8 @@
|
|||||||
# - 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.
|
||||||
@ -77,7 +77,7 @@ services:
|
|||||||
PAPERLESS_TIKA_ENDPOINT: http://tika:9998
|
PAPERLESS_TIKA_ENDPOINT: http://tika:9998
|
||||||
|
|
||||||
gotenberg:
|
gotenberg:
|
||||||
image: docker.io/gotenberg/gotenberg:8.19
|
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.
|
||||||
|
@ -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
|
||||||
|
@ -22,6 +22,10 @@
|
|||||||
# - 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.
|
||||||
|
@ -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
|
||||||
@ -70,7 +71,7 @@ services:
|
|||||||
PAPERLESS_TIKA_ENDPOINT: http://tika:9998
|
PAPERLESS_TIKA_ENDPOINT: http://tika:9998
|
||||||
|
|
||||||
gotenberg:
|
gotenberg:
|
||||||
image: docker.io/gotenberg/gotenberg:8.19
|
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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
@ -58,7 +59,7 @@ services:
|
|||||||
PAPERLESS_TIKA_ENDPOINT: http://tika:9998
|
PAPERLESS_TIKA_ENDPOINT: http://tika:9998
|
||||||
|
|
||||||
gotenberg:
|
gotenberg:
|
||||||
image: docker.io/gotenberg/gotenberg:8.19
|
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
|
||||||
|
@ -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
|
||||||
|
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
|
||||||
|
@ -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 [[ -n "${USER_IS_NON_ROOT}" ]]; then
|
|
||||||
# Non-root mode: Create directories as current user, warn about permission issues
|
|
||||||
echo "${log_prefix} Running in non-root mode, checking directories"
|
|
||||||
current_uid=$(id --user)
|
|
||||||
current_gid=$(id --group)
|
|
||||||
|
|
||||||
for dir in "${extra_dirs[@]}"; do
|
|
||||||
if [[ ! -d "${dir}" ]]; then
|
|
||||||
mkdir --parents --verbose "${dir}" || echo "${log_prefix} WARNING: Could not create ${dir} - permission denied"
|
|
||||||
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
|
if [[ ! -d "${dir}" ]]; then
|
||||||
mkdir --parents --verbose "${dir}"
|
mkdir --parents --verbose "${dir}"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
# Then fix permissions on all directories
|
echo "${log_prefix} Adjusting file and folder permissions"
|
||||||
for dir in "${main_dirs[@]}"; do
|
for dir in \
|
||||||
|
"${export_dir}" \
|
||||||
|
"${data_dir}" \
|
||||||
|
"${media_root_dir}" \
|
||||||
|
"${consume_dir}" \
|
||||||
|
"${tmp_dir}"; do
|
||||||
find "${dir}" -not \( -user paperless -and -group paperless \) -exec chown --changes paperless:paperless {} +
|
find "${dir}" -not \( -user paperless -and -group paperless \) -exec chown --changes paperless:paperless {} +
|
||||||
done
|
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}"
|
||||||
|
|
||||||
|
(
|
||||||
|
# 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..."
|
echo "${log_prefix} Apply database migrations..."
|
||||||
|
|
||||||
cd "${PAPERLESS_SRC_DIR}"
|
cd "${PAPERLESS_SRC_DIR}"
|
||||||
|
|
||||||
# The whole migrate, with flock, needs to run as the right user
|
|
||||||
if [[ -n "${USER_IS_NON_ROOT}" ]]; then
|
if [[ -n "${USER_IS_NON_ROOT}" ]]; then
|
||||||
exec s6-setlock -n "${data_dir}/migration_lock" python3 manage.py migrate --skip-checks --no-input
|
exec python3 manage.py migrate --skip-checks --no-input
|
||||||
else
|
else
|
||||||
exec s6-setuidgid paperless \
|
exec s6-setuidgid paperless python3 manage.py migrate --skip-checks --no-input
|
||||||
s6-setlock -n "${data_dir}/migration_lock" \
|
|
||||||
python3 manage.py migrate --skip-checks --no-input
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
) 200>"${data_dir}/migration_lock"
|
||||||
|
@ -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`
|
||||||
|
@ -1,296 +1,5 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## 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/".
|
||||||
@ -1670,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"
|
||||||
|
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[project]
|
[project]
|
||||||
name = "paperless-ngx"
|
name = "paperless-ngx"
|
||||||
version = "2.15.2"
|
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,14 +16,14 @@ 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.5.1",
|
"django-celery-results~=2.5.1",
|
||||||
@ -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]
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "paperless-ngx-ui",
|
"name": "paperless-ui",
|
||||||
"version": "2.15.2",
|
"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.7",
|
"@angular/cdk": "^19.2.2",
|
||||||
"@angular/common": "~19.2.4",
|
"@angular/common": "~19.2.1",
|
||||||
"@angular/compiler": "~19.2.4",
|
"@angular/compiler": "~19.2.1",
|
||||||
"@angular/core": "~19.2.4",
|
"@angular/core": "~19.2.1",
|
||||||
"@angular/forms": "~19.2.4",
|
"@angular/forms": "~19.2.1",
|
||||||
"@angular/localize": "~19.2.4",
|
"@angular/localize": "~19.2.1",
|
||||||
"@angular/platform-browser": "~19.2.4",
|
"@angular/platform-browser": "~19.2.1",
|
||||||
"@angular/platform-browser-dynamic": "~19.2.4",
|
"@angular/platform-browser-dynamic": "~19.2.1",
|
||||||
"@angular/router": "~19.2.4",
|
"@angular/router": "~19.2.1",
|
||||||
"@ng-bootstrap/ng-bootstrap": "^18.0.0",
|
"@ng-bootstrap/ng-bootstrap": "^18.0.0",
|
||||||
"@ng-select/ng-select": "^14.2.6",
|
"@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",
|
||||||
@ -44,28 +44,28 @@
|
|||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@angular-builders/custom-webpack": "^19.0.0",
|
"@angular-builders/custom-webpack": "^19.0.0",
|
||||||
"@angular-builders/jest": "^19.0.0",
|
"@angular-builders/jest": "^19.0.0",
|
||||||
"@angular-devkit/build-angular": "^19.2.5",
|
"@angular-devkit/build-angular": "^19.2.1",
|
||||||
"@angular-devkit/core": "^19.2.5",
|
"@angular-devkit/core": "^19.2.1",
|
||||||
"@angular-devkit/schematics": "^19.2.5",
|
"@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.5",
|
"@angular/cli": "~19.2.1",
|
||||||
"@angular/compiler-cli": "~19.2.4",
|
"@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.13.17",
|
"@types/node": "^22.13.9",
|
||||||
"@typescript-eslint/eslint-plugin": "^8.29.0",
|
"@typescript-eslint/eslint-plugin": "^8.26.1",
|
||||||
"@typescript-eslint/parser": "^8.29.0",
|
"@typescript-eslint/parser": "^8.26.1",
|
||||||
"@typescript-eslint/utils": "^8.29.0",
|
"@typescript-eslint/utils": "^8.26.1",
|
||||||
"eslint": "^9.23.0",
|
"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.4",
|
"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",
|
||||||
|
2387
src-ui/pnpm-lock.yaml
generated
2387
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) {
|
||||||
|
@ -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
|
||||||
|
|
||||||
|
@ -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(NEGATIVE_NULL_FILTER_VALUE, newState)
|
|
||||||
} else if (
|
|
||||||
key === NEGATIVE_NULL_FILTER_VALUE &&
|
|
||||||
this.intersection === Intersection.Include
|
|
||||||
) {
|
|
||||||
this.temporarySelectionStates.set(null, newState)
|
|
||||||
} else {
|
|
||||||
this.temporarySelectionStates.set(key, newState)
|
this.temporarySelectionStates.set(key, newState)
|
||||||
}
|
|
||||||
})
|
})
|
||||||
|
|
||||||
this.changed.next(this)
|
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 {
|
||||||
|
@ -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>
|
||||||
|
@ -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)
|
||||||
|
@ -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,
|
||||||
@ -1336,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,
|
||||||
@ -824,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(
|
||||||
@ -995,23 +988,19 @@ 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({
|
|
||||||
next: (response: HttpResponse<Blob>) => {
|
|
||||||
const filename = response.headers
|
|
||||||
.get('Content-Disposition')
|
|
||||||
?.split(';')
|
|
||||||
?.find((part) => part.trim().startsWith('filename='))
|
|
||||||
?.split('=')[1]
|
|
||||||
?.replace(/['"]/g, '')
|
|
||||||
const blob = new Blob([response.body], {
|
|
||||||
type: response.body.type,
|
|
||||||
})
|
|
||||||
this.downloading = false
|
this.downloading = false
|
||||||
const file = new File([blob], filename, {
|
const blobParts = [blob]
|
||||||
type: response.body.type,
|
const file = new File(
|
||||||
})
|
blobParts,
|
||||||
|
original
|
||||||
|
? this.document.original_file_name
|
||||||
|
: this.document.archived_file_name,
|
||||||
|
{
|
||||||
|
type: original ? this.document.mime_type : 'application/pdf',
|
||||||
|
}
|
||||||
|
)
|
||||||
if (
|
if (
|
||||||
!this.deviceDetectorService.isDesktop() &&
|
!this.deviceDetectorService.isDesktop() &&
|
||||||
navigator.canShare &&
|
navigator.canShare &&
|
||||||
@ -1024,7 +1013,7 @@ export class DocumentDetailComponent
|
|||||||
const url = URL.createObjectURL(blob)
|
const url = URL.createObjectURL(blob)
|
||||||
const a = document.createElement('a')
|
const a = document.createElement('a')
|
||||||
a.href = url
|
a.href = url
|
||||||
a.download = filename
|
a.download = this.document.title
|
||||||
a.click()
|
a.click()
|
||||||
URL.revokeObjectURL(url)
|
URL.revokeObjectURL(url)
|
||||||
}
|
}
|
||||||
@ -1290,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 }
|
||||||
|
@ -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()
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@ -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
|
||||||
|
@ -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(''))
|
||||||
)
|
)
|
||||||
|
@ -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)
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
@ -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
|
||||||
|
@ -5,7 +5,7 @@ export const environment = {
|
|||||||
apiBaseUrl: document.baseURI + 'api/',
|
apiBaseUrl: document.baseURI + 'api/',
|
||||||
apiVersion: '7',
|
apiVersion: '7',
|
||||||
appTitle: 'Paperless-ngx',
|
appTitle: 'Paperless-ngx',
|
||||||
version: '2.15.2',
|
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
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
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
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