Merge branch '2.4-develop' into jquery-upgrade

Author: sivaschenko

app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/View.php

@@ -104,7 +104,10 @@ public function afterSave(
         Store $object,
         Store $store
     ): Store {
-        if ($this->origStore->isObjectNew() || $this->origStore->dataHasChangedFor('group_id')) {
+        if (
+            $this->origStore->getData('group_id')
+            && ($this->origStore->isObjectNew() || $this->origStore->dataHasChangedFor('group_id'))
+        ) {
             $categoryRewriteUrls = $this->generateCategoryUrls(
                 (int)$this->origStore->getRootCategoryId(),
                 (int)$this->origStore->getId()

app/code/Magento/CatalogUrlRewrite/Test/Unit/Model/Category/Plugin/Store/ViewTest.php

@@ -7,18 +7,18 @@
 
 namespace Magento\CatalogUrlRewrite\Test\Unit\Model\Category\Plugin\Store;
 
-use Magento\Catalog\Model\ResourceModel\Category\Collection as CategoryCollection;
 use Magento\Catalog\Model\Category;
 use Magento\Catalog\Model\CategoryFactory;
 use Magento\Catalog\Model\Product;
 use Magento\Catalog\Model\ProductFactory;
+use Magento\Catalog\Model\ResourceModel\Category\Collection as CategoryCollection;
 use Magento\Catalog\Model\ResourceModel\Product\Collection as ProductCollection;
 use Magento\CatalogUrlRewrite\Model\Category\Plugin\Store\View as StoreViewPlugin;
 use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
 use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
 use Magento\Framework\Model\AbstractModel;
-use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
-use Magento\Store\Model\ResourceModel\Store;
+use Magento\Store\Model\ResourceModel\Store as StoreResourceModel;
+use Magento\Store\Model\Store;
 use Magento\UrlRewrite\Model\UrlPersistInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -28,11 +28,6 @@
  */
 class ViewTest extends TestCase
 {
-    /**
-     * @var ObjectManager
-     */
-    private $objectManager;
-
     /**
      * @var StoreViewPlugin
      */
@@ -44,7 +39,7 @@ class ViewTest extends TestCase
     private $abstractModelMock;
 
     /**
-     * @var Store|MockObject
+     * @var StoreResourceModel|MockObject
      */
     private $subjectMock;
 
@@ -93,12 +88,11 @@ class ViewTest extends TestCase
      */
     protected function setUp(): void
     {
-        $this->objectManager = new ObjectManager($this);
         $this->abstractModelMock = $this->getMockBuilder(AbstractModel::class)
             ->disableOriginalConstructor()
             ->setMethods(['isObjectNew'])
             ->getMockForAbstractClass();
-        $this->subjectMock = $this->getMockBuilder(Store::class)
+        $this->subjectMock = $this->getMockBuilder(StoreResourceModel::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->urlPersistMock = $this->getMockBuilder(UrlPersistInterface::class)
@@ -131,15 +125,12 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->setMethods(['getCollection'])
             ->getMock();
-        $this->plugin = $this->objectManager->getObject(
-            StoreViewPlugin::class,
-            [
-                'urlPersist' => $this->urlPersistMock,
-                'categoryFactory' => $this->categoryFactoryMock,
-                'productFactory' => $this->productFactoryMock,
-                'categoryUrlRewriteGenerator' => $this->categoryUrlRewriteGeneratorMock,
-                'productUrlRewriteGenerator' => $this->productUrlRewriteGeneratorMock
-            ]
+        $this->plugin = new StoreViewPlugin(
+            $this->urlPersistMock,
+            $this->categoryFactoryMock,
+            $this->productFactoryMock,
+            $this->categoryUrlRewriteGeneratorMock,
+            $this->productUrlRewriteGeneratorMock
         );
     }
 
@@ -150,13 +141,19 @@ protected function setUp(): void
      */
     public function testAfterSave(): void
     {
-        $origStoreMock = $this->getMockBuilder(\Magento\Store\Model\Store::class)
+        $origStoreMock = $this->getMockBuilder(Store::class)
             ->disableOriginalConstructor()
             ->getMock();
         $reflectionStore = new \ReflectionClass($this->plugin);
         $origStore = $reflectionStore->getProperty('origStore');
         $origStore->setAccessible(true);
         $origStore->setValue($this->plugin, $origStoreMock);
+
+        $origStoreMock->expects($this->atLeastOnce())
+            ->method('getData')
+            ->with('group_id')
+            ->willReturn('1');
+
         $origStoreMock->expects($this->atLeastOnce())
             ->method('isObjectNew')
             ->willReturn(true);
@@ -203,7 +200,54 @@ public function testAfterSave(): void
 
         $this->assertSame(
             $this->subjectMock,
-            $this->plugin->afterSave($this->subjectMock, $this->subjectMock, $this->abstractModelMock)
+            $this->plugin->afterSave($this->subjectMock, $this->subjectMock)
+        );
+    }
+
+    public function testAfterSaveWhenNoGroupId()
+    {
+        $origStoreMock = $this->getMockBuilder(Store::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+        $reflectionStore = new \ReflectionClass($this->plugin);
+        $origStore = $reflectionStore->getProperty('origStore');
+        $origStore->setAccessible(true);
+        $origStore->setValue($this->plugin, $origStoreMock);
+
+        $origStoreMock->expects($this->atLeastOnce())
+            ->method('getData')
+            ->with('group_id')
+            ->willReturn(null);
+
+        $origStoreMock->expects($this->any())
+            ->method('isObjectNew')
+            ->willReturn(true);
+
+        $this->abstractModelMock->expects($this->any())
+            ->method('isObjectNew')
+            ->willReturn(true);
+        $categoryCollection = $this->getMockBuilder(CategoryCollection::class)
+            ->disableOriginalConstructor()
+            ->setMethods(['getIterator'])
+            ->getMock();
+        $categoryCollection->expects($this->any())
+            ->method('getIterator')
+            ->willReturn(new \ArrayIterator([]));
+        $this->categoryMock->expects($this->never())
+            ->method('getCategories');
+        $this->categoryFactoryMock->expects($this->never())->method('create');
+        $this->productFactoryMock->expects($this->never())->method('create');
+        $this->productMock->expects($this->never())->method('getCollection');
+        $this->productCollectionMock->expects($this->never())->method('addCategoryIds');
+        $this->productCollectionMock->expects($this->never())->method('addAttributeToSelect');
+        $this->productCollectionMock->expects($this->never())->method('addStoreFilter');
+
+        $this->productCollectionMock->expects($this->never())->method('getIterator');
+        $this->productUrlRewriteGeneratorMock->expects($this->never())->method('generate');
+
+        $this->assertSame(
+            $this->subjectMock,
+            $this->plugin->afterSave($this->subjectMock, $this->subjectMock)
         );
     }
 

app/code/Magento/Cms/etc/db_schema.xml

@@ -22,6 +22,9 @@
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="block_id"/>
         </constraint>
+        <index referenceId="CMS_BLOCK_IDENTIFIER" indexType="btree">
+            <column name="identifier"/>
+        </index>
         <index referenceId="CMS_BLOCK_TITLE_IDENTIFIER_CONTENT" indexType="fulltext">
             <column name="title"/>
             <column name="identifier"/>

app/code/Magento/Cms/etc/db_schema_whitelist.json

@@ -10,7 +10,8 @@
             "is_active": true
         },
         "index": {
-            "CMS_BLOCK_TITLE_IDENTIFIER_CONTENT": true
+            "CMS_BLOCK_TITLE_IDENTIFIER_CONTENT": true,
+            "CMS_BLOCK_IDENTIFIER": true
         },
         "constraint": {
             "PRIMARY": true

app/code/Magento/CmsUrlRewrite/Plugin/Cms/Model/PageRepository/ValidationCompositePlugin.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CmsUrlRewrite\Plugin\Cms\Model\PageRepository;
+
+use Magento\Cms\Api\Data\PageInterface;
+use Magento\Cms\Model\PageRepository\ValidationComposite;
+use Magento\CmsUrlRewrite\Model\CmsPageUrlPathGenerator;
+
+/**
+ * Generate url_key if the merchant didn't fill this field
+ */
+class ValidationCompositePlugin
+{
+    /**
+     * @var CmsPageUrlPathGenerator
+     */
+    private $cmsPageUrlPathGenerator;
+
+    /**
+     * @param CmsPageUrlPathGenerator $cmsPageUrlPathGenerator
+     */
+    public function __construct(
+        CmsPageUrlPathGenerator $cmsPageUrlPathGenerator
+    ) {
+        $this->cmsPageUrlPathGenerator = $cmsPageUrlPathGenerator;
+    }
+
+    /**
+     * Before save handler
+     *
+     * @param ValidationComposite $subject
+     * @param PageInterface $page
+     */
+    public function beforeSave(
+        ValidationComposite $subject,
+        PageInterface $page
+    ) {
+        $urlKey = $page->getData('identifier');
+        if ($urlKey === '' || $urlKey === null) {
+            $page->setData('identifier', $this->cmsPageUrlPathGenerator->generateUrlKey($page));
+        }
+    }
+}

app/code/Magento/CmsUrlRewrite/etc/di.xml

@@ -9,6 +9,10 @@
     <type name="Magento\Cms\Model\ResourceModel\Page">
         <plugin name="cms_url_rewrite_plugin" type="Magento\CmsUrlRewrite\Plugin\Cms\Model\ResourceModel\Page"/>
     </type>
+    <type name="Magento\Cms\Model\PageRepository\ValidationComposite">
+        <plugin name="cms_validate_url_plugin"
+                type="Magento\CmsUrlRewrite\Plugin\Cms\Model\PageRepository\ValidationCompositePlugin" sortOrder="10"/>
+    </type>
     <type name="Magento\UrlRewrite\Model\UrlRewrite">
         <arguments>
             <argument name="entityToCacheTagMap" xsi:type="array">

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

@@ -17,7 +17,9 @@ define([
 ], function ($, _, ko, sectionConfig, url) {
     'use strict';
 
-    var options = {},
+    var options = {
+            cookieLifeTime: 86400 //1 day by default
+        },
         storage,
         storageInvalidation,
         invalidateCacheBySessionTimeOut,
@@ -30,6 +32,22 @@ define([
     url.setBaseUrl(window.BASE_URL);
     options.sectionLoadUrl = url.build('customer/section/load');
 
+    /**
+     * Storage initialization
+     */
+    function initStorage() {
+        $.cookieStorage.setConf({
+            path: '/',
+            expires: new Date(Date.now() + parseInt(options.cookieLifeTime, 10) * 1000),
+            samesite: 'lax'
+        });
+        storage = $.initNamespaceStorage('mage-cache-storage').localStorage;
+        storageInvalidation = $.initNamespaceStorage('mage-cache-storage-section-invalidation').localStorage;
+    }
+
+    // Initialize storage with default parameters to prevent JS errors while component still not initialized
+    initStorage();
+
     /**
      * @param {Object} invalidateOptions
      */
@@ -216,15 +234,7 @@ define([
         /**
          * Storage init
          */
-        initStorage: function () {
-            $.cookieStorage.setConf({
-                path: '/',
-                expires: new Date(Date.now() + parseInt(options.cookieLifeTime, 10) * 1000),
-                samesite: 'lax'
-            });
-            storage = $.initNamespaceStorage('mage-cache-storage').localStorage;
-            storageInvalidation = $.initNamespaceStorage('mage-cache-storage-section-invalidation').localStorage;
-        },
+        initStorage: initStorage,
 
         /**
          * Retrieve the list of sections that has expired since last page reload.
@@ -389,7 +399,10 @@ define([
          */
         'Magento_Customer/js/customer-data': function (settings) {
             options = settings;
+
+            // re-init storage with a new settings
             customerData.initStorage();
+
             invalidateCacheBySessionTimeOut(settings);
             invalidateCacheByCloseCookieSession();
             customerData.init();

app/code/Magento/ImportExport/README.md

@@ -1,2 +1,85 @@
-Magento_ImportExport module provides a framework and basic functionality for importing/exporting various entities in Magento.
+# Magento_ImportExport module 
+
+This module provides a framework and basic functionality for importing/exporting various entities in Magento.
 It can be disabled and in such case all dependent import/export functionality (products, customers, orders etc.) will be disabled in Magento.
+
+## Installation
+
+The Magento_ImportExport module creates the following tables in the database:
+- `importexport_importdata`
+- `import_history`
+
+All database schema changes made by this module are rolled back when the module gets disabled and setup:upgrade command is run.
+
+For information about a module installation in Magento 2, see [Enable or disable modules](https://devdocs.magento.com/guides/v2.4/install-gde/install/cli/install-cli-subcommands-enable.html).
+
+## Structure
+
+`Files/` - the directory that contains sample import files.
+
+For information about a typical file structure of a module in Magento 2, see [Module file structure](http://devdocs.magento.com/guides/v2.4/extension-dev-guide/build/module-file-structure.html#module-file-structure).
+
+## Extensibility
+
+Extension developers can interact with the Magento_ImportExport module. For more information about the Magento extension mechanism, see [Magento plugins](https://devdocs.magento.com/guides/v2.4/extension-dev-guide/plugins.html).
+
+[The Magento dependency injection mechanism](https://devdocs.magento.com/guides/v2.4/extension-dev-guide/depend-inj.html) enables you to override the functionality of the Magento_ImportExport module.
+
+### Layouts
+
+This module introduces the following layout handles in the `view/frontend/layout` directory:
+
+- `adminhtml_export_getfilter`
+- `adminhtml_export_index`
+- `adminhtml_history_grid_block`
+- `adminhtml_history_index`
+- `adminhtml_import_busy`
+- `adminhtml_import_index`
+- `adminhtml_import_start`
+- `adminhtml_import_validate`
+
+For more information about a layout in Magento 2, see the [Layout documentation](http://devdocs.magento.com/guides/v2.4/frontend-dev-guide/layouts/layout-overview.html).
+
+### UI components
+
+You can extend an export updates using the configuration files located in the `view/adminhtml/ui_component` directory:
+
+- `export_grid` 
+
+For information about a UI component in Magento 2, see [Overview of UI components](http://devdocs.magento.com/guides/v2.4/ui_comp_guide/bk-ui_comps.html).
+
+### Public APIs
+
+- `Magento\ImportExport\Api\Data\ExportInfoInterface`
+    - getter and setter interface with data needed for export
+
+- `Magento\ImportExport\Api\Data\ExtendedExportInfoInterface`
+    - extends `Magento\ImportExport\Api\Data\ExportInfoInterface`. Contains data for skipped attributes
+
+- `\Magento\ImportExport\Api\ExportManagementInterface`
+    - Executing actual export and returns export data
+
+For information about a public API in Magento 2, see [Public interfaces & APIs](http://devdocs.magento.com/guides/v2.4/extension-dev-guide/api-concepts.html).
+
+## Additional information
+
+#### Message Queue Consumer
+
+- `exportProcessor` - consumer to run export process
+
+[Learn how to manage Message Queues](https://devdocs.magento.com/guides/v2.4/config-guide/mq/manage-message-queues.html).
+
+#### Create custom import entity
+
+1. Declare the new import entity in `etc/import.xml`
+2. Create an import model
+
+#### Create custom export entity
+
+1. Declare the new import entity in `etc/export.xml`
+2. Create an export model
+
+You can get more information about import/export processes in magento at the articles:
+- [Create custom import entity](https://devdocs.magento.com/guides/v2.4/ext-best-practices/tutorials/custom-import-entity.html)
+- [Import](https://docs.magento.com/user-guide/system/data-import.html)
+- [Export](https://docs.magento.com/user-guide/system/data-export.html)