Merge branch 'main' into ADO-449-categoryid-issue

Author: priyambad

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

@@ -174,16 +174,6 @@ public function getAccessTokenAjaxRoute()
         return $this->fbeHelper->getUrl('fbeadmin/ajax/fbtoken');
     }
 
-    /**
-     * Get profiles ajax route
-     *
-     * @return mixed
-     */
-    public function getProfilesAjaxRoute()
-    {
-        return $this->fbeHelper->getUrl('fbeadmin/ajax/fbprofiles');
-    }
-
     /**
      * Get aam settings route
      *

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

@@ -172,7 +172,6 @@ private function deleteConfigKeys($storeId)
             ->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_COMMERCE_ACCOUNT_ID, $storeId)
             ->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_PIXEL_ID, $storeId)
             ->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_PIXEL_AAM_SETTINGS, $storeId)
-            ->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_PROFILES, $storeId)
             ->deleteConfig(SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_CATALOG_ID, $storeId)
             ->deleteConfig(
                 SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_COMMERCE_PARTNER_INTEGRATION_ID,

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

@@ -147,7 +147,6 @@ public function save($response, $storeId)
         );
 
         $this->savePixelId($pixelId, $storeId);
-        $this->saveProfiles($data['profiles'] ?? '', $storeId);
         $this->savePages($data['pages'] ?? '', $storeId);
         $this->saveCatalogId($catalogId, $storeId);
         $this->saveCommercePartnerIntegrationId($commercePartnerIntegrationId, $storeId);
@@ -186,25 +185,6 @@ private function savePixelId($pixelId, $storeId)
         }
     }
 
-    /**
-     * Save profiles
-     *
-     * @param array $profiles
-     * @param int   $storeId
-     */
-    private function saveProfiles($profiles, $storeId)
-    {
-        if ($profiles) {
-            $profiles = json_encode($profiles);
-            $this->systemConfig->saveConfig(
-                SystemConfig::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_PROFILES,
-                $profiles,
-                $storeId
-            );
-            $this->fbeHelper->log("Saved fbe_installs profiles --- {$profiles} for storeID: {$storeId}");
-        }
-    }
-
     /**
      * Save pages
      *

app/code/Meta/BusinessExtension/Model/MBEInstalls.php

@@ -49,9 +49,6 @@ class Config
     public const XML_PATH_FACEBOOK_BUSINESS_EXTENSION_PIXEL_ID = 'facebook/business_extension/pixel_id';
     public const XML_PATH_FACEBOOK_BUSINESS_EXTENSION_PIXEL_AAM_SETTINGS =
         'facebook/business_extension/pixel_aam_settings';
-
-    public const XML_PATH_FACEBOOK_BUSINESS_EXTENSION_PROFILES = 'facebook/business_extension/profiles';
-
     public const XML_PATH_FACEBOOK_BUSINESS_EXTENSION_PAGE_ID = 'facebook/business_extension/page_id';
     public const XML_PATH_FACEBOOK_BUSINESS_EXTENSION_CATALOG_ID = 'facebook/business_extension/catalog_id';
 
@@ -158,7 +155,7 @@ class Config
      *
      * @var string|null
      */
-    private ?string $version = '1.4.3-dev';
+    private ?string $version = '1.5.1-dev';
 
     /**
      * Config class constructor
@@ -602,18 +599,6 @@ public function getPixelAamSettings($scopeId = null, $scope = null)
         );
     }
 
-    /**
-     * Get profiles
-     *
-     * @param int $scopeId
-     * @param int $scope
-     * @return mixed
-     */
-    public function getProfiles($scopeId = null, $scope = null)
-    {
-        return $this->getConfig(self::XML_PATH_FACEBOOK_BUSINESS_EXTENSION_PROFILES, $scopeId, $scope);
-    }
-
     /**
      * Get page id
      *

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

@@ -65,7 +65,6 @@ use Magento\Framework\Escaper;
                 setAccessToken: '{$escaper->escapeHtml($block->getAccessTokenAjaxRoute()) }',
                 setInstalledFeatures: '{$escaper->escapeHtml($block->getInstalledFeaturesAjaxRouteUrl()) }',
                 setPixelId: '{$escaper->escapeHtml($block->getPixelAjaxRoute()) }',
-                setProfilesData: '{$escaper->escapeHtml($block->getProfilesAjaxRoute()) }',
                 storeId: '{$escaper->escapeHtml($block->getSelectedStoreId()) }',
                 timeZone: '{$escaper->escapeHtml($block->getStoreTimezone()) }',
                 countryCode: '{$escaper->escapeHtml($block->getStoreCountryCode()) }',

app/code/Meta/BusinessExtension/Test/Unit/Controller/Adminhtml/Ajax/FbprofilesTest.php

@@ -78,6 +78,13 @@ require(['jquery'], function (jQuery) {
                 if (data.success) {
                     msg = data.message;
                     console.log("Update success");
+                    if (triggerPostOnboarding) {
+                        // Store sync info before reload
+                        sessionStorage.setItem('mbe_pending_post_onboarding_sync', JSON.stringify({
+                            storeId: window.facebookBusinessExtensionConfig.storeId,
+                            timestamp: new Date().getTime()
+                        }));
+                    }
                 } else {
                     msg = data.error_message;
                 }
@@ -89,6 +96,42 @@ require(['jquery'], function (jQuery) {
         });
     }
 
+    // Add function to handle post-onboarding sync
+    function handlePostReloadSync() {
+        const pendingSyncData = sessionStorage.getItem('mbe_pending_post_onboarding_sync');
+        if (pendingSyncData) {
+            sessionStorage.removeItem('mbe_pending_post_onboarding_sync');
+            try {
+                const {storeId, timestamp} = JSON.parse(pendingSyncData);
+                const SYNC_EXPIRY_MS = 30 * 60 * 1000; // 30 minutes
+                if (new Date().getTime() - timestamp < SYNC_EXPIRY_MS) {
+                    console.log('Starting initial sync in the background');
+                    // Use setTimeout to ensure page is fully loaded
+                    setTimeout(function () {
+                        jQuery.ajax({
+                            type: 'post',
+                            url: ajaxify(window.facebookBusinessExtensionConfig.postFBEOnboardingSync),
+                            data: ajaxParam({
+                                storeId: storeId
+                            }),
+                            success: function (response) {
+                                console.log('Background sync completed successfully');
+                            },
+                            error: function (error) {
+                                console.error('Background sync failed:', error);
+                            }
+                        });
+                    }, 0);
+                }
+            } catch (e) {
+                console.error('Error processing pending sync data:', e);
+            }
+        }
+    }
+
+    // Initialize post-reload sync handling
+    jQuery(document).ready(handlePostReloadSync);
+
     function cleanConfigCacheAndReloadPage()
     {
         jQuery.ajax({