Merge remote-tracking branch 'origin/MAGETWO-44521' into PR

Author: Volodymyr Zaets

app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_listing.xml

@@ -85,6 +85,14 @@
                         <item name="provider" xsi:type="string">cms_block_listing.cms_block_listing.listing_top.bookmarks</item>
                         <item name="namespace" xsi:type="string">current.filters</item>
                     </item>
+                    <item name="templates" xsi:type="array">
+                        <item name="filters" xsi:type="array">
+                            <item name="select" xsi:type="array">
+                                <item name="component" xsi:type="string">Magento_Ui/js/form/element/ui-select</item>
+                                <item name="template" xsi:type="string">ui/grid/filters/elements/ui-select</item>
+                            </item>
+                        </item>
+                    </item>
                     <item name="childDefaults" xsi:type="array">
                         <item name="provider" xsi:type="string">cms_block_listing.cms_block_listing.listing_top.listing_filters</item>
                         <item name="imports" xsi:type="array">

app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_listing.xml

@@ -86,6 +86,14 @@
                         <item name="provider" xsi:type="string">cms_page_listing.cms_page_listing.listing_top.bookmarks</item>
                         <item name="namespace" xsi:type="string">current.filters</item>
                     </item>
+                    <item name="templates" xsi:type="array">
+                        <item name="filters" xsi:type="array">
+                            <item name="select" xsi:type="array">
+                                <item name="component" xsi:type="string">Magento_Ui/js/form/element/ui-select</item>
+                                <item name="template" xsi:type="string">ui/grid/filters/elements/ui-select</item>
+                            </item>
+                        </item>
+                    </item>
                     <item name="childDefaults" xsi:type="array">
                         <item name="provider" xsi:type="string">cms_page_listing.cms_page_listing.listing_top.listing_filters</item>
                         <item name="imports" xsi:type="array">

app/code/Magento/Ui/Component/Filters.php

@@ -73,6 +73,11 @@ public function update(UiComponentInterface $component)
     {
         if ($component instanceof ColumnInterface) {
             $filterType = $component->getData('config/filter');
+
+            if (is_array($filterType)) {
+                $filterType = $filterType['filterType'];
+            }
+
             if (!$filterType) {
                 return;
             }

app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js

@@ -57,19 +57,6 @@ define([
             }
         },
 
-        /**
-         * Extends instance with defaults, extends config with formatted values
-         *     and options, and invokes initialize method of AbstractElement class.
-         *
-         * @returns {Object} Chainable
-         */
-        initialize: function () {
-            this._super()
-                .initOptions();
-
-            return this;
-        },
-
         /**
          * Parses options and merges the result with instance
          *