[Bug]: Fix Inherited classification store data now displays correctly in grid view (#1042)

* inherited classification store data now displays correctly in grid view

* add new function return type

* refactor and fix table inheritance

* refactor static to self

---------

Co-authored-by: cameronfromtorq <[email protected]>

Author: kingjia90

src/Service/GridData/DataObject.php

@@ -26,6 +26,7 @@
 use Pimcore\Model\DataObject\Service;
 use Pimcore\Tool\Admin as AdminTool;
 use Pimcore\Tool\Session;
+use Pimcore\Model\DataObject\ClassDefinition\Data;
 use Symfony\Component\HttpFoundation\Session\Attribute\AttributeBagInterface;
 
 /**
@@ -185,21 +186,27 @@ public static function getData(AbstractObject $object, array $fields = null, str
                     }
 
                     // 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();
@@ -358,17 +365,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,
@@ -377,4 +376,35 @@ 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);
+    }
 }