MC-5810: Improve naming of the critical variables/parameters in the code and configuration

- Resolved pagebuilder product rule tree failure
- Updated google maps warning message test

Author: Hwashiang Yu

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeMapActionGroup.xml

@@ -409,6 +409,11 @@
         <seeInCurrentUrl url="{{AdminContentManagementPage.url}}#cms_pagebuilder" stepKey="validateURL"/>
         <seeElement selector="{{ContentManagementSection.GoogleMapsAPIKeyInputField}}" stepKey="seeGoogleMapsAPIKeyInputField"/>
     </actionGroup>
+    <actionGroup name="validateWarningMessageLinkNewTabTarget" extends="validateWarningMessageLink">
+        <switchToNextTab stepKey="switchToNewConfigurationTab" after="clickLink"/>
+        <closeTab stepKey="closeTab" after="seeGoogleMapsAPIKeyInputField"/>
+        <switchToPreviousTab stepKey="switchToPreviousTab" after="closeTab"/>
+    </actionGroup>
     <actionGroup name="validateAdvancedStyleWithAllUpdatedMapWithErrorOverlay" extends="validateAdvancedStyleWithAllUpdatedNotVisible">
         <waitForElementVisible selector="{{page.warningMessageLink(index)}}" stepKey="dontSeeElement"/>
     </actionGroup>

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderMapGoogleMapsSettingsTests.xml

@@ -129,12 +129,9 @@
         <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage1"/>
         <!-- Stage: Validate Warning Message Link -->
         <comment userInput="Stage: Validate Warning Message Link" stepKey="commentValidateWarningMessageLinkStage"/>
-        <actionGroup ref="validateWarningMessageLink" stepKey="validateWarningMessageLink1">
+        <actionGroup ref="validateWarningMessageLinkNewTabTarget" stepKey="validateWarningMessageLink1">
             <argument name="section" value="MapOnStage"/>
         </actionGroup>
-        <moveBack stepKey="moveBack1"/>
-        <waitForPageLoad stepKey="waitForPageLoad1"/>
-        <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage2"/>
         <!-- Edit Form: Validate Warning Message Link -->
         <comment userInput="Edit Form: Validate Warning Message Link" stepKey="commentValidateWarningMessageLinkEditForm"/>
         <actionGroup ref="openPageBuilderEditPanel" stepKey="openEditPanel1">
@@ -152,7 +149,7 @@
             <argument name="contentType" value="PageBuilderMapContentType"/>
         </actionGroup>
         <actionGroup ref="clickAddLocationButton" stepKey="clickAddLocationButton"/>
-        <actionGroup ref="validateWarningMessageLink" stepKey="validateWarningMessageLink3">
+        <actionGroup ref="validateWarningMessageLinkNewTabTarget" stepKey="validateWarningMessageLink3">
             <argument name="section" value="AddLocationForm"/>
         </actionGroup>
     </test>

app/code/Magento/PageBuilder/view/adminhtml/templates/form/element/conditions.phtml

@@ -17,7 +17,7 @@ $role = 'pagebuilder-conditions-form-placeholder-' . $attribute;
     <div class="rule-tree">
         <fieldset id="<?= $block->escapeHtmlAttr($id) ?>" class="fieldset">
             <div class="rule-tree-wrapper">
-                <div data-content-type="<?= $block->escapeHtmlAttr($role) ?>"></div>
+                <div data-role="<?= $block->escapeHtmlAttr($role) ?>"></div>
             </div>
         </fieldset>
     </div>