MAGETWO-94406: [2.3.0] "Directory Data" and "Cart" sections are loaded twice after user logged in

- Updated customer data reload

Author: vital-pantsialeyeu

app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js

@@ -101,7 +101,7 @@ define([
                 self.isLoading(true);
             });
 
-            if (cartData()['website_id'] !== window.checkout.websiteId) {
+            if ((cartData()['website_id'] !== window.checkout.websiteId) && !customerData.get('is-loading')) {
                 customerData.reload(['cart'], false);
             }
 

app/code/Magento/Customer/view/frontend/web/js/customer-data.js

@@ -87,9 +87,16 @@ define([
             } : [];
             parameters['update_section_id'] = updateSectionId;
 
-            return $.getJSON(options.sectionLoadUrl, parameters).fail(function (jqXHR) {
-                throw new Error(jqXHR);
-            });
+            return $.getJSON(options.sectionLoadUrl, parameters)
+                .done(
+                    function () {
+                        if (_.isEmpty(sectionNames)) {
+                            customerData.set('is_loading', false);
+                        }
+                    }
+                ).fail(function (jqXHR) {
+                    throw new Error(jqXHR);
+                });
         }
     };
 
@@ -199,7 +206,8 @@ define([
                 privateContent = $.cookieStorage.get(privateContentVersion),
                 localPrivateContent = $.localStorage.get(privateContentVersion),
                 needVersion = 'need_version',
-                expiredSectionNames = this.getExpiredSectionNames();
+                expiredSectionNames = this.getExpiredSectionNames(),
+                isLoading = false;
 
             if (privateContent &&
                 !$.cookieStorage.isSet(privateContentVersion) &&
@@ -208,13 +216,15 @@ define([
                 $.cookieStorage.set(privateContentVersion, needVersion);
                 $.localStorage.set(privateContentVersion, needVersion);
                 this.reload([], false);
+                this.set('is_loading', true);
             } else if (localPrivateContent !== privateContent) {
                 if (!$.cookieStorage.isSet(privateContentVersion)) {
                     privateContent = needVersion;
                     $.cookieStorage.set(privateContentVersion, privateContent);
                 }
                 $.localStorage.set(privateContentVersion, privateContent);
                 this.reload([], false);
+                this.set('is_loading', true);
             } else if (expiredSectionNames.length > 0) {
                 _.each(dataProvider.getFromStorage(storage.keys()), function (sectionData, sectionName) {
                     buffer.notify(sectionName, sectionData);
@@ -232,8 +242,9 @@ define([
 
             if (!_.isEmpty(privateContent)) {
                 countryData = this.get('directory-data');
+                isLoading = this.get('is_loading');
 
-                if (_.isEmpty(countryData())) {
+                if (_.isEmpty(countryData()) && !isLoading) {
                     customerData.reload(['directory-data'], false);
                 }
             }
@@ -328,7 +339,6 @@ define([
          */
         reload: function (sectionNames, updateSectionId) {
             return dataProvider.getFromServer(sectionNames, updateSectionId).done(function (sections) {
-                $(document).trigger('customer-data-reload', [sectionNames]);
                 buffer.update(sections);
             });
         },