MAGETWO-97044: Calculated Labels in Columns Widget

Author: zakdma

app/code/Magento/Catalog/Ui/Component/ColumnFactory.php

@@ -5,6 +5,11 @@
  */
 namespace Magento\Catalog\Ui\Component;
 
+use Magento\Ui\Component\Filters\FilterModifier;
+
+/**
+ * Product grid columns factory.
+ */
 class ColumnFactory
 {
     /**
@@ -50,19 +55,24 @@ public function __construct(\Magento\Framework\View\Element\UiComponentFactory $
      */
     public function create($attribute, $context, array $config = [])
     {
+        $filterModifiers = $context->getRequestParam(FilterModifier::FILTER_MODIFIER, []);
+
         $columnName = $attribute->getAttributeCode();
         $config = array_merge([
             'label' => __($attribute->getDefaultFrontendLabel()),
             'dataType' => $this->getDataType($attribute),
             'add_field' => true,
             'visible' => $attribute->getIsVisibleInGrid(),
-            'filter' => ($attribute->getIsFilterableInGrid())
+            'filter' => ($attribute->getIsFilterableInGrid() || array_key_exists($columnName, $filterModifiers))
                 ? $this->getFilterType($attribute->getFrontendInput())
                 : null,
         ], $config);
 
         if ($attribute->usesSource()) {
             $config['options'] = $attribute->getSource()->getAllOptions();
+            foreach ($config['options'] as &$optionData) {
+                $optionData['__disableTmpl'] = true;
+            }
         }
 
         $config['component'] = $this->getJsComponent($config['dataType']);

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php

@@ -568,8 +568,12 @@ public function setupAttributeMeta(ProductAttributeInterface $attribute, $groupC
         // TODO: Refactor to $attribute->getOptions() when MAGETWO-48289 is done
         $attributeModel = $this->getAttributeModel($attribute);
         if ($attributeModel->usesSource()) {
+            $options = $attributeModel->getSource()->getAllOptions();
+            foreach ($options as &$option) {
+                $option['__disableTmpl'] = true;
+            }
             $meta = $this->arrayManager->merge($configPath, $meta, [
-                'options' => $attributeModel->getSource()->getAllOptions(),
+                'options' => $this->convertOptionsValueToString($options),
             ]);
         }
 
@@ -622,6 +626,22 @@ public function setupAttributeMeta(ProductAttributeInterface $attribute, $groupC
         return $meta;
     }
 
+    /**
+     * Convert options value to string
+     *
+     * @param array $options
+     * @return array
+     */
+    private function convertOptionsValueToString(array $options): array
+    {
+        array_walk($options, function (&$value) {
+            if (isset($value['value']) && is_scalar($value['value'])) {
+                $value['value'] = (string)$value['value'];
+            }
+        });
+        return $options;
+    }
+
     /**
      * @param ProductAttributeInterface $attribute
      * @param array $meta