Skip to content

Commit 77084b0

Browse files
ENGCOM-8012: #1748: Some category grid columns are empty #29494
2 parents e95d82d + 65076e6 commit 77084b0

File tree

5 files changed

+78
-2
lines changed

5 files changed

+78
-2
lines changed

app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/ActionGroup/AdminAssertCategoryGridPageDetailsActionGroup.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,7 @@
1616
<seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.name('1', 'Default Category')}}" stepKey="assertNameColumn"/>
1717
<seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.displayMode('1', 'PRODUCTS')}}" stepKey="assertDisplayModeColumn"/>
1818
<seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.products('1', '0')}}" stepKey="assertProductsColumn"/>
19+
<seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.inMenu('1', 'Yes')}}" stepKey="assertInMenuColumn"/>
20+
<seeElement selector="{{AdminMediaGalleryCatalogUiCategoryGridSection.enabled('1', 'Yes')}}" stepKey="assertEnabledColumn"/>
1921
</actionGroup>
2022
</actionGroups>

app/code/Magento/MediaGalleryCatalogUi/Test/Mftf/Section/AdminMediaGalleryCatalogUiCategoryGridSection.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
<element name="name" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Name')]/preceding-sibling::th) +1 ]//*[text()='{{categoryName}}']" parameterized="true"/>
1515
<element name="displayMode" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Display Mode')]/preceding-sibling::th) +1 ]//*[text()='{{productsText}}']" parameterized="true"/>
1616
<element name="products" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Products')]/preceding-sibling::th) +1 ]//*[text()='{{productsQty}}']" parameterized="true"/>
17+
<element name="inMenu" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'In Menu')]/preceding-sibling::th) +1 ]//*[text()='{{inMenuValue}}']" parameterized="true"/>
18+
<element name="enabled" type="text" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Enabled')]/preceding-sibling::th) +1 ]//*[text()='{{enabledValue}}']" parameterized="true"/>
1719
<element name="edit" type="button" selector="//tr[{{row}}]//td[count(//div[@data-role='grid-wrapper']//tr//th[contains(., 'Action')]/preceding-sibling::th) +1 ]//*[text()='{{edit}}']" parameterized="true"/>
1820
</section>
1921
</sections>
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\MediaGalleryCatalogUi\Ui\Component\Listing\Columns;
7+
8+
use Magento\Ui\Component\Listing\Columns\Column;
9+
10+
/**
11+
* Class InMenu column for Category grid
12+
*/
13+
class InMenu extends Column
14+
{
15+
/**
16+
* Prepare data source.
17+
*
18+
* @param array $dataSource
19+
* @return array
20+
*/
21+
public function prepareDataSource(array $dataSource)
22+
{
23+
if (isset($dataSource['data']['items'])) {
24+
$fieldName = $this->getData('name');
25+
foreach ($dataSource['data']['items'] as & $item) {
26+
if (isset($item[$fieldName]) && $item[$fieldName] == 1) {
27+
$item[$fieldName] = 'Yes';
28+
} else {
29+
$item[$fieldName] = 'No';
30+
}
31+
}
32+
}
33+
34+
return $dataSource;
35+
}
36+
}
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\MediaGalleryCatalogUi\Ui\Component\Listing\Columns;
7+
8+
use Magento\Ui\Component\Listing\Columns\Column;
9+
10+
/**
11+
* Class IsActive column for Category grid
12+
*/
13+
class IsActive extends Column
14+
{
15+
/**
16+
* Prepare data source.
17+
*
18+
* @param array $dataSource
19+
* @return array
20+
*/
21+
public function prepareDataSource(array $dataSource)
22+
{
23+
if (isset($dataSource['data']['items'])) {
24+
$fieldName = $this->getData('name');
25+
foreach ($dataSource['data']['items'] as & $item) {
26+
if (isset($item[$fieldName]) && $item[$fieldName] == 1) {
27+
$item[$fieldName] = 'Yes';
28+
} else {
29+
$item[$fieldName] = 'No';
30+
}
31+
}
32+
}
33+
34+
return $dataSource;
35+
}
36+
}

app/code/Magento/MediaGalleryCatalogUi/view/adminhtml/ui_component/media_gallery_category_listing.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,12 +167,12 @@
167167
<label translate="true">Products</label>
168168
</settings>
169169
</column>
170-
<column name="include_in_menu" component="Magento_Ui/js/grid/columns/select">
170+
<column name="include_in_menu" class="Magento\MediaGalleryCatalogUi\Ui\Component\Listing\Columns\InMenu">
171171
<settings>
172172
<label translate="true">In Menu</label>
173173
</settings>
174174
</column>
175-
<column name="is_active" component="Magento_Ui/js/grid/columns/select" >
175+
<column name="is_active" class="Magento\MediaGalleryCatalogUi\Ui\Component\Listing\Columns\IsActive">
176176
<settings>
177177
<label translate="true">Enabled</label>
178178
</settings>

0 commit comments

Comments
 (0)