Fix FBE UX being inconsistent with the true state of the FBE connection (#235)

* Resolving issue with inconsistent UX caused by FBE uninstall

* regenerating fbe_allinone

* reverting change to config.xml

* Resolving PR comments and reverting changes to composer files

* Add return to new function in PersistConfiguration.php

* fixing extra white space in fbdeleteasset.php

* remove installed flag

Author: camcuz97

app/code/Meta/BusinessExtension/Controller/Adminhtml/Ajax/Fbdeleteasset.php

@@ -157,11 +157,15 @@ public function executeForJson()
      */
     private function deleteConfigKeys($storeId)
     {
+        $this->systemConfig->saveConfig(
+            SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_INSTALLED,
+            false,
+            $storeId,
+        );
         $this->systemConfig->deleteConfig(
             SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_EXTERNAL_BUSINESS_ID,
             $storeId
         )
-            ->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_INSTALLED, $storeId)
             ->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_ACCESS_TOKEN, $storeId)
             ->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_PAGE_ID, $storeId)
             ->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_PAGE_ACCESS_TOKEN, $storeId)

app/code/Meta/BusinessExtension/Controller/Adminhtml/Ajax/Fbpixel.php

@@ -77,11 +77,6 @@ public function executeForJson()
                 $pixelId,
                 $storeId
             );
-            $this->systemConfig->saveConfig(
-                SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_INSTALLED,
-                true,
-                $storeId
-            );
             $response['success'] = true;
             $response['pixelId'] = $pixelId;
             if ($oldPixelId && $oldPixelId != $pixelId) {

app/code/Meta/BusinessExtension/Controller/Adminhtml/Ajax/PersistConfiguration.php

@@ -80,6 +80,7 @@ public function executeForJson()
 
             $this->saveExternalBusinessId($externalBusinessId, $storeId)
                 ->saveCatalogId($catalogId, $storeId)
+                ->saveInstalledFlag($storeId)
                 ->completeOnsiteOnboarding($accessToken, $pageId, $storeId);
 
             $response['success'] = true;
@@ -133,6 +134,23 @@ public function saveExternalBusinessId($externalBusinessId, $storeId)
         return $this;
     }
 
+    /**
+     * Update install flag to true and save
+     *
+     * @param int $storeId
+     * @return $this
+     */
+    public function saveInstalledFlag($storeId)
+    {
+         // set installed to true
+        $this->systemConfig->saveConfig(
+            SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_INSTALLED,
+            true,
+            $storeId,
+        );
+        return $this;
+    }
+
     /**
      * Complete onsite onboarding
      *

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

@@ -261,6 +261,7 @@ jQuery('#store').on('change', function() {
         async : false,
         data: ajaxParam({
           pixelId: pixelId,
+          storeId: window.facebookBusinessExtensionConfig.storeId, 
         }),
         success: function onSuccess(data, _textStatus, _jqXHR) {
           var response = data;
@@ -369,6 +370,7 @@ jQuery('#store').on('change', function() {
           catalogId: catalogId,
           pageId: pageId,
           accessToken: accessToken,
+          storeId: window.facebookBusinessExtensionConfig.storeId,
         }),
         success: function onSuccess(data, _textStatus, _jqXHR) {
           if(data.success) {
@@ -385,6 +387,9 @@ jQuery('#store').on('change', function() {
         jQuery.ajax({
         type: 'delete',
         url: ajaxify(window.facebookBusinessExtensionConfig.deleteConfigKeys),
+        data: ajaxParam({
+            storeId: window.facebookBusinessExtensionConfig.storeId,
+        }),
         success: function onSuccess(data, _textStatus, _jqXHR) {
           let msg = '';
           if(data.success) {

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

@@ -123,6 +123,7 @@ jQuery('#store').on('change', function() {
         async : false,
         data: ajaxParam({
           pixelId: pixelId,
+          storeId: window.facebookBusinessExtensionConfig.storeId, 
         }),
         success: function onSuccess(data, _textStatus, _jqXHR) {
           var response = data;
@@ -231,6 +232,7 @@ jQuery('#store').on('change', function() {
           catalogId: catalogId,
           pageId: pageId,
           accessToken: accessToken,
+          storeId: window.facebookBusinessExtensionConfig.storeId,
         }),
         success: function onSuccess(data, _textStatus, _jqXHR) {
           if(data.success) {
@@ -247,6 +249,9 @@ jQuery('#store').on('change', function() {
         jQuery.ajax({
         type: 'delete',
         url: ajaxify(window.facebookBusinessExtensionConfig.deleteConfigKeys),
+        data: ajaxParam({
+            storeId: window.facebookBusinessExtensionConfig.storeId,
+        }),
         success: function onSuccess(data, _textStatus, _jqXHR) {
           let msg = '';
           if(data.success) {

app/code/Meta/Promotions/composer.json

@@ -10,7 +10,6 @@
         "magento/module-sales-rule": "*",
         "magento/module-offline-shipping": "*",
         "meta/module-business-extension": "*"
-
     },
     "license": "Apache-2.0",
     "autoload": {