Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#1691: Add filter placeholders and Display mode options to category grid #29404

Merged
merged 3 commits into from
Aug 8, 2020
Merged

#1691: Add filter placeholders and Display mode options to category grid #29404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ee84fb
Merge pull request #1 from magento/2.4-develop
Aug 5, 2020
8623834
Merge branch '2.4-develop' of github.com:magento/magento2 into ASI-16…
Aug 5, 2020
5245a40
magento/adobe-stock-integration#1691: Add filter placeholders and Dis…
Aug 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 34 additions & 28 deletions ...ento/MediaGalleryCatalogUi/view/adminhtml/ui_component/media_gallery_category_listing.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand All @@ -126,7 +159,6 @@
</column>
<column name="display_mode">
<settings>
<filter>text</filter>
<label translate="true">Display Mode</label>
</settings>
</column>
Expand All @@ -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>
Expand Down
8 changes: 7 additions & 1 deletion app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/web/css/source/_module.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
.admin__field-label {
text-align: left;
}

.admin__action-dropdown-wrap._active .admin__action-dropdown-text::after {
margin-right: 6px;
}
Expand All @@ -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;
}
}
}