Bump to version 2.0.2

This way it gets all environment variables and we do not need to hassle ourselves with the generation of php-fpm config files and we can use the normal clear_env=no option

This fixes issue #1006

.docker/frankenphp/Caddyfile

@@ -0,0 +1,55 @@
+{
+	{$CADDY_GLOBAL_OPTIONS}
+
+	frankenphp {
+		{$FRANKENPHP_CONFIG}
+	}
+
+	# https://caddyserver.com/docs/caddyfile/directives#sorting-algorithm
+	order mercure after encode
+	order vulcain after reverse_proxy
+	order php_server before file_server
+}
+
+{$CADDY_EXTRA_CONFIG}
+
+{$SERVER_NAME:localhost} {
+	log {
+		# Redact the authorization query parameter that can be set by Mercure
+		format filter {
+			wrap console
+			fields {
+				uri query {
+					replace authorization REDACTED
+				}
+			}
+		}
+	}
+
+	root * /app/public
+	encode zstd br gzip
+
+	mercure {
+		# Transport to use (default to Bolt)
+		transport_url {$MERCURE_TRANSPORT_URL:bolt:///data/mercure.db}
+		# Publisher JWT key
+		publisher_jwt {env.MERCURE_PUBLISHER_JWT_KEY} {env.MERCURE_PUBLISHER_JWT_ALG}
+		# Subscriber JWT key
+		subscriber_jwt {env.MERCURE_SUBSCRIBER_JWT_KEY} {env.MERCURE_SUBSCRIBER_JWT_ALG}
+		# Allow anonymous subscribers (double-check that it's what you want)
+		anonymous
+		# Enable the subscription API (double-check that it's what you want)
+		subscriptions
+		# Extra directives
+		{$MERCURE_EXTRA_DIRECTIVES}
+	}
+
+	vulcain
+
+	{$CADDY_SERVER_EXTRA_DIRECTIVES}
+
+	# Disable Topics tracking if not enabled explicitly: https://github.com/jkarlin/topics
+	header ?Permissions-Policy "browsing-topics=()"
+
+	php_server
+}

.docker/frankenphp/conf.d/app.dev.ini

@@ -0,0 +1,5 @@
+; See https://docs.docker.com/desktop/networking/#i-want-to-connect-from-a-container-to-a-service-on-the-host
+; See https://github.com/docker/for-linux/issues/264
+; The `client_host` below may optionally be replaced with `discover_client_host=yes`
+; Add `start_with_request=yes` to start debug session on each request
+xdebug.client_host = host.docker.internal

.docker/frankenphp/conf.d/app.ini

@@ -0,0 +1,18 @@
+expose_php = 0
+date.timezone = UTC
+apc.enable_cli = 1
+session.use_strict_mode = 1
+zend.detect_unicode = 0
+
+; https://symfony.com/doc/current/performance.html
+realpath_cache_size = 4096K
+realpath_cache_ttl = 600
+opcache.interned_strings_buffer = 16
+opcache.max_accelerated_files = 20000
+opcache.memory_consumption = 256
+opcache.enable_file_override = 1
+
+memory_limit = 256M
+
+upload_max_filesize=256M
+post_max_size=300M

.docker/frankenphp/conf.d/app.prod.ini

@@ -0,0 +1,2 @@
+opcache.preload_user = root
+opcache.preload = /app/config/preload.php

.docker/frankenphp/docker-entrypoint.sh

@@ -0,0 +1,60 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = 'frankenphp' ] || [ "$1" = 'php' ] || [ "$1" = 'bin/console' ]; then
+	# Install the project the first time PHP is started
+	# After the installation, the following block can be deleted
+	if [ ! -f composer.json ]; then
+		rm -Rf tmp/
+		composer create-project "symfony/skeleton $SYMFONY_VERSION" tmp --stability="$STABILITY" --prefer-dist --no-progress --no-interaction --no-install
+
+		cd tmp
+		cp -Rp . ..
+		cd -
+		rm -Rf tmp/
+
+		composer require "php:>=$PHP_VERSION" runtime/frankenphp-symfony
+		composer config --json extra.symfony.docker 'true'
+
+		if grep -q ^DATABASE_URL= .env; then
+			echo "To finish the installation please press Ctrl+C to stop Docker Compose and run: docker compose up --build -d --wait"
+			sleep infinity
+		fi
+	fi
+
+	if [ -z "$(ls -A 'vendor/' 2>/dev/null)" ]; then
+		composer install --prefer-dist --no-progress --no-interaction
+	fi
+
+	if grep -q ^DATABASE_URL= .env; then
+		echo "Waiting for database to be ready..."
+		ATTEMPTS_LEFT_TO_REACH_DATABASE=60
+		until [ $ATTEMPTS_LEFT_TO_REACH_DATABASE -eq 0 ] || DATABASE_ERROR=$(php bin/console dbal:run-sql -q "SELECT 1" 2>&1); do
+			if [ $? -eq 255 ]; then
+				# If the Doctrine command exits with 255, an unrecoverable error occurred
+				ATTEMPTS_LEFT_TO_REACH_DATABASE=0
+				break
+			fi
+			sleep 1
+			ATTEMPTS_LEFT_TO_REACH_DATABASE=$((ATTEMPTS_LEFT_TO_REACH_DATABASE - 1))
+			echo "Still waiting for database to be ready... Or maybe the database is not reachable. $ATTEMPTS_LEFT_TO_REACH_DATABASE attempts left."
+		done
+
+		if [ $ATTEMPTS_LEFT_TO_REACH_DATABASE -eq 0 ]; then
+			echo "The database is not up or not reachable:"
+			echo "$DATABASE_ERROR"
+			exit 1
+		else
+			echo "The database is now ready and reachable"
+		fi
+
+		if [ "$( find ./migrations -iname '*.php' -print -quit )" ]; then
+			php bin/console doctrine:migrations:migrate --no-interaction
+		fi
+	fi
+
+	setfacl -R -m u:www-data:rwX -m u:"$(whoami)":rwX var
+	setfacl -dR -m u:www-data:rwX -m u:"$(whoami)":rwX var
+fi
+
+exec docker-php-entrypoint "$@"

.docker/frankenphp/worker.Caddyfile

@@ -0,0 +1,4 @@
+worker {
+	file ./public/index.php
+	env APP_RUNTIME Runtime\FrankenPhpSymfony\Runtime
+}

.docker/partdb-entrypoint.sh

@@ -39,8 +39,50 @@ if [ -d /var/www/html/var/db ]; then
     fi
 fi
 
-# Start PHP-FPM
-service php8.1-fpm start
+# Start PHP-FPM (the PHP_VERSION is replaced by the configured version in the Dockerfile)
+php-fpmPHP_VERSION -F &
+
+
+# Run migrations if automigration is enabled via env variable DB_AUTOMIGRATE
+if [ "$DB_AUTOMIGRATE" = "true" ]; then
+		echo "Waiting for database to be ready..."
+		ATTEMPTS_LEFT_TO_REACH_DATABASE=60
+		until [ $ATTEMPTS_LEFT_TO_REACH_DATABASE -eq 0 ] || DATABASE_ERROR=$(sudo -E -u www-data php bin/console dbal:run-sql -q "SELECT 1" 2>&1); do
+			if [ $? -eq 255 ]; then
+				# If the Doctrine command exits with 255, an unrecoverable error occurred
+				ATTEMPTS_LEFT_TO_REACH_DATABASE=0
+				break
+			fi
+			sleep 1
+			ATTEMPTS_LEFT_TO_REACH_DATABASE=$((ATTEMPTS_LEFT_TO_REACH_DATABASE - 1))
+			echo "Still waiting for database to be ready... Or maybe the database is not reachable. $ATTEMPTS_LEFT_TO_REACH_DATABASE attempts left."
+		done
+
+		if [ $ATTEMPTS_LEFT_TO_REACH_DATABASE -eq 0 ]; then
+			echo "The database is not up or not reachable:"
+			echo "$DATABASE_ERROR"
+			exit 1
+		else
+			echo "The database is now ready and reachable"
+		fi
+
+    # Check if there are any available migrations to do, by executing doctrine:migrations:up-to-date
+    # and checking if the exit code is 0 (up to date) or 1 (not up to date)
+    if  sudo -E -u www-data php bin/console doctrine:migrations:up-to-date --no-interaction; then
+        echo "Database is up to date, no migrations necessary."
+    else
+        echo "Migrations available..."
+        echo "Do backup of database..."
+
+        sudo -E -u www-data mkdir -p /var/www/html/uploads/.automigration-backup/
+        # Backup the database
+        sudo -E -u www-data php bin/console partdb:backup -n --database /var/www/html/uploads/.automigration-backup/backup-$(date +%Y-%m-%d_%H-%M-%S).zip
+
+        # Check if there are any migration files
+        sudo -E -u www-data php bin/console doctrine:migrations:migrate --no-interaction
+    fi
+
+fi
 
 # first arg is `-f` or `--some-option` (taken from https://github.com/docker-library/php/blob/master/8.2/bullseye/apache/docker-php-entrypoint)
 if [ "${1#-}" != "$1" ]; then
@@ -48,4 +90,4 @@ if [ "${1#-}" != "$1" ]; then
 fi
 
 # Pass to the original entrypoint
-exec "$@"
+exec "$@"

.docker/symfony.conf

@@ -24,29 +24,10 @@
         ErrorLog ${APACHE_LOG_DIR}/error.log
         CustomLog ${APACHE_LOG_DIR}/access.log combined
 
-        # Pass the configuration from the docker env to the PHP environment (here you should list all .env options)
-        PassEnv APP_ENV APP_DEBUG APP_SECRET
-        PassEnv TRUSTED_PROXIES TRUSTED_HOSTS LOCK_DSN
-        PassEnv DATABASE_URL ENFORCE_CHANGE_COMMENTS_FOR
-        PassEnv DEFAULT_LANG DEFAULT_TIMEZONE BASE_CURRENCY INSTANCE_NAME ALLOW_ATTACHMENT_DOWNLOADS USE_GRAVATAR MAX_ATTACHMENT_FILE_SIZE DEFAULT_URI CHECK_FOR_UPDATES
-        PassEnv MAILER_DSN ALLOW_EMAIL_PW_RESET EMAIL_SENDER_EMAIL EMAIL_SENDER_NAME
-        PassEnv HISTORY_SAVE_CHANGED_FIELDS HISTORY_SAVE_CHANGED_DATA HISTORY_SAVE_REMOVED_DATA HISTORY_SAVE_NEW_DATA
-        PassEnv ERROR_PAGE_ADMIN_EMAIL ERROR_PAGE_SHOW_HELP
-        PassEnv DEMO_MODE NO_URL_REWRITE_AVAILABLE FIXER_API_KEY BANNER
-        # In old version the SAML sp private key env, was wrongly named SAMLP_SP_PRIVATE_KEY, keep it for backward compatibility
-        PassEnv SAML_ENABLED SAML_ROLE_MAPPING SAML_UPDATE_GROUP_ON_LOGIN SAML_IDP_ENTITY_ID SAML_IDP_SINGLE_SIGN_ON_SERVICE SAML_IDP_SINGLE_LOGOUT_SERVICE SAML_IDP_X509_CERT SAML_SP_ENTITY_ID SAML_SP_X509_CERT SAML_SP_PRIVATE_KEY SAMLP_SP_PRIVATE_KEY
-        PassEnv TABLE_DEFAULT_PAGE_SIZE TABLE_PARTS_DEFAULT_COLUMNS
-
-        PassEnv PROVIDER_DIGIKEY_CLIENT_ID PROVIDER_DIGIKEY_SECRET PROVIDER_DIGIKEY_CURRENCY PROVIDER_DIGIKEY_LANGUAGE PROVIDER_DIGIKEY_COUNTRY
-        PassEnv PROVIDER_ELEMENT14_KEY PROVIDER_ELEMENT14_STORE_ID
-        PassEnv PROVIDER_TME_KEY PROVIDER_TME_SECRET PROVIDER_TME_CURRENCY PROVIDER_TME_LANGUAGE PROVIDER_TME_COUNTRY PROVIDER_TME_GET_GROSS_PRICES
-        PassEnv PROVIDER_OCTOPART_CLIENT_ID PROVIDER_OCTOPART_SECRET PROVIDER_OCTOPART_CURRENCY PROVIDER_OCTOPART_COUNTRY PROVIDER_OCTOPART_SEARCH_LIMIT PROVIDER_OCTOPART_ONLY_AUTHORIZED_SELLERS
-        PassEnv PROVIDER_MOUSER_KEY PROVIDER_MOUSER_SEARCH_OPTION PROVIDER_MOUSER_SEARCH_LIMIT PROVIDER_MOUSER_SEARCH_WITH_SIGNUP_LANGUAGE
-
         # For most configuration files from conf-available/, which are
         # enabled or disabled at a global level, it is possible to
         # include a line for only one particular virtual host. For example the
         # following line enables the CGI configuration for this host only
         # after it has been globally disabled with "a2disconf".
         #Include conf-available/serve-cgi-bin.conf
-</VirtualHost>
+</VirtualHost>

.dockerignore

@@ -5,6 +5,8 @@ tests/
 docs/
 .git
 
+/public/media/*
+
 ###> symfony/framework-bundle ###
 /.env.local
 /.env.local.php
@@ -42,3 +44,39 @@ yarn-error.log
 /phpunit.xml
 .phpunit.result.cache
 ###< phpunit/phpunit ###
+
+
+### From frankenphp
+
+**/*.log
+**/*.php~
+**/*.dist.php
+**/*.dist
+**/*.cache
+**/._*
+**/.dockerignore
+**/.DS_Store
+**/.git/
+**/.gitattributes
+**/.gitignore
+**/.gitmodules
+**/compose.*.yaml
+**/compose.*.yml
+**/compose.yaml
+**/compose.yml
+**/docker-compose.*.yaml
+**/docker-compose.*.yml
+**/docker-compose.yaml
+**/docker-compose.yml
+**/Dockerfile
+**/Thumbs.db
+.github/
+public/bundles/
+var/
+vendor/
+.editorconfig
+.env.*.local
+.env.local
+.env.local.php
+.env.test
+

.editorconfig

@@ -0,0 +1,17 @@
+# editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[{compose.yaml,compose.*.yaml}]
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false

.env

@@ -14,39 +14,27 @@ DATABASE_URL="sqlite:///%kernel.project_dir%/var/app.db"
 # Uncomment this line (and comment the line above to use a MySQL database
 #DATABASE_URL=mysql://root:@127.0.0.1:3306/part-db?serverVersion=5.7
 
+# Set this value to 1, if you want to use SSL to connect to the MySQL server. It will be tried to use the CA certificate
+# otherwise a CA bundle shipped with PHP will be used.
+# Leave it at 0, if you do not want to use SSL or if your server does not support it
+DATABASE_MYSQL_USE_SSL_CA=0
+
+# Set this value to 0, if you don't want to verify the CA certificate of the MySQL server
+# Only do this, if you know what you are doing!
+DATABASE_MYSQL_SSL_VERIFY_CERT=1
+
+# Emulate natural sorting of strings even on databases that do not support it (like SQLite, MySQL or MariaDB < 10.7)
+# This can be slow on big databases and might have some problems and quirks, so use it with caution
+DATABASE_EMULATE_NATURAL_SORT=0
+
 ###################################################################################
 # General settings
 ###################################################################################
 
-# The language to use serverwide as default (en, de, ru, etc.)
-DEFAULT_LANG="en"
-# The default timezone to use serverwide (e.g. Europe/Berlin)
-DEFAULT_TIMEZONE="Europe/Berlin"
-# The currency that is used inside the DB (and is assumed when no currency is set). This can not be changed later, so be sure to set it the currency used in your country
-BASE_CURRENCY="EUR"
-# The name of this installation. This will be shown as title in the browser and in the header of the website
-INSTANCE_NAME="Part-DB"
-# Allow users to download attachments to the server by providing an URL
-# This could be a potential security issue, as the user can retrieve any file the server has access to (via internet)
-ALLOW_ATTACHMENT_DOWNLOADS=0
-# Use gravatars for user avatars, when user has no own avatar defined
-USE_GRAVATAR=0
-# The maximum allowed size for attachment files in bytes (you can use M for megabytes and G for gigabytes)
-# Please note that the php.ini setting upload_max_filesize also limits the maximum size of uploaded files
-MAX_ATTACHMENT_FILE_SIZE="100M"
-
-# The public reachable URL of this Part-DB installation. This is used for generating links to the website in emails and so on
+# The public reachable URL of this Part-DB installation. This is used for generating links in SAML and email templates
 # This must end with a slash!
 DEFAULT_URI="https://partdb.changeme.invalid/"
 
-# With this option you can configure, where users are enforced to give a change reason, which will be logged
-# This is a comma separated list of values, see documentation for available values
-# Leave this empty, to make all change reasons optional
-ENFORCE_CHANGE_COMMENTS_FOR=""
-
-# Disable that if you do not want that Part-DB connects to GitHub to check for available updates, or if your server can not connect to the internet
-CHECK_FOR_UPDATES=1
-
 ###################################################################################
 # Email settings
 ###################################################################################
@@ -63,21 +51,6 @@ EMAIL_SENDER_NAME="Part-DB Mailer"
 # Set this to 1 to allow reset of a password per email
 ALLOW_EMAIL_PW_RESET=0
 
-######################################################################################
-# History/Eventlog settings
-######################################################################################
-# If you want to use full timetrave functionality all values below have to be set to 1
-
-# Save which fields were changed in a ElementEdited log entry
-HISTORY_SAVE_CHANGED_FIELDS=1
-# Save the old data in the  ElementEdited log entry (warning this could increase the database size in short time)
-HISTORY_SAVE_CHANGED_DATA=1
-# Save the data of an element that gets removed into log entry. This allows to undelete an element
-HISTORY_SAVE_REMOVED_DATA=1
-# Save the new data of an element that gets changed or added. This allows an easy comparison of the old and new data on the detail page
-# This option only becomes active when HISTORY_SAVE_CHANGED_DATA is set to 1
-HISTORY_SAVE_NEW_DATA=1
-
 ###################################################################################
 # Error pages settings
 ###################################################################################
@@ -87,82 +60,17 @@ ERROR_PAGE_ADMIN_EMAIL=''
 # If this is set to true, solutions to common problems are shown on error pages. Disable this, if you do not want your users to see them...
 ERROR_PAGE_SHOW_HELP=1
 
-##################################################################################
-# Part table settings
-##################################################################################
-
-# The default page size for the part table (set to -1 to show all parts on one page)
-TABLE_DEFAULT_PAGE_SIZE=50
-# Configure which columns will be visible by default in the parts table (and in which order).
-# This is a comma separated list of column names. See documentation for available values.
-TABLE_PARTS_DEFAULT_COLUMNS=name,description,category,footprint,manufacturer,storage_location,amount
-
-##################################################################################
-# Info provider settings
-##################################################################################
-
-# Digikey Provider:
-# You can get your client id and secret from https://developer.digikey.com/
-PROVIDER_DIGIKEY_CLIENT_ID=
-PROVIDER_DIGIKEY_SECRET=
-# The currency to get prices in
-PROVIDER_DIGIKEY_CURRENCY=EUR
-# The language to get results in (en, de, fr, it, es, zh, ja, ko)
-PROVIDER_DIGIKEY_LANGUAGE=en
-# The country to get results for
-PROVIDER_DIGIKEY_COUNTRY=DE
-
-# Farnell Provider:
-# You can get your API key from https://partner.element14.com/
-PROVIDER_ELEMENT14_KEY=
-# Configure the store domain you want to use. This decides the language and currency of results. You can get a list of available stores from https://partner.element14.com/docs/Product_Search_API_REST__Description
-PROVIDER_ELEMENT14_STORE_ID=de.farnell.com
-
-# TME Provider:
-# You can get your API key from https://developers.tme.eu/en/
-PROVIDER_TME_KEY=
-PROVIDER_TME_SECRET=
-# The currency to get prices in
-PROVIDER_TME_CURRENCY=EUR
-# The language to get results in (en, de, pl)
-PROVIDER_TME_LANGUAGE=en
-# The country to get results for
-PROVIDER_TME_COUNTRY=DE
-# Set this to 1 to get gross prices (including VAT) instead of net prices
-PROVIDER_TME_GET_GROSS_PRICES=1
-
-# Octopart / Nexar Provider:
-# You can get your API key from https://nexar.com/api
-PROVIDER_OCTOPART_CLIENT_ID=
-PROVIDER_OCTOPART_SECRET=
-# The currency and country to get prices for (you have to set both to get meaningful results)
-# 3 letter ISO currency code (e.g. EUR, USD, GBP)
-PROVIDER_OCTOPART_CURRENCY=EUR
-# 2 letter ISO country code (e.g. DE, US, GB)
-PROVIDER_OCTOPART_COUNTRY=DE
-# The number of results to get from Octopart while searching (please note that this counts towards your API limits)
-PROVIDER_OCTOPART_SEARCH_LIMIT=10
-# Set to false to include non authorized offers in the results
-PROVIDER_OCTOPART_ONLY_AUTHORIZED_SELLERS=1
-
-# Mouser Provider API V2:
-# You can get your API key from https://www.mouser.it/api-hub/
-PROVIDER_MOUSER_KEY=
-# Filter search results by RoHS compliance and stock availability:
-# Available options: None | Rohs | InStock | RohsAndInStock
-PROVIDER_MOUSER_SEARCH_OPTION='None'
-# The number of results to get from Mouser while searching (please note that this value is max 50)
-PROVIDER_MOUSER_SEARCH_LIMIT=50
-# It is recommended to leave this set to 'true'. The option is not really good doumented by Mouser:
-# Used when searching for keywords in the language specified when you signed up for Search API.
-PROVIDER_MOUSER_SEARCH_WITH_SIGNUP_LANGUAGE='true'
 
 ###################################################################################
 # SAML Single sign on-settings
 ###################################################################################
 # Set this to 1 to enable SAML single sign on
+# Be also sure to set the correct values for DEFAULT_URI
 SAML_ENABLED=0
 
+# Set to 1, if your Part-DB installation is behind a reverse proxy and you want to use SAML
+SAML_BEHIND_PROXY=0
+
 # A JSON encoded array of role mappings in the form { "saml_role": PARTDB_GROUP_ID, "*": PARTDB_GROUP_ID }
 # The first match is used, so the order is important! Put the group mapping with the most privileges first.
 # Please not to only use single quotes to enclose the JSON string
@@ -202,19 +110,14 @@ DEMO_MODE=0
 # In that case all URL contains the index.php front controller in URL
 NO_URL_REWRITE_AVAILABLE=0
 
-# If you want to use fixer.io for currency conversion, you have to set this to your API key
-FIXER_API_KEY=CHANGEME
-
-# Override value if you want to show to show a given text on homepage.
-# When this is empty the content of config/banner.md is used as banner
-BANNER=""
-
-APP_ENV=prod
-APP_SECRET=a03498528f5a5fc089273ec9ae5b2849
+# Set to 1, if Part-DB should redirect all HTTP requests to HTTPS. You dont need to configure this, if your webserver already does this.
+REDIRECT_TO_HTTPS=0
 
+# Set this to zero, if you want to disable the year 2038 bug check on 32-bit systems (it will cause errors with current 32-bit PHP versions)
+DISABLE_YEAR2038_BUG_CHECK=0
 
 # Set the trusted IPs here, when using an reverse proxy
-#TRUSTED_PROXIES=127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
+#TRUSTED_PROXIES=127.0.0.0/8,::1,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
 #TRUSTED_HOSTS='^(localhost|example\.com)$'
 
 
@@ -227,3 +130,8 @@ LOCK_DSN=flock
 ###> nelmio/cors-bundle ###
 CORS_ALLOW_ORIGIN='^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$'
 ###< nelmio/cors-bundle ###
+
+###> symfony/framework-bundle ###
+APP_ENV=prod
+APP_SECRET=a03498528f5a5fc089273ec9ae5b2849
+###< symfony/framework-bundle ###

.env.dev

@@ -0,0 +1,4 @@
+
+###> symfony/framework-bundle ###
+APP_SECRET=318b5d659e07a0b3f96d9b3a83b254ca
+###< symfony/framework-bundle ###

.env.test

@@ -5,5 +5,11 @@ SYMFONY_DEPRECATIONS_HELPER=999999
 PANTHER_APP_ENV=panther
 PANTHER_ERROR_SCREENSHOT_DIR=./var/error-screenshots
 
+DATABASE_URL="sqlite:///%kernel.project_dir%/var/app_test.db"
 # Doctrine automatically adds an _test suffix to database name in test env
-DATABASE_URL=mysql://root:@127.0.0.1:3306/part-db
+#DATABASE_URL=mysql://root:@127.0.0.1:3306/part-db
+
+# Disable update checks, as tests would fail, when github is not reachable
+CHECK_FOR_UPDATES=0
+
+INSTANCE_NAME="Part-DB"

.github/workflows/assets_artifact_build.yml

@@ -1,5 +1,8 @@
 name: Build assets artifact
 
+permissions:
+    contents: read
+
 on:
   push:
     branches:
@@ -19,7 +22,7 @@ jobs:
       APP_ENV: prod
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -27,19 +30,19 @@ jobs:
           php-version: '8.2'
           coverage: none
           ini-values: xdebug.max_nesting_level=1000
-          extensions: mbstring, intl, gd, xsl, gmp, bcmath
+          extensions: mbstring, intl, gd, xsl, gmp, bcmath, :php-psr
 
       - name: Get Composer Cache Directory
         id: composer-cache
         run: |
           echo "::set-output name=dir::$(composer config cache-files-dir)"
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: |
-            ${{ runner.os }}-composer-  
+            ${{ runner.os }}-composer-
 
       - name: Install dependencies
         run: composer install --prefer-dist --no-progress --no-dev -a
@@ -48,7 +51,7 @@ jobs:
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -57,9 +60,9 @@ jobs:
             ${{ runner.os }}-yarn-
 
       - name: Setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: '18'
+          node-version: '20'
 
       - name: Install yarn dependencies
         run: yarn install
@@ -77,13 +80,13 @@ jobs:
         run: zip -r /tmp/partdb_assets.zip public/build/ vendor/
 
       - name: Upload assets artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Only dependencies and built assets
           path: /tmp/partdb_assets.zip
 
       - name: Upload full artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Full Part-DB including dependencies and built assets
           path: /tmp/partdb_with_assets.zip

.github/workflows/docker_build.yml

@@ -1,5 +1,8 @@
 name: Docker Image Build
 
+permissions:
+    contents: read
+
 on:
   #schedule:
   #  - cron: '0 10 * * *' # everyday at 10am
@@ -17,7 +20,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       -
         name: Docker meta
         id: docker_meta
@@ -65,7 +68,7 @@ jobs:
 
       -
         name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: .
           platforms: linux/amd64,linux/arm64,linux/arm/v7
@@ -73,4 +76,4 @@ jobs:
           tags: ${{ steps.docker_meta.outputs.tags }}
           labels: ${{ steps.docker_meta.outputs.labels }}
           cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-to: type=gha,mode=max

.github/workflows/docker_frankenphp.yml

@@ -0,0 +1,80 @@
+name: Docker Image Build (FrankenPHP)
+
+permissions:
+    contents: read
+
+on:
+  #schedule:
+  #  - cron: '0 10 * * *' # everyday at 10am
+  push:
+    branches:
+      - '**'
+      - '!l10n_**'
+    tags:
+      - 'v*.*.*'
+      - 'v*.*.*-**'
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v5
+      -
+        name: Docker meta
+        id: docker_meta
+        uses: docker/metadata-action@v5
+        with:
+          # list of Docker images to use as base name for tags
+          images: |
+            partdborg/part-db
+          # Mark the image build from master as latest (as we dont have really releases yet)
+          tags: |
+            type=edge,branch=master
+            type=ref,event=branch,
+            type=ref,event=tag,
+            type=schedule
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=ref,event=branch
+            type=ref,event=pr
+          labels: |
+            org.opencontainers.image.source=${{ github.event.repository.clone_url }}
+            org.opencontainers.image.revision=${{ github.sha }}
+            org.opencontainers.image.title=Part-DB
+            org.opencontainers.image.description=Part-DB is a web application for managing electronic components and your inventory.
+            org.opencontainers.image.url=https://github.com/Part-DB/Part-DB-server
+            org.opencontainers.image.source=https://github.com/Part-DB/Part-DB-server
+            org.opencontainers.image.authors=Jan Böhmer
+            org.opencontainers.licenses=AGPL-3.0-or-later
+
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: 'arm64,arm'
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      -
+        name: Login to DockerHub
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      -
+        name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: Dockerfile-frankenphp
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.docker_meta.outputs.tags }}
+          labels: ${{ steps.docker_meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

.github/workflows/static_analysis.yml

@@ -1,5 +1,8 @@
 name: Static analysis
 
+permissions:
+    contents: read
+
 on:
   push:
     branches:
@@ -16,7 +19,7 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
@@ -24,26 +27,26 @@ jobs:
         php-version: '8.2'
         coverage: none
         ini-values: xdebug.max_nesting_level=1000
-        extensions: mbstring, intl, gd, xsl, gmp, bcmath
+        extensions: mbstring, intl, gd, xsl, gmp, bcmath, :php-psr
 
     - name: Get Composer Cache Directory
       id: composer-cache
       run: |
         echo "::set-output name=dir::$(composer config cache-files-dir)"
-    
-    - uses: actions/cache@v3
+
+    - uses: actions/cache@v4
       with:
         path: ${{ steps.composer-cache.outputs.dir }}
         key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
         restore-keys: |
-          ${{ runner.os }}-composer-  
+          ${{ runner.os }}-composer-
 
     - name: Install dependencies
       run: composer install --prefer-dist --no-progress
 
     - name: Lint config files
       run: ./bin/console lint:yaml config --parse-tags
-    
+
     - name: Lint twig templates
       run: ./bin/console lint:twig templates --env=prod
 
@@ -53,13 +56,13 @@ jobs:
 
     - name: Check dependencies for security
       uses: symfonycorp/security-checker-action@v5
-    
+
     - name: Check doctrine mapping
       run: ./bin/console doctrine:schema:validate --skip-sync -vvv --no-interaction
 
     # Use the -d option to raise the max nesting level
     - name: Generate dev container
       run: php -d xdebug.max_nesting_level=1000 ./bin/console cache:clear --env dev
-    
+
     - name: Run PHPstan
       run: composer phpstan

.github/workflows/tests.yml

@@ -1,5 +1,8 @@
 name: PHPUnit Tests
 
+permissions:
+    contents: read
+
 on:
   push:
     branches:
@@ -9,17 +12,17 @@ on:
     branches:
       - '*'
       - "!l10n_*"
-    
+
 jobs:
   phpunit:
     name: PHPUnit and coverage Test (PHP ${{ matrix.php-versions }}, ${{ matrix.db-type }})
-    # Ubuntu 20.04 ships MySQL 8.0 which causes problems with login, so we just use ubuntu 18.04 for now...
     runs-on: ubuntu-22.04
 
     strategy:
+      fail-fast: false
       matrix:
-        php-versions: [ '8.1', '8.2' ]
-        db-type: [ 'mysql', 'sqlite' ]
+        php-versions: ['8.2', '8.3', '8.4' ]
+        db-type: [ 'mysql', 'sqlite', 'postgres' ]
 
     env:
       # Note that we set DATABASE URL later based on our db-type matrix value
@@ -27,18 +30,23 @@ jobs:
       SYMFONY_DEPRECATIONS_HELPER: disabled
       PHP_VERSION: ${{ matrix.php-versions }}
       DB_TYPE: ${{ matrix.db-type }}
+      CHECK_FOR_UPDATES: false  # Disable update checks for tests
 
     steps:
       - name: Set Database env for MySQL
-        run: echo "DATABASE_URL=mysql://root:root@127.0.0.1:3306/test" >> $GITHUB_ENV
+        run: echo "DATABASE_URL=mysql://root:root@127.0.0.1:3306/partdb?serverVersion=8.0.35" >> $GITHUB_ENV
         if: matrix.db-type == 'mysql'
 
       - name: Set Database env for SQLite
         run: echo "DATABASE_URL="sqlite:///%kernel.project_dir%/var/app_test.db"" >> $GITHUB_ENV
         if: matrix.db-type == 'sqlite'
 
+      - name: Set Database env for PostgreSQL
+        run: echo "DATABASE_URL=postgresql://postgres:postgres @127.0.0.1:5432/partdb?serverVersion=14&charset=utf8" >> $GITHUB_ENV
+        if: matrix.db-type == 'postgres'
+
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -46,99 +54,104 @@ jobs:
           php-version: ${{ matrix.php-versions }}
           coverage: pcov
           ini-values: xdebug.max_nesting_level=1000
-          extensions: mbstring, intl, gd, xsl, gmp, bcmath        
-    
+          extensions: mbstring, intl, gd, xsl, gmp, bcmath, :php-psr
+
       - name: Start MySQL
         run: sudo systemctl start mysql.service
+        if: matrix.db-type == 'mysql'
 
-      #- name: Setup MySQL
+        # Replace the scram-sha-256 with trust for host connections, to avoid password authentication
+      - name: Start PostgreSQL
+        run: |
+          sudo sed -i 's/^\(host.*all.*all.*\)scram-sha-256/\1trust/' /etc/postgresql/14/main/pg_hba.conf
+          sudo systemctl start postgresql.service
+          sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';"
+        if: matrix.db-type == 'postgres'
+
+        #- name: Setup MySQL
       #  uses: mirromutth/mysql-action@v1.1
       #  with:
       #    mysql version: 5.7
       #    mysql database: 'part-db'
       #    mysql root password: '1234'
-        
+
       ## Setup caches
-      
+
       - name: Get Composer Cache Directory
         id: composer-cache
         run: |
           echo "::set-output name=dir::$(composer config cache-files-dir)"
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
           restore-keys: |
-            ${{ runner.os }}-composer-  
-      
+            ${{ runner.os }}-composer-
+
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-yarn-
-      
+
       - name: Install composer dependencies
         run: composer install --prefer-dist --no-progress
-    
+
       - name: Setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: '18'
-    
+          node-version: '20'
+
       - name: Install yarn dependencies
         run: yarn install
-    
+
       - name: Build frontend
         run: yarn build
-    
+
       - name: Create DB
         run: php bin/console --env test doctrine:database:create --if-not-exists -n
-        if: matrix.db-type == 'mysql'
+        if: matrix.db-type == 'mysql' || matrix.db-type == 'postgres'
 
-      # Checkinf for existance is not supported for sqlite, so do it without it
-      - name: Create DB
-        run: php bin/console --env test doctrine:database:create -n
-        if: matrix.db-type == 'sqlite'
-    
       - name: Do migrations
         run: php bin/console --env test doctrine:migrations:migrate -n
-    
+
+      # Use our own custom fixtures loading command to circumvent some problems with reset the autoincrement values
       - name: Load fixtures
-        run: php bin/console --env test doctrine:fixtures:load -n
-    
+        run: php bin/console --env test partdb:fixtures:load -n
+
       - name: Run PHPunit and generate coverage
         run: ./bin/phpunit --coverage-clover=coverage.xml
-      
+
       - name: Upload coverage
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v5
         with:
           env_vars: PHP_VERSION,DB_TYPE
           token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: true
-          
+
       - name: Test app:clean-attachments
         run: php bin/console partdb:attachments:clean-unused -n
-      
+
       - name: Test app:convert-bbcode
         run: php bin/console app:convert-bbcode -n
-      
+
       - name: Test app:show-logs
         run: php bin/console app:show-logs -n
 
       - name: Test check-requirements command
         run: php bin/console partdb:check-requirements -n
 
+      - name: Test partdb:backup command
+        run: php bin/console partdb:backup -n --full /tmp/test_backup.zip
+
       - name: Test legacy Part-DB import
         run: bash .github/assets/legacy_import/test_legacy_import.sh
         if: matrix.db-type == 'mysql' && matrix.php-versions == '8.2'
         env:
           DATABASE_URL: mysql://root:root@localhost:3306/legacy_db
-
-
-      

.gitignore

@@ -2,6 +2,7 @@
 /.env.local
 /.env.local.php
 /.env.*.local
+/.env.local.bak
 /config/secrets/prod/prod.decrypt.private.php
 /public/bundles/
 /var/
@@ -41,7 +42,7 @@ yarn-error.log
 
 ###> phpunit/phpunit ###
 /phpunit.xml
-.phpunit.result.cache
+/.phpunit.cache/
 ###< phpunit/phpunit ###
 
 ###> phpstan/phpstan ###

Dockerfile

@@ -1,22 +1,64 @@
-FROM debian:bullseye-slim
+ARG BASE_IMAGE=debian:bookworm-slim
+ARG PHP_VERSION=8.4
+
+FROM ${BASE_IMAGE} AS base
+ARG PHP_VERSION
 
 # Install needed dependencies for PHP build
 #RUN apt-get update &&  apt-get install -y pkg-config curl libcurl4-openssl-dev libicu-dev \
 #    libpng-dev libjpeg-dev libfreetype6-dev gnupg zip libzip-dev libjpeg62-turbo-dev libonig-dev libxslt-dev libwebp-dev vim \
 #    && apt-get -y autoremove && apt-get clean autoclean && rm -rf /var/lib/apt/lists/*
 
-RUN apt-get update && apt-get -y install apt-transport-https lsb-release ca-certificates curl zip \
+RUN apt-get update && apt-get -y install \
+      apt-transport-https \
+      lsb-release \
+      ca-certificates \
+      curl \
+      zip \
+      mariadb-client \
+      postgresql-client \
     && curl -sSLo /usr/share/keyrings/deb.sury.org-php.gpg https://packages.sury.org/php/apt.gpg  \
     && sh -c 'echo "deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list' \
     && apt-get update && apt-get upgrade -y \
-    && apt-get install -y apache2 php8.1 php8.1-fpm php8.1-opcache php8.1-curl php8.1-gd php8.1-mbstring php8.1-xml php8.1-bcmath php8.1-intl php8.1-zip php8.1-xsl php8.1-sqlite3 php8.1-mysql gpg \
-    && apt-get -y autoremove && apt-get clean autoclean && rm -rf /var/lib/apt/lists/*;
-
-ENV APACHE_CONFDIR /etc/apache2
-ENV APACHE_ENVVARS $APACHE_CONFDIR/envvars
-
+    && apt-get install -y \
+      apache2 \
+      php${PHP_VERSION} \
+      php${PHP_VERSION}-fpm \
+      php${PHP_VERSION}-opcache \
+      php${PHP_VERSION}-curl \
+      php${PHP_VERSION}-gd \
+      php${PHP_VERSION}-mbstring \
+      php${PHP_VERSION}-xml \
+      php${PHP_VERSION}-bcmath \
+      php${PHP_VERSION}-intl \
+      php${PHP_VERSION}-zip \
+      php${PHP_VERSION}-xsl \
+      php${PHP_VERSION}-sqlite3 \
+      php${PHP_VERSION}-mysql \
+      php${PHP_VERSION}-pgsql \
+      gpg \
+      sudo \
+    && apt-get -y autoremove && apt-get clean autoclean && rm -rf /var/lib/apt/lists/* \
 # Create workdir and set permissions if directory does not exists
-RUN mkdir -p /var/www/html && chown -R www-data:www-data /var/www/html
+    && mkdir -p /var/www/html \
+    && chown -R www-data:www-data /var/www/html \
+# delete the "index.html" that installing Apache drops in here
+    && rm -rvf /var/www/html/*
+
+# Install node and yarn
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
+    echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
+    curl -sL https://deb.nodesource.com/setup_22.x | bash - && \
+    apt-get update && apt-get install -y \
+      nodejs \
+      yarn \
+    && apt-get -y autoremove && apt-get clean autoclean && rm -rf /var/lib/apt/lists/*
+
+# Install composer
+COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
+
+ENV APACHE_CONFDIR=/etc/apache2
+ENV APACHE_ENVVARS=$APACHE_CONFDIR/envvars
 
 # Configure apache 2 (taken from https://github.com/docker-library/php/blob/master/8.2/bullseye/apache/Dockerfile)
 # generically convert lines like
@@ -27,8 +69,6 @@ RUN mkdir -p /var/www/html && chown -R www-data:www-data /var/www/html
 # so that they can be overridden at runtime ("-e APACHE_RUN_USER=...")
 RUN  sed -ri 's/^export ([^=]+)=(.*)$/: ${\1:=\2}\nexport \1/' "$APACHE_ENVVARS"; \
       set -eux; . "$APACHE_ENVVARS";  \
-    # delete the "index.html" that installing Apache drops in here
-    	rm -rvf /var/www/html/*; \
     	\
     # logs should go to stdout / stderr
     	ln -sfT /dev/stderr "$APACHE_LOG_DIR/error.log"; \
@@ -36,82 +76,87 @@ RUN  sed -ri 's/^export ([^=]+)=(.*)$/: ${\1:=\2}\nexport \1/' "$APACHE_ENVVARS"
     	ln -sfT /dev/stdout "$APACHE_LOG_DIR/other_vhosts_access.log"; \
         chown -R --no-dereference "$APACHE_RUN_USER:$APACHE_RUN_GROUP" "$APACHE_LOG_DIR";
 
-# Enable php-fpm
-RUN a2enmod proxy_fcgi setenvif && a2enconf php8.1-fpm
+# ---
 
+FROM scratch AS apache-config
+ARG PHP_VERSION
 # Configure php-fpm to log to stdout of the container (stdout of PID 1)
 # We have to use /proc/1/fd/1 because /dev/stdout or /proc/self/fd/1 does not point to the container stdout (because we use apache as entrypoint)
 # We also disable the clear_env option to allow the use of environment variables in php-fpm
-RUN { \
-    echo '[global]'; \
-    echo 'error_log = /proc/1/fd/1'; \
-    echo; \
-    echo '[www]'; \
-    echo 'access.log = /proc/1/fd/1'; \
-    echo 'catch_workers_output = yes'; \
-    echo 'decorate_workers_output = no'; \
-    echo 'clear_env = no'; \
-   } | tee "/etc/php/8.1/fpm/pool.d/zz-docker.conf"
+COPY <<EOF /etc/php/${PHP_VERSION}/fpm/pool.d/zz-docker.conf
+[global]
+error_log = /proc/1/fd/1
+
+[www]
+access.log = /proc/1/fd/1
+catch_workers_output = yes
+decorate_workers_output = no
+clear_env = no
+EOF
 
 # PHP files should be handled by PHP, and should be preferred over any other file type
-RUN { \
-		echo '<FilesMatch \.php$>'; \
-		echo '\tSetHandler application/x-httpd-php'; \
-		echo '</FilesMatch>'; \
-		echo; \
-		echo 'DirectoryIndex disabled'; \
-		echo 'DirectoryIndex index.php index.html'; \
-		echo; \
-		echo '<Directory /var/www/>'; \
-		echo '\tOptions -Indexes'; \
-		echo '\tAllowOverride All'; \
-		echo '</Directory>'; \
-	} | tee "$APACHE_CONFDIR/conf-available/docker-php.conf" \
-	&& a2enconf docker-php
+COPY <<EOF /etc/apache2/conf-available/docker-php.conf
+<FilesMatch \\.php$>
+	SetHandler application/x-httpd-php
+</FilesMatch>
+
+DirectoryIndex disabled
+DirectoryIndex index.php index.html
+
+<Directory /var/www/>
+	Options -Indexes
+	AllowOverride All
+</Directory>
+EOF
 
 # Enable opcache and configure it recommended for symfony (see https://symfony.com/doc/current/performance.html)
-RUN  \
-	{ \
-		echo 'opcache.memory_consumption=256'; \
-		echo 'opcache.max_accelerated_files=20000'; \
-		echo 'opcache.validate_timestamp=0'; \
-        # Configure Realpath cache for performance
-        echo 'realpath_cache_size=4096K'; \
-        echo 'realpath_cache_ttl=600'; \
-    } > /etc/php/8.1/fpm/conf.d/symfony-recommended.ini
+COPY <<EOF /etc/php/${PHP_VERSION}/fpm/conf.d/symfony-recommended.ini
+opcache.memory_consumption=256
+opcache.max_accelerated_files=20000
+opcache.validate_timestamp=0
+# Configure Realpath cache for performance
+realpath_cache_size=4096K
+realpath_cache_ttl=600
+EOF
 
-# Increase upload limit and enable preloading
-RUN  \
-	{ \
-		echo 'upload_max_filesize=256M'; \
-		echo 'post_max_size=300M'; \
-        echo 'opcache.preload_user=www-data'; \
-        echo 'opcache.preload=/var/www/html/config/preload.php'; \
-    } > /etc/php/8.1/fpm/conf.d/partdb.ini
+# Increase upload limit and enable preloading (disabled for now, as it does not seem to work properly, and require prod env anyway)
+COPY <<EOF /etc/php/${PHP_VERSION}/fpm/conf.d/partdb.ini
+upload_max_filesize=256M
+post_max_size=300M
+;opcache.preload_user=www-data
+;opcache.preload=/var/www/html/config/preload.php
+log_limit=8096
+EOF
 
-# Install node and yarn
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
-RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
-RUN curl -sL https://deb.nodesource.com/setup_18.x | bash - && apt-get update && apt-get install -y nodejs yarn && apt-get -y autoremove && apt-get clean autoclean && rm -rf /var/lib/apt/lists/*
+COPY ./.docker/symfony.conf /etc/apache2/sites-available/symfony.conf
 
-# Install composer
-COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
+# ---
 
+FROM base
+ARG PHP_VERSION
 
 # Set working dir
 WORKDIR /var/www/html
+COPY --from=apache-config / /
 COPY --chown=www-data:www-data . .
 
 # Setup apache2
-RUN a2dissite 000-default.conf
-COPY ./.docker/symfony.conf /etc/apache2/sites-available/symfony.conf
-RUN a2ensite symfony.conf
-RUN a2enmod rewrite
+RUN a2dissite 000-default.conf && \
+    a2ensite symfony.conf && \
+# Enable php-fpm
+    a2enmod proxy_fcgi setenvif && \
+    a2enconf php${PHP_VERSION}-fpm && \
+    a2enconf docker-php && \
+    a2enmod rewrite
 
 # Install composer and yarn dependencies for Part-DB
 USER www-data
-RUN composer install -a --no-dev && composer clear-cache
-RUN yarn install --network-timeout 600000 && yarn build && yarn cache clean && rm -rf node_modules/
+RUN composer install -a --no-dev && \
+    composer clear-cache
+RUN yarn install --network-timeout 600000 && \
+    yarn build && \
+    yarn cache clean && \
+    rm -rf node_modules/
 
 # Use docker env to output logs to stdout
 ENV APP_ENV=docker
@@ -119,10 +164,12 @@ ENV DATABASE_URL="sqlite:///%kernel.project_dir%/uploads/app.db"
 
 USER root
 
-# Copy entrypoint to /usr/local/bin and make it executable
-RUN cp ./.docker/partdb-entrypoint.sh /usr/local/bin/partdb-entrypoint.sh && chmod +x /usr/local/bin/partdb-entrypoint.sh
-# Copy apache2-foreground to /usr/local/bin and make it executable
-RUN cp ./.docker/apache2-foreground /usr/local/bin/apache2-foreground && chmod +x /usr/local/bin/apache2-foreground
+# Replace the php version placeholder in the entry point, with our php version
+RUN sed -i "s/PHP_VERSION/${PHP_VERSION}/g" ./.docker/partdb-entrypoint.sh
+
+# Copy entrypoint and apache2-foreground to /usr/local/bin and make it executable
+RUN install ./.docker/partdb-entrypoint.sh /usr/local/bin && \
+    install ./.docker/apache2-foreground /usr/local/bin
 ENTRYPOINT ["partdb-entrypoint.sh"]
 CMD ["apache2-foreground"]
 
@@ -130,4 +177,4 @@ CMD ["apache2-foreground"]
 STOPSIGNAL SIGWINCH
 
 EXPOSE 80
-VOLUME ["/var/www/html/uploads", "/var/www/html/public/media"]
+VOLUME ["/var/www/html/uploads", "/var/www/html/public/media"]

Dockerfile-frankenphp

@@ -0,0 +1,121 @@
+FROM dunglas/frankenphp:1-php8.4 AS frankenphp_upstream
+
+RUN apt-get update && apt-get -y install \
+      curl \
+      ca-certificates \
+      mariadb-client \
+      postgresql-client \
+      file \
+      acl \
+      git \
+      gettext \
+      gnupg \
+      zip \
+    && apt-get -y autoremove && apt-get clean autoclean && rm -rf /var/lib/apt/lists/*;
+
+RUN set -eux; \
+    # Prepare keyrings directory
+    mkdir -p /etc/apt/keyrings; \
+    \
+    # Import Yarn GPG key
+    curl -fsSL https://dl.yarnpkg.com/debian/pubkey.gpg \
+      | tee /etc/apt/keyrings/yarn.gpg >/dev/null; \
+    chmod 644 /etc/apt/keyrings/yarn.gpg; \
+    \
+    # Add Yarn repo with signed-by
+    echo "deb [signed-by=/etc/apt/keyrings/yarn.gpg] https://dl.yarnpkg.com/debian stable main" \
+      | tee /etc/apt/sources.list.d/yarn.list; \
+    \
+    # Run NodeSource setup script (unchanged)
+    curl -sL https://deb.nodesource.com/setup_22.x | bash -; \
+    \
+    # Install Node.js + Yarn
+    apt-get update; \
+    apt-get install -y --no-install-recommends \
+      nodejs \
+      yarn; \
+    \
+    # Cleanup
+    apt-get -y autoremove; \
+    apt-get clean autoclean; \
+    rm -rf /var/lib/apt/lists/*
+
+
+# Install PHP
+RUN set -eux; \
+	install-php-extensions \
+		@composer \
+		apcu \
+		intl \
+		opcache \
+		zip \
+        pdo_mysql \
+        pdo_sqlite \
+        pdo_pgsql \
+        gd \
+        bcmath \
+        xsl \
+	;
+
+# Copy config files for php and caddy
+COPY --link .docker/frankenphp/conf.d/app.ini $PHP_INI_DIR/conf.d/
+COPY --chmod=755 .docker/frankenphp/docker-entrypoint.sh /usr/local/bin/docker-entrypoint
+COPY --link .docker/frankenphp/Caddyfile /etc/caddy/Caddyfile
+COPY --link .docker/frankenphp/conf.d/app.prod.ini $PHP_INI_DIR/conf.d/
+COPY --link .docker/frankenphp/worker.Caddyfile /etc/caddy/worker.Caddyfile
+ENV FRANKENPHP_CONFIG="import worker.Caddyfile"
+
+RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
+
+# Install composer
+ENV COMPOSER_ALLOW_SUPERUSER=1
+#COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
+
+# Create workdir and set permissions if directory does not exists
+WORKDIR /app
+
+# prevent the reinstallation of vendors at every changes in the source code
+COPY --link composer.* symfony.* ./
+RUN set -eux; \
+	composer install --no-cache --prefer-dist --no-dev --no-autoloader --no-scripts --no-progress
+
+# copy sources
+COPY --link . ./
+
+# Install composer and yarn dependencies for Part-DB
+RUN set -eux; \
+	mkdir -p var/cache var/log; \
+	composer dump-autoload --classmap-authoritative --no-dev; \
+	composer dump-env prod; \
+	composer run-script --no-dev post-install-cmd; \
+	chmod +x bin/console; sync;
+
+RUN yarn install --network-timeout 600000 && \
+    yarn build && \
+    yarn cache clean && \
+    rm -rf node_modules/
+
+# Use docker env to output logs to stdout
+ENV APP_ENV=docker
+ENV DATABASE_URL="sqlite:///%kernel.project_dir%/uploads/app.db"
+
+USER root
+
+ENTRYPOINT ["docker-entrypoint"]
+CMD ["frankenphp", "run", "--config", "/etc/caddy/Caddyfile"]
+
+# https://httpd.apache.org/docs/2.4/stopping.html#gracefulstop
+STOPSIGNAL SIGWINCH
+
+VOLUME ["/var/www/html/uploads", "/var/www/html/public/media"]
+
+HEALTHCHECK --start-period=60s CMD curl -f http://localhost:2019/metrics || exit 1
+
+# See https://caddyserver.com/docs/conventions#file-locations for details
+ENV XDG_CONFIG_HOME /config
+ENV XDG_DATA_HOME /data
+
+EXPOSE 80
+EXPOSE 443
+EXPOSE 443/udp
+EXPOSE 2019

README.md

@@ -9,7 +9,7 @@
 ![Docker Build Status](https://github.com/Part-DB/Part-DB-symfony/workflows/Docker%20Image%20Build/badge.svg)
 [![Crowdin](https://badges.crowdin.net/e/8325196085d4bee8c04b75f7c915452a/localized.svg)](https://part-db.crowdin.com/part-db)
 
-**[Documentation](https://docs.part-db.de/)** | **[Demo](https://part-db.herokuapp.com)** | **[Docker Image](https://hub.docker.com/r/jbtronics/part-db1)**
+**[Documentation](https://docs.part-db.de/)** | **[Demo](https://demo.part-db.de/)** | **[Docker Image](https://hub.docker.com/r/jbtronics/part-db1)**
 
 # Part-DB
 
@@ -24,13 +24,13 @@ for everybody.
 
 ## Demo
 
-If you want to test Part-DB without installing it, you can use [this](https://part-db.herokuapp.com) Heroku instance.
-(Or this link for the [German Version](https://part-db.herokuapp.com/de/)).
+If you want to test Part-DB without installing it, you can use [this](https://demo.part-db.de/) Heroku instance.
+(Or this link for the [German Version](https://demo.part-db.de/de/)).
 
 You can log in with username: *user* and password: *user*.
 
 Every change to the master branch gets automatically deployed, so it represents the current development progress and is
-maybe not completely stable. Please mind, that the free Heroku instance is used, so it can take some time when loading
+may not completely stable. Please mind, that the free Heroku instance is used, so it can take some time when loading
 the page
 for the first time.
 
@@ -39,44 +39,46 @@ for the first time.
 
 ## Features
 
-* Inventory management of your electronic parts. Each part can be assigned to a category, footprint, manufacturer
+* Inventory management of your electronic parts. Each part can be assigned to a category, footprint, manufacturer,
   and multiple store locations and price information. Parts can be grouped using tags. You can associate various files
   like datasheets or pictures with the parts.
-* Multi-Language support (currently German, English, Russian, Japanese and French (experimental))
+* Multi-language support (currently German, English, Russian, Japanese, French, Czech, Danish, and Chinese)
 * Barcodes/Labels generator for parts and storage locations, scan barcodes via webcam using the builtin barcode scanner
 * User system with groups and detailed (fine granular) permissions.
   Two-factor authentication is supported (Google Authenticator and Webauthn/U2F keys) and can be enforced for groups.
-  Password reset via email can be setup.
+  Password reset via email can be set up.
 * Optional support for single sign-on (SSO) via SAML (using an intermediate service
   like [Keycloak](https://www.keycloak.org/) you can connect Part-DB to an existing LDAP or Active Directory server)
-* Import/Export system for parts and datastructure. BOM import for projects from KiCAD is supported.
+* Import/Export system for parts and data structure. BOM import for projects from KiCAD is supported.
 * Project management: Create projects and assign parts to the bill of material (BOM), to show how often you could build
   this project and directly withdraw all components needed from DB
-* Event log: Track what changes happens to your inventory, track which user does what. Revert your parts to older
+* Event log: Track what changes happen to your inventory, track which user does what. Revert your parts to older
   versions.
-* Responsive design: You can use Part-DB on your PC, your tablet and your smartphone using the same interface.
-* MySQL and SQLite supported as database backends
+* Responsive design: You can use Part-DB on your PC, your tablet, and your smartphone using the same interface.
+* MySQL, SQLite and PostgreSQL are supported as database backends
 * Support for rich text descriptions and comments in parts
 * Support for multiple currencies and automatic update of exchange rates supported
 * Powerful search and filter function, including parametric search (search for parts according to some specifications)
 * Automatic thumbnail generation for pictures
-* Use cloud providers (like Octopart, Digikey, farnell or TME) to automatically get part information, datasheets and
+* Use cloud providers (like Octopart, Digikey, Farnell, LCSC or TME) to automatically get part information, datasheets, and
   prices for parts
 * API to access Part-DB from other applications/scripts
+* [Integration with KiCad](https://docs.part-db.de/usage/eda_integration.html): Use Part-DB as the central datasource for your
+  KiCad and see available parts from Part-DB directly inside KiCad.
 
-With these features Part-DB is useful to hobbyists, who want to keep track of their private electronic parts inventory,
-or makerspaces, where many users have should have (controlled) access to the shared inventory.
+With these features, Part-DB is useful to hobbyists, who want to keep track of their private electronic parts inventory,
+or maker spaces, where many users should have (controlled) access to the shared inventory.
 
 Part-DB is also used by small companies and universities for managing their inventory.
 
 ## Requirements
 
 * A **web server** (like Apache2 or nginx) that is capable of
-  running [Symfony 5](https://symfony.com/doc/current/reference/requirements.html),
-  this includes a minimum PHP version of **PHP 8.1**
-* A **MySQL** (at least 5.7) /**MariaDB** (at least 10.2.2) database server if you do not want to use SQLite.
-* Shell access to your server is highly suggested!
-* For building the client side assets **yarn** and **nodejs** (>= 18.0) is needed.
+  running [Symfony 6](https://symfony.com/doc/current/reference/requirements.html),
+  this includes a minimum PHP version of **PHP 8.2**
+* A **MySQL** (at least 5.7) /**MariaDB** (at least 10.4) database server, or **PostgreSQL** 10+ if you do not want to use SQLite.
+* Shell access to your server is highly recommended!
+* For building the client-side assets **yarn** and **nodejs** (>= 20.0) is needed.
 
 ## Installation
 
@@ -86,8 +88,8 @@ read [this](https://docs.part-db.de/upgrade_legacy.html) first.
 *Hint:* A docker image is available under [jbtronics/part-db1](https://hub.docker.com/r/jbtronics/part-db1). How to set
 up Part-DB via docker is described [here](https://docs.part-db.de/installation/installation_docker.html).
 
-**Below you find some very rough outline of the installation process, see [here](https://docs.part-db.de/installation/)
-for a detailed guide how to install Part-DB.**
+**Below you find a very rough outline of the installation process, see [here](https://docs.part-db.de/installation/)
+for a detailed guide on how to install Part-DB.**
 
 1. Copy or clone this repository into a folder on your server.
 2. Configure your webserver to serve from the `public/` folder.
@@ -101,46 +103,42 @@ for a detailed guide how to install Part-DB.**
       In bigger instances with concurrent accesses, MySQL is more performant. This can not be changed easily later, so
       choose wisely.
 4. Install composer dependencies and generate autoload files: `composer install -o --no-dev`
-5. If you have put Part-DB into a subdirectory on your server (like `part-db/`), you have to edit the file
-   `webpack.config.js` and uncomment the lines (remove the `//` before the lines) `.setPublicPath('/part-db/build')` (
-   line 43) and
-   `.setManifestKeyPrefix('build/')` (line 44). You have to replace `/part-db` with your own path on line 44.
-6. Install client side dependencies and build it: `yarn install` and `yarn build`
-7. _Optional_ (speeds up first load): Warmup cache: `php bin/console cache:warmup`
-8. Upgrade database to new scheme (or create it, when it was empty): `php bin/console doctrine:migrations:migrate` and
+5. Install client side dependencies and build it: `yarn install` and `yarn build`
+6. _Optional_ (speeds up first load): Warmup cache: `php bin/console cache:warmup`
+7. Upgrade database to new scheme (or create it, when it was empty): `php bin/console doctrine:migrations:migrate` and
    follow the instructions given. During the process the password for the admin is user is shown. Copy it. **Caution**:
-   This steps tamper with your database and could potentially destroy it. So make sure to make a backup of your
+   These steps tamper with your database and could potentially destroy it. So make sure to make a backup of your
    database.
-9. You can configure Part-DB via `config/parameters.yaml`. You should check if settings match your expectations, after
+8. You can configure Part-DB via `config/parameters.yaml`. You should check if settings match your expectations after
    you installed/upgraded Part-DB. Check if `partdb.default_currency` matches your mainly used currency (this can not be
    changed after creating price information).
-   Run `php bin/console cache:clear` when you changed something.
-10. Access Part-DB in your browser (under the URL you put it) and login with user *admin*. Password is the one outputted
-    during DB setup.
-    If you can not remember the password, set a new one with `php bin/console app:set-password admin`. You can create
-    new users with the admin user and start using Part-DB.
+   Run `php bin/console cache:clear` when you change something.
+9. Access Part-DB in your browser (under the URL you put it) and log in with user *admin*. Password is the one outputted
+   during DB setup.
+   If you can not remember the password, set a new one with `php bin/console app:set-password admin`. You can create
+   new users with the admin user and start using Part-DB.
 
 When you want to upgrade to a newer version, then just copy the new files into the folder
 and repeat the steps 4. to 7.
 
 Normally a random password is generated when the admin user is created during initial database creation,
-however you can set the initial admin password, by setting the `INITIAL_ADMIN_PW` env var.
+however, you can set the initial admin password, by setting the `INITIAL_ADMIN_PW` env var.
 
 You can configure Part-DB to your needs by changing environment variables in the `.env.local` file.
 See [here](https://docs.part-db.de/configuration.html) for more information.
 
 ### Reverse proxy
 
-If you are using a reverse proxy, you have to ensure that the proxies sets the `X-Forwarded-*` headers correctly, or you
+If you are using a reverse proxy, you have to ensure that the proxies set the `X-Forwarded-*` headers correctly, or you
 will get HTTP/HTTPS mixup and wrong hostnames.
 If the reverse proxy is on a different server (or it cannot access Part-DB via localhost) you have to set
-the `TRUSTED_PROXIES` env variable to match your reverse proxies IP-address (or IP block). You can do this in
+the `TRUSTED_PROXIES` env variable to match your reverse proxy's IP address (or IP block). You can do this in
 your `.env.local` or (when using docker) in your `docker-compose.yml` file.
 
 ## Donate for development
 
 If you want to donate to the Part-DB developer, see the sponsor button in the top bar (next to the repo name).
-There you will find various methods to support development on a monthly or a one time base.
+There you will find various methods to support development on a monthly or a one-time base.
 
 ## Built with
 

VERSION

@@ -1 +1 @@
-1.8.1
+2.0.2

assets/ckeditor/html_label.js

@@ -1,66 +1,63 @@
-/**
- * @license Copyright (c) 2014-2022, CKSource Holding sp. z o.o. All rights reserved.
- * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
- */
-import ClassicEditor from '@ckeditor/ckeditor5-editor-classic/src/classiceditor.js';
-import Alignment from '@ckeditor/ckeditor5-alignment/src/alignment.js';
-import Autoformat from '@ckeditor/ckeditor5-autoformat/src/autoformat.js';
-import Base64UploadAdapter from '@ckeditor/ckeditor5-upload/src/adapters/base64uploadadapter.js';
-import BlockQuote from '@ckeditor/ckeditor5-block-quote/src/blockquote.js';
-import Bold from '@ckeditor/ckeditor5-basic-styles/src/bold.js';
-import Code from '@ckeditor/ckeditor5-basic-styles/src/code.js';
-import CodeBlock from '@ckeditor/ckeditor5-code-block/src/codeblock.js';
-import Essentials from '@ckeditor/ckeditor5-essentials/src/essentials.js';
-import FindAndReplace from '@ckeditor/ckeditor5-find-and-replace/src/findandreplace.js';
-import FontBackgroundColor from '@ckeditor/ckeditor5-font/src/fontbackgroundcolor.js';
-import FontColor from '@ckeditor/ckeditor5-font/src/fontcolor.js';
-import FontFamily from '@ckeditor/ckeditor5-font/src/fontfamily.js';
-import FontSize from '@ckeditor/ckeditor5-font/src/fontsize.js';
-import GeneralHtmlSupport from '@ckeditor/ckeditor5-html-support/src/generalhtmlsupport.js';
-import Heading from '@ckeditor/ckeditor5-heading/src/heading.js';
-import Highlight from '@ckeditor/ckeditor5-highlight/src/highlight.js';
-import HorizontalLine from '@ckeditor/ckeditor5-horizontal-line/src/horizontalline.js';
-import HtmlComment from '@ckeditor/ckeditor5-html-support/src/htmlcomment.js';
-import HtmlEmbed from '@ckeditor/ckeditor5-html-embed/src/htmlembed.js';
-import Image from '@ckeditor/ckeditor5-image/src/image.js';
-import ImageResize from '@ckeditor/ckeditor5-image/src/imageresize.js';
-import ImageStyle from '@ckeditor/ckeditor5-image/src/imagestyle.js';
-import ImageToolbar from '@ckeditor/ckeditor5-image/src/imagetoolbar.js';
-import ImageUpload from '@ckeditor/ckeditor5-image/src/imageupload.js';
-import Indent from '@ckeditor/ckeditor5-indent/src/indent.js';
-import IndentBlock from '@ckeditor/ckeditor5-indent/src/indentblock.js';
-import Italic from '@ckeditor/ckeditor5-basic-styles/src/italic.js';
-import Link from '@ckeditor/ckeditor5-link/src/link.js';
-import LinkImage from '@ckeditor/ckeditor5-link/src/linkimage.js';
-import List from '@ckeditor/ckeditor5-list/src/list.js';
-import ListProperties from '@ckeditor/ckeditor5-list/src/listproperties.js';
-import Markdown from '@ckeditor/ckeditor5-markdown-gfm/src/markdown.js';
-import MediaEmbed from '@ckeditor/ckeditor5-media-embed/src/mediaembed.js';
-import MediaEmbedToolbar from '@ckeditor/ckeditor5-media-embed/src/mediaembedtoolbar.js';
-import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph.js';
-import PasteFromOffice from '@ckeditor/ckeditor5-paste-from-office/src/pastefromoffice.js';
-import RemoveFormat from '@ckeditor/ckeditor5-remove-format/src/removeformat.js';
-import SourceEditing from '@ckeditor/ckeditor5-source-editing/src/sourceediting.js';
-import SpecialCharacters from '@ckeditor/ckeditor5-special-characters/src/specialcharacters.js';
-import SpecialCharactersArrows from '@ckeditor/ckeditor5-special-characters/src/specialcharactersarrows.js';
-import SpecialCharactersCurrency from '@ckeditor/ckeditor5-special-characters/src/specialcharacterscurrency.js';
-import SpecialCharactersEssentials from '@ckeditor/ckeditor5-special-characters/src/specialcharactersessentials.js';
-import SpecialCharactersLatin from '@ckeditor/ckeditor5-special-characters/src/specialcharacterslatin.js';
-import SpecialCharactersMathematical from '@ckeditor/ckeditor5-special-characters/src/specialcharactersmathematical.js';
-import SpecialCharactersText from '@ckeditor/ckeditor5-special-characters/src/specialcharacterstext.js';
-import Strikethrough from '@ckeditor/ckeditor5-basic-styles/src/strikethrough.js';
-import Subscript from '@ckeditor/ckeditor5-basic-styles/src/subscript.js';
-import Superscript from '@ckeditor/ckeditor5-basic-styles/src/superscript.js';
-import Table from '@ckeditor/ckeditor5-table/src/table.js';
-import TableCaption from '@ckeditor/ckeditor5-table/src/tablecaption.js';
-import TableCellProperties from '@ckeditor/ckeditor5-table/src/tablecellproperties';
-import TableColumnResize from '@ckeditor/ckeditor5-table/src/tablecolumnresize.js';
-import TableProperties from '@ckeditor/ckeditor5-table/src/tableproperties';
-import TableToolbar from '@ckeditor/ckeditor5-table/src/tabletoolbar.js';
-import Underline from '@ckeditor/ckeditor5-basic-styles/src/underline.js';
-import WordCount from '@ckeditor/ckeditor5-word-count/src/wordcount.js';
-import EditorWatchdog from '@ckeditor/ckeditor5-watchdog/src/editorwatchdog.js';
+import {ClassicEditor} from 'ckeditor5'
+import {Alignment} from 'ckeditor5';
+import {Autoformat} from 'ckeditor5';
+import {Base64UploadAdapter} from 'ckeditor5';
+import {BlockQuote} from 'ckeditor5';
+import {Bold} from 'ckeditor5';
+import {Code} from 'ckeditor5';
+import {CodeBlock} from 'ckeditor5';
+import {Essentials} from 'ckeditor5';
+import {FindAndReplace} from 'ckeditor5';
+import {FontBackgroundColor} from 'ckeditor5';
+import {FontColor} from 'ckeditor5';
+import {FontFamily} from 'ckeditor5';
+import {FontSize} from 'ckeditor5';
+import {GeneralHtmlSupport} from 'ckeditor5';
+import {Heading} from 'ckeditor5';
+import {Highlight} from 'ckeditor5';
+import {HorizontalLine} from 'ckeditor5';
+import {HtmlComment} from 'ckeditor5';
+import {HtmlEmbed} from 'ckeditor5';
+import {Image} from 'ckeditor5';
+import {ImageResize} from 'ckeditor5';
+import {ImageStyle} from 'ckeditor5';
+import {ImageToolbar} from 'ckeditor5';
+import {ImageUpload} from 'ckeditor5';
+import {Indent} from 'ckeditor5';
+import {IndentBlock} from 'ckeditor5';
+import {Italic} from 'ckeditor5';
+import {Link} from 'ckeditor5';
+import {LinkImage} from 'ckeditor5';
+import {List} from 'ckeditor5';
+import {ListProperties} from 'ckeditor5';
+import {Markdown} from 'ckeditor5';
+import {MediaEmbed} from 'ckeditor5';
+import {MediaEmbedToolbar} from 'ckeditor5';
+import {Paragraph} from 'ckeditor5';
+import {PasteFromOffice} from 'ckeditor5';
+import {RemoveFormat} from 'ckeditor5';
+import {SourceEditing} from 'ckeditor5';
+import {SpecialCharacters} from 'ckeditor5';
+import {SpecialCharactersArrows} from 'ckeditor5';
+import {SpecialCharactersCurrency} from 'ckeditor5';
+import {SpecialCharactersEssentials} from 'ckeditor5';
+import {SpecialCharactersLatin} from 'ckeditor5';
+import {SpecialCharactersMathematical} from 'ckeditor5';
+import {SpecialCharactersText} from 'ckeditor5';
+import {Strikethrough} from 'ckeditor5';
+import {Subscript} from 'ckeditor5';
+import {Superscript} from 'ckeditor5';
+import {Table} from 'ckeditor5';
+import {TableCaption} from 'ckeditor5';
+import {TableCellProperties} from 'ckeditor5';
+import {TableColumnResize} from 'ckeditor5';
+import {TableProperties} from 'ckeditor5';
+import {TableToolbar} from 'ckeditor5';
+import {Underline} from 'ckeditor5';
+import {WordCount} from 'ckeditor5';
+import {EditorWatchdog} from 'ckeditor5';
 import PartDBLabel from "./plugins/PartDBLabel/PartDBLabel";
+import SpecialCharactersGreek from "./plugins/special_characters_emoji";
 
 class Editor extends ClassicEditor {}
 
@@ -122,7 +119,8 @@ Editor.builtinPlugins = [
     Underline,
     WordCount,
 
-    PartDBLabel
+    PartDBLabel,
+    SpecialCharactersGreek
 ];
 
 // Editor configuration.

assets/ckeditor/markdown_full.js

@@ -2,68 +2,69 @@
  * @license Copyright (c) 2014-2022, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
-import ClassicEditor from '@ckeditor/ckeditor5-editor-classic/src/classiceditor.js';
-import Alignment from '@ckeditor/ckeditor5-alignment/src/alignment.js';
-import Autoformat from '@ckeditor/ckeditor5-autoformat/src/autoformat.js';
-import Base64UploadAdapter from '@ckeditor/ckeditor5-upload/src/adapters/base64uploadadapter.js';
-import BlockQuote from '@ckeditor/ckeditor5-block-quote/src/blockquote.js';
-import Bold from '@ckeditor/ckeditor5-basic-styles/src/bold.js';
-import Code from '@ckeditor/ckeditor5-basic-styles/src/code.js';
-import CodeBlock from '@ckeditor/ckeditor5-code-block/src/codeblock.js';
-import Essentials from '@ckeditor/ckeditor5-essentials/src/essentials.js';
-import FindAndReplace from '@ckeditor/ckeditor5-find-and-replace/src/findandreplace.js';
-import FontBackgroundColor from '@ckeditor/ckeditor5-font/src/fontbackgroundcolor.js';
-import FontColor from '@ckeditor/ckeditor5-font/src/fontcolor.js';
-import FontFamily from '@ckeditor/ckeditor5-font/src/fontfamily.js';
-import FontSize from '@ckeditor/ckeditor5-font/src/fontsize.js';
-import GeneralHtmlSupport from '@ckeditor/ckeditor5-html-support/src/generalhtmlsupport.js';
-import Heading from '@ckeditor/ckeditor5-heading/src/heading.js';
-import Highlight from '@ckeditor/ckeditor5-highlight/src/highlight.js';
-import HorizontalLine from '@ckeditor/ckeditor5-horizontal-line/src/horizontalline.js';
-import HtmlComment from '@ckeditor/ckeditor5-html-support/src/htmlcomment.js';
-import HtmlEmbed from '@ckeditor/ckeditor5-html-embed/src/htmlembed.js';
-import Image from '@ckeditor/ckeditor5-image/src/image.js';
-import ImageResize from '@ckeditor/ckeditor5-image/src/imageresize.js';
-import ImageStyle from '@ckeditor/ckeditor5-image/src/imagestyle.js';
-import ImageToolbar from '@ckeditor/ckeditor5-image/src/imagetoolbar.js';
-import ImageUpload from '@ckeditor/ckeditor5-image/src/imageupload.js';
-import Indent from '@ckeditor/ckeditor5-indent/src/indent.js';
-import IndentBlock from '@ckeditor/ckeditor5-indent/src/indentblock.js';
-import Italic from '@ckeditor/ckeditor5-basic-styles/src/italic.js';
-import Link from '@ckeditor/ckeditor5-link/src/link.js';
-import LinkImage from '@ckeditor/ckeditor5-link/src/linkimage.js';
-import List from '@ckeditor/ckeditor5-list/src/list.js';
-import ListProperties from '@ckeditor/ckeditor5-list/src/listproperties.js';
-import Markdown from '@ckeditor/ckeditor5-markdown-gfm/src/markdown.js';
-import MediaEmbed from '@ckeditor/ckeditor5-media-embed/src/mediaembed.js';
-import MediaEmbedToolbar from '@ckeditor/ckeditor5-media-embed/src/mediaembedtoolbar.js';
-import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph.js';
-import PasteFromOffice from '@ckeditor/ckeditor5-paste-from-office/src/pastefromoffice.js';
-import RemoveFormat from '@ckeditor/ckeditor5-remove-format/src/removeformat.js';
-import SourceEditing from '@ckeditor/ckeditor5-source-editing/src/sourceediting.js';
-import SpecialCharacters from '@ckeditor/ckeditor5-special-characters/src/specialcharacters.js';
-import SpecialCharactersArrows from '@ckeditor/ckeditor5-special-characters/src/specialcharactersarrows.js';
-import SpecialCharactersCurrency from '@ckeditor/ckeditor5-special-characters/src/specialcharacterscurrency.js';
-import SpecialCharactersEssentials from '@ckeditor/ckeditor5-special-characters/src/specialcharactersessentials.js';
-import SpecialCharactersLatin from '@ckeditor/ckeditor5-special-characters/src/specialcharacterslatin.js';
-import SpecialCharactersMathematical from '@ckeditor/ckeditor5-special-characters/src/specialcharactersmathematical.js';
-import SpecialCharactersText from '@ckeditor/ckeditor5-special-characters/src/specialcharacterstext.js';
-import Strikethrough from '@ckeditor/ckeditor5-basic-styles/src/strikethrough.js';
-import Subscript from '@ckeditor/ckeditor5-basic-styles/src/subscript.js';
-import Superscript from '@ckeditor/ckeditor5-basic-styles/src/superscript.js';
-import Table from '@ckeditor/ckeditor5-table/src/table.js';
-import TableCaption from '@ckeditor/ckeditor5-table/src/tablecaption.js';
-import TableCellProperties from '@ckeditor/ckeditor5-table/src/tablecellproperties';
-import TableColumnResize from '@ckeditor/ckeditor5-table/src/tablecolumnresize.js';
-import TableProperties from '@ckeditor/ckeditor5-table/src/tableproperties';
-import TableToolbar from '@ckeditor/ckeditor5-table/src/tabletoolbar.js';
-import Underline from '@ckeditor/ckeditor5-basic-styles/src/underline.js';
-import WordCount from '@ckeditor/ckeditor5-word-count/src/wordcount.js';
-import EditorWatchdog from '@ckeditor/ckeditor5-watchdog/src/editorwatchdog.js';
-import TodoList from '@ckeditor/ckeditor5-list/src/todolist';
+import {ClassicEditor} from 'ckeditor5';
+import {Alignment} from 'ckeditor5';
+import {Autoformat} from 'ckeditor5';
+import {Base64UploadAdapter} from 'ckeditor5';
+import {BlockQuote} from 'ckeditor5';
+import {Bold} from 'ckeditor5';
+import {Code} from 'ckeditor5';
+import {CodeBlock} from 'ckeditor5';
+import {Essentials} from 'ckeditor5';
+import {FindAndReplace} from 'ckeditor5';
+import {FontBackgroundColor} from 'ckeditor5';
+import {FontColor} from 'ckeditor5';
+import {FontFamily} from 'ckeditor5';
+import {FontSize} from 'ckeditor5';
+import {GeneralHtmlSupport} from 'ckeditor5';
+import {Heading} from 'ckeditor5';
+import {Highlight} from 'ckeditor5';
+import {HorizontalLine} from 'ckeditor5';
+import {HtmlComment} from 'ckeditor5';
+import {HtmlEmbed} from 'ckeditor5';
+import {Image} from 'ckeditor5';
+import {ImageResize} from 'ckeditor5';
+import {ImageStyle} from 'ckeditor5';
+import {ImageToolbar} from 'ckeditor5';
+import {ImageUpload} from 'ckeditor5';
+import {Indent} from 'ckeditor5';
+import {IndentBlock} from 'ckeditor5';
+import {Italic} from 'ckeditor5';
+import {Link} from 'ckeditor5';
+import {LinkImage} from 'ckeditor5';
+import {List} from 'ckeditor5';
+import {ListProperties} from 'ckeditor5';
+import {Markdown} from 'ckeditor5';
+import {MediaEmbed} from 'ckeditor5';
+import {MediaEmbedToolbar} from 'ckeditor5';
+import {Paragraph} from 'ckeditor5';
+import {PasteFromOffice} from 'ckeditor5';
+import {RemoveFormat} from 'ckeditor5';
+import {SourceEditing} from 'ckeditor5';
+import {SpecialCharacters} from 'ckeditor5';
+import {SpecialCharactersArrows} from 'ckeditor5';
+import {SpecialCharactersCurrency} from 'ckeditor5';
+import {SpecialCharactersEssentials} from 'ckeditor5';
+import {SpecialCharactersLatin} from 'ckeditor5';
+import {SpecialCharactersMathematical} from 'ckeditor5';
+import {SpecialCharactersText} from 'ckeditor5';
+import {Strikethrough} from 'ckeditor5';
+import {Subscript} from 'ckeditor5';
+import {Superscript} from 'ckeditor5';
+import {Table} from 'ckeditor5';
+import {TableCaption} from 'ckeditor5';
+import {TableCellProperties} from 'ckeditor5';
+import {TableColumnResize} from 'ckeditor5';
+import {TableProperties} from 'ckeditor5';
+import {TableToolbar} from 'ckeditor5';
+import {Underline} from 'ckeditor5';
+import {WordCount} from 'ckeditor5';
+import {EditorWatchdog} from 'ckeditor5';
+import {TodoList} from 'ckeditor5';
 
 import ExtendedMarkdown from "./plugins/extendedMarkdown.js";
-import SpecialCharactersEmoji from "./plugins/special_characters_emoji";
+import SpecialCharactersGreek from "./plugins/special_characters_emoji";
+import {Mention, Emoji} from "ckeditor5";
 
 class Editor extends ClassicEditor {}
 
@@ -117,9 +118,11 @@ Editor.builtinPlugins = [
     Underline,
     TodoList,
 
+    Mention, Emoji,
+
     //Our own extensions
     ExtendedMarkdown,
-    SpecialCharactersEmoji
+    SpecialCharactersGreek
 ];
 
 // Editor configuration.
@@ -148,6 +151,7 @@ Editor.defaultConfig = {
             'indent',
             '|',
             'specialCharacters',
+            "emoji",
             'horizontalLine',
             '|',
             'imageUpload',

assets/ckeditor/markdown_single_line.js

@@ -2,35 +2,36 @@
  * @license Copyright (c) 2014-2022, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
-import ClassicEditor from '@ckeditor/ckeditor5-editor-classic/src/classiceditor.js';
-import Autoformat from '@ckeditor/ckeditor5-autoformat/src/autoformat.js';
-import AutoLink from '@ckeditor/ckeditor5-link/src/autolink.js';
-import Bold from '@ckeditor/ckeditor5-basic-styles/src/bold.js';
-import Code from '@ckeditor/ckeditor5-basic-styles/src/code.js';
-import Essentials from '@ckeditor/ckeditor5-essentials/src/essentials.js';
-import FindAndReplace from '@ckeditor/ckeditor5-find-and-replace/src/findandreplace.js';
-import Highlight from '@ckeditor/ckeditor5-highlight/src/highlight.js';
-import Italic from '@ckeditor/ckeditor5-basic-styles/src/italic.js';
-import Link from '@ckeditor/ckeditor5-link/src/link.js';
-import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph.js';
-import RemoveFormat from '@ckeditor/ckeditor5-remove-format/src/removeformat.js';
-import SourceEditing from '@ckeditor/ckeditor5-source-editing/src/sourceediting.js';
-import SpecialCharacters from '@ckeditor/ckeditor5-special-characters/src/specialcharacters.js';
-import SpecialCharactersArrows from '@ckeditor/ckeditor5-special-characters/src/specialcharactersarrows.js';
-import SpecialCharactersCurrency from '@ckeditor/ckeditor5-special-characters/src/specialcharacterscurrency.js';
-import SpecialCharactersEssentials from '@ckeditor/ckeditor5-special-characters/src/specialcharactersessentials.js';
-import SpecialCharactersLatin from '@ckeditor/ckeditor5-special-characters/src/specialcharacterslatin.js';
-import SpecialCharactersMathematical from '@ckeditor/ckeditor5-special-characters/src/specialcharactersmathematical.js';
-import SpecialCharactersText from '@ckeditor/ckeditor5-special-characters/src/specialcharacterstext.js';
-import Strikethrough from '@ckeditor/ckeditor5-basic-styles/src/strikethrough.js';
-import Subscript from '@ckeditor/ckeditor5-basic-styles/src/subscript.js';
-import Superscript from '@ckeditor/ckeditor5-basic-styles/src/superscript.js';
-import Underline from '@ckeditor/ckeditor5-basic-styles/src/underline.js';
-import EditorWatchdog from '@ckeditor/ckeditor5-watchdog/src/editorwatchdog.js';
+import {ClassicEditor} from 'ckeditor5';
+import {Autoformat} from 'ckeditor5';
+import {AutoLink} from 'ckeditor5';
+import {Bold} from 'ckeditor5';
+import {Code} from 'ckeditor5';
+import {Essentials} from 'ckeditor5';
+import {FindAndReplace} from 'ckeditor5';
+import {Highlight} from 'ckeditor5';
+import {Italic} from 'ckeditor5';
+import {Link} from 'ckeditor5';
+import {Paragraph} from 'ckeditor5';
+import {RemoveFormat} from 'ckeditor5';
+import {SourceEditing} from 'ckeditor5';
+import {SpecialCharacters} from 'ckeditor5';
+import {SpecialCharactersArrows} from 'ckeditor5';
+import {SpecialCharactersCurrency} from 'ckeditor5';
+import {SpecialCharactersEssentials} from 'ckeditor5';
+import {SpecialCharactersLatin} from 'ckeditor5';
+import {SpecialCharactersMathematical} from 'ckeditor5';
+import {SpecialCharactersText} from 'ckeditor5';
+import {Strikethrough} from 'ckeditor5';
+import {Subscript} from 'ckeditor5';
+import {Superscript} from 'ckeditor5';
+import {Underline} from 'ckeditor5';
+import {EditorWatchdog} from 'ckeditor5';
+import {Mention, Emoji} from "ckeditor5";
 
 import ExtendedMarkdownInline from "./plugins/extendedMarkdownInline";
 import SingleLinePlugin from "./plugins/singleLine";
-import SpecialCharactersEmoji from "./plugins/special_characters_emoji";
+import SpecialCharactersGreek from "./plugins/special_characters_emoji";
 
 class Editor extends ClassicEditor {}
 
@@ -62,7 +63,8 @@ Editor.builtinPlugins = [
 
     ExtendedMarkdownInline,
     SingleLinePlugin,
-    SpecialCharactersEmoji
+    SpecialCharactersGreek,
+    Mention, Emoji
 ];
 
 // Editor configuration.
@@ -81,6 +83,7 @@ Editor.defaultConfig = {
             'link',
             'code',
             'specialCharacters',
+            'emoji',
             '|',
             'undo',
             'redo',

assets/ckeditor/plugins/PartDBLabel/PartDBLabel.js

@@ -22,7 +22,7 @@ import PartDBLabelEditing from "./PartDBLabelEditing";
 
 import "./PartDBLabel.css";
 
-import Plugin from "@ckeditor/ckeditor5-core/src/plugin";
+import {Plugin} from "ckeditor5";
 
 export default class PartDBLabel extends Plugin {
     static get requires() {
@@ -32,4 +32,4 @@ export default class PartDBLabel extends Plugin {
     static get pluginName() {
         return 'PartDBLabel';
     }
-}
+}

assets/ckeditor/plugins/PartDBLabel/PartDBLabelCommand.js

@@ -17,7 +17,7 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import Command from '@ckeditor/ckeditor5-core/src/command';
+import {Command} from 'ckeditor5';
 
 export default class PartDBLabelCommand extends Command {
     execute( { value } ) {
@@ -47,4 +47,4 @@ export default class PartDBLabelCommand extends Command {
 
         this.isEnabled = isAllowed;
     }
-}
+}

assets/ckeditor/plugins/PartDBLabel/PartDBLabelEditing.js

@@ -17,11 +17,11 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
+import {Plugin} from 'ckeditor5';
 import PartDBLabelCommand from "./PartDBLabelCommand";
 
-import { toWidget } from '@ckeditor/ckeditor5-widget/src/utils';
-import Widget from '@ckeditor/ckeditor5-widget/src/widget';
+import { toWidget } from 'ckeditor5';
+import {Widget} from 'ckeditor5';
 
 export default class PartDBLabelEditing extends Plugin {
     static get requires() {                                                    // ADDED
@@ -102,4 +102,4 @@ export default class PartDBLabelEditing extends Plugin {
         }
     }
 
-}
+}

assets/ckeditor/plugins/PartDBLabel/PartDBLabelUI.js

@@ -17,14 +17,14 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
+import {Plugin} from 'ckeditor5';
 
 require('./lang/de.js');
 
-import { addListToDropdown, createDropdown } from '@ckeditor/ckeditor5-ui/src/dropdown/utils';
+import { addListToDropdown, createDropdown } from 'ckeditor5';
 
-import Collection from '@ckeditor/ckeditor5-utils/src/collection';
-import Model from '@ckeditor/ckeditor5-ui/src/model';
+import {Collection} from 'ckeditor5';
+import {Model} from 'ckeditor5';
 
 export default class PartDBLabelUI extends Plugin {
     init() {
@@ -85,6 +85,9 @@ const PLACEHOLDERS = [
             ['[[COMMENT_T]]', 'Comment (plain text)'],
             ['[[LAST_MODIFIED]]', 'Last modified datetime'],
             ['[[CREATION_DATE]]', 'Creation datetime'],
+            ['[[IPN_BARCODE_QR]]', 'IPN as QR code'],
+            ['[[IPN_BARCODE_C128]]', 'IPN as Code 128 barcode'],
+            ['[[IPN_BARCODE_C39]]', 'IPN as Code 39 barcode'],
         ]
     },
     {
@@ -125,6 +128,8 @@ const PLACEHOLDERS = [
             ['[[BARCODE_QR]]', 'QR code linking to this element'],
             ['[[BARCODE_C128]]', 'Code 128 barcode linking to this element'],
             ['[[BARCODE_C39]]', 'Code 39 barcode linking to this element'],
+            ['[[BARCODE_C93]]', 'Code 93 barcode linking to this element'],
+            ['[[BARCODE_DATAMATRIX]]', 'Datamatrix code linking to this element'],
         ]
     },
     {
@@ -182,4 +187,4 @@ function getDropdownItemsDefinitions(t) {
     }
 
     return itemDefinitions;
-}
+}

assets/ckeditor/plugins/PartDBLabel/lang/de.js

@@ -48,6 +48,9 @@ Object.assign( window.CKEDITOR_TRANSLATIONS[ 'de' ].dictionary, {
     'Comment (plain text)': 'Kommentar (Nur-Text)',
     'Last modified datetime': 'Zuletzt geändert',
     'Creation datetime': 'Erstellt',
+    'IPN as QR code': 'IPN als QR Code',
+    'IPN as Code 128 barcode': 'IPN als Code 128 Barcode',
+    'IPN as Code 39 barcode': 'IPN als Code 39 Barcode',
 
     'Lot ID': 'Lot ID',
     'Lot name': 'Lot Name',
@@ -66,6 +69,8 @@ Object.assign( window.CKEDITOR_TRANSLATIONS[ 'de' ].dictionary, {
     'QR code linking to this element': 'QR Code verknüpft mit diesem Element',
     'Code 128 barcode linking to this element': 'Code 128 Barcode verknüpft mit diesem Element',
     'Code 39 barcode linking to this element': 'Code 39 Barcode verknüpft mit diesem Element',
+    'Code 93 barcode linking to this element': 'Code 93 Barcode verknüpft mit diesem Element',
+    'Datamatrix code linking to this element': 'Datamatrix Code verknüpft mit diesem Element',
 
     'Location ID': 'Lagerort ID',
     'Name': 'Name',

assets/ckeditor/plugins/extendedMarkdown.js

@@ -17,8 +17,7 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import { Plugin } from 'ckeditor5/src/core';
-import GFMDataProcessor from '@ckeditor/ckeditor5-markdown-gfm/src/gfmdataprocessor';
+import { Plugin, MarkdownGfmDataProcessor } from 'ckeditor5';
 
 const ALLOWED_TAGS = [
 	//Common elements
@@ -34,7 +33,6 @@ const ALLOWED_TAGS = [
 
 	//Block elements
 	'span',
-	'p',
 	'img',
 
 
@@ -57,7 +55,7 @@ export default class ExtendedMarkdown extends Plugin {
 	constructor( editor ) {
 		super( editor );
 
-		editor.data.processor = new GFMDataProcessor( editor.data.viewDocument );
+		editor.data.processor = new MarkdownGfmDataProcessor( editor.data.viewDocument );
 		for (const tag of ALLOWED_TAGS) {
 			editor.data.processor.keepHtml(tag);
 		}

assets/ckeditor/plugins/extendedMarkdownInline.js

@@ -17,8 +17,8 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import { Plugin } from 'ckeditor5/src/core';
-import GFMDataProcessor from '@ckeditor/ckeditor5-markdown-gfm/src/gfmdataprocessor';
+import {Plugin} from 'ckeditor5';
+import {MarkdownGfmDataProcessor} from 'ckeditor5';
 
 const ALLOWED_TAGS = [
 	//Common elements
@@ -46,7 +46,7 @@ export default class ExtendedMarkdownInline extends Plugin {
 	constructor( editor ) {
 		super( editor );
 
-		editor.data.processor = new GFMDataProcessor( editor.data.viewDocument );
+		editor.data.processor = new MarkdownGfmDataProcessor( editor.data.viewDocument );
 		for (const tag of ALLOWED_TAGS) {
 			editor.data.processor.keepHtml(tag);
 		}

assets/ckeditor/plugins/singleLine.js

@@ -17,7 +17,7 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
+import {Plugin} from 'ckeditor5';
 
 export default class SingleLinePlugin extends Plugin {
     init() {
@@ -42,7 +42,7 @@ export default class SingleLinePlugin extends Plugin {
             //We can not use the dataTransfer.setData method because the old object is somehow protected
             data.dataTransfer = new DataTransfer();
             data.dataTransfer.setData("text", cleaned);
-            
+
         }, { priority: 'high' } );
     }
-}
+}

assets/ckeditor/plugins/special_characters_emoji.js

@@ -17,14 +17,12 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import SpecialCharacters from '@ckeditor/ckeditor5-special-characters/src/specialcharacters';
-import SpecialCharactersEssentials from '@ckeditor/ckeditor5-special-characters/src/specialcharactersessentials';
+import SpecialCharacters from 'ckeditor5';
+import SpecialCharactersEssentials from 'ckeditor5';
 
-import Plugin from '@ckeditor/ckeditor5-core/src/plugin';
+import {Plugin} from 'ckeditor5';
 
-const emoji = require('emoji.json');
-
-export default class SpecialCharactersEmoji extends Plugin {
+export default class SpecialCharactersGreek extends Plugin {
 
     init() {
         const editor = this.editor;
@@ -32,9 +30,6 @@ export default class SpecialCharactersEmoji extends Plugin {
 
         //Add greek characters to special characters
         specialCharsPlugin.addItems('Greek', this.getGreek());
-
-        //Add Emojis to special characters
-        specialCharsPlugin.addItems('Emoji', this.getEmojis());
     }
 
     getGreek() {
@@ -96,14 +91,4 @@ export default class SpecialCharactersEmoji extends Plugin {
             { title: 'san', character: 'Ϻ' },
         ];
     }
-
-    getEmojis() {
-        //Map our emoji data to the format the plugin expects
-        return emoji.map(emoji => {
-            return {
-                title: emoji.name,
-                character: emoji.char
-            };
-        });
-    }
-}
+}

assets/controllers/common/hide_sidebar_controller.js

@@ -88,5 +88,8 @@ export default class extends Controller {
         } else {
             this.hideSidebar();
         }
+
+        //Hide the tootip on the button
+        this._toggle_button.blur();
     }
 }

assets/controllers/common/markdown_controller.js

@@ -20,18 +20,26 @@
 'use strict';
 
 import { Controller } from '@hotwired/stimulus';
-import { marked } from "marked";
+import { Marked } from "marked";
 import { mangle } from "marked-mangle";
 import { gfmHeadingId } from "marked-gfm-heading-id";
 import DOMPurify from 'dompurify';
 
 import "../../css/app/markdown.css";
 
-export default class extends Controller {
+export default class MarkdownController extends Controller {
+
+    static _marked = new Marked([
+        {
+            gfm: true,
+        },
+        gfmHeadingId(),
+        mangle(),
+    ])
+    ;
 
     connect()
     {
-        this.configureMarked();
         this.render();
 
         //Dispatch an event that we are now finished
@@ -45,7 +53,7 @@ export default class extends Controller {
         let raw = this.element.dataset['markdown'];
 
         //Apply purified parsed markdown
-        this.element.innerHTML = DOMPurify.sanitize(marked(this.unescapeHTML(raw)));
+        this.element.innerHTML = DOMPurify.sanitize(MarkdownController._marked.parse(this.unescapeHTML(raw)));
 
         for(let a of this.element.querySelectorAll('a')) {
             //Mark all links as external
@@ -81,8 +89,17 @@ export default class extends Controller {
     /**
      * Configure the marked parser
      */
-    configureMarked()
+    /*static newMarked()
     {
+        const marked = new Marked([
+            {
+                gfm: true,
+            },
+            gfmHeadingId(),
+            mangle(),
+            ])
+        ;
+
         marked.use(mangle());
         marked.use(gfmHeadingId({
         }));
@@ -90,5 +107,5 @@ export default class extends Controller {
         marked.setOptions({
             gfm: true,
         });
-    }
+    }*/
 }

assets/controllers/csrf_protection_controller.js

@@ -0,0 +1,79 @@
+const nameCheck = /^[-_a-zA-Z0-9]{4,22}$/;
+const tokenCheck = /^[-_/+a-zA-Z0-9]{24,}$/;
+
+// Generate and double-submit a CSRF token in a form field and a cookie, as defined by Symfony's SameOriginCsrfTokenManager
+document.addEventListener('submit', function (event) {
+    generateCsrfToken(event.target);
+}, true);
+
+// When @hotwired/turbo handles form submissions, send the CSRF token in a header in addition to a cookie
+// The `framework.csrf_protection.check_header` config option needs to be enabled for the header to be checked
+document.addEventListener('turbo:submit-start', function (event) {
+    const h = generateCsrfHeaders(event.detail.formSubmission.formElement);
+    Object.keys(h).map(function (k) {
+        event.detail.formSubmission.fetchRequest.headers[k] = h[k];
+    });
+});
+
+// When @hotwired/turbo handles form submissions, remove the CSRF cookie once a form has been submitted
+document.addEventListener('turbo:submit-end', function (event) {
+    removeCsrfToken(event.detail.formSubmission.formElement);
+});
+
+export function generateCsrfToken (formElement) {
+    const csrfField = formElement.querySelector('input[data-controller="csrf-protection"], input[name="_csrf_token"]');
+
+    if (!csrfField) {
+        return;
+    }
+
+    let csrfCookie = csrfField.getAttribute('data-csrf-protection-cookie-value');
+    let csrfToken = csrfField.value;
+
+    if (!csrfCookie && nameCheck.test(csrfToken)) {
+        csrfField.setAttribute('data-csrf-protection-cookie-value', csrfCookie = csrfToken);
+        csrfField.defaultValue = csrfToken = btoa(String.fromCharCode.apply(null, (window.crypto || window.msCrypto).getRandomValues(new Uint8Array(18))));
+        csrfField.dispatchEvent(new Event('change', { bubbles: true }));
+    }
+
+    if (csrfCookie && tokenCheck.test(csrfToken)) {
+        const cookie = csrfCookie + '_' + csrfToken + '=' + csrfCookie + '; path=/; samesite=strict';
+        document.cookie = window.location.protocol === 'https:' ? '__Host-' + cookie + '; secure' : cookie;
+    }
+}
+
+export function generateCsrfHeaders (formElement) {
+    const headers = {};
+    const csrfField = formElement.querySelector('input[data-controller="csrf-protection"], input[name="_csrf_token"]');
+
+    if (!csrfField) {
+        return headers;
+    }
+
+    const csrfCookie = csrfField.getAttribute('data-csrf-protection-cookie-value');
+
+    if (tokenCheck.test(csrfField.value) && nameCheck.test(csrfCookie)) {
+        headers[csrfCookie] = csrfField.value;
+    }
+
+    return headers;
+}
+
+export function removeCsrfToken (formElement) {
+    const csrfField = formElement.querySelector('input[data-controller="csrf-protection"], input[name="_csrf_token"]');
+
+    if (!csrfField) {
+        return;
+    }
+
+    const csrfCookie = csrfField.getAttribute('data-csrf-protection-cookie-value');
+
+    if (tokenCheck.test(csrfField.value) && nameCheck.test(csrfCookie)) {
+        const cookie = csrfCookie + '_' + csrfField.value + '=0; path=/; samesite=strict; max-age=0';
+
+        document.cookie = window.location.protocol === 'https:' ? '__Host-' + cookie + '; secure' : cookie;
+    }
+}
+
+/* stimulusFetch: 'lazy' */
+export default 'csrf-protection-controller';

assets/controllers/elements/attachment_autocomplete_controller.js

@@ -23,6 +23,12 @@ import "tom-select/dist/css/tom-select.bootstrap5.css";
 import '../../css/components/tom-select_extensions.css';
 import TomSelect from "tom-select";
 
+import TomSelect_click_to_edit from '../../tomselect/click_to_edit/click_to_edit'
+import TomSelect_autoselect_typed from '../../tomselect/autoselect_typed/autoselect_typed'
+
+TomSelect.define('click_to_edit', TomSelect_click_to_edit)
+TomSelect.define('autoselect_typed', TomSelect_autoselect_typed)
+
 export default class extends Controller {
     _tomSelect;
 
@@ -46,6 +52,12 @@ export default class extends Controller {
                     }
                     return '<div>' + escape(data.label) + '</div>';
                 }
+            },
+            plugins: {
+                'autoselect_typed': {},
+                'click_to_edit': {},
+                'clear_button': {},
+                "restore_on_backspace": {}
             }
         };
 

assets/controllers/elements/ckeditor_controller.js

@@ -23,8 +23,9 @@ import { default as FullEditor } from "../../ckeditor/markdown_full";
 import { default as SingleLineEditor} from "../../ckeditor/markdown_single_line";
 import { default as HTMLLabelEditor } from "../../ckeditor/html_label";
 
-import EditorWatchdog from '@ckeditor/ckeditor5-watchdog/src/editorwatchdog';
+import {EditorWatchdog} from 'ckeditor5';
 
+import "ckeditor5/ckeditor5.css";;
 import "../../css/components/ckeditor.css";
 
 /* stimulusFetch: 'lazy' */
@@ -51,8 +52,15 @@ export default class extends Controller {
 
         const language = document.body.dataset.locale ?? "en";
 
+        const emojiURL = new URL('../../ckeditor/emojis.json', import.meta.url).href;
+
         const config = {
             language: language,
+            licenseKey: "GPL",
+
+            emoji: {
+                definitionsUrl: emojiURL
+            }
         }
 
         const watchdog = new EditorWatchdog();
@@ -70,7 +78,9 @@ export default class extends Controller {
                         editor_div.classList.add(...new_classes.split(","));
                     }
 
-                    console.log(editor);
+                    //This return is important! Otherwise we get mysterious errors in the console
+                    //See: https://github.com/ckeditor/ckeditor5/issues/5897#issuecomment-628471302
+                    return editor;
                 })
                 .catch(error => {
                     console.error(error);
@@ -81,4 +91,4 @@ export default class extends Controller {
             console.error(error);
         });
     }
-}
+}

assets/controllers/elements/collection_type_controller.js

@@ -75,13 +75,49 @@ export default class extends Controller {
 
         //Insert new html after the last child element
         //If the table has a tbody, insert it there
+        //Afterwards return the newly created row
         if(targetTable.tBodies[0]) {
             targetTable.tBodies[0].insertAdjacentHTML('beforeend', newElementStr);
+            return targetTable.tBodies[0].lastElementChild;
         } else { //Otherwise just insert it
             targetTable.insertAdjacentHTML('beforeend', newElementStr);
+            return targetTable.lastElementChild;
         }
     }
 
+    /**
+     * This action opens a file dialog to select multiple files and then creates a new element for each file, where
+     * the file is assigned to the input field.
+     * This should only be used for attachments collection types
+     * @param event
+     */
+    uploadMultipleFiles(event) {
+        //Open a file dialog to select multiple files
+        const input = document.createElement('input');
+        input.type = 'file';
+        input.multiple = true;
+        input.click();
+
+        input.addEventListener('change', (event) => {
+            //Create a element for each file
+
+            for (let i = 0; i < input.files.length; i++) {
+                const file = input.files[i];
+
+                const newElement = this.createElement(event);
+                const rowInput = newElement.querySelector("input[type='file']");
+
+                //We can not directly assign the file to the input, so we have to create a new DataTransfer object
+                const dataTransfer = new DataTransfer();
+                dataTransfer.items.add(file);
+
+                rowInput.files = dataTransfer.files;
+            }
+
+        });
+
+    }
+
     /**
      * Similar to createEvent Pricedetails need some special handling to fill min amount
      * @param event

assets/controllers/elements/datatables/datatables_controller.js

@@ -24,18 +24,25 @@ import 'datatables.net-bs5/css/dataTables.bootstrap5.css'
 import 'datatables.net-buttons-bs5/css/buttons.bootstrap5.css'
 import 'datatables.net-fixedheader-bs5/css/fixedHeader.bootstrap5.css'
 import 'datatables.net-responsive-bs5/css/responsive.bootstrap5.css';
-import 'datatables.net-select-bs5/css/select.bootstrap5.css';
+
+//Use our own styles for the select extension which fit the bootstrap theme better
+//import 'datatables.net-select-bs5/css/select.bootstrap5.css';
+import '../../../css/components/datatables_select_bs5.css';
 
 //JS
 import 'datatables.net-bs5';
 import 'datatables.net-buttons-bs5';
 import 'datatables.net-buttons/js/buttons.colVis.js';
 import 'datatables.net-fixedheader-bs5';
-import 'datatables.net-select-bs5';
 import 'datatables.net-colreorder-bs5';
 import 'datatables.net-responsive-bs5';
 import '../../../js/lib/datatables';
 
+//import 'datatables.net-select-bs5';
+//Use the local version containing the fix for the select extension
+import '../../../js/lib/dataTables.select.mjs';
+
+
 const EVENT_DT_LOADED = 'dt:loaded';
 
 export default class extends Controller {
@@ -132,7 +139,7 @@ export default class extends Controller {
         if(this.isSelectable()) {
             options.select = {
                 style:    'multi+shift',
-                selector: 'td.select-checkbox'
+                selector: 'td.dt-select',
             };
         }
 
@@ -145,6 +152,12 @@ export default class extends Controller {
 
         //Fix height of the length selector
         promise.then((dt) => {
+
+            //Draw the rows to make sure the correct status text is displayed ("No matching records found" instead of "Loading...")
+            if (dt.data().length === 0) {
+                dt.rows().draw()
+            }
+
             //Find all length selectors (select with name dt_length), which are inside a label
             const lengthSelectors = document.querySelectorAll('label select[name="dt_length"]');
             //And remove the surrounding label, while keeping the select with all event handlers
@@ -180,27 +193,6 @@ export default class extends Controller {
             dt.fixedHeader.headerOffset($("#navbar").outerHeight());
         });
 
-        //Register event handler to selectAllRows checkbox if available
-        if (this.isSelectable()) {
-            promise.then((dt) => {
-               const selectAllCheckbox = this.element.querySelector('thead th.select-checkbox');
-               selectAllCheckbox.addEventListener('click', () => {
-                   if(selectAllCheckbox.parentElement.classList.contains('selected')) {
-                       dt.rows().deselect();
-                       selectAllCheckbox.parentElement.classList.remove('selected');
-                   } else {
-                       dt.rows().select();
-                       selectAllCheckbox.parentElement.classList.add('selected');
-                   }
-               });
-
-                //When any row is deselected, also deselect the selectAll checkbox
-                dt.on('deselect.dt', () => {
-                    selectAllCheckbox.parentElement.classList.remove('selected');
-                });
-            });
-        }
-
         //Allow to further configure the datatable
         promise.then(this._afterLoaded.bind(this));
 

assets/controllers/elements/delete_btn_controller.js

@@ -43,7 +43,8 @@ export default class extends Controller
         const message = this.element.dataset.deleteMessage;
         const title = this.element.dataset.deleteTitle;
 
-        const form = this.element;
+        //Use event target, to find the form, where the submit button was clicked
+        const form = event.target;
         const submitter = event.submitter;
         const that = this;
 

assets/controllers/elements/localStorage_checkbox_controller.js

@@ -0,0 +1,67 @@
+/*
+ * This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
+ *
+ *  Copyright (C) 2019 - 2023 Jan Böhmer (https://github.com/jbtronics)
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published
+ *  by the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import {Controller} from "@hotwired/stimulus";
+
+export default class extends Controller
+{
+    static values = {
+        id: String
+    }
+
+    connect() {
+        this.loadState()
+        this.element.addEventListener('change', () => {
+            this.saveState()
+        });
+    }
+
+    loadState() {
+        let storageKey = this.getStorageKey();
+        let value = localStorage.getItem(storageKey);
+        if (value === null) {
+            return;
+        }
+
+        if (value === 'true') {
+            this.element.checked = true
+        }
+        if (value === 'false') {
+            this.element.checked = false
+        }
+    }
+
+    saveState() {
+        let storageKey = this.getStorageKey();
+
+        if (this.element.checked) {
+            localStorage.setItem(storageKey, 'true');
+        } else {
+            localStorage.setItem(storageKey, 'false');
+        }
+    }
+
+    getStorageKey() {
+        if (this.hasIdValue) {
+            return 'persistent_checkbox_' + this.idValue
+        }
+
+        return 'persistent_checkbox_' + this.element.id;
+    }
+}

assets/controllers/elements/part_search_controller.js

@@ -0,0 +1,200 @@
+/*
+ * This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
+ *
+ *  Copyright (C) 2019 - 2024 Jan Böhmer (https://github.com/jbtronics)
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published
+ *  by the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import { Controller } from "@hotwired/stimulus";
+import { autocomplete } from '@algolia/autocomplete-js';
+//import "@algolia/autocomplete-theme-classic/dist/theme.css";
+import "../../css/components/autocomplete_bootstrap_theme.css";
+import { createLocalStorageRecentSearchesPlugin } from '@algolia/autocomplete-plugin-recent-searches';
+import {marked} from "marked";
+
+import {
+    trans,
+    SEARCH_PLACEHOLDER,
+    SEARCH_SUBMIT,
+    STATISTICS_PARTS
+} from '../../translator';
+
+
+/**
+ * This controller is responsible for the search fields in the navbar and the homepage.
+ * It uses the Algolia Autocomplete library to provide a fast and responsive search.
+ */
+export default class extends Controller {
+
+    static targets = ["input"];
+
+    _autocomplete;
+
+    // Highlight the search query in the results
+    _highlight = (text, query) => {
+        if (!text) return text;
+        if (!query) return text;
+
+        const HIGHLIGHT_PRE_TAG = '__aa-highlight__'
+        const HIGHLIGHT_POST_TAG = '__/aa-highlight__'
+
+        const escaped = query.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&');
+        const regex = new RegExp(escaped, 'gi');
+
+        return text.replace(regex, (match) => `${HIGHLIGHT_PRE_TAG}${match}${HIGHLIGHT_POST_TAG}`);
+    }
+
+    initialize() {
+        // The endpoint for searching parts
+        const base_url = this.element.dataset.autocomplete;
+        // The URL template for the part detail pages
+        const part_detail_uri_template = this.element.dataset.detailUrl;
+
+        //The URL of the placeholder picture
+        const placeholder_image = this.element.dataset.placeholderImage;
+
+        //If the element is in navbar mode, or not
+        const navbar_mode = this.element.dataset.navbarMode === "true";
+
+        const that = this;
+
+        const recentSearchesPlugin = createLocalStorageRecentSearchesPlugin({
+            key: 'RECENT_SEARCH',
+            limit: 5,
+        });
+
+        this._autocomplete = autocomplete({
+            container: this.element,
+            //Place the panel in the navbar, if the element is in navbar mode
+            panelContainer: navbar_mode ? document.getElementById("navbar-search-form") : document.body,
+            panelPlacement: this.element.dataset.panelPlacement,
+            plugins: [recentSearchesPlugin],
+            openOnFocus: true,
+            placeholder: trans(SEARCH_PLACEHOLDER),
+            translations: {
+                submitButtonTitle: trans(SEARCH_SUBMIT)
+            },
+
+            // Use a navigator compatible with turbo:
+            navigator: {
+                navigate({ itemUrl }) {
+                    window.Turbo.visit(itemUrl, { action: "advance" });
+                },
+                navigateNewTab({ itemUrl }) {
+                    const windowReference = window.open(itemUrl, '_blank', 'noopener');
+
+                    if (windowReference) {
+                        windowReference.focus();
+                    }
+                },
+                navigateNewWindow({ itemUrl }) {
+                    window.open(itemUrl, '_blank', 'noopener');
+                },
+            },
+
+            // If the form is submitted, forward the term to the form
+            onSubmit({state, event, ...setters}) {
+                //Put the current text into each target input field
+                const input = that.inputTarget;
+
+                if (!input) {
+                    return;
+                }
+
+                //Do not submit the form, if the input is empty
+                if (state.query === "") {
+                    return;
+                }
+
+                input.value = state.query;
+                input.form.requestSubmit();
+            },
+
+
+            getSources({ query }) {
+                return [
+                    // The parts source
+                    {
+                        sourceId: 'parts',
+                        getItems() {
+                            const url = base_url.replace('__QUERY__', encodeURIComponent(query));
+
+                            const data = fetch(url)
+                                .then((response) => response.json())
+                                ;
+
+                            //Iterate over all fields besides the id and highlight them
+                            const fields = ["name", "description", "category", "footprint"];
+
+                            data.then((items) => {
+                                items.forEach((item) => {
+                                    for (const field of fields) {
+                                        item[field] = that._highlight(item[field], query);
+                                    }
+                                });
+                            });
+
+                            return data;
+                        },
+                        getItemUrl({ item }) {
+                            return part_detail_uri_template.replace('__ID__', item.id);
+                        },
+                        templates: {
+                            header({ html }) {
+                                return html`<span class="aa-SourceHeaderTitle">${trans(STATISTICS_PARTS)}</span>
+                                    <div class="aa-SourceHeaderLine" />`;
+                            },
+                            item({item, components, html}) {
+                                const details_url = part_detail_uri_template.replace('__ID__', item.id);
+
+                                return html`
+                                    <a class="aa-ItemLink" href="${details_url}">
+                                        <div class="aa-ItemContent">
+                                            <div class="aa-ItemIcon aa-ItemIcon--picture aa-ItemIcon--alignTop">
+                                                <img src="${item.image !== "" ? item.image : placeholder_image}" alt="${item.name}" width="30" height="30"/>
+                                            </div>
+                                            <div class="aa-ItemContentBody">
+                                                <div class="aa-ItemContentTitle">
+                                                    <b>
+                                                        ${components.Highlight({hit: item, attribute: 'name'})}
+                                                    </b>
+                                                </div>
+                                                <div class="aa-ItemContentDescription">
+                                                    ${components.Highlight({hit: item, attribute: 'description'})}
+                                                    ${item.category ? html`<p class="m-0"><span class="fa-solid fa-tags fa-fw"></span>${components.Highlight({hit: item, attribute: 'category'})}</p>` : ""}
+                                                    ${item.footprint ? html`<p class="m-0"><span class="fa-solid fa-microchip fa-fw"></span>${components.Highlight({hit: item, attribute: 'footprint'})}</p>` : ""}
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </a>
+                                `;
+                            },
+                        },
+                    },
+                ];
+            },
+        });
+
+        //Try to find the input field and register a defocus handler. This is necessarry, as by default the autocomplete
+        //lib has problems when multiple inputs are present on the page. (see https://github.com/algolia/autocomplete/issues/1216)
+        const inputs = this.element.getElementsByClassName('aa-Input');
+        for (const input of inputs) {
+            input.addEventListener('blur', () => {
+                this._autocomplete.setIsOpen(false);
+            });
+        }
+
+    }
+}

assets/controllers/elements/part_select_controller.js

@@ -27,7 +27,7 @@ export default class extends Controller {
                     }
 
                     let tmp = '<div class="row m-0">' +
-                        "<div class='col-2 p-0 d-flex align-items-center'>" +
+                        "<div class='col-2 p-0 d-flex align-items-center' style='max-width: 80px;'>" +
                         (data.image ? "<img class='typeahead-image' src='" + data.image + "'/>" : "") +
                         "</div>" +
                         "<div class='col-10'>" +

assets/controllers/elements/select_controller.js

@@ -40,6 +40,7 @@ export default class extends Controller {
 
 
         let settings = {
+            plugins: ["clear_button"],
             allowEmptyOption: true,
             selectOnTab: true,
             maxOptions: null,
@@ -50,7 +51,24 @@ export default class extends Controller {
             }
         };
 
+        //Load the drag_drop plugin if the select is ordered
+        if (this.element.dataset.orderedValue) {
+            settings.plugins.push('drag_drop');
+            settings.plugins.push("caret_position");
+        }
+
+        //If multiple items can be selected, enable the remove_button plugin
+        if (this.element.multiple) {
+            settings.plugins.push('remove_button');
+        }
+
         this._tomSelect = new TomSelect(this.element, settings);
+
+        //If the select is ordered, we need to update the value field (with the decoded value from the orderedValue field)
+        if (this.element.dataset.orderedValue) {
+            const data = JSON.parse(this.element.dataset.orderedValue);
+            this._tomSelect.setValue(data);
+        }
     }
 
     getTomSelect() {

assets/controllers/elements/select_multiple_controller.js

@@ -20,6 +20,8 @@
 import {Controller} from "@hotwired/stimulus";
 import TomSelect from "tom-select";
 
+// TODO: Merge with select_controller.js
+
 export default class extends Controller {
     _tomSelect;
 

assets/controllers/elements/static_file_autocomplete_controller.js

@@ -0,0 +1,106 @@
+/*
+ * This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
+ *
+ *  Copyright (C) 2019 - 2023 Jan Böhmer (https://github.com/jbtronics)
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published
+ *  by the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import {Controller} from "@hotwired/stimulus";
+
+import "tom-select/dist/css/tom-select.bootstrap5.css";
+import '../../css/components/tom-select_extensions.css';
+import TomSelect from "tom-select";
+
+import TomSelect_click_to_edit from '../../tomselect/click_to_edit/click_to_edit'
+import TomSelect_autoselect_typed from '../../tomselect/autoselect_typed/autoselect_typed'
+
+TomSelect.define('click_to_edit', TomSelect_click_to_edit)
+TomSelect.define('autoselect_typed', TomSelect_autoselect_typed)
+
+/**
+ * This is the frontend controller for StaticFileAutocompleteType form element.
+ * Basically it loads a text file from the given url (via data-url) and uses it as a source for the autocomplete.
+ * The file is just a list of strings, one per line, which will be used as the autocomplete options.
+ * Lines starting with # will be ignored.
+ */
+export default class extends Controller {
+    _tomSelect;
+
+    connect() {
+
+        let settings = {
+            persistent: false,
+            create: true,
+            maxItems: 1,
+            maxOptions: 100,
+            createOnBlur: true,
+            selectOnTab: true,
+            valueField: 'text',
+            searchField: 'text',
+            orderField: 'text',
+
+            //This a an ugly solution to disable the delimiter parsing of the TomSelect plugin
+            delimiter: 'VERY_L0NG_D€LIMITER_WHICH_WILL_NEVER_BE_ENCOUNTERED_IN_A_STRING',
+            plugins: {
+                'autoselect_typed': {},
+                'click_to_edit': {},
+                'clear_button': {},
+                'restore_on_backspace': {}
+            }
+        };
+
+        if (this.element.dataset.url) {
+            const url = this.element.dataset.url;
+            settings.load = (query, callback) => {
+                const self = this;
+                if (self.loading > 1) {
+                    callback();
+                    return;
+                }
+
+                fetch(url)
+                    .then(response => response.text())
+                    .then(text => {
+                        // Convert the text file to array
+                        let lines = text.split("\n");
+                        //Remove all lines beginning with #
+                        lines = lines.filter(x => !x.startsWith("#"));
+
+                        //Convert the array to an object, where each line is in the text field
+                        lines = lines.map(x => {
+                            return {text: x};
+                        });
+
+
+                        //Unset the load function to prevent endless recursion
+                        self._tomSelect.settings.load = null;
+
+                        callback(lines);
+                    }).catch(() => {
+                    callback();
+                });
+            };
+        }
+
+        this._tomSelect = new TomSelect(this.element, settings);
+    }
+
+    disconnect() {
+        super.disconnect();
+        //Destroy the TomSelect instance
+        this._tomSelect.destroy();
+    }
+
+}

assets/controllers/elements/structural_entity_select_controller.js

@@ -24,6 +24,8 @@ import {Controller} from "@hotwired/stimulus";
 
 import {trans, ENTITY_SELECT_GROUP_NEW_NOT_ADDED_TO_DB} from '../../translator.js'
 
+import TomSelect_autoselect_typed from '../../tomselect/autoselect_typed/autoselect_typed'
+TomSelect.define('autoselect_typed', TomSelect_autoselect_typed)
 
 export default class extends Controller {
     _tomSelect;
@@ -38,11 +40,20 @@ export default class extends Controller {
         const allowAdd = this.element.getAttribute("data-allow-add") === "true";
         const addHint = this.element.getAttribute("data-add-hint") ?? "";
 
+
+
+
         let settings = {
             allowEmptyOption: true,
             selectOnTab: true,
             maxOptions: null,
             create: allowAdd ? this.createItem.bind(this) : false,
+            createFilter: this.createFilter.bind(this),
+
+            // This three options allow us to paste element names with commas: (see issue #538)
+            maxItems: 1,
+            delimiter: "$$VERY_LONG_DELIMITER_THAT_SHOULD_NEVER_APPEAR$$",
+            splitOn: null,
 
             searchField: [
                 {field: "text", weight : 2},
@@ -53,7 +64,21 @@ export default class extends Controller {
             render: {
                 item: this.renderItem.bind(this),
                 option: this.renderOption.bind(this),
-                option_create: function(data, escape) {
+                option_create: (data, escape)  => {
+                    //If the input starts with "->", we prepend the current selected value, for easier extension of existing values
+                    //This here handles the display part, while the createItem function handles the actual creation
+                    if (data.input.startsWith("->")) {
+                        //Get current selected value
+                        const current = this._tomSelect.getItem(this._tomSelect.getValue()).textContent.replaceAll("→", "->").trim();
+                        //Prepend it to the input
+                        if (current) {
+                            data.input = current + " " + data.input;
+                        } else {
+                            //If there is no current value, we remove the "->"
+                            data.input = data.input.substring(2);
+                        }
+                    }
+
                     return '<div class="create"><i class="fa-solid fa-plus fa-fw"></i>&nbsp;<strong>' + escape(data.input) + '</strong>&hellip;&nbsp;' +
                         '<small class="text-muted float-end">(' + addHint +')</small>' +
                         '</div>';
@@ -63,14 +88,39 @@ export default class extends Controller {
             //Add callbacks to update validity
             onInitialize: this.updateValidity.bind(this),
             onChange: this.updateValidity.bind(this),
+
+            plugins: {
+                "autoselect_typed": {},
+            }
         };
 
+        //Add clear button plugin, if an empty option is present
+        if (this.element.querySelector("option[value='']") !== null) {
+            settings.plugins["clear_button"] = {};
+        }
+
         this._tomSelect = new TomSelect(this.element, settings);
         //Do not do a sync here as this breaks the initial rendering of the empty option
         //this._tomSelect.sync();
     }
 
     createItem(input, callback) {
+
+        //If the input starts with "->", we prepend the current selected value, for easier extension of existing values
+        if (input.startsWith("->")) {
+            //Get current selected value
+            let current = this._tomSelect.getItem(this._tomSelect.getValue()).textContent.replaceAll("→", "->").trim();
+            //Replace no break spaces with normal spaces
+            current = current.replaceAll("\u00A0", " ");
+            //Prepend it to the input
+            if (current) {
+                input = current + " " + input;
+            } else {
+                //If there is no current value, we remove the "->"
+                input = input.substring(2);
+            }
+        }
+
         callback({
             //$%$ is a special value prefix, that is used to identify items, that are not yet in the DB
             value: '$%$' + input,
@@ -79,6 +129,31 @@ export default class extends Controller {
         });
     }
 
+    createFilter(input) {
+
+        //Normalize the input (replace spacing around arrows)
+        if (input.includes("->")) {
+            const inputs = input.split("->");
+            inputs.forEach((value, index) => {
+                inputs[index] = value.trim();
+            });
+            input = inputs.join("->");
+        } else {
+            input = input.trim();
+        }
+
+        const options = this._tomSelect.options;
+        //Iterate over all options and check if the input is already present
+        for (let index in options) {
+            const option = options[index];
+            if (option.path === input) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
 
     updateValidity() {
         //Mark this input as invalid, if the selected option is disabled

assets/controllers/elements/tagsinput_controller.js

@@ -23,14 +23,21 @@ import "tom-select/dist/css/tom-select.bootstrap5.css";
 import '../../css/components/tom-select_extensions.css';
 import TomSelect from "tom-select";
 
+import TomSelect_click_to_edit from '../../tomselect/click_to_edit/click_to_edit'
+import TomSelect_autoselect_typed from '../../tomselect/autoselect_typed/autoselect_typed'
+
+TomSelect.define('click_to_edit', TomSelect_click_to_edit)
+TomSelect.define('autoselect_typed', TomSelect_autoselect_typed)
+
 export default class extends Controller {
     _tomSelect;
 
     connect() {
         let settings = {
             plugins: {
-                remove_button:{
-                }
+                remove_button:{},
+                'autoselect_typed': {},
+                'click_to_edit': {},
             },
             persistent: false,
             selectOnTab: true,

assets/controllers/elements/tree_controller.js

@@ -94,13 +94,15 @@ export default class extends Controller {
             showTags: this._showTags,
             data: data,
             showIcon: true,
+            preventUnselect: true,
+            allowReselect: true,
             onNodeSelected: (event) => {
                 const node = event.detail.node;
                 if (node.href) {
                     window.Turbo.visit(node.href, {action: "advance"});
+                    this._registerURLWatcher(node);
                 }
             },
-            //onNodeContextmenu: contextmenu_handler,
         }, [BS5Theme, BS53Theme, FAIconTheme]);
 
         this.treeTarget.addEventListener(EVENT_INITIALIZED, (event) => {
@@ -108,12 +110,42 @@ export default class extends Controller {
             const treeView = event.detail.treeView;
             treeView.revealNode(treeView.getSelected());
 
+            //Add the url watcher to all selected nodes
+            for (const node of treeView.getSelected()) {
+                this._registerURLWatcher(node);
+            }
+
             //Add contextmenu event listener to the tree, which allows us to open the links in a new tab with a right click
             treeView.getTreeElement().addEventListener("contextmenu", this._onContextMenu.bind(this));
         });
 
     }
 
+    _registerURLWatcher(node)
+    {
+        //Register a watcher for a location change, which will unselect the node, if the location changes
+        const desired_url = node.href;
+
+        //Ensure that the node is unselected, if the location changes
+        const unselectNode = () => {
+            //Parse url so we can properly compare them
+            const desired = new URL(node.href, window.location.origin);
+
+            //We only compare the pathname, because the hash and parameters should not matter
+            if(window.location.pathname !== desired.pathname) {
+                //The ignore parameter is important here, otherwise the node will not be unselected
+                node.setSelected(false, {silent: true, ignorePreventUnselect: true});
+
+                //Unregister the watcher
+                document.removeEventListener('turbo:load', unselectNode);
+            }
+        };
+
+        //Register the watcher via hotwire turbo
+        //We must just load to have the new url in window.location
+        document.addEventListener('turbo:load', unselectNode);
+    }
+
     _onContextMenu(event)
     {
         //Find the node that was clicked and open link in new tab

assets/controllers/pages/association_edit_type_select_controller.js

@@ -0,0 +1,44 @@
+/*
+ * This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
+ *
+ *  Copyright (C) 2019 - 2023 Jan Böhmer (https://github.com/jbtronics)
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published
+ *  by the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import {Controller} from "@hotwired/stimulus";
+
+export default class extends Controller {
+
+    static targets = [ "display", "select" ]
+
+    connect()
+    {
+        this.update();
+        this.selectTarget.addEventListener('change', this.update.bind(this));
+    }
+
+    update()
+    {
+        //If the select value is 0, then we show the input field
+        if( this.selectTarget.value === '0')
+        {
+            this.displayTarget.classList.remove('d-none');
+        }
+        else
+        {
+            this.displayTarget.classList.add('d-none');
+        }
+    }
+}

assets/controllers/pages/barcode_scan_controller.js

@@ -20,7 +20,7 @@
 import {Controller} from "@hotwired/stimulus";
 //import * as ZXing from "@zxing/library";
 
-import {Html5QrcodeScanner, Html5Qrcode} from "html5-qrcode";
+import {Html5QrcodeScanner, Html5Qrcode} from "@part-db/html5-qrcode";
 
 /* stimulusFetch: 'lazy' */
 export default class extends Controller {
@@ -50,7 +50,7 @@ export default class extends Controller {
         });
 
         this._scanner = new Html5QrcodeScanner(this.element.id, {
-            fps: 2,
+            fps: 10,
             qrbox: qrboxFunction,
             experimentalFeatures: {
                 //This option improves reading quality on android chrome
@@ -61,6 +61,11 @@ export default class extends Controller {
         this._scanner.render(this.onScanSuccess.bind(this));
     }
 
+    disconnect() {
+        this._scanner.pause();
+        this._scanner.clear();
+    }
+
     onScanSuccess(decodedText, decodedResult) {
         //Put our decoded Text into the input box
         document.getElementById('scan_dialog_input').value = decodedText;

assets/controllers/pages/latex_preview_controller.js

@@ -25,9 +25,23 @@ import "katex/dist/katex.css";
 export default class extends Controller {
     static targets = ["input", "preview"];
 
+    static values = {
+        unit: {type: Boolean, default: false} //Render as upstanding (non-italic) text, useful for units
+    }
+
     updatePreview()
     {
-        katex.render(this.inputTarget.value, this.previewTarget, {
+        let value = "";
+        if (this.unitValue) {
+            //Escape percentage signs
+            value = this.inputTarget.value.replace(/%/g, '\\%');
+
+            value = "\\mathrm{" + value + "}";
+        } else {
+            value = this.inputTarget.value;
+        }
+
+        katex.render(value, this.previewTarget, {
             throwOnError: false,
         });
     }

assets/controllers/pages/parameters_autocomplete_controller.js

@@ -22,6 +22,13 @@ import TomSelect from "tom-select";
 import katex from "katex";
 import "katex/dist/katex.css";
 
+
+import TomSelect_click_to_edit from '../../tomselect/click_to_edit/click_to_edit'
+import TomSelect_autoselect_typed from '../../tomselect/autoselect_typed/autoselect_typed'
+
+TomSelect.define('click_to_edit', TomSelect_click_to_edit)
+TomSelect.define('autoselect_typed', TomSelect_autoselect_typed)
+
 /* stimulusFetch: 'lazy' */
 export default class extends Controller
 {
@@ -53,7 +60,10 @@ export default class extends Controller
     connect() {
         const settings = {
             plugins: {
-                clear_button:{}
+                'autoselect_typed': {},
+                'click_to_edit': {},
+                'clear_button': {},
+                'restore_on_backspace': {}
             },
             persistent: false,
             maxItems: 1,
@@ -75,7 +85,9 @@ export default class extends Controller
                         tmp += '<span>' + katex.renderToString(data.symbol) + '</span>'
                     }
                     if (data.unit) {
-                        tmp += '<span class="ms-2">' + katex.renderToString('[' + data.unit + ']') + '</span>'
+                        let unit  = data.unit.replace(/%/g, '\\%');
+                        unit = "\\mathrm{" + unit + "}";
+                        tmp += '<span class="ms-2">' + katex.renderToString('[' + unit + ']') + '</span>'
                     }
 
 

assets/controllers/pages/part_merge_modal_controller.js

@@ -0,0 +1,68 @@
+/*
+ * This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
+ *
+ *  Copyright (C) 2019 - 2023 Jan Böhmer (https://github.com/jbtronics)
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published
+ *  by the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import {Controller} from "@hotwired/stimulus";
+
+export default class extends Controller
+{
+    static targets = ['link', 'mode', 'otherSelect'];
+    static values = {
+        targetId: Number,
+    };
+
+    connect() {
+    }
+
+    update() {
+        const link = this.linkTarget;
+        const other_select = this.otherSelectTarget;
+
+        //Extract the mode using the mode radio buttons (we filter the array to get the checked one)
+        const mode = (this.modeTargets.filter((e)=>e.checked))[0].value;
+
+        if (other_select.value === '') {
+            link.classList.add('disabled');
+            return;
+        }
+
+        //Extract href template from data attribute on link target
+        let href = link.getAttribute('data-href-template');
+
+        let target, other;
+        if (mode === '1') {
+            target = this.targetIdValue;
+            other = other_select.value;
+        } else if (mode === '2') {
+            target = other_select.value;
+            other = this.targetIdValue;
+        } else {
+            throw 'Invalid mode';
+        }
+
+        //Replace placeholder with actual target id
+        href = href.replace('__target__', target);
+        //Replace placeholder with selected value of the select (the event sender)
+        href = href.replace('__other__', other);
+
+        //Assign new href to link
+        link.setAttribute('href', href);
+        //Make link clickable
+        link.classList.remove('disabled');
+    }
+}

assets/controllers/toggle_password_controller.js

@@ -0,0 +1,86 @@
+/*
+ * This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
+ *
+ *  Copyright (C) 2019 - 2025 Jan Böhmer (https://github.com/jbtronics)
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published
+ *  by the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+import { Controller } from '@hotwired/stimulus';
+import '../css/components/toggle_password.css';
+
+export default class extends Controller {
+    static values = {
+        visibleLabel: { type: String, default: 'Show' },
+        visibleIcon: { type: String, default: 'Default' },
+        hiddenLabel: { type: String, default: 'Hide' },
+        hiddenIcon: { type: String, default: 'Default' },
+        buttonClasses: Array,
+    };
+
+    isDisplayed = false;
+    visibleIcon = `<svg xmlns="http://www.w3.org/2000/svg" class="toggle-password-icon" viewBox="0 0 20 20" fill="currentColor">
+<path d="M10 12a2 2 0 100-4 2 2 0 000 4z" />
+<path fill-rule="evenodd" d="M.458 10C1.732 5.943 5.522 3 10 3s8.268 2.943 9.542 7c-1.274 4.057-5.064 7-9.542 7S1.732 14.057.458 10zM14 10a4 4 0 11-8 0 4 4 0 018 0z" clip-rule="evenodd" />
+</svg>`;
+    hiddenIcon = `<svg xmlns="http://www.w3.org/2000/svg" class="toggle-password-icon" viewBox="0 0 20 20" fill="currentColor">
+<path fill-rule="evenodd" d="M3.707 2.293a1 1 0 00-1.414 1.414l14 14a1 1 0 001.414-1.414l-1.473-1.473A10.014 10.014 0 0019.542 10C18.268 5.943 14.478 3 10 3a9.958 9.958 0 00-4.512 1.074l-1.78-1.781zm4.261 4.26l1.514 1.515a2.003 2.003 0 012.45 2.45l1.514 1.514a4 4 0 00-5.478-5.478z" clip-rule="evenodd" />
+<path d="M12.454 16.697L9.75 13.992a4 4 0 01-3.742-3.741L2.335 6.578A9.98 9.98 0 00.458 10c1.274 4.057 5.065 7 9.542 7 .847 0 1.669-.105 2.454-.303z" />
+</svg>`;
+
+    connect() {
+        if (this.visibleIconValue !== 'Default') {
+            this.visibleIcon = this.visibleIconValue;
+        }
+
+        if (this.hiddenIconValue !== 'Default') {
+            this.hiddenIcon = this.hiddenIconValue;
+        }
+
+        const button = this.createButton();
+
+        this.element.insertAdjacentElement('afterend', button);
+        this.dispatchEvent('connect', { element: this.element, button });
+    }
+
+    /**
+     * @returns {HTMLButtonElement}
+     */
+    createButton() {
+        const button = document.createElement('button');
+        button.type = 'button';
+        button.classList.add(...this.buttonClassesValue);
+        button.setAttribute('tabindex', '-1');
+        button.addEventListener('click', this.toggle.bind(this));
+        button.innerHTML = `${this.visibleIcon} ${this.visibleLabelValue}`;
+        return button;
+    }
+
+    /**
+     * Toggle input type between "text" or "password" and update label accordingly
+     */
+    toggle(event) {
+        this.isDisplayed = !this.isDisplayed;
+        const toggleButtonElement = event.currentTarget;
+        toggleButtonElement.innerHTML = this.isDisplayed
+            ? `${this.hiddenIcon} ${this.hiddenLabelValue}`
+            : `${this.visibleIcon} ${this.visibleLabelValue}`;
+        this.element.setAttribute('type', this.isDisplayed ? 'text' : 'password');
+        this.dispatchEvent(this.isDisplayed ? 'show' : 'hide', { element: this.element, button: toggleButtonElement });
+    }
+
+    dispatchEvent(name, payload) {
+        this.dispatch(name, { detail: payload, prefix: 'toggle-password' });
+    }
+}

assets/css/app/bs-overrides.css

@@ -120,4 +120,11 @@ ins {
 del {
     background-color: #f09595;
     font-weight: bold;
-}
+}
+
+/****************************************
+ * Password toggle
+ ****************************************/
+.toggle-password-button {
+    top: 0.7rem !important;
+}

assets/css/app/helpers.css

@@ -111,4 +111,11 @@ ul.structural_link li a:hover {
 .permission-checkbox:checked {
     background-color: var(--bs-success);
     border-color: var(--bs-success);
+}
+
+/***********************************************
+ * Katex rendering with same height as text
+ ***********************************************/
+.katex-same-height-as-text .katex {
+    font-size: 1.0em;
 }

assets/css/app/images.css

@@ -51,7 +51,6 @@
 .part-table-image {
     max-height: 40px;
     object-fit: contain;
-    width: 100%;
 }
 
 .part-info-image {
@@ -61,4 +60,4 @@
 
 .object-fit-cover {
     object-fit: cover;
-}
+}

assets/css/app/layout.css

@@ -108,8 +108,8 @@ body {
 .back-to-top {
     cursor: pointer;
     position: fixed;
-    bottom: 20px;
-    right: 20px;
+    bottom: 60px;
+    right: 40px;
     display:none;
     z-index: 1030;
 }

assets/css/app/tables.css

@@ -63,10 +63,6 @@ table.dataTable > tbody > tr.selected > td > a {
     margin-block-end: 0;
 }
 
-.card-footer-table {
-    padding-top: 0;
-}
-
 table.dataTable {
     margin-top: 0 !important;
 }
@@ -84,7 +80,7 @@ th.select-checkbox {
  * Datatables definitions/overrides
  ********************************************************************/
 
-.dataTables_length {
+.dt-length {
     display: inline-flex;
 }
 
@@ -94,6 +90,16 @@ table.dataTable tr.selected td.select-checkbox:after
     margin-top: -20px !important;
 }
 
+/** Show pagination right aligned */
+.dt-paging .pagination {
+    justify-content: flex-end;
+}
+
+/** Fix table row coloring */
+table.table.dataTable > :not(caption) > * > * {
+    background-color: var(--bs-table-bg);
+}
+
 
 /******************************************************
 Classes for Datatables export
@@ -103,53 +109,4 @@ Classes for Datatables export
 #export-messageTop,
 .export-helper{
     display: none;
-}
-
-/******************************************************
- * Styling for the select all checkbox in the parts table
- * Should match the styling of the select checkbox
- ******************************************************/
-table.dataTable > thead > tr > th.select-checkbox {
-    position: relative;
-}
-table.dataTable > thead > tr > th.select-checkbox:before,
-table.dataTable > thead > tr > th.select-checkbox:after {
-    display: block;
-    position: absolute;
-    top: 0.9em;
-    left: 50%;
-    width: 1em !important;
-    height: 1em !important;
-    box-sizing: border-box;
-}
-table.dataTable > thead > tr > th.select-checkbox:before {
-    content: " ";
-    margin-top: -5px;
-    margin-left: -6px;
-    border: 2px solid var(--bs-tertiary-color);
-    border-radius: 3px;
-}
-
-table.dataTable > tbody > tr > td.select-checkbox:before, table.dataTable > tbody > tr > th.select-checkbox:before {
-    border: 2px solid var(--bs-tertiary-color) !important;
-}
-
-table.dataTable > tbody > tr > td.select-checkbox:before, table.dataTable > tbody > tr > td.select-checkbox:after, table.dataTable > tbody > tr > th.select-checkbox:before, table.dataTable > tbody > tr > th.select-checkbox:after {
-    width: 1em !important;
-    height: 1em !important;
-}
-
-table.dataTable > thead > tr.selected > th.select-checkbox:after {
-    content: "✓";
-    font-size: 20px;
-    margin-top: -20px;
-    margin-left: -6px;
-    text-align: center;
-    /*text-shadow: 1px 1px #B0BED9, -1px -1px #B0BED9, 1px -1px #B0BED9, -1px 1px #B0BED9; */
-}
-table.dataTable.compact > thead > tr > th.select-checkbox:before {
-    margin-top: -12px;
-}
-table.dataTable.compact > thead > tr.selected > th.select-checkbox:after {
-    margin-top: -16px;
-}
+}

assets/css/components/ckeditor.css

@@ -24,9 +24,8 @@
 /** Should be the same settings, as in label_style.css */
 .ck-html-label .ck-content {
     font-family: "DejaVu Sans Mono", monospace;
-    font-size: 12px;
+    font-size: 12pt;
     line-height: 1.0;
-    font-size-adjust: 1.5;
 }
 
 .ck-html-label .ck-content p {

assets/css/components/datatables_select_bs5.css

@@ -0,0 +1,69 @@
+/******************************************************************************************
+* This styles the checkboxes of the select extension exactly like the ones in bootstrap 5
+******************************************************************************************/
+
+table.dataTable > tbody > tr > .selected {
+    background-color: var(--bs-primary-bg-subtle) !important;
+    color: white;
+}
+table.dataTable > tbody > tr > .dt-select {
+    text-align: center;
+    vertical-align: middle;
+}
+table.dataTable > thead > tr > .dt-select {
+    text-align: center;
+}
+table.dataTable input.dt-select-checkbox {
+    --bs-form-check-bg: var(--bs-body-bg);
+    flex-shrink: 0;
+    width: 1em;
+    height: 1em;
+    margin-top: 0.25em;
+    vertical-align: top;
+    -webkit-appearance: none;
+    -moz-appearance: none;
+    appearance: none;
+    background-color: var(--bs-form-check-bg);
+    background-image: var(--bs-form-check-bg-image);
+    background-repeat: no-repeat;
+    background-position: center;
+    background-size: contain;
+    border: var(--bs-border-width) solid var(--bs-border-color);
+    -webkit-print-color-adjust: exact;
+    color-adjust: exact;
+    print-color-adjust: exact;
+    border-radius: 0.25em;
+}
+
+table.dataTable input.dt-select-checkbox:checked {
+    background-color: rgb(var(--bs-secondary-rgb));
+    border-color: rgb(var(--bs-secondary-rgb));
+    --bs-form-check-bg-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20 20'%3e%3cpath fill='none' stroke='%23fff' stroke-linecap='round' stroke-linejoin='round' stroke-width='3' d='m6 10 3 3 6-6'/%3e%3c/svg%3e");
+}
+
+table.dataTable input.dt-select-checkbox:indeterminate {
+    background-color: rgb(var(--bs-secondary-rgb));
+    border-color: rgb(var(--bs-secondary-rgb));
+    --bs-form-check-bg-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20 20'%3e%3cpath fill='none' stroke='%23fff' stroke-linecap='round' stroke-linejoin='round' stroke-width='3' d='M6 10h8'/%3e%3c/svg%3e");
+}
+
+
+
+
+div.dt-container span.select-info,
+div.dt-container span.select-item {
+    margin-left: 0.5em;
+}
+
+
+@media screen and (max-width: 640px) {
+    div.dt-container span.select-info,
+    div.dt-container span.select-item {
+        margin-left: 0;
+        display: block;
+    }
+}
+table.dataTable.table-sm tbody td.select-checkbox::before {
+    margin-top: -9px;
+}
+

assets/css/components/toggle_password.css

@@ -0,0 +1,41 @@
+/*
+ * This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
+ *
+ *  Copyright (C) 2019 - 2025 Jan Böhmer (https://github.com/jbtronics)
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU Affero General Public License as published
+ *  by the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU Affero General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Affero General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+.toggle-password-container {
+    position: relative;
+}
+.toggle-password-icon {
+    height: 1rem;
+    width: 1rem;
+}
+.toggle-password-button {
+    align-items: center;
+    background-color: transparent;
+    border: none;
+    column-gap: 0.25rem;
+    display: flex;
+    flex-direction: row;
+    font-size: 0.875rem;
+    justify-items: center;
+    height: 1rem;
+    line-height: 1.25rem;
+    position: absolute;
+    right: 0.5rem;
+    top: -1.25rem;
+}

assets/js/app.js

@@ -44,4 +44,18 @@ import "./register_events";
 import "./tristate_checkboxes";
 
 //Define jquery globally
-window.$ = window.jQuery = require("jquery")
+window.$ = window.jQuery = require("jquery");
+
+//Use the local WASM file for the ZXing library
+import {
+    setZXingModuleOverrides,
+} from "barcode-detector/ponyfill";
+import  wasmFile from "../../node_modules/zxing-wasm/dist/reader/zxing_reader.wasm";
+setZXingModuleOverrides({
+    locateFile: (path, prefix) => {
+        if (path.endsWith(".wasm")) {
+            return wasmFile;
+        }
+        return prefix + path;
+    },
+});

assets/js/lib/datatables.js

@@ -75,11 +75,10 @@
                             request._dt = config.name;
 
                             //Try to resolve the original column index when the column was reordered (using the ColReorder plugin)
-                            //Only do this when _ColReorder_iOrigCol is available
-                            if (settings.aoColumns && settings.aoColumns.length && settings.aoColumns[0]._ColReorder_iOrigCol !== undefined) {
+                            if (dt.colReorder && dt.colReorder.transpose) {
                                 if (request.order && request.order.length) {
                                     request.order.forEach(function (order) {
-                                        order.column = settings.aoColumns[order.column]._ColReorder_iOrigCol;
+                                        order.column = dt.colReorder.transpose(order.column, "toOriginal");
                                     });
                                 }
                             }
@@ -98,6 +97,15 @@
                     dtOpts = config.options(dtOpts);
                 }
 
+                //Choose the column where the className contains "select-column" and apply the select extension to its render field
+                //Added for Part-DB
+                for (let column of dtOpts.columns) {
+                    if (column.className && column.className.includes('dt-select')) {
+                        column.render = $.fn.dataTable.render.select();
+                    }
+                }
+
+
                 root.html(data.template);
                 dt = $('table', root).DataTable(dtOpts);
                 if (config.state !== 'none') {

assets/js/register_events.js

@@ -21,6 +21,7 @@
 
 import {Dropdown} from "bootstrap";
 import ClipboardJS from "clipboard";
+import {Modal} from "bootstrap";
 
 class RegisterEventHelper {
     constructor() {
@@ -31,9 +32,11 @@ class RegisterEventHelper {
         //Initialize ClipboardJS
         this.registerLoadHandler(() => {
             new ClipboardJS('.btn');
-        })
+        });
 
         this.registerModalDropRemovalOnFormSubmit();
+
+
     }
 
     registerModalDropRemovalOnFormSubmit() {
@@ -43,6 +46,15 @@ class RegisterEventHelper {
             if (back_drop) {
                 back_drop.remove();
             }
+
+            //Remove scroll-lock if it is still active
+            if (document.body.classList.contains('modal-open')) {
+                document.body.classList.remove('modal-open');
+
+                //Remove the padding-right and overflow:hidden from the body
+                document.body.style.paddingRight = '';
+                document.body.style.overflow = '';
+            }
         });
     }
 

assets/js/tab_remember.js

@@ -19,7 +19,7 @@
 
 "use strict";
 
-import {Tab, Dropdown} from "bootstrap";
+import {Tab, Dropdown, Collapse} from "bootstrap";
 import tab from "bootstrap/js/src/tab";
 
 /**
@@ -54,6 +54,7 @@ class TabRememberHelper {
         const first_element = merged[0] ?? null;
         if(first_element) {
             this.revealElementOnTab(first_element);
+            this.revealElementInCollapse(first_element);
         }
     }
 
@@ -62,10 +63,20 @@ class TabRememberHelper {
      * @param event
      */
     onInvalid(event) {
+        this.revealElementInCollapse(event.target);
         this.revealElementOnTab(event.target);
         this.revealElementInDropdown(event.target);
     }
 
+    revealElementInCollapse(element) {
+        let collapse = element.closest('.collapse');
+
+        if(collapse) {
+            let bs_collapse = Collapse.getOrCreateInstance(collapse);
+            bs_collapse.show();
+        }
+    }
+
     revealElementInDropdown(element) {
         let dropdown = element.closest('.dropdown-menu');
 

assets/tomselect/autoselect_typed/autoselect_typed.js

@@ -0,0 +1,63 @@
+/**
+ * Autoselect Typed plugin for Tomselect
+ *
+ * This plugin allows automatically selecting an option matching the typed text when the Tomselect element goes out of
+ * focus (is blurred) and/or when the delimiter is typed.
+ *
+ * #select_on_blur option
+ * Tomselect natively supports the "createOnBlur" option. This option picks up any remaining text in the input field
+ * and uses it to create a new option and selects that option. It does behave a bit strangely though, in that it will
+ * not select an already existing option when the input is blurred, so if you typed something that matches an option in
+ * the list and then click outside the box (without pressing enter) the entered text is just removed (unless you have
+ * allow duplicates on in which case it will create a new option).
+ * This plugin fixes that, such that Tomselect will first try to select an option matching the remaining uncommitted
+ * text and only when no matching option is found tries to create a new one (if createOnBlur and create is on)
+ *
+ * #select_on_delimiter option
+ * Normally when typing the delimiter (space by default) Tomselect will try to create a new option (and select it) (if
+ * create is on), but if the typed text matches an option (and allow duplicates is off) it refuses to react at all until
+ * you press enter. With this option, the delimiter will also allow selecting an option, not just creating it.
+ */
+function select_current_input(self){
+    if(self.isLocked){
+        return
+    }
+
+    const val = self.inputValue()
+    //Do nothing if the input is empty
+    if (!val) {
+        return
+    }
+
+    if (self.options[val]) {
+        self.addItem(val)
+        self.setTextboxValue()
+    }
+}
+
+export default function(plugin_options_) {
+    const plugin_options = Object.assign({
+        //Autoselect the typed text when the input element goes out of focus
+        select_on_blur: true,
+        //Autoselect the typed text when the delimiter is typed
+        select_on_delimiter: true,
+    }, plugin_options_);
+
+    const self = this
+
+    if(plugin_options.select_on_blur) {
+        this.hook("before", "onBlur", function () {
+            select_current_input(self)
+        })
+    }
+
+    if(plugin_options.select_on_delimiter) {
+        this.hook("before", "onKeyPress", function (e) {
+            const character = String.fromCharCode(e.keyCode || e.which);
+            if (self.settings.mode === 'multi' && character === self.settings.delimiter) {
+                select_current_input(self)
+            }
+        })
+    }
+
+}

assets/tomselect/click_to_edit/click_to_edit.js

@@ -0,0 +1,93 @@
+/**
+ * click_to_edit plugin for Tomselect
+ *
+ * This plugin allows editing (and selecting text in) any selected item by clicking it.
+ *
+ * Usually, when the user typed some text and created an item in Tomselect that item cannot be edited anymore. To make
+ * a change, the item has to be deleted and retyped completely. There is also generally no way to copy text out of a
+ * tomselect item. The "restore_on_backspace" plugin improves that somewhat, by allowing the user to edit an item after
+ * pressing backspace. However, it is somewhat confusing to first have to focus the field an then hit backspace in order
+ * to copy a piece of text. It may also not be immediately obvious for editing.
+ * This plugin transforms an item into editable text when it is clicked, e.g. when the user tries to place the caret
+ * within an item or when they try to drag across the text to highlight it.
+ * It also plays nice with the remove_button plugin which still removes (deselects) an option entirely.
+ *
+ * It is recommended to also enable the autoselect_typed plugin when using this plugin. Without it, the text in the
+ * input field (i.e. the item that was just clicked) is lost when the user clicks outside the field. Also, when the user
+ * clicks an option (making it text) and then tries to enter another one by entering the delimiter (e.g. space) nothing
+ * happens until enter is pressed or the text is changed from what it was.
+ */
+
+/**
+ * Return a dom element from either a dom query string, jQuery object, a dom element or html string
+ * https://stackoverflow.com/questions/494143/creating-a-new-dom-element-from-an-html-string-using-built-in-dom-methods-or-pro/35385518#35385518
+ *
+ * param query should be {}
+ */
+const getDom = query => {
+    if (query.jquery) {
+        return query[0];
+    }
+    if (query instanceof HTMLElement) {
+        return query;
+    }
+    if (isHtmlString(query)) {
+        var tpl = document.createElement('template');
+        tpl.innerHTML = query.trim(); // Never return a text node of whitespace as the result
+        return tpl.content.firstChild;
+    }
+    return document.querySelector(query);
+};
+const isHtmlString = arg => {
+    if (typeof arg === 'string' && arg.indexOf('<') > -1) {
+        return true;
+    }
+    return false;
+};
+
+function plugin(plugin_options_) {
+    const self = this
+
+    const plugin_options = Object.assign({
+        //If there is unsubmitted text in the input field, should that text be automatically used to select a matching
+        //element? If this is off, clicking on item1 and then clicking on item2 will result in item1 being deselected
+        auto_select_before_edit: true,
+        //If there is unsubmitted text in the input field, should that text be automatically used to create a matching
+        //element if no matching element was found or auto_select_before_edit is off?
+        auto_create_before_edit: true,
+        //customize this function to change which text the item is replaced with when clicking on it
+        text: option => {
+            return option[self.settings.labelField];
+        }
+    }, plugin_options_);
+
+
+    self.hook('after', 'setupTemplates', () => {
+        const orig_render_item = self.settings.render.item;
+        self.settings.render.item = (data, escape) => {
+            const item = getDom(orig_render_item.call(self, data, escape));
+
+            item.addEventListener('click', evt => {
+                    if (self.isLocked) {
+                        return;
+                    }
+                    const val = self.inputValue();
+
+                    if (self.options[val]) {
+                        self.addItem(val)
+                    } else if (self.settings.create) {
+                        self.createItem();
+                    }
+                    const option = self.options[item.dataset.value]
+                    self.setTextboxValue(plugin_options.text.call(self, option));
+                    self.focus();
+                    self.removeItem(item);
+                }
+            );
+
+            return item;
+        }
+    });
+
+}
+export { plugin as default };

bin/console

@@ -4,6 +4,17 @@
 use App\Kernel;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 
+if (!is_dir(dirname(__DIR__).'/vendor')) {
+    throw new LogicException('Dependencies are missing. Try running "composer install".');
+}
+
+//Increase xdebug.max_nesting_level to 1000 if required (see issue #411)
+//Check if xdebug extension is active, and xdebug.max_nesting_level is set to 256 or lower
+if (extension_loaded('xdebug') && ((int) ini_get('xdebug.max_nesting_level')) <= 256) {
+    //Increase xdebug.max_nesting_level to 1000
+    ini_set('xdebug.max_nesting_level', '1000');
+}
+
 if (!is_file(dirname(__DIR__).'/vendor/autoload_runtime.php')) {
     throw new LogicException('Symfony Runtime is missing. Try running "composer require symfony/runtime".');
 }

bin/phpunit

@@ -6,9 +6,13 @@ if (!ini_get('date.timezone')) {
 }
 
 if (is_file(dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit')) {
-    define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__).'/vendor/autoload.php');
-    require PHPUNIT_COMPOSER_INSTALL;
-    PHPUnit\TextUI\Command::main();
+    if (PHP_VERSION_ID >= 80000) {
+        require dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit';
+    } else {
+        define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__).'/vendor/autoload.php');
+        require PHPUNIT_COMPOSER_INSTALL;
+        PHPUnit\TextUI\Command::main();
+    }
 } else {
     if (!is_file(dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php')) {
         echo "Unable to find the `simple-phpunit.php` script in `vendor/symfony/phpunit-bridge/bin/`.\n";

codecov.yml

@@ -5,4 +5,5 @@ coverage:
   status:
     project:
       default:
-        threshold: 5%
+        threshold: 10%
+        target: 40%

composer.json

@@ -1,8 +1,9 @@
 {
+    "name": "part-db/part-db-server",
     "type": "project",
     "license": "AGPL-3.0-or-later",
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "ext-ctype": "*",
         "ext-dom": "*",
         "ext-gd": "*",
@@ -10,106 +11,111 @@
         "ext-intl": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
-        "api-platform/core": "^3.1",
+        "amphp/http-client": "^5.1",
+        "api-platform/doctrine-orm": "^4.1",
+        "api-platform/json-api": "^4.0.0",
+        "api-platform/symfony": "^4.0.0",
         "beberlei/doctrineextensions": "^1.2",
-        "brick/math": "^0.11.0",
+        "brick/math": "^0.13.1",
+        "composer/ca-bundle": "^1.5",
         "composer/package-versions-deprecated": "^1.11.99.5",
-        "doctrine/annotations": "1.14.3",
-        "doctrine/data-fixtures": "^1.6.6",
-        "doctrine/dbal": "^3.4.6",
+        "doctrine/data-fixtures": "^2.0.0",
+        "doctrine/dbal": "^4.0.0",
         "doctrine/doctrine-bundle": "^2.0",
         "doctrine/doctrine-migrations-bundle": "^3.0",
-        "doctrine/orm": "^2.16",
-        "dompdf/dompdf": "dev-master#87bea32efe0b0db309e1d31537201f64d5508280 as v2.0.3",
-        "erusev/parsedown": "^1.7",
+        "doctrine/orm": "^3.2.0",
+        "dompdf/dompdf": "^v3.0.0",
         "florianv/swap": "^4.0",
         "florianv/swap-bundle": "dev-master",
         "gregwar/captcha-bundle": "^2.1.0",
-        "jbtronics/2fa-webauthn": "^v2.0.0",
+        "hshn/base64-encoded-file": "^5.0",
+        "jbtronics/2fa-webauthn": "^3.0.0",
         "jbtronics/dompdf-font-loader-bundle": "^1.0.0",
+        "jbtronics/settings-bundle": "^3.0.0",
         "jfcherng/php-diff": "^6.14",
         "knpuniversity/oauth2-client-bundle": "^2.15",
+        "league/commonmark": "^2.7",
         "league/csv": "^9.8.0",
         "league/html-to-markdown": "^5.0.1",
         "liip/imagine-bundle": "^2.2",
-        "nbgrp/onelogin-saml-bundle": "^1.3",
+        "nbgrp/onelogin-saml-bundle": "^v2.0.2",
         "nelexa/zip": "^4.0",
         "nelmio/cors-bundle": "^2.3",
         "nelmio/security-bundle": "^3.0",
         "nyholm/psr7": "^1.1",
-        "ocramius/proxy-manager": "2.2.*",
-        "omines/datatables-bundle": "^0.7.2",
+        "omines/datatables-bundle": "^0.10.0",
+        "paragonie/sodium_compat": "^1.21",
         "part-db/label-fonts": "^1.0",
-        "php-translation/symfony-bundle": "^0.14.0",
-        "phpdocumentor/reflection-docblock": "^5.2",
-        "phpstan/phpdoc-parser": "^1.23",
+        "rhukster/dom-sanitizer": "^1.0",
+        "runtime/frankenphp-symfony": "^0.2.0",
         "s9e/text-formatter": "^2.1",
-        "scheb/2fa-backup-code": "^6.8.0",
-        "scheb/2fa-bundle": "^6.8.0",
-        "scheb/2fa-google-authenticator": "^6.8.0",
-        "scheb/2fa-trusted-device": "^6.8.0",
+        "scheb/2fa-backup-code": "^v7.11.0",
+        "scheb/2fa-bundle": "^v7.11.0",
+        "scheb/2fa-google-authenticator": "^v7.11.0",
+        "scheb/2fa-trusted-device": "^v7.11.0",
         "shivas/versioning-bundle": "^4.0",
         "spatie/db-dumper": "^3.3.1",
         "symfony/apache-pack": "^1.0",
-        "symfony/asset": "6.3.*",
-        "symfony/console": "6.3.*",
-        "symfony/dotenv": "6.3.*",
-        "symfony/expression-language": "6.3.*",
+        "symfony/asset": "7.3.*",
+        "symfony/console": "7.3.*",
+        "symfony/css-selector": "7.3.*",
+        "symfony/dom-crawler": "7.3.*",
+        "symfony/dotenv": "7.3.*",
+        "symfony/expression-language": "7.3.*",
         "symfony/flex": "^v2.3.1",
-        "symfony/form": "6.3.*",
-        "symfony/framework-bundle": "6.3.*",
-        "symfony/http-client": "6.3.*",
-        "symfony/http-kernel": "6.3.*",
-        "symfony/mailer": "6.3.*",
+        "symfony/form": "7.3.*",
+        "symfony/framework-bundle": "7.3.*",
+        "symfony/http-client": "7.3.*",
+        "symfony/http-kernel": "7.3.*",
+        "symfony/mailer": "7.3.*",
         "symfony/monolog-bundle": "^3.1",
-        "symfony/process": "6.3.*",
-        "symfony/property-access": "6.3.*",
-        "symfony/property-info": "6.3.*",
-        "symfony/proxy-manager-bridge": "6.3.*",
-        "symfony/rate-limiter": "6.3.*",
-        "symfony/runtime": "6.3.*",
-        "symfony/security-bundle": "6.3.*",
-        "symfony/serializer": "6.3.*",
-        "symfony/translation": "6.3.*",
-        "symfony/twig-bundle": "6.3.*",
+        "symfony/polyfill-php82": "^1.28",
+        "symfony/process": "7.3.*",
+        "symfony/property-access": "7.3.*",
+        "symfony/property-info": "7.3.*",
+        "symfony/rate-limiter": "7.3.*",
+        "symfony/runtime": "7.3.*",
+        "symfony/security-bundle": "7.3.*",
+        "symfony/serializer": "7.3.*",
+        "symfony/string": "7.3.*",
+        "symfony/translation": "7.3.*",
+        "symfony/twig-bundle": "7.3.*",
         "symfony/ux-translator": "^2.10",
         "symfony/ux-turbo": "^2.0",
-        "symfony/validator": "6.3.*",
-        "symfony/web-link": "6.3.*",
+        "symfony/validator": "7.3.*",
+        "symfony/web-link": "7.3.*",
         "symfony/webpack-encore-bundle": "^v2.0.1",
-        "symfony/yaml": "6.3.*",
-        "tecnickcom/tc-lib-barcode": "^1.15",
+        "symfony/yaml": "7.3.*",
+        "symplify/easy-coding-standard": "^12.5.20",
+        "tecnickcom/tc-lib-barcode": "^2.1.4",
         "twig/cssinliner-extra": "^3.0",
-        "twig/extra-bundle": "^3.0",
-        "twig/html-extra": "^3.0",
+        "twig/extra-bundle": "^3.8",
+        "twig/html-extra": "^3.8",
         "twig/inky-extra": "^3.0",
-        "twig/intl-extra": "^3.0",
-        "twig/markdown-extra": "^3.0",
-        "web-auth/webauthn-symfony-bundle": "^4.0.0",
-        "webmozart/assert": "^1.4"
+        "twig/intl-extra": "^3.8",
+        "twig/markdown-extra": "^3.8",
+        "twig/string-extra": "^3.8",
+        "web-auth/webauthn-symfony-bundle": "^5.0.0"
     },
     "require-dev": {
-        "dama/doctrine-test-bundle": "^7.0",
-        "doctrine/doctrine-fixtures-bundle": "^3.2",
-        "ekino/phpstan-banned-code": "^v1.0.0",
+        "dama/doctrine-test-bundle": "^v8.0.0",
+        "doctrine/doctrine-fixtures-bundle": "^4.0.0",
+        "ekino/phpstan-banned-code": "^v3.0.0",
+        "jbtronics/translation-editor-bundle": "^1.0",
         "phpstan/extension-installer": "^1.0",
-        "phpstan/phpstan": "^1.4.7",
-        "phpstan/phpstan-doctrine": "^1.2.11",
-        "phpstan/phpstan-strict-rules": "^1.5",
-        "phpstan/phpstan-symfony": "^1.1.7",
-        "phpunit/phpunit": "^9.5",
-        "psalm/plugin-symfony": "^v5.0.1",
-        "rector/rector": "^0.18.0",
+        "phpstan/phpstan": "^2.0.4",
+        "phpstan/phpstan-doctrine": "^2.0.1",
+        "phpstan/phpstan-strict-rules": "^2.0.1",
+        "phpstan/phpstan-symfony": "^2.0.0",
+        "phpunit/phpunit": "^11.5.0",
+        "rector/rector": "^2.0.4",
         "roave/security-advisories": "dev-latest",
-        "symfony/browser-kit": "6.3.*",
-        "symfony/css-selector": "6.3.*",
-        "symfony/debug-bundle": "6.3.*",
+        "symfony/browser-kit": "7.3.*",
+        "symfony/debug-bundle": "7.3.*",
         "symfony/maker-bundle": "^1.13",
-        "symfony/phpunit-bridge": "6.3.*",
-        "symfony/stopwatch": "6.3.*",
-        "symfony/web-profiler-bundle": "6.3.*",
-        "symplify/easy-coding-standard": "^12.0",
-        "vimeo/psalm": "^5.6.0"
+        "symfony/phpunit-bridge": "7.3.*",
+        "symfony/stopwatch": "7.3.*",
+        "symfony/web-profiler-bundle": "7.3.*"
     },
     "suggest": {
         "ext-bcmath": "Used to improve price calculation performance",
@@ -120,7 +126,7 @@
             "*": "dist"
         },
         "platform": {
-            "php": "8.1.0"
+            "php": "8.2.0"
         },
         "sort-packages": true,
         "allow-plugins": {
@@ -160,7 +166,8 @@
     "extra": {
         "symfony": {
             "allow-contrib": false,
-            "require": "6.3.*"
+            "require": "7.3.*",
+            "docker": true
         }
     }
 }

config/banner.md

@@ -1,14 +1,4 @@
-Welcome to Part-DB.
- 
-<small>If you want to change this banner, edit `config/banner.md` file or set the `BANNER` environment variable.</small>
+**Attention**:
+Since Version 2.0.0 this file is no longer used.
 
-<blockquote class="pb-0">
-<p style="font-size: 12px">
-And God said <br>
-$\nabla \cdot \vec{D} = \rho$, 
-$\nabla \cdot \vec{B} = 0$, 
-$\nabla \times \vec{E} = -\frac{\partial \vec{B}}{\partial t}$, 
-$\nabla \times \vec{H} = \vec{j} + \frac{\partial \vec{D}}{\partial t}$,  <br>
-and then there was light.
-</p>
-</blockquote>
+You can now set the banner text directly in the admin interface, or by setting the `BANNER` environment variable.

config/bundles.php

@@ -18,13 +18,11 @@ return [
     DAMA\DoctrineTestBundle\DAMADoctrineTestBundle::class => ['test' => true],
     Twig\Extra\TwigExtraBundle\TwigExtraBundle::class => ['all' => true],
     Gregwar\CaptchaBundle\GregwarCaptchaBundle::class => ['all' => true],
-    Translation\Bundle\TranslationBundle::class => ['all' => true],
     Florianv\SwapBundle\FlorianvSwapBundle::class => ['all' => true],
     Nelmio\SecurityBundle\NelmioSecurityBundle::class => ['all' => true],
     Symfony\UX\Turbo\TurboBundle::class => ['all' => true],
     Jbtronics\TFAWebauthn\TFAWebauthnBundle::class => ['all' => true],
     Scheb\TwoFactorBundle\SchebTwoFactorBundle::class => ['all' => true],
-    SpomkyLabs\CborBundle\SpomkyLabsCborBundle::class => ['all' => true],
     Webauthn\Bundle\WebauthnBundle::class => ['all' => true],
     Nbgrp\OneloginSamlBundle\NbgrpOneloginSamlBundle::class => ['all' => true],
     Symfony\UX\StimulusBundle\StimulusBundle::class => ['all' => true],
@@ -32,5 +30,7 @@ return [
     Jbtronics\DompdfFontLoaderBundle\DompdfFontLoaderBundle::class => ['all' => true],
     KnpU\OAuth2ClientBundle\KnpUOAuth2ClientBundle::class => ['all' => true],
     Nelmio\CorsBundle\NelmioCorsBundle::class => ['all' => true],
+    Jbtronics\SettingsBundle\JbtronicsSettingsBundle::class => ['all' => true],
+    Jbtronics\TranslationEditorBundle\JbtronicsTranslationEditorBundle::class => ['dev' => true],
     ApiPlatform\Symfony\Bundle\ApiPlatformBundle::class => ['all' => true],
 ];

config/packages/api_platform.yaml

@@ -1,12 +1,18 @@
 api_platform:
-
   title: 'Part-DB API'
   description: 'API of Part-DB'
-
   version: '0.1.0'
 
-#  eager_loading:
-#    max_joins: 100
+  formats:
+    jsonld: ['application/ld+json']
+    json:   ['application/json']
+    jsonapi: ['application/vnd.api+json']
+
+  docs_formats:
+    jsonld: ['application/ld+json']
+    jsonopenapi: ['application/vnd.openapi+json']
+    html: ['text/html']
+    json:   ['application/vnd.openapi+json']
 
   swagger:
     api_keys:
@@ -22,5 +28,13 @@ api_platform:
         vary: ['Content-Type', 'Authorization', 'Origin']
     extra_properties:
         standard_put: true
+        rfc_7807_compliant_errors: true
 
-    pagination_client_items_per_page: true # Allow clients to override the default items per page
+    pagination_client_items_per_page: true # Allow clients to override the default items per page
+
+  # Need to be true, or some tests will fail
+  use_symfony_listeners: true
+
+  serializer:
+    # Change this to false later, to remove the hydra prefix on the API
+    hydra_prefix: true

config/packages/csrf.yaml

@@ -0,0 +1,12 @@
+# Enable stateless CSRF protection for forms and logins/logouts
+framework:
+    form:
+        csrf_protection:
+            token_id: submit
+
+    csrf_protection:
+        check_header: true
+        stateless_token_ids:
+            - submit
+            - authenticate
+            - logout

config/packages/dama_doctrine_test_bundle.yaml

@@ -0,0 +1,5 @@
+when@test:
+    dama_doctrine_test:
+        enable_static_connection: true
+        enable_static_meta_data_cache: true
+        enable_static_query_cache: true

config/packages/datatables.yaml

@@ -8,17 +8,17 @@ datatables:
 
     # Set options, as documented at https://datatables.net/reference/option/
     options:
-        lengthMenu : [[10, 25, 50, 100, -1], [10, 25, 50, 100, "All"]]
-        pageLength: '%partdb.table.default_page_size%'   # Set to -1 to disable pagination (i.e. show all rows) by default
-        #dom: "<'row' <'col-sm-12' tr>><'row' <'col-sm-6'l><'col-sm-6 text-right'pif>>"
-        dom: "  <'row'<'col mb-2 input-group' B l> <'col mb-2' <'pull-end' p>>>
-                        <'card'
-                            rt
-                            <'card-footer card-footer-table text-muted' i >
-                        >
-                        <'row'<'col mt-2 input-group' B l> <'col mt-2' <'pull-right' p>>>"
+        lengthMenu : [[10, 25, 50, 100], [10, 25, 50, 100]] # We add the "All" option, when part tables are generated
+        #pageLength: '%partdb.table.default_page_size%'   # Set to -1 to disable pagination (i.e. show all rows) by default
+        pageLength: 50 #TODO
+        dom: "  <'row' <'col mb-2 input-group flex-nowrap' B l > <'col-auto mb-2' < p >>>
+                    <'card'
+                        rt
+                        <'card-footer card-footer-table text-muted' i >
+                    >
+                <'row' <'col mt-2 input-group flex-nowrap' B l > <'col-auto mt-2' < p >>>"
         pagingType: 'simple_numbers'
-        searching: true
+        searching: false
         stateSave: true
 
 

config/packages/dev/php_translation.yaml

@@ -1,5 +0,0 @@
-translation:
-    symfony_profiler:
-        enabled: true
-    webui:
-        enabled: true

config/packages/doctrine.yaml

@@ -2,19 +2,29 @@ doctrine:
     dbal:
         url: '%env(resolve:DATABASE_URL)%'
 
+        # Required for DAMA doctrine test bundle
+        use_savepoints: true
+
         # IMPORTANT: You MUST configure your server version,
         # either here or in the DATABASE_URL env var (see .env file)
 
         types:
+            # UTC datetimes
             datetime:
                 class: App\Doctrine\Types\UTCDateTimeType
             date:
                 class: App\Doctrine\Types\UTCDateTimeType
+
+            datetime_immutable:
+                class: App\Doctrine\Types\UTCDateTimeImmutableType
+            date_immutable:
+                class: App\Doctrine\Types\UTCDateTimeImmutableType
+
             big_decimal:
                 class: App\Doctrine\Types\BigDecimalType
             tinyint:
                 class: App\Doctrine\Types\TinyIntType
-        
+
         schema_filter: ~^(?!internal)~
         # Only enable this when needed
         profiling_collect_backtrace: false
@@ -25,21 +35,27 @@ doctrine:
         report_fields_where_declared: true
         validate_xml_mapping: true
         naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware
+        identity_generation_preferences:
+            Doctrine\DBAL\Platforms\PostgreSQLPlatform: identity
         auto_mapping: true
+        controller_resolver:
+            auto_mapping: true
         mappings:
             App:
-                is_bundle: false
                 type: attribute
+                is_bundle: false
                 dir: '%kernel.project_dir%/src/Entity'
                 prefix: 'App\Entity'
                 alias: App
 
         dql:
             string_functions:
-                regexp: DoctrineExtensions\Query\Mysql\Regexp
-                ifnull: DoctrineExtensions\Query\Mysql\IfNull
+                regexp: App\Doctrine\Functions\Regexp
                 field:  DoctrineExtensions\Query\Mysql\Field
                 field2: App\Doctrine\Functions\Field2
+                natsort: App\Doctrine\Functions\Natsort
+                array_position: App\Doctrine\Functions\ArrayPosition
+                ilike: App\Doctrine\Functions\ILike
 
 when@test:
     doctrine:

config/packages/framework.yaml

@@ -1,10 +1,8 @@
 # see https://symfony.com/doc/current/reference/configuration/framework.html
 framework:
     secret: '%env(APP_SECRET)%'
-    csrf_protection: true
-    handle_all_throwables: true
 
-    # We set this header by ourself, so we can disable it here
+    # We set this header by ourselves, so we can disable it here
     disallow_search_engine_index: false
 
     # Must be set to true, to enable the change of HTTP method via _method parameter, otherwise our delete routines does not work anymore
@@ -26,12 +24,14 @@ framework:
         handler_id: null
         cookie_secure: auto
         cookie_samesite: lax
-        storage_factory_id: session.storage.factory.native
 
     #esi: true
     #fragments: true
-    php_errors:
-        log: true
+
+
+    form: { csrf_protection: { token_id: 'submit' } }
+    csrf_protection:
+        stateless_token_ids: ['submit', 'authenticate', 'logout']
 
 when@test:
     framework:

config/packages/knpu_oauth2_client.yaml

@@ -6,8 +6,8 @@ knpu_oauth2_client:
             type: generic
             provider_class: '\League\OAuth2\Client\Provider\GenericProvider'
 
-            client_id: '%env(PROVIDER_DIGIKEY_CLIENT_ID)%'
-            client_secret: '%env(PROVIDER_DIGIKEY_SECRET)%'
+            client_id: '%env(settings:digikey:clientId)%'
+            client_secret: '%env(settings:digikey:secret)%'
 
             redirect_route: 'oauth_client_check'
             redirect_params: {name: 'ip_digikey_oauth'}
@@ -26,8 +26,8 @@ knpu_oauth2_client:
             type: generic
             provider_class: '\League\OAuth2\Client\Provider\GenericProvider'
 
-            client_id: '%env(PROVIDER_OCTOPART_CLIENT_ID)%'
-            client_secret: '%env(PROVIDER_OCTOPART_SECRET)%'
+            client_id: '%env(settings:octopart:clientId)%'
+            client_secret: '%env(settings:octopart:secret)%'
 
             redirect_route: 'oauth_client_check'
             redirect_params: { name: 'ip_octopart_oauth' }

config/packages/monolog.yaml

@@ -50,7 +50,6 @@ when@prod:
                 type: stream
                 path: "%kernel.logs_dir%/%kernel.environment%.log"
                 level: debug
-                formatter: monolog.formatter.json
             console:
                 type: console
                 process_psr_3_messages: false
@@ -70,11 +69,11 @@ when@docker:
                 excluded_http_codes: [404, 405]
                 buffer_size: 50 # How many messages should be saved? Prevent memory leaks
                 include_stacktraces: true
+                channels: ["!deprecation"]
             nested:
                 type: stream
                 path: "php://stderr"
                 level: debug
-                formatter: monolog.formatter.json
             console:
                 type: console
                 process_psr_3_messages: false

config/packages/nbgrp_onelogin_saml.yaml

@@ -5,6 +5,7 @@ parameters:
   saml.sp.privateKey: '%env(string:SAML_SP_PRIVATE_KEY)%'
 
 nbgrp_onelogin_saml:
+  use_proxy_vars: '%env(bool:SAML_BEHIND_PROXY)%'
   onelogin_settings:
     default:
       # Basic settings
@@ -31,7 +32,7 @@ nbgrp_onelogin_saml:
         privateKey: '%env(string:default:saml.sp.privateKey:string:SAMLP_SP_PRIVATE_KEY)%'
 
       # Optional settings
-      #baseurl: 'http://myapp.com'
+      baseurl: '%partdb.default_uri%saml/'
       strict: true
       debug: false
       security:

config/packages/nelmio_security.yaml

@@ -51,12 +51,16 @@ nelmio_security:
             img-src:
                 - '*'
                 - 'data:'
+                # Required for be able to load pictures in the QR code scanner
+                - 'blob:'
             style-src:
                 - 'self'
                 - 'unsafe-inline'
                 - 'data:'
             script-src:
                 - 'self'
+                # Required for loading the Wasm for the barcode scanner:
+                - 'wasm-unsafe-eval'
             object-src:
                 - 'self'
                 - 'data:'

config/packages/php_translation.yaml

@@ -1,11 +0,0 @@
-translation:
-    locales: ["en", "de"]
-    edit_in_place:
-        enabled: false
-        config_name: app
-    configs:
-        app:
-            dirs: ["%kernel.project_dir%/templates", "%kernel.project_dir%/src"]
-            output_dir: "%kernel.project_dir%/translations"
-            excluded_names: ["*TestCase.php", "*Test.php"]
-            excluded_dirs: [cache, data, logs]

config/packages/property_info.yaml

@@ -0,0 +1,3 @@
+framework:
+    property_info:
+        with_constructor_extractor: true

config/packages/routing.yaml

@@ -1,7 +1,5 @@
 framework:
     router:
-        utf8: true
-
         # Configure how to generate URLs in non-HTTP contexts, such as CLI commands.
         # See https://symfony.com/doc/current/routing.html#generating-urls-in-commands
         default_uri: '%env(DEFAULT_URI)%'

config/packages/scheb_2fa.yaml

@@ -6,7 +6,7 @@ scheb_two_factor:
         server_name: '$$DOMAIN$$'       # This field is replaced by the domain name of the server in DecoratedGoogleAuthenticator
         issuer: '%partdb.title%'        # Issuer name used in QR code
         digits: 6                       # Number of digits in authentication code
-        window: 1                       # How many codes before/after the current one would be accepted as valid
+        leeway: 5                       # Acceptable time drift in seconds
         template: security/2fa_form.html.twig
 
     backup_codes:

config/packages/security.yaml

@@ -13,13 +13,13 @@ security:
 
     firewalls:
         dev:
-            pattern: ^/(_(profiler|wdt)|css|images|js)/
+            pattern: ^/(_(profiler|wdt)|css|images|js|\.well-known)/
             security: false
         main:
             provider: app_user_provider
             lazy: true
             user_checker: App\Security\UserChecker
-            entry_point: form_login
+            entry_point: App\Security\AuthenticationEntryPoint
 
             # Enable user impersonation
             switch_user: { role: CAN_SWITCH_USER }
@@ -71,3 +71,5 @@ security:
         - { path: "^/\\w{2}/tree", role: PUBLIC_ACCESS }
         # Restrict access to API to users, which has the API access permission
         - { path: "^/api", allow_if: 'is_granted("@api.access_api") and is_authenticated()' }
+        # Restrict access to KICAD to users, which has API access permission
+        - { path: "^/kicad-api", allow_if: 'is_granted("@api.access_api") and is_authenticated()' }

config/packages/settings.yaml

@@ -0,0 +1,8 @@
+jbtronics_settings:
+  default_storage_adapter: Jbtronics\SettingsBundle\Storage\ORMStorageAdapter
+
+  cache:
+    default_cacheable: true
+
+  orm_storage:
+    default_entity_class: App\Entity\SettingsEntry