Merge branch 'ACP2E-98' of https://github.com/magento-l3/magento2ce into PR-2022-03-11

Author: Anna Bukatar

app/code/Magento/Customer/ViewModel/Customer/StoreConfig.php

@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Customer\ViewModel\Customer;
+
+use Magento\Customer\Model\Config\Share as ConfigShare;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+
+class StoreConfig implements ArgumentInterface
+{
+
+    /**
+     * @var ConfigShare
+     */
+    private ConfigShare $configShare;
+
+    /**
+     * Constructor
+     *
+     * @param ConfigShare $configShare
+     */
+    public function __construct(
+        ConfigShare $configShare
+    ) {
+        $this->configShare = $configShare;
+    }
+
+    /**
+     * Get global account sharing is enabled or not
+     *
+     * @return bool
+     */
+    public function isGlobalScopeEnabled(): bool
+    {
+        return $this->configShare->isGlobalScope();
+    }
+}

app/code/Magento/Customer/view/frontend/layout/default.xml

@@ -38,6 +38,7 @@
                             </item>
                         </item>
                     </argument>
+                    <argument name="view_model" xsi:type="object">Magento\Customer\ViewModel\Customer\StoreConfig</argument>
                 </arguments>
             </block>
             <block name="customer.section.config" class="Magento\Customer\Block\SectionConfig"

app/code/Magento/Customer/view/frontend/requirejs-config.js

@@ -14,7 +14,8 @@ var config = {
             addressValidation: 'Magento_Customer/js/addressValidation',
             showPassword: 'Magento_Customer/js/show-password',
             'Magento_Customer/address': 'Magento_Customer/js/address',
-            'Magento_Customer/change-email-password': 'Magento_Customer/js/change-email-password'
+            'Magento_Customer/change-email-password': 'Magento_Customer/js/change-email-password',
+            globalSessionLoader:    'Magento_Customer/js/customer-global-session-loader.js'
         }
     }
 };

app/code/Magento/Customer/view/frontend/templates/account/authentication-popup.phtml

@@ -6,11 +6,14 @@
 
 /** @var \Magento\Customer\Block\Account\AuthenticationPopup $block */
 /** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/** @var Magento\Customer\ViewModel\Customer\StoreConfig $viewModel */
+$viewModel = $block->getViewModel();
 ?>
 <div id="authenticationPopup" data-bind="scope:'authenticationPopup', style: {display: 'none'}">
     <?php $scriptString = 'window.authenticationPopup = ' . /* @noEscape */ $block->getSerializedConfig(); ?>
     <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>
     <!-- ko template: getTemplate() --><!-- /ko -->
+    <?php // phpcs:ignore Magento2.Legacy.PhtmlTemplate ?>
     <script type="text/x-magento-init">
         {
             "#authenticationPopup": {
@@ -20,6 +23,10 @@
                 "Magento_Ui/js/block-loader": "<?= $block->escapeJs($block->escapeUrl($block->getViewFileUrl(
                     'images/loader-1.gif'
                 ))) ?>"
+                <?php if ($viewModel->isGlobalScopeEnabled()): ?>
+                ,
+                "Magento_Customer/js/customer-global-session-loader": {}
+                <?php endif; ?>
             }
         }
     </script>

app/code/Magento/Customer/view/frontend/web/js/customer-global-session-loader.js

@@ -0,0 +1,27 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+define([
+    'jquery',
+    'Magento_Customer/js/customer-data'
+], function ($, customerData) {
+    'use strict';
+
+    return function () {
+        var customer;
+
+        // When the session is available, this customer menu will be available
+        if ($('.customer-menu').length > 0) {
+            customer = customerData.get('customer');
+
+            customerData.getInitCustomerData().done(function () {
+                // Check if the customer data is set in local storage, if not reload data from server
+                if (!customer().firstname) {
+                    customerData.reload([], false);
+                }
+            });
+        }
+    };
+});

dev/tests/js/jasmine/tests/app/code/Magento/Customer/frontend/js/customer-global-session-loader.test.js

@@ -0,0 +1,110 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/* eslint-disable max-nested-callbacks */
+/*jscs:disable jsDoc*/
+define([
+    'squire', 'jquery', 'ko'
+], function (Squire, $, ko) {
+    'use strict';
+
+    describe('Magento_Customer/js/customer-global-session-loader', function () {
+        var injector,
+            customer = ko.observable({}),
+            mocks = {
+                'Magento_Customer/js/customer-data': {
+                    get: jasmine.createSpy('get', function () {
+                        return customer;
+                    }).and.callThrough(),
+                    reload: jasmine.createSpy('reload'),
+                    getInitCustomerData: function () {}
+                }
+            },
+            deferred,
+            customerSessionLoader;
+
+        beforeAll(function () {
+            $('body').append('<div id="customerMenu" class="customer-menu">Customer Menu</div>');
+        });
+
+        beforeEach(function (done) {
+            injector = new Squire();
+            injector.mock(mocks);
+            injector.require(['Magento_Customer/js/customer-global-session-loader'], function (instance) {
+                customerSessionLoader = instance;
+                done();
+            });
+        });
+
+        afterEach(function () {
+            try {
+                injector.clean();
+                injector.remove();
+                injector = null;
+            } catch (e) {
+                console.log(e);
+            }
+
+            customer({});
+        });
+
+        afterAll(function () {
+            $('#customerMenu').remove();
+        });
+
+        describe('Check customer data preparation process', function () {
+            it('Tests that customer data does not reloads if it has first name defined', function () {
+                spyOn(mocks['Magento_Customer/js/customer-data'], 'getInitCustomerData').and.callFake(function () {
+                    deferred = $.Deferred();
+
+                    deferred.resolve();
+
+                    return deferred.promise();
+                });
+                customer({
+                    firstname: 'First Name'
+                });
+                customerSessionLoader();
+
+                expect(mocks['Magento_Customer/js/customer-data'].get).toHaveBeenCalledWith('customer');
+                expect(mocks['Magento_Customer/js/customer-data'].reload).not.toHaveBeenCalled();
+            });
+
+            it('Tests that customer data reloads after init, if customer first name is not there', function () {
+                spyOn(mocks['Magento_Customer/js/customer-data'], 'getInitCustomerData').and.callFake(function () {
+                    deferred = $.Deferred();
+
+                    return deferred.promise();
+                });
+                customer({
+                    _data: null
+                });
+                customerSessionLoader();
+
+                expect(mocks['Magento_Customer/js/customer-data'].get).toHaveBeenCalledWith('customer');
+                expect(mocks['Magento_Customer/js/customer-data'].reload).not.toHaveBeenCalled();
+
+                deferred.resolve();
+
+                expect(mocks['Magento_Customer/js/customer-data'].reload).toHaveBeenCalledWith([], false);
+            });
+
+            it('Tests that customer data reloads if customer data is not there', function () {
+                spyOn(mocks['Magento_Customer/js/customer-data'], 'getInitCustomerData').and.callFake(function () {
+                    deferred = $.Deferred();
+
+                     deferred.resolve();
+
+                    return deferred.promise();
+                });
+                expect(customerSessionLoader()).toBe(undefined);
+
+                expect(mocks['Magento_Customer/js/customer-data'].get).toHaveBeenCalledWith('customer');
+                expect(mocks['Magento_Customer/js/customer-data'].getInitCustomerData).toHaveBeenCalled();
+                expect(mocks['Magento_Customer/js/customer-data'].reload).toHaveBeenCalledWith([], false);
+            });
+        });
+    });
+});