MC-41885: [Magento Cloud] GraphQL | Attribute sorting issue

Author: Serhii Balko

app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/AttributeOptionProvider.php

@@ -134,7 +134,9 @@ private function formatResult(Select $select): array
                     'options' => [],
                 ];
             }
-            $result[$option['attribute_code']]['options'][$option['option_id']] = $option['option_label'];
+            if (!empty($option['option_id'])) {
+                $result[$option['attribute_code']]['options'][$option['option_id']] = $option['option_label'];
+            }
         }
 
         return $result;

app/code/Magento/CatalogGraphQl/DataProvider/Product/LayeredNavigation/Builder/Attribute.php

@@ -86,7 +86,7 @@ public function build(AggregationInterface $aggregation, ?int $storeId): array
                 $attribute['attribute_code'] ?? $bucketName
             );
 
-            $options = $this->getSortedOptions($bucket,$attribute['options'] ?? []);
+            $options = $this->getSortedOptions($bucket,$attribute['options'] ?: []);
             foreach ($options as $option) {
                 $result[$bucketName]['options'][] = $this->layerFormatter->buildItem(
                     $option['label'],
@@ -182,6 +182,15 @@ private function getSortedOptions(BucketInterface $bucket, array $optionLabels):
             $options[$optionValue] = $metrics + ['label' => $optionLabel];
         }
 
+        /**
+         * Delete options without bucket values
+         */
+        foreach ($options as $optionId => $option) {
+            if (!is_array($options[$optionId])) {
+               unset($options[$optionId]);
+            }
+        }
+
         return array_values($options);
     }
 }