Merge remote-tracking branch 'origin/MC-10833-typescript-errors' into MC-5810

Author: Hwashiang Yu

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

@@ -405,9 +405,12 @@
         </arguments>
         <waitForElementVisible selector="{{section.warningMessageLink('1')}}" stepKey="waitForWarningMessageLink"/>
         <click selector="{{section.warningMessageLink('1')}}" stepKey="clickLink"/>
+        <waitForPageLoad stepKey="waitForLinkClick"/>
+        <switchToNextTab stepKey="switchToOpenedLink" />
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <seeInCurrentUrl url="{{AdminContentManagementPage.url}}#cms_pagebuilder" stepKey="validateURL"/>
         <seeElement selector="{{ContentManagementSection.GoogleMapsAPIKeyInputField}}" stepKey="seeGoogleMapsAPIKeyInputField"/>
+        <closeTab stepKey="closeOpenedTab" />
     </actionGroup>
     <actionGroup name="validateAdvancedStyleWithAllUpdatedMapWithErrorOverlay" extends="validateAdvancedStyleWithAllUpdatedNotVisible">
         <waitForElementVisible selector="{{page.warningMessageLink(index)}}" stepKey="dontSeeElement"/>

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

@@ -97,7 +97,7 @@
         <actionGroup ref="dragContentTypeToDropZone" stepKey="dragRowToStage">
             <argument name="contentType" value="PageBuilderRowContentType"/>
             <argument name="contentTypeIndex" value="2"/>
-            <argument name="containerTargetType" value="PageBuilderStage"/>
+            <argument name="containerTargetType" value="PageBuilderRootContainerContentType"/>
             <argument name="dropZoneIndex" value="2"/>
         </actionGroup>
         <!-- Edit 2nd Row -->

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

@@ -132,6 +132,8 @@
         <actionGroup ref="validateWarningMessageLink" stepKey="validateWarningMessageLink1">
             <argument name="section" value="MapOnStage"/>
         </actionGroup>
+        <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">
@@ -140,14 +142,8 @@
         <actionGroup ref="validateWarningMessageLink" stepKey="validateWarningMessageLink2">
             <argument name="section" value="EditMapForm"/>
         </actionGroup>
-        <moveBack stepKey="moveBack2"/>
         <waitForPageLoad stepKey="waitForPageLoad2"/>
-        <actionGroup ref="switchToPageBuilderStage" stepKey="switchToPageBuilderStage3"/>
         <!-- Location Form: Validate Warning Message Link -->
-        <comment userInput="Location Form: Validate Warning Message Link" stepKey="commentValidateWarningMessageLinkLocationForm"/>
-        <actionGroup ref="openPageBuilderEditPanel" stepKey="openEditPanel2">
-            <argument name="contentType" value="PageBuilderMapContentType"/>
-        </actionGroup>
         <actionGroup ref="clickAddLocationButton" stepKey="clickAddLocationButton"/>
         <actionGroup ref="validateWarningMessageLink" stepKey="validateWarningMessageLink3">
             <argument name="section" value="AddLocationForm"/>

app/code/Magento/PageBuilder/view/adminhtml/ui_component/pagebuilder_map_form.xml

@@ -71,7 +71,7 @@
                 <item name="additionalClasses" xsi:type="string">message message-warning</item>
                 <item name="visible" xsi:type="boolean">false</item>
                 <item name="map_configuration_url" xsi:type="string">adminhtml/system_config/edit/section/cms</item>
-                <item name="content" xsi:type="string" translate="true"><![CDATA[You must provide a valid <a href="%s">Google Maps API key</a> to use a map.]]></item>
+                <item name="content" xsi:type="string" translate="true"><![CDATA[You must provide a valid <a href="%s" target="_blank">Google Maps API key</a> to use a map.]]></item>
             </item>
         </argument>
     </container>

package.json

@@ -3,9 +3,10 @@
     "version": "100.0.0-dev",
     "description": "PageBuilder module",
     "scripts": {
-        "test:static": "npm run ts:errors && tslint --project tsconfig.json",
-        "test:static:log": "npm run test:static -- -o ./static-error-log.xml -t junit",
+        "test:static": "tslint --project tsconfig.json",
+        "test:static:log": "set -o pipefail; npm run test:static | tee tslint-errors.txt",
         "ts:errors": "tsc --noEmit",
+        "test:errors:log": "set -o pipefail; npm run ts:errors | tee tsc-errors.txt",
         "ts:errors:watch": "npm run ts:errors -- -watch",
         "ts:lint": "tslint --fix --project .",
         "ts:defs": "node ./dev/dts-generator.js",