grid: support sorting by object brick quantity value field

src/Helper/GridHelperService.php

@@ -566,19 +566,20 @@ public function prepareListingForGrid(array $requestParams, string $requestedLan
                     $orderKey = 'concat(' . $orderKey . '__rgb, ' . $orderKey . '__a)';
                     $doNotQuote = true;
                 } elseif (strpos($orderKey, '~') !== false) {
-                    $orderKeyParts = explode('~', $orderKey);
+                    $orderKey = $list->quoteIdentifier($orderKeyParts[0]).'.'.$list->quoteIdentifier($orderKeyParts[1]);
 
-                    if (strpos($orderKey, '?') !== false) {
-                        $brickDescriptor = substr($orderKeyParts[0], 1);
-                        $brickDescriptor = json_decode($brickDescriptor, true);
-                        $orderKey = $list->quoteIdentifier($brickDescriptor['containerKey'] . '_localized')
-                            . '.' . $list->quoteIdentifier($brickDescriptor['brickfield']);
-                        $doNotQuote = true;
-                    } elseif (count($orderKeyParts) === 2) {
-                        $orderKey = $list->quoteIdentifier($orderKeyParts[0])
-                            . '.' . $list->quoteIdentifier($orderKeyParts[1]);
-                        $doNotQuote = true;
+                    $brickDefinition = Objectbrick\Definition::getByKey($orderKeyParts[0]);
+                    if ($brickDefinition instanceof Objectbrick\Definition) {
+                        $brickFieldDefinition = $brickDefinition->getFieldDefinition($orderKeyParts[1]);
+
+                        if ($brickFieldDefinition instanceof ClassDefinition\Data\QuantityValue) {
+                            $orderKey = 'CONCAT('.$list->quoteIdentifier($orderKeyParts[0]).'.'.$list->quoteIdentifier($orderKeyParts[1].'__unit').', '.$list->quoteIdentifier($orderKeyParts[0]).'.'.$list->quoteIdentifier($orderKeyParts[1].'__value').')';
+                        } elseif ($brickFieldDefinition instanceof ClassDefinition\Data\RgbaColor) {
+                            $orderKey = 'CONCAT('.$list->quoteIdentifier($orderKeyParts[0]).'.'.$list->quoteIdentifier($orderKeyParts[1].'__rgb').', '.$list->quoteIdentifier($orderKeyParts[0]).'.'.$list->quoteIdentifier($orderKeyParts[1].'__a').')';
+                        }
                     }
+
+                    $doNotQuote = true;
                 } else {
                     $orderKey = $list->getDao()->getTableName() . '.' . $list->quoteIdentifier($orderKey);
                     $doNotQuote = true;