[Setup] Merge config flags for CommerceExtension and CommerceExtensio… (#467)

* [Setup] Merge config flags for CommerceExtension and CommerceExtensionSplash

* Rename the final config

Author: dalongi

app/code/Meta/BusinessExtension/Block/Adminhtml/Setup.php

@@ -199,24 +199,14 @@ public function isCommerceExtensionEnabled()
         return $storeHasCommercePartnerIntegration || $this->systemConfig->isCommerceExtensionEnabled();
     }
 
-    /**
-     * Whether to enable the pre-onboarding Splash page for the new Commerce Extension.
-     *
-     * @return bool
-     */
-    public function isCommerceExtensionSplashEnabled()
-    {
-        return $this->systemConfig->isCommerceExtensionSplashEnabled();
-    }
-
     /**
      * The expected origin for the Messages received from the FBE iframe/popup.
      *
      * @return string
      */
     public function getPopupOrigin()
     {
-        if (!$this->systemConfig->isCommerceExtensionSplashEnabled()) {
+        if (!$this->systemConfig->isCommerceExtensionEnabled()) {
             return 'https://business.facebook.com';
         }
 
@@ -230,7 +220,7 @@ public function getPopupOrigin()
      */
     public function getSplashPageURL()
     {
-        if (!$this->systemConfig->isCommerceExtensionSplashEnabled()) {
+        if (!$this->systemConfig->isCommerceExtensionEnabled()) {
             return 'https://business.facebook.com/fbe-iframe-get-started/?';
         }
 

app/code/Meta/BusinessExtension/Model/System/Config.php

@@ -115,9 +115,6 @@ class Config
     private const XML_PATH_FACEBOOK_BUSINESS_EXTENSION_ENABLE_COMMERCE_EXTENSION_UI_FLAG =
         'facebook/business_extension/commerce_extension';
 
-    private const XML_PATH_FACEBOOK_BUSINESS_EXTENSION_ENABLE_COMMERCE_EXTENSION_SPLASH_UI_FLAG =
-        'facebook/business_extension/commerce_extension_splash';
-
     private const XML_PATH_FACEBOOK_BUSINESS_EXTENSION_ENABLE_COMMERCE_EXTENSION_BASE_URL =
         'facebook/internal/extension_base_url';
 
@@ -330,22 +327,6 @@ public function isCommerceExtensionEnabled($scopeId = null, $scope = ScopeInterf
         );
     }
 
-    /**
-     * Is commerce extension UI Splash Screen is enabled
-     *
-     * @param int|null $scopeId
-     * @param string $scope
-     * @return bool
-     */
-    public function isCommerceExtensionSplashEnabled($scopeId = null, $scope = ScopeInterface::SCOPE_STORE): bool
-    {
-        return (bool)$this->getConfig(
-            self::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_ENABLE_COMMERCE_EXTENSION_SPLASH_UI_FLAG,
-            $scopeId,
-            $scope
-        );
-    }
-
     /**
      * The base URL for rendering the Commerce Extension Splash page.
      *

app/code/Meta/BusinessExtension/etc/config.xml

@@ -7,7 +7,6 @@
                 <active>1</active>
                 <onsite>0</onsite>
                 <commerce_extension>0</commerce_extension>
-                <commerce_extension_splash>0</commerce_extension_splash>
                 <meta_exception_logging_enabled>1</meta_exception_logging_enabled>
                 <meta_telemetry_logging_enabled>0</meta_telemetry_logging_enabled>
                 <client_access_token>195311308289826|52dcd04d6c7ed113121b5eb4be23b4a7</client_access_token>

app/code/Meta/BusinessExtension/view/adminhtml/templates/setup.phtml

@@ -29,8 +29,7 @@
             installed: '<?=
                 $escaper->escapeHtml($block->isFBEInstalled($block->getSelectedStoreId())) ? 'true' : 'false'
             ?>',
-            isCommerceEmbeddedExtensionEnabled: <?=$block->isCommerceExtensionEnabled() ? 'true' : 'false'?>,
-            isCommerceEmbeddedExtensionSplashEnabled: <?=$block->isCommerceExtensionSplashEnabled() ? 'true' : 'false'?>,
+            isCommerceExtensionEnabled: <?=$block->isCommerceExtensionEnabled() ? 'true' : 'false'?>,
             pixelId: '<?= $escaper->escapeHtml($block->fetchPixelId($block->getSelectedStoreId())) ?>',
             popupOrigin: '<?= $escaper->escapeHtml($block->getPopupOrigin()) ?>',
             postFBEOnboardingSync: '<?= $escaper->escapeHtml($block->fetchPostFBEOnboardingSyncAjaxRoute()) ?>',

app/code/Meta/BusinessExtension/view/adminhtml/web/js/fbe_allinone.js

@@ -258,7 +258,7 @@ jQuery(document).ready(function() {
           _this.cleanConfigCache();
           _this.postFBEOnboardingSync();
 
-          if (window.facebookBusinessExtensionConfig.isCommerceEmbeddedExtensionEnabled) {
+          if (window.facebookBusinessExtensionConfig.isCommerceExtensionEnabled) {
             window.location.reload();
           } else {
             _this.setState({installed: 'true'});
@@ -522,7 +522,7 @@ jQuery(document).ready(function() {
     },
     render: function render() {
       const _this = this;
-      const isNewSplashPage = window.facebookBusinessExtensionConfig.isCommerceEmbeddedExtensionSplashEnabled;
+      const isNewSplashPage = window.facebookBusinessExtensionConfig.isCommerceExtensionEnabled;
       try {
         _this.consoleLog("query params --"+_this.queryParams());
         return React.createElement(
@@ -536,7 +536,7 @@ jQuery(document).ready(function() {
               height: isNewSplashPage ? undefined : '700px',
               minHeight: isNewSplashPage ? '700px' : undefined,
             },
-            scrolling: window.facebookBusinessExtensionConfig.isCommerceEmbeddedExtensionSplashEnabled
+            scrolling: window.facebookBusinessExtensionConfig.isCommerceExtensionEnabled
               ? 'no'
               : undefined,
           }

app/code/Meta/BusinessExtension/view/adminhtml/web/js/lib/fbe.js

@@ -120,7 +120,7 @@ jQuery(document).ready(function() {
           _this.cleanConfigCache();
           _this.postFBEOnboardingSync();
 
-          if (window.facebookBusinessExtensionConfig.isCommerceEmbeddedExtensionEnabled) {
+          if (window.facebookBusinessExtensionConfig.isCommerceExtensionEnabled) {
             window.location.reload();
           } else {
             _this.setState({installed: 'true'});
@@ -384,7 +384,7 @@ jQuery(document).ready(function() {
     },
     render: function render() {
       const _this = this;
-      const isNewSplashPage = window.facebookBusinessExtensionConfig.isCommerceEmbeddedExtensionSplashEnabled;
+      const isNewSplashPage = window.facebookBusinessExtensionConfig.isCommerceExtensionEnabled;
       try {
         _this.consoleLog("query params --"+_this.queryParams());
         return React.createElement(
@@ -398,7 +398,7 @@ jQuery(document).ready(function() {
               height: isNewSplashPage ? undefined : '700px',
               minHeight: isNewSplashPage ? '700px' : undefined,
             },
-            scrolling: window.facebookBusinessExtensionConfig.isCommerceEmbeddedExtensionSplashEnabled
+            scrolling: window.facebookBusinessExtensionConfig.isCommerceExtensionEnabled
               ? 'no'
               : undefined,
           }