Merge remote-tracking branch 'origin/1.7' into 2.2

# Conflicts:
#	public/js/pimcore/element/helpers/gridColumnConfig.js

Author: kingjia90

public/js/pimcore/element/helpers/gridColumnConfig.js

@@ -435,34 +435,63 @@ pimcore.element.helpers.gridColumnConfig = {
 
         editor.fieldConfig.width = 300;
 
-        const formPanel = Ext.create('Ext.form.Panel', {
-            xtype: "form",
-            border: false,
-            items: [editor.getLayoutEdit()],
-            bodyStyle: "padding: 10px;",
-            buttons: [
-                {
-                    text: t("clear_relation_filter"),
-                    iconCls: "pimcore_icon_filter_condition pimcore_icon_overlay_delete",
-                    handler: function () {
-                        this.filterByRelationWindow.close();
-                        this.grid.store.filters.removeByKey("x-gridfilter-"+fieldInfo.dataIndex);
-                    }.bind(this)
-                },
-                {
-                    text: t("apply_filter"),
-                    iconCls: "pimcore_icon_filter pimcore_icon_overlay_add",
-                    handler: function () {
-                        if (formPanel.isValid() && typeof fieldInfo.getRelationFilter === "function") {
-                            this.grid.filters.getStore().addFilter(
-                                fieldInfo.getRelationFilter(fieldInfo.dataIndex, editor)
-                            );
-                            this.filterByRelationWindow.close();
-                        }
-                    }.bind(this)
+            const activeFilter = this.grid.getStore().getFilters().items;
+
+            for (let filter of activeFilter) {
+                if (filter.dataIndex !== fieldInfo.dataIndex) {
+                    continue;
                 }
-            ]
-        });
+                editor.data = filter.getValue()
+                    .split(",")
+                    .map(v => ({ id: Number.parseInt(v.trim()) }))
+                    .filter(v => !Number.isNaN(v.id));
+                editor.store.loadData(items, false);
+                break;
+            }
+
+            const formPanel = Ext.create('Ext.form.Panel', {
+                xtype: "form",
+                border: false,
+                items: [editor.getLayoutEdit()],
+                bodyStyle: "padding: 10px;",
+                buttons: [
+                    {
+                        text: t("clear_relation_filter"),
+                        iconCls: "pimcore_icon_filter_condition pimcore_icon_overlay_delete",
+                        handler: function () {
+                            this.filterByRelationWindow.close();
+                            this.grid.store.filters.removeByKey("x-gridfilter-"+fieldInfo.dataIndex);
+                        }.bind(this)
+                    },
+                    {
+                        text: t("apply_filter"),
+                        iconCls: "pimcore_icon_filter pimcore_icon_overlay_add",
+                        handler: function () {
+                            if (formPanel.isValid() && typeof fieldInfo.getRelationFilter === "function") {
+                                try {
+                                    // Sync editor store with its current value (if applicable)
+                                    const value = editor.getValue();
+                                    let items = [];
+                                    if (Array.isArray(value)) {
+                                        items = value;
+                                    } else if (value) {
+                                        items = [value];
+                                    }
+                                    editor.store.loadData(items, false);
+
+                                    this.grid.filters.getStore().addFilter(
+                                        fieldInfo.getRelationFilter(fieldInfo.dataIndex, editor)
+                                    );
+                                    this.filterByRelationWindow.close();
+                                } catch (e) {
+                                    console.error("Error applying relation filter:", e);
+                                    pimcore.helpers.showNotification(t("error"), e.message || e, "error");
+                                }
+                            }
+                        }.bind(this)
+                    }
+                ]
+            });
 
         const title = t("filter_by_relation_field") + " " + fieldInfo.text;
         let width = 700;
@@ -970,6 +999,10 @@ pimcore.element.helpers.gridColumnConfig = {
             params["only_direct_children"] = this.checkboxOnlyDirectChildren.getValue();
         }
 
+        if (typeof this.selectObjectType !=='undefined') {
+            params['filter_by_object_type'] = this.selectObjectType.getValue();
+        }
+
         //only unreferenced filter
         if (this.checkboxOnlyUnreferenced) {
             params["only_unreferenced"] = this.checkboxOnlyUnreferenced.getValue();

public/js/pimcore/object/class.js

@@ -16,9 +16,12 @@ pimcore.object.klass = Class.create({
 
     forbiddenNames: [
         "abstract", "class", "data", "folder", "list", "permissions", "resource", "concrete", "interface",
-        "service", "fieldcollection", "localizedfield", "objectbrick", "default"
+        "service", "fieldcollection", "localizedfield", "objectbrick", "default",
+        "abstractobject", "classdefinition", "classdefinitioninterface", "classificationstore",
+        "definitionmodifier", "importdataserviceinterface", "lazyloadedfieldsinterface", "listing",
+        "objectawarefieldinterface", "ownerawarefieldinterface", "pregetvaluehookinterface",
+        "selectoptionsinterface"
     ],
-
     initialize: function () {
 
         this.getTabPanel();

public/js/pimcore/object/classificationstore/groupsPanel.js

@@ -399,7 +399,13 @@ pimcore.object.classificationstore.groupsPanel = Class.create({
                         this.relationsPanel.setTitle(t("relations") + " - " + t("group") + " " + record.data.id + " - " + groupName);
                         this.relationsPanel.enable();
                         this.relationsStore.getProxy().setExtraParam("groupId", groupId);
-                        this.relationsStore.reload();
+                        
+                        // reset paging params
+                        this.relationsStore.reload({
+                            page: 1,
+                            start: 0
+                        });
+                        
                         this.relationsGrid.show();
                     }
                 }.bind(this)

src/Controller/Admin/DataObject/ClassificationstoreController.php

@@ -1475,7 +1475,14 @@ private function getTranslatedSearchFilterTerms(string $searchTerm): array
         if ($user instanceof User) {
             $translationListing = new Listing();
             $translationListing->setDomain(Translation::DOMAIN_ADMIN);
-            $translationListing->setCondition('language=? AND text LIKE ?', [$user->getLanguage(), '%'.$searchTerm.'%']);
+            $translationListing->setCondition(
+                $translationListing->quoteIdentifier('language') . ' = ? AND ' .
+                $translationListing->quoteIdentifier('text') . ' LIKE ?',
+                [
+                    $user->getLanguage(),
+                    '%' . $searchTerm . '%',
+                ]
+            );
 
             foreach ($translationListing as $translation) {
                 $terms[] = $translation->getKey();

src/DependencyInjection/PimcoreAdminExtension.php

@@ -13,16 +13,13 @@
 
 namespace Pimcore\Bundle\AdminBundle\DependencyInjection;
 
-use Pimcore;
 use Pimcore\Bundle\CoreBundle\DependencyInjection\ConfigurationHelper;
-use Pimcore\Bundle\SimpleBackendSearchBundle\PimcoreSimpleBackendSearchBundle;
 use Pimcore\Config\LocationAwareConfigRepository;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\Extension;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
-use Symfony\Component\Yaml\Yaml;
 
 /**
  * @internal
@@ -51,33 +48,6 @@ public function load(array $configs, ContainerBuilder $container): void
         $loader->load('event_listeners.yaml');
         $loader->load('export.yaml');
 
-        // Check if PimcoreSimpleBackendSearchBundle is installed and load to replace the search data provider services
-        try {
-            $bundle = Pimcore::getKernel()->getBundle('PimcoreSimpleBackendSearchBundle');
-            $configFile = $bundle->getPath() . '/config/admin-classic.yaml';
-
-            $yaml = Yaml::parseFile($configFile);
-
-            $tmpFile = tempnam(sys_get_temp_dir(), 'services_');
-
-            try {
-                file_put_contents(
-                    $tmpFile,
-                    Yaml::dump(['services' => $yaml['services']])
-                );
-
-                $loader = new YamlFileLoader($container, new FileLocator(dirname($tmpFile)));
-
-                $loader->load(basename($configFile));
-            } finally {
-                if (is_file($tmpFile)) {
-                    unlink($tmpFile);
-                }
-            }
-        } catch (\Exception $e) {
-            // no simple backend search bundle installed
-        }
-
         // Merge
         //Set Config for GDPR data providers to container parameters
         $container->setParameter('pimcore.gdpr-data-extrator.dataobjects', $config['gdpr_data_extractor']['dataObjects']);

src/Helper/GridHelperService.php

@@ -829,6 +829,7 @@ public function prepareAssetListingForGrid(array $allParams, User $adminUser): M
             $filters = json_decode($filterJson, true);
             foreach ($filters as $filter) {
                 $operator = '=';
+                $notSubselect = '';
 
                 $filterDef = explode('~', $filter['property']);
                 $filterField = $filterDef[0];
@@ -874,7 +875,10 @@ public function prepareAssetListingForGrid(array $allParams, User $adminUser): M
                     $operator = 'IN';
                 } elseif ($filterType == 'boolean') {
                     $operator = '=';
-                    $filter['value'] = (int) $filter['value'];
+                    if ((int) $filter['value'] === 0) {
+                        $notSubselect = 'NOT';
+                    }
+                    $filter['value'] = 1;
                 }
                 // system field
                 $value = $filter['value'] ?? '';
@@ -907,7 +911,12 @@ public function prepareAssetListingForGrid(array $allParams, User $adminUser): M
                         $language = $filterDef[1];
                     }
                     $language = str_replace(['none', 'default'], '', $language);
-                    $conditionFilters[] = 'id IN (SELECT cid FROM assets_metadata WHERE `name` = ' . $db->quote($filterField) . ' AND `data` ' . $operator . ' ' . $value . ' AND `language` = ' . $db->quote($language). ')';
+                    $conditionFilters[] =
+                        'id ' . $notSubselect .
+                        ' IN (SELECT cid FROM assets_metadata WHERE `name` = ' . $db->quote($filterField) .
+                        ' AND `data` ' . $operator . ' ' . $value .
+                        ' AND `language` = ' . $db->quote($language).
+                        ')';
                 }
             }
         }

src/Security/ContentSecurityPolicyHandler.php

@@ -79,7 +79,7 @@ public function configureOptions(OptionsResolver $resolver): void
             self::DEFAULT_OPT => self::SELF,
             self::IMG_OPT => '* data: blob:',
             self::MEDIA_OPT => self::SELF . ' data:',
-            self::SCRIPT_OPT => self::SELF . " 'nonce-" . $this->getNonce() . "' 'unsafe-inline' 'unsafe-eval'",
+            self::SCRIPT_OPT => self::SELF . " 'nonce-" . $this->getNonce() . "' 'unsafe-eval'",
             self::STYLE_OPT => self::SELF . " 'unsafe-inline'",
             self::FRAME_OPT => self::SELF . ' data:',
             self::FRAME_ANCHESTORS => self::SELF,

src/Service/GridData/DataObject.php

@@ -17,6 +17,7 @@
 use Pimcore\Model;
 use Pimcore\Model\DataObject\AbstractObject;
 use Pimcore\Model\DataObject\ClassDefinition;
+use Pimcore\Model\DataObject\ClassDefinition\Data;
 use Pimcore\Model\DataObject\Classificationstore;
 use Pimcore\Model\DataObject\Concrete;
 use Pimcore\Model\DataObject\Objectbrick;
@@ -182,21 +183,27 @@ public static function getData(AbstractObject $object, ?array $fields = null, ?s
                     }
 
                     // because the key for the classification store has not a direct getter, you have to check separately if the data is inheritable
-                    if (str_starts_with($key, '~')) {
-                        $curClassAttributeValue = $data[$key] ?? null;
-                        $isValueEmpty = is_array($curClassAttributeValue) ? empty($curClassAttributeValue['value'] ?? null) : empty($curClassAttributeValue);
-
-                        if ($isValueEmpty) {
-                            $type = $keyParts[1];
-
-                            if ($type === 'classificationstore') {
-                                if (!empty($inheritedData = self::getInheritedData($object, $key, $requestedLanguage))) {
-                                    $data[$dataKey] = $inheritedData['value'];
-                                    $data['inheritedFields'][$dataKey] = ['inherited' => $inheritedData['parent']->getId() != $object->getId(), 'objectid' => $inheritedData['parent']->getId()];
-                                }
+                    if (
+                        str_starts_with($key, '~') &&
+                        ($keyParts[1] ?? null) === 'classificationstore'
+                    ) {
+                        $fieldDef = self::getClassificationStoreFieldDefinition($key);
+                        $value = self::normalizeValue($data[$key]);
+
+                        if ($fieldDef->isEmpty($value)) {
+                            $inheritedData = static::getInheritedData($object, $key, $requestedLanguage);
+
+                            if (!empty($inheritedData)) {
+                                $parent = $inheritedData['parent'];
+                                $data[$dataKey] = $inheritedData['value'];
+                                $data['inheritedFields'][$dataKey] = [
+                                    'inherited' => $parent->getId() !== $object->getId(),
+                                    'objectid'  => $parent->getId(),
+                                ];
                             }
                         }
                     }
+
                     if ($needLocalizedPermissions) {
                         if (!$user->isAdmin()) {
                             $locale = \Pimcore::getContainer()->get(LocaleServiceInterface::class)->findLocale();
@@ -355,17 +362,9 @@ protected static function getInheritedData(Concrete $object, string $key, string
             return [];
         }
 
-        $inheritedValue = self::getStoreValueForObject($parent, $key, $requestedLanguage);
-        if (
-            (!is_array($inheritedValue) && $inheritedValue !== null) ||
-            (
-                is_array($inheritedValue) &&
-                (
-                    array_is_list($inheritedValue) || //for table field types
-                    !empty($inheritedValue['value'] ?? null)
-                )
-            )
-        ) {
+        $inheritedValue = self::normalizeValue(self::getStoreValueForObject($parent, $key, $requestedLanguage));
+
+        if (!static::getClassificationStoreFieldDefinition($key)->isEmpty($inheritedValue)) {
             return [
                 'parent' => $parent,
                 'value' => $inheritedValue,
@@ -374,4 +373,37 @@ protected static function getInheritedData(Concrete $object, string $key, string
 
         return self::getInheritedData($parent, $key, $requestedLanguage);
     }
+
+    /**
+     * The actual data could be a plain array for tables,
+     * an associative array for RGB or Quantity Value where the value is a key.
+     *
+     */
+    private static function normalizeValue(mixed $data): mixed
+    {
+        if (is_array($data)) {
+            if (array_is_list($data)) {
+                return $data;
+            }
+            if (array_key_exists('value', $data)) {
+                return $data['value'];
+            }
+        }
+
+        return $data;
+    }
+
+    protected static function getClassificationStoreFieldDefinition(string $key): Data
+    {
+        $keyParts = explode('~', $key);
+        $groupKeyId = explode('-', $keyParts[3]);
+
+        $keyid = (int) $groupKeyId[1];
+
+        $keyConfig = Model\DataObject\Classificationstore\KeyConfig::getById($keyid);
+        $type = $keyConfig->getType();
+        $definition = json_decode($keyConfig->getDefinition(), true);
+
+        return \Pimcore\Model\DataObject\Classificationstore\Service::getFieldDefinitionFromJson($definition, $type);
+    }
 }