MC-5723: Flaky MFTF Map Tests - Google Maps Rate Limit Reached

Author: davemacaulay

app/code/Magento/PageBuilder/Component/GoogleMapsApiKeyValidationContainer.php

@@ -30,26 +30,19 @@ class GoogleMapsApiKeyValidationContainer extends \Magento\Ui\Component\Containe
      */
     private $scopeConfig;
 
-    /**
-     * @var ApiKeyValidator
-     */
-    private $apiKeyValidator;
-
     /**
      * Constructor
      *
      * @param ContextInterface $context
      * @param UrlInterface $url
      * @param ScopeConfigInterface $scopeConfig
-     * @param ApiKeyValidator $apiKeyValidator
      * @param array $components
      * @param array $data
      */
     public function __construct(
         ContextInterface $context,
         UrlInterface $url,
         ScopeConfigInterface $scopeConfig,
-        ApiKeyValidator $apiKeyValidator,
         array $components = [],
         array $data = []
     ) {
@@ -60,7 +53,6 @@ public function __construct(
         );
         $this->url = $url;
         $this->scopeConfig = $scopeConfig;
-        $this->apiKeyValidator = $apiKeyValidator;
     }
 
     /**
@@ -73,8 +65,7 @@ public function prepare()
         parent::prepare();
         $config = $this->getData('config');
         $apiKey = $this->scopeConfig->getValue(self::GOOGLE_MAPS_API_KEY_PATH) ?: "";
-        $response = $this->apiKeyValidator->validate($apiKey);
-        if (!$response['success']) {
+        if (trim($apiKey) == "") {
             $config['visible'] = true;
         }
 

app/code/Magento/PageBuilder/Test/Mftf/Data/MapData.xml

@@ -24,7 +24,7 @@
     <entity name="PageBuilderMapCommonData" type="pagebuilder__map_common_data">
         <data key="mapErrorTitleStorefront">Oops! Something went wrong.</data>
         <data key="mapErrorMessageStorefront">This page didn't load Google Maps correctly. See the JavaScript console for technical details.</data>
-        <data key="mapErrorMessageStage">Enter API Key to use Google Maps</data>
+        <data key="mapErrorMessageStage">Enter valid API Key to use Google Maps</data>
     </entity>
     <!-- Map Position -->
     <entity name="PageBuilderMapPositionDefaultProperty" type="pagebuilder_map_position_property">

app/code/Magento/PageBuilder/etc/adminhtml/system.xml

@@ -27,7 +27,7 @@
                 <field id="google_maps_api_key_validator" translate="button_label valid_label invalid_label" sortOrder="2011" showInDefault="1" showInWebsite="0" showInStore="0">
                     <attribute type="button_label">Test Key</attribute>
                     <attribute type="valid_label">Key is valid</attribute>
-                    <attribute type="invalid_label">Key is invalid. Try different key.</attribute>
+                    <attribute type="invalid_label">Key is invalid. Try a different key.</attribute>
                     <attribute type="source_field">cms_pagebuilder_google_maps_api_key</attribute>
                     <frontend_model>Magento\PageBuilder\Block\Adminhtml\System\Config\Form\Field\GoogleMapsApiKey</frontend_model>
                 </field>

app/code/Magento/PageBuilder/view/base/web/js/utils/map.js

@@ -50,7 +50,7 @@ define([
         this.usePlaceholder = function (container) {
             var placeholder = document.createElement('div');
 
-            placeholder.innerHTML = $t('Enter API Key to use Google Maps');
+            placeholder.innerHTML = $t('Enter valid API Key to use Google Maps');
             placeholder.classList.add('google-map-auth-failure-placeholder');
             container.innerHTML = '';
             container.appendChild(placeholder);