Skip to content

Commit 246e7e6

Browse files
sivaschenkosivaschenko
authored
ENGCOM-2667: Migrating Store Grid to UI Components #17371 
2 parents d4dddfa + 2f791ae commit 246e7e6

File tree

31 files changed

+775
-106
lines changed

31 files changed

+775
-106
lines changed

‎app/code/Magento/Backend/Block/System/Store/Grid/Render/Group.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@
99
* Store render group
1010
*
1111
* @author Magento Core Team <core@magentocommerce.com>
12+
* @deprecated since Store Grid is refactored with UI Components
1213
*/
1314
class Group extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
1415
{
1516
/**
16-
* {@inheritdoc}
17+
* @inheritdoc
1718
*/
1819
public function render(\Magento\Framework\DataObject $row)
1920
{

‎app/code/Magento/Backend/Block/System/Store/Grid/Render/Store.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@
99
* Store render store
1010
*
1111
* @author Magento Core Team <core@magentocommerce.com>
12+
* @deprecated since Store Grid is refactored with UI Components
1213
*/
1314
class Store extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
1415
{
1516
/**
16-
* {@inheritdoc}
17+
* @inheritdoc
1718
*/
1819
public function render(\Magento\Framework\DataObject $row)
1920
{

‎app/code/Magento/Backend/Block/System/Store/Grid/Render/Website.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@
99
* Store render website
1010
*
1111
* @author Magento Core Team <core@magentocommerce.com>
12+
* @deprecated since Store Grid is refactored with UI Components
1213
*/
1314
class Website extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
1415
{
1516
/**
16-
* {@inheritdoc}
17+
* @inheritdoc
1718
*/
1819
public function render(\Magento\Framework\DataObject $row)
1920
{

‎app/code/Magento/Backend/Block/System/Store/Store.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* @author Magento Core Team <core@magentocommerce.com>
1313
* @api
1414
* @since 100.0.2
15+
* @deprecated since Store Grid is refactored with UI Components
1516
*/
1617
class Store extends \Magento\Backend\Block\Widget\Grid\Container
1718
{

‎app/code/Magento/Backend/view/adminhtml/layout/adminhtml_system_store_index.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66
*/
77
-->
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
9-
<update handle="formkey"/>
10-
<update handle="adminhtml_system_store_grid_block"/>
9+
<update handle="styles"/>
1110
<body>
1211
<referenceContainer name="content">
13-
<block class="Magento\Backend\Block\System\Store\Store" name="adminhtml.system.store.container"/>
12+
<uiComponent name="store_listing"/>
1413
</referenceContainer>
1514
</body>
1615
</page>

‎app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateRootCategoryAndSubcategoriesTest.xml

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,10 @@
2222
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin2"/>
2323
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnPageAdminSystemStore"/>
2424
<waitForPageLoad stepKey="waitForPageAdminSystemStoreLoad" />
25-
<click selector="{{AdminStoresGridSection.resetButton}}" stepKey="clickOnResetButton"/>
26-
<waitForPageLoad time="10" stepKey="waitForPageAdminStoresGridLoadAfterResetButton"/>
27-
<fillField selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" userInput="Main Website Store" stepKey="fillFieldOnWebsiteStore"/>
28-
<click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickOnSearchButton"/>
29-
<waitForPageLoad stepKey="waitForPageAdminStoresGridLoadAfterSearchButton"/>
30-
<click selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" stepKey="clickOnstoreGrpNameInFirstRow"/>
25+
<actionGroup ref="filterStoresGridByStore" stepKey="enterStoreGroup1Name">
26+
<argument name="store" value="Main Website Store"/>
27+
</actionGroup>
28+
<click selector="{{AdminStoresGridSection.storeInFirstRow}}" stepKey="clickOnstoreInFirstRow"/>
3129
<waitForPageLoad stepKey="waitForPageAdminSystemStoreLoad1" />
3230
<selectOption userInput="Default Category" selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" stepKey="selectOptionDefaultCategory"/>
3331
<click selector="{{AdminStoreGroupActionsSection.saveButton}}" stepKey="clickSaveStoreButton"/>
@@ -59,12 +57,11 @@
5957
<!--Assign new created root category to store-->
6058
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnPageAdminSystemStore"/>
6159
<waitForPageLoad stepKey="waitForPageAdminSystemStoreLoad" />
62-
<click selector="{{AdminStoresGridSection.resetButton}}" stepKey="clickOnResetButton"/>
63-
<waitForPageLoad time="10" stepKey="waitForPageAdminStoresGridLoadAfterResetButton"/>
64-
<fillField selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" userInput="Main Website Store" stepKey="fillFieldOnWebsiteStore"/>
65-
<click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickOnSearchButton"/>
60+
<actionGroup ref="filterStoresGridByStore" stepKey="enterStoreGroup1Name">
61+
<argument name="store" value="Main Website Store"/>
62+
</actionGroup>
6663
<waitForPageLoad stepKey="waitForPageAdminStoresGridLoadAfterSearchButton"/>
67-
<click selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" stepKey="clickOnstoreGrpNameInFirstRow"/>
64+
<click selector="{{AdminStoresGridSection.storeInFirstRow}}" stepKey="clickOnstoreInFirstRow"/>
6865
<waitForPageLoad stepKey="waitForPageAdminStoresGroupEditLoad" />
6966
<selectOption userInput="{{NewRootCategory.name}}" selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" stepKey="selectOptionCreatedNewRootCategory"/>
7067
<click selector="{{AdminStoreGroupActionsSection.saveButton}}" stepKey="clickSaveStoreButton"/>
@@ -80,4 +77,4 @@
8077
<argument name="categoryEntity" value="SubCategoryWithParent"/>
8178
</actionGroup>
8279
</test>
83-
</tests>
80+
</tests>

‎app/code/Magento/Catalog/Test/Mftf/Test/DeleteCategoriesTest.xml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,17 @@
5858
<!-- Change root category for Main Website Store. -->
5959
<amOnPage stepKey="s1" url="{{AdminSystemStorePage.url}}"/>
6060
<waitForPageLoad stepKey="waitForPageAdminSystemStoreLoad" />
61-
<click stepKey="s2" selector="{{AdminStoresGridSection.resetButton}}"/>
62-
<waitForPageLoad stepKey="waitForPageAdminStoresGridLoadAfterResetButton" time="10"/>
63-
<fillField stepKey="s4" selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" userInput="Main Website Store"/>
64-
<click stepKey="s5" selector="{{AdminStoresGridSection.searchButton}}"/>
65-
<waitForPageLoad stepKey="waitForPageAdminStoresGridLoadAfterSearchButton"/>
66-
<click stepKey="s7" selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" />
61+
<actionGroup ref="filterStoresGridByStore" stepKey="filterStoresGridByStore">
62+
<argument name="store" value="Main Website Store"/>
63+
</actionGroup>
64+
<click stepKey="s7" selector="{{AdminStoresGridSection.storeInFirstRow}}" />
6765
<waitForPageLoad stepKey="waitForPageAdminStoresGroupEditLoad" />
6866
<selectOption selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" userInput="{{NewRootCategory.name}}" stepKey="setNewCategoryForStoreGroup"/>
6967
<click selector="{{AdminNewStoreViewActionsSection.saveButton}}" stepKey="clickSaveStoreGroup"/>
7068
<waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForModalSaveStoreGroup"/>
7169
<see selector="{{AdminConfirmationModalSection.title}}" userInput="Warning message" stepKey="seeWarning"/>
7270
<click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptModal" />
73-
<waitForElementVisible selector="{{AdminStoresGridSection.storeFilterTextField}}" stepKey="waitForPageAdminStoresGridReload"/>
71+
<waitForElementVisible selector="{{AdminStoresGridFilterSection.filters}}" stepKey="waitForPageAdminStoresGridReload"/>
7472
<see userInput="You saved the store." stepKey="seeSavedMessage"/>
7573

7674
<!-- @TODO: Uncomment commented below code after MQE-903 is fixed -->
@@ -160,4 +158,4 @@
160158
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategoryDefaultCategory"/>
161159
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccessMessageAfterSaveDefaultCategory"/>
162160
</test>
163-
</tests>
161+
</tests>

‎app/code/Magento/Store/Model/ResourceModel/Website/Grid/Collection.php

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,18 @@
1010
*/
1111
class Collection extends \Magento\Store\Model\ResourceModel\Website\Collection
1212
{
13+
/**
14+
* @inheritdoc
15+
*/
16+
protected function _construct()
17+
{
18+
parent::_construct();
19+
20+
$this->_map['fields']['store_title'] = 'store_table.name';
21+
$this->_map['fields']['group_title'] = 'group_table.name';
22+
$this->_map['fields']['name'] = 'main_table.name';
23+
}
24+
1325
/**
1426
* Join website and store names
1527
*
@@ -21,4 +33,37 @@ protected function _initSelect()
2133
$this->joinGroupAndStore();
2234
return $this;
2335
}
36+
37+
/**
38+
* @inheritdoc
39+
*/
40+
public function load($printQuery = false, $logQuery = false)
41+
{
42+
if ($this->isLoaded()) {
43+
return $this;
44+
}
45+
46+
return $this->loadWithFilter($printQuery, $logQuery);
47+
}
48+
49+
/**
50+
* @inheritdoc
51+
*/
52+
public function joinGroupAndStore()
53+
{
54+
if (!$this->getFlag('groups_and_stores_joined')) {
55+
$this->_idFieldName = 'website_group_store';
56+
$this->getSelect()->joinLeft(
57+
['group_table' => $this->getTable('store_group')],
58+
'main_table.website_id = group_table.website_id',
59+
['group_id' => 'group_id', 'group_title' => 'name', 'group_code' => 'code']
60+
)->joinLeft(
61+
['store_table' => $this->getTable('store')],
62+
'group_table.group_id = store_table.group_id',
63+
['store_id' => 'store_id', 'store_title' => 'name', 'store_code' => 'code']
64+
);
65+
}
66+
67+
return $this;
68+
}
2469
}

‎app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateNewStoreGroupActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<fillField selector="{{AdminNewStoreGroupSection.storeGrpCodeTextField}}" userInput="{{storeGroupCode}}" stepKey="enterStoreGroupCode" />
2323
<selectOption selector="{{AdminNewStoreGroupSection.storeRootCategoryDropdown}}" userInput="Default Category" stepKey="chooseRootCategory" />
2424
<click selector="{{AdminStoreGroupActionsSection.saveButton}}" stepKey="clickSaveStoreGroup" />
25-
<waitForElementVisible selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" stepKey="waitForStoreGridReload"/>
25+
<waitForElementVisible selector="{{AdminStoresGridFilterSection.filters}}" stepKey="waitForStoreGridReload"/>
2626
<see userInput="You saved the store." stepKey="seeSavedMessage" />
2727
</actionGroup>
2828
</actionGroups>

‎app/code/Magento/Store/Test/Mftf/ActionGroup/AdminCreateWebsiteActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<fillField selector="{{AdminNewWebsiteSection.name}}" userInput="{{newWebsiteName}}" stepKey="enterWebsiteName" />
2121
<fillField selector="{{AdminNewWebsiteSection.code}}" userInput="{{websiteCode}}" stepKey="enterWebsiteCode" />
2222
<click selector="{{AdminNewWebsiteActionsSection.saveWebsite}}" stepKey="clickSaveWebsite" />
23-
<waitForElementVisible selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="waitForStoreGridToReload"/>
23+
<waitForElementVisible selector="{{AdminStoresGridFilterSection.filters}}" stepKey="waitForStoreGridToReload"/>
2424
<see userInput="You saved the website." stepKey="seeSavedMessage" />
2525
</actionGroup>
2626

‎app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteStoreViewActionGroup.xml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,12 @@
1414
</arguments>
1515
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="navigateToStoresIndex"/>
1616
<waitForPageLoad stepKey="waitStoreIndexPageLoad" />
17-
<fillField selector="{{AdminStoresGridSection.storeFilterTextField}}" userInput="{{customStore.name}}" stepKey="fillStoreViewFilterField"/>
18-
<click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearch"/>
19-
<click selector="{{AdminStoresGridSection.storeNameInFirstRow}}" stepKey="clickStoreViewInGrid"/>
17+
<conditionalClick selector="{{AdminStoresGridFilterSection.clearFilters}}" dependentSelector="{{AdminStoresGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
18+
<click selector="{{AdminStoresGridFilterSection.filters}}" stepKey="openStoresFilters"/>
19+
<fillField selector="{{AdminStoresGridFilterSection.storeViewFilter}}" userInput="{{customStore.name}}" stepKey="fillStoreViewFilterField"/>
20+
<click selector="{{AdminStoresGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
21+
<waitForLoadingMaskToDisappear stepKey="waitForGridLoad"/>
22+
<click selector="{{AdminStoresGridSection.storeViewInFirstRow}}" stepKey="clickStoreViewInGrid"/>
2023
<waitForPageLoad stepKey="waitForStoreViewPage"/>
2124
<click selector="{{AdminNewStoreViewActionsSection.delete}}" stepKey="clickDeleteStoreView"/>
2225
<selectOption selector="{{AdminStoreBackupOptionsSection.createBackupSelect}}" userInput="No" stepKey="dontCreateDbBackup"/>
@@ -29,6 +32,6 @@
2932
<arguments>
3033
<argument name="customStoreName" type="string"/>
3134
</arguments>
32-
<fillField selector="{{AdminStoresGridSection.storeFilterTextField}}" userInput="{{customStoreName}}" stepKey="fillStoreViewFilterField"/>
35+
<fillField selector="{{AdminStoresGridFilterSection.storeViewFilter}}" userInput="{{customStoreName}}" stepKey="fillStoreViewFilterField"/>
3336
</actionGroup>
3437
</actionGroups>

‎app/code/Magento/Store/Test/Mftf/ActionGroup/AdminDeleteWebsiteActionGroup.xml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,18 @@
1212
<argument name="websiteName" type="string"/>
1313
</arguments>
1414
<amOnPage url="{{AdminSystemStorePage.url}}" stepKey="amOnAdminSystemStorePage"/>
15-
<click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
16-
<fillField userInput="{{websiteName}}" selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="fillSearchWebsiteField"/>
17-
<click selector="{{AdminStoresGridSection.searchButton}}" stepKey="clickSearchButton"/>
18-
<see userInput="{{websiteName}}" selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="verifyThatCorrectWebsiteFound"/>
19-
<click selector="{{AdminStoresGridSection.websiteNameInFirstRow}}" stepKey="clickEditExistingStoreRow"/>
15+
<conditionalClick selector="{{AdminStoresGridFilterSection.clearFilters}}" dependentSelector="{{AdminStoresGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
16+
<click selector="{{AdminStoresGridFilterSection.filters}}" stepKey="openStoresFilters"/>
17+
<fillField selector="{{AdminStoresGridFilterSection.websiteFilter}}" userInput="{{websiteName}}" stepKey="fillWebsiteFilter"/>
18+
<click selector="{{AdminStoresGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
19+
<waitForLoadingMaskToDisappear stepKey="waitForGridLoad"/>
20+
<see userInput="{{websiteName}}" selector="{{AdminStoresGridSection.websiteInFirstRow}}" stepKey="verifyThatCorrectWebsiteFound"/>
21+
<click selector="{{AdminStoresGridSection.websiteInFirstRow}}" stepKey="clickEditExistingStoreRow"/>
2022
<waitForPageLoad stepKey="waitForStoreToLoad"/>
2123
<click selector="{{AdminStoresMainActionsSection.deleteButton}}" stepKey="clickDeleteWebsiteButtonOnEditWebsitePage"/>
2224
<selectOption userInput="No" selector="{{AdminStoresDeleteStoreGroupSection.createDbBackup}}" stepKey="setCreateDbBackupToNo"/>
2325
<click selector="{{AdminStoresDeleteStoreGroupSection.deleteStoreGroupButton}}" stepKey="clickDeleteWebsiteButton"/>
24-
<waitForElementVisible selector="{{AdminStoresGridSection.websiteFilterTextField}}" stepKey="waitForStoreGridToReload"/>
26+
<waitForElementVisible selector="{{AdminStoresGridFilterSection.filters}}" stepKey="waitForStoreGridToReload"/>
2527
<see userInput="You deleted the website." stepKey="seeSavedMessage"/>
2628
<conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearExistingFilters"/>
2729
</actionGroup>

‎app/code/Magento/Store/Test/Mftf/ActionGroup/AdminStoresFilterGridActionGroup.xml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="filterStoresGridByWebsite">
12+
<arguments>
13+
<argument name="website" type="string"/>
14+
</arguments>
15+
<conditionalClick selector="{{AdminStoresGridFilterSection.clearFilters}}" dependentSelector="{{AdminStoresGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
16+
<click selector="{{AdminStoresGridFilterSection.filters}}" stepKey="openStoresFilters"/>
17+
<fillField selector="{{AdminStoresGridFilterSection.websiteFilter}}" userInput="{{website}}" stepKey="fillWebsiteFilter"/>
18+
<click selector="{{AdminStoresGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
19+
<waitForLoadingMaskToDisappear stepKey="waitForGridLoad"/>
20+
</actionGroup>
21+
22+
<actionGroup name="filterStoresGridByStore">
23+
<arguments>
24+
<argument name="store" type="string"/>
25+
</arguments>
26+
<conditionalClick selector="{{AdminStoresGridFilterSection.clearFilters}}" dependentSelector="{{AdminStoresGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
27+
<click selector="{{AdminStoresGridFilterSection.filters}}" stepKey="openStoresFilters"/>
28+
<fillField selector="{{AdminStoresGridFilterSection.storeFilter}}" userInput="{{store}}" stepKey="fillStoreFilter"/>
29+
<click selector="{{AdminStoresGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
30+
<waitForLoadingMaskToDisappear stepKey="waitForGridLoad"/>
31+
</actionGroup>
32+
33+
<actionGroup name="filterStoresGridByStoreView">
34+
<arguments>
35+
<argument name="storeView" type="string"/>
36+
</arguments>
37+
<conditionalClick selector="{{AdminStoresGridFilterSection.clearFilters}}" dependentSelector="{{AdminStoresGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
38+
<click selector="{{AdminStoresGridFilterSection.filters}}" stepKey="openStoresFilters"/>
39+
<fillField selector="{{AdminStoresGridFilterSection.storeViewFilter}}" userInput="{{storeView}}" stepKey="fillStoreViewFilter"/>
40+
<click selector="{{AdminStoresGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
41+
<waitForLoadingMaskToDisappear stepKey="waitForGridLoad"/>
42+
</actionGroup>
43+
</actionGroups>

‎app/code/Magento/Store/Test/Mftf/ActionGroup/DeleteCustomStoreActionGroup.xml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@
1313
<argument name="storeGroupName" defaultValue="customStoreGroup.name"/>
1414
</arguments>
1515
<amOnPage stepKey="amOnAdminSystemStorePage" url="{{AdminSystemStorePage.url}}"/>
16-
<click stepKey="resetSearchFilter" selector="{{AdminStoresGridSection.resetButton}}"/>
17-
<fillField stepKey="fillSearchStoreGroupField" selector="{{AdminStoresGridSection.storeGrpFilterTextField}}" userInput="{{storeGroupName}}"/>
18-
<click stepKey="clickSearchButton" selector="{{AdminStoresGridSection.searchButton}}"/>
19-
<see stepKey="verifyThatCorrectStoreGroupFound" selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}" userInput="{{storeGroupName}}"/>
20-
<click stepKey="clickEditExistingStoreRow" selector="{{AdminStoresGridSection.storeGrpNameInFirstRow}}"/>
16+
<conditionalClick stepKey="resetSearchFilter" selector="{{AdminStoresGridFilterSection.clearAll}}" dependentSelector="{{AdminStoresGridFilterSection.clearAll}}" visible="true"/>
17+
<click selector="{{AdminStoresGridFilterSection.filters}}" stepKey="openStoresFilters"/>
18+
<fillField stepKey="fillSearchStoreGroupField" selector="{{AdminStoresGridFilterSection.storeFilter}}" userInput="{{storeGroupName}}"/>
19+
<click stepKey="clickSearchButton" selector="{{AdminStoresGridFilterSection.applyFilters}}"/>
20+
<see stepKey="verifyThatCorrectStoreGroupFound" selector="{{AdminStoresGridSection.storeInFirstRow}}" userInput="{{storeGroupName}}"/>
21+
<click stepKey="clickEditExistingStoreRow" selector="{{AdminStoresGridSection.storeInFirstRow}}"/>
2122
<waitForPageLoad stepKey="waitForStoreToLoad"/>
2223
<click stepKey="clickDeleteStoreGroupButtonOnEditStorePage" selector="{{AdminStoresMainActionsSection.deleteButton}}"/>
2324
<selectOption stepKey="setCreateDbBackupToNo" selector="{{AdminStoresDeleteStoreGroupSection.createDbBackup}}" userInput="No"/>

0 commit comments

Comments
 (0)