Merge remote-tracking branch 'upstream/master' into Buerklin-provider

config/packages/monolog.yaml

@@ -10,14 +10,6 @@ when@dev:
                 path: "%kernel.logs_dir%/%kernel.environment%.log"
                 level: debug
                 channels: ["!event"]
-            # uncomment to get logging in your browser
-            # you may have to allow bigger header sizes in your Web server configuration
-            #firephp:
-            #    type: firephp
-            #    level: info
-            #chromephp:
-            #    type: chromephp
-            #    level: info
             console:
                 type: console
                 process_psr_3_messages: false
@@ -45,6 +37,7 @@ when@prod:
                 action_level: error
                 handler: nested
                 excluded_http_codes: [404, 405]
+                channels: ["!deprecation"]
                 buffer_size: 50 # How many messages should be saved? Prevent memory leaks
             nested:
                 type: stream

config/packages/translation.yaml

@@ -1,7 +1,7 @@
 framework:
     default_locale: 'en'
     # Just enable the locales we need for performance reasons.
-    enabled_locale: '%partdb.locale_menu%'
+    enabled_locale: ['en', 'de', 'it', 'fr', 'ru', 'ja', 'cs', 'da', 'zh', 'pl']
     translator:
         default_path: '%kernel.project_dir%/translations'
         fallbacks:

config/packages/twig.yaml

@@ -1,6 +1,6 @@
 twig:
     default_path: '%kernel.project_dir%/templates'
-    form_themes: ['bootstrap_5_horizontal_layout.html.twig', 'form/extended_bootstrap_layout.html.twig', 'form/permission_layout.html.twig', 'form/filter_types_layout.html.twig']
+    form_themes: ['bootstrap_5_horizontal_layout.html.twig', 'form/extended_bootstrap_layout.html.twig', 'form/permission_layout.html.twig', 'form/filter_types_layout.html.twig', 'form/synonyms_collection.html.twig']
 
     paths:
         '%kernel.project_dir%/assets/css': css
@@ -20,4 +20,4 @@ twig:
 
 when@test:
     twig:
-        strict_variables: true
+        strict_variables: true

config/parameters.yaml

@@ -10,7 +10,7 @@ parameters:
   partdb.title: '%env(string:settings:customization:instanceName)%'  # The title shown inside of Part-DB (e.g. in the navbar and on homepage)
   partdb.locale_menu: ['en', 'de', 'it', 'fr', 'ru', 'ja', 'cs', 'da', 'zh', 'pl', 'hu']    # The languages that are shown in user drop down menu
 
-  partdb.default_uri: '%env(string:DEFAULT_URI)%'             # The default URI to use for the Part-DB instance (e.g. https://part-db.example.com/). This is used for generating links in emails
+  partdb.default_uri: '%env(addSlash:string:DEFAULT_URI)%'             # The default URI to use for the Part-DB instance (e.g. https://part-db.example.com/). This is used for generating links in emails
 
   partdb.db.emulate_natural_sort: '%env(bool:DATABASE_EMULATE_NATURAL_SORT)%' # If this is set to true, natural sorting is emulated on platforms that do not support it natively. This can be slow on large datasets.
 

config/permissions.yaml

@@ -18,13 +18,13 @@ perms: # Here comes a list with all Permission names (they have a perm_[name] co
 
   parts: # e.g. this maps to perms_parts in User/Group database
     group: "data"
-    label: "perm.parts"
+    label: "[[Part]]"
     operations: # Here are all possible operations are listed => the op name is mapped to bit value
       read:
         label: "perm.read"
         # If a part can be read by a user, he can also see all the datastructures (except devices)
         alsoSet: ['storelocations.read', 'footprints.read', 'categories.read', 'suppliers.read', 'manufacturers.read',
-                  'currencies.read', 'attachment_types.read', 'measurement_units.read']
+                  'currencies.read', 'attachment_types.read', 'measurement_units.read', 'part_custom_states.read']
         apiTokenRole: ROLE_API_READ_ONLY
       edit:
         label: "perm.edit"
@@ -71,7 +71,7 @@ perms: # Here comes a list with all Permission names (they have a perm_[name] co
 
 
   storelocations: &PART_CONTAINING
-    label: "perm.storelocations"
+    label: "[[Storage_location]]"
     group: "data"
     operations:
       read:
@@ -103,35 +103,39 @@ perms: # Here comes a list with all Permission names (they have a perm_[name] co
 
   footprints:
     <<: *PART_CONTAINING
-    label: "perm.part.footprints"
+    label: "[[Footprint]]"
 
   categories:
     <<: *PART_CONTAINING
-    label: "perm.part.categories"
+    label: "[[Category]]"
 
   suppliers:
     <<: *PART_CONTAINING
-    label: "perm.part.supplier"
+    label: "[[Supplier]]"
 
   manufacturers:
     <<: *PART_CONTAINING
-    label: "perm.part.manufacturers"
+    label: "[[Manufacturer]]"
 
   projects:
     <<: *PART_CONTAINING
-    label: "perm.projects"
+    label: "[[Project]]"
 
   attachment_types:
     <<: *PART_CONTAINING
-    label: "perm.part.attachment_types"
+    label: "[[Attachment_type]]"
 
   currencies:
     <<: *PART_CONTAINING
-    label: "perm.currencies"
+    label: "[[Currency]]"
 
   measurement_units:
     <<: *PART_CONTAINING
-    label: "perm.measurement_units"
+    label: "[[Measurement_unit]]"
+
+  part_custom_states:
+    <<: *PART_CONTAINING
+    label: "[[Part_custom_state]]"
 
   tools:
     label: "perm.part.tools"
@@ -373,4 +377,4 @@ perms: # Here comes a list with all Permission names (they have a perm_[name] co
       manage_tokens:
         label: "perm.api.manage_tokens"
         alsoSet: ['access_api']
-        apiTokenRole: ROLE_API_FULL
+        apiTokenRole: ROLE_API_FULL

config/routes.yaml

@@ -1,3 +1,12 @@
+# yaml-language-server: $schema=../vendor/symfony/routing/Loader/schema/routing.schema.json
+
+# This file is the entry point to configure the routes of your app.
+# Methods with the #[Route] attribute are automatically imported.
+# See also https://symfony.com/doc/current/routing.html
+
+# To list all registered routes, run the following command:
+#   bin/console debug:router
+
 # Redirect every url without an locale to the locale of the user/the global base locale
 
 scan_qr:
@@ -16,4 +25,4 @@ redirector:
         url: ".*"
     controller: App\Controller\RedirectController::addLocalePart
     # Dont match localized routes (no redirection loop, if no root with that name exists) or API prefixed routes
-    condition: "not (request.getPathInfo() matches '/^\\\\/([a-z]{2}(_[A-Z]{2})?|api)\\\\//')"
+    condition: "not (request.getPathInfo() matches '/^\\\\/([a-z]{2}(_[A-Z]{2})?|api)\\\\//')"

config/services.yaml

@@ -1,5 +1,8 @@
+# yaml-language-server: $schema=../vendor/symfony/dependency-injection/Loader/schema/services.schema.json
+
 # This file is the entry point to configure your own services.
 # Files in the packages/ subdirectory configure your dependencies.
+# See also https://symfony.com/doc/current/service_container/import.html
 
 # Put parameters here that don't need to change on each machine where the app is deployed
 # https://symfony.com/doc/current/best_practices/configuration.html#application-related-configuration
@@ -29,6 +32,9 @@ services:
     # this creates a service per class whose id is the fully-qualified class name
     App\:
         resource: '../src/'
+        exclude:
+            - '../src/Entity/'
+            - '../src/Helpers/'
 
     # controllers are imported separately to make sure services can be injected
     # as action arguments even if you don't extend any base controller class
@@ -227,9 +233,15 @@ services:
         arguments:
             $enforce_index_php: '%env(bool:NO_URL_REWRITE_AVAILABLE)%'
 
-    App\Doctrine\Purger\ResetAutoIncrementPurgerFactory:
+    App\Repository\PartRepository:
+        arguments:
+            $translator: '@translator'
+        tags: ['doctrine.repository_service']
+
+    App\EventSubscriber\UserSystem\PartUniqueIpnSubscriber:
         tags:
-            - { name: 'doctrine.fixtures.purger_factory', alias: 'reset_autoincrement_purger' }
+            - { name: doctrine.event_listener, event: onFlush, connection: default }
+
 
     # We are needing this service inside a migration, where only the container is injected. So we need to define it as public, to access it from the container.
     App\Services\UserSystem\PermissionPresetsHelper:
@@ -262,7 +274,11 @@ services:
         tags:
             - { name: monolog.processor }
 
-when@test:
+    App\Doctrine\Purger\ResetAutoIncrementPurgerFactory:
+        tags:
+            - { name: 'doctrine.fixtures.purger_factory', alias: 'reset_autoincrement_purger' }
+
+when@test: &test
     services:
         # Decorate the doctrine fixtures load command to use our custom purger by default
         doctrine.fixtures_load_command.custom: