From 5245a40b5e259d8830842c04399cf2f289cc867a Mon Sep 17 00:00:00 2001
From: joweecaquicla <joie@aovethefray.io>
Date: Wed, 5 Aug 2020 20:20:55 +0800
Subject: [PATCH] magento/adobe-stock-integration#1691: Add filter placeholders
 and Display mode options to category grid - added placeholder to filters and
 options to display mode in media gallery category grid

---
 .../media_gallery_category_listing.xml        | 62 ++++++++++---------
 .../adminhtml/web/css/source/_module.less     |  8 ++-
 2 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/media_gallery_category_listing.xml b/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/media_gallery_category_listing.xml
index e0b9eacbb4d20..9945643ccffef 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/media_gallery_category_listing.xml
+++ b/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/media_gallery_category_listing.xml
@@ -66,6 +66,9 @@
                         <item name="identityColumn" xsi:type="string">entity_id</item>
                         <item name="filterOptions" xsi:type="boolean">true</item>
                         <item name="filterPlaceholder" xsi:type="string" translate="true">Asset Title</item>
+                        <item name="selectedPlaceholders" xsi:type="array">
+                            <item name="defaultPlaceholder" xsi:type="string">Select</item>
+                        </item>
                         <item name="emptyOptionsHtml" xsi:type="string" translate="true">Start typing to find assets</item>
                         <item name="filterRateLimit" xsi:type="string" translate="true">1000</item>
                         <item name="filterRateLimitMethod" xsi:type="string" translate="true">notifyWhenChangesStop</item>
@@ -80,6 +83,37 @@
                     <dataScope>asset_id</dataScope>
                     </settings>
             </filterSelect>
+            <filterInput name="entity_id" provider="${ $.parentName }" sortOrder="20">
+                <settings>
+                    <dataScope>entity_id</dataScope>
+                    <label translate="true">ID</label>
+                    <placeholder>ID</placeholder>
+                </settings>
+            </filterInput>
+            <filterSelect name="display_mode" provider="${ $.parentName }" sortOrder="30">
+                <settings>
+                    <options class="Magento\Catalog\Model\Category\Attribute\Source\Mode"/>
+                    <caption translate="true">Select</caption>
+                    <label translate="true">Display Mode</label>
+                    <dataScope>display_mode</dataScope>
+                </settings>
+            </filterSelect>
+            <filterSelect name="include_in_menu" provider="${ $.parentName }" sortOrder="40">
+                <settings>
+                    <options class="Magento\Config\Model\Config\Source\Yesno"/>
+                    <caption translate="true">Select</caption>
+                    <label translate="true">In Menu</label>
+                    <dataScope>include_in_menu</dataScope>
+                </settings>
+            </filterSelect>
+            <filterSelect name="is_active" provider="${ $.parentName }" sortOrder="50">
+                <settings>
+                    <options class="Magento\Config\Model\Config\Source\Yesno"/>
+                    <caption translate="true">Select</caption>
+                    <label translate="true">Enabled</label>
+                    <dataScope>is_active</dataScope>
+                </settings>
+            </filterSelect>
          </filters>
         <paging name="listing_paging">
             <settings>
@@ -104,7 +138,6 @@
     <columns name="media_gallery_category_columns">
         <column name="entity_id">
             <settings>
-                <filter>text</filter>
                 <label translate="true">ID</label>
             </settings>
         </column>
@@ -126,7 +159,6 @@
         </column>
         <column name="display_mode">
             <settings>
-                <filter>text</filter>
                 <label translate="true">Display Mode</label>
             </settings>
         </column>
@@ -136,38 +168,12 @@
             </settings>
         </column>
         <column name="include_in_menu" component="Magento_Ui/js/grid/columns/select">
-           <argument name="data" xsi:type="array">
-            </argument>
             <settings>
-                 <options>
-                    <option name="Yes" xsi:type="array">
-                        <item name="value" xsi:type="number">1</item>
-                        <item name="label" xsi:type="string">Yes</item>
-                    </option>
-                     <option name="No" xsi:type="array">
-                        <item name="value" xsi:type="number">0</item>
-                        <item name="label" xsi:type="string">No</item>
-                    </option>
-                </options>
-                <dataType>select</dataType>
-                <filter>select</filter>
                 <label translate="true">In Menu</label>
             </settings>
         </column>
         <column name="is_active" component="Magento_Ui/js/grid/columns/select" >
             <settings>
-                <dataType>select</dataType>
-                <filter>select</filter>
-                <options>
-                    <option name="Yes" xsi:type="array">
-                        <item name="value" xsi:type="number">1</item>
-                        <item name="label" xsi:type="string">Yes</item>
-                    </option>
-                     <option name="No" xsi:type="array">
-                        <item name="value" xsi:type="number">0</item>
-                        <item name="label" xsi:type="string">No</item>
-                    </option>
-                </options>
                 <label translate="true">Enabled</label>
             </settings>
         </column>
diff --git a/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/web/css/source/_module.less b/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/web/css/source/_module.less
index 0d2a1897e0c25..51575bd496598 100644
--- a/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/web/css/source/_module.less
+++ b/app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/web/css/source/_module.less
@@ -10,7 +10,7 @@
         .admin__field-label {
             text-align: left;
         }
-        
+
         .admin__action-dropdown-wrap._active .admin__action-dropdown-text::after {
             margin-right: 6px;
         }
@@ -19,5 +19,11 @@
             left: auto;
             right: 0;
         }
+
+        .admin__field:not(.admin__field-option) > .admin__field-label {
+            font-size: 1.3rem;
+            font-weight: bold;
+            line-height: 2.1rem;
+        }
     }
 }