Merge remote-tracking branch 'mainline/2.4.0-develop' into 3.0.0-RC5-2.4.0

# Conflicts:
#	composer.lock

Author: soumyau

app/code/Magento/Catalog/Controller/Category/View.php

@@ -205,10 +205,9 @@ protected function _initCategory()
     /**
      * Category view action
      *
-     * @return ResultInterface
      * @throws NoSuchEntityException
      */
-    public function execute(): ?ResultInterface
+    public function execute()
     {
         $result = null;
 

app/code/Magento/Checkout/view/frontend/web/js/empty-cart.js

@@ -3,14 +3,16 @@
  * See COPYING.txt for license details.
  */
 
-define([
-    'Magento_Customer/js/customer-data'
-], function (customerData) {
+define(['Magento_Customer/js/customer-data'], function (customerData) {
     'use strict';
 
-    var cartData = customerData.get('cart');
+    return function () {
+        var cartData = customerData.get('cart');
 
-    if (cartData().items && cartData().items.length !== 0) {
-        customerData.reload(['cart'], false);
-    }
+        customerData.getInitCustomerData().done(function () {
+            if (cartData().items && cartData().items.length !== 0) {
+                customerData.reload(['cart'], false);
+            }
+        });
+    };
 });

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

@@ -24,7 +24,8 @@ define([
         invalidateCacheByCloseCookieSession,
         dataProvider,
         buffer,
-        customerData;
+        customerData,
+        deferred = $.Deferred();
 
     url.setBaseUrl(window.BASE_URL);
     options.sectionLoadUrl = url.build('customer/section/load');
@@ -341,6 +342,15 @@ define([
             $.cookieStorage.set('section_data_ids', sectionDataIds);
         },
 
+        /**
+         * Checks if customer data is initialized.
+         *
+         * @returns {jQuery.Deferred}
+         */
+        getInitCustomerData: function () {
+            return deferred.promise();
+        },
+
         /**
          * @param {Object} settings
          * @constructor
@@ -350,6 +360,7 @@ define([
             invalidateCacheBySessionTimeOut(settings);
             invalidateCacheByCloseCookieSession();
             customerData.init();
+            deferred.resolve();
         }
     };
 

app/code/Magento/MediaGallery/Model/Asset.php

@@ -32,11 +32,21 @@ class Asset implements AssetInterface
      */
     private $title;
 
+    /**
+     * @var string|null
+     */
+    private $description;
+
     /**
      * @var string|null
      */
     private $source;
 
+    /**
+     * @var string|null
+     */
+    private $hash;
+
     /**
      * @var string
      */
@@ -80,7 +90,9 @@ class Asset implements AssetInterface
      * @param int $size
      * @param int|null $id
      * @param string|null $title
+     * @param string|null $description
      * @param string|null $source
+     * @param string|null $hash
      * @param string|null $createdAt
      * @param string|null $updatedAt
      * @param AssetExtensionInterface|null $extensionAttributes
@@ -93,7 +105,9 @@ public function __construct(
         int $size,
         ?int $id = null,
         ?string $title = null,
+        ?string $description = null,
         ?string $source = null,
+        ?string $hash = null,
         ?string $createdAt = null,
         ?string $updatedAt = null,
         ?AssetExtensionInterface $extensionAttributes = null
@@ -105,7 +119,9 @@ public function __construct(
         $this->size = $size;
         $this->id = $id;
         $this->title = $title;
+        $this->description = $description;
         $this->source = $source;
+        $this->hash = $hash;
         $this->createdAt = $createdAt;
         $this->updatedAt = $updatedAt;
         $this->extensionAttributes = $extensionAttributes;
@@ -135,6 +151,14 @@ public function getTitle(): ?string
         return $this->title;
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function getDescription(): ?string
+    {
+        return $this->description;
+    }
+
     /**
      * @inheritdoc
      */
@@ -143,6 +167,14 @@ public function getSource(): ?string
         return $this->source;
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function getHash(): ?string
+    {
+        return $this->hash;
+    }
+
     /**
      * @inheritdoc
      */

app/code/Magento/MediaGallery/Model/Asset/Command/GetById.php

@@ -94,7 +94,9 @@ public function execute(int $mediaAssetId): AssetInterface
                     'id' => $mediaAssetData['id'],
                     'path' => $mediaAssetData['path'],
                     'title' => $mediaAssetData['title'],
+                    'description' => $mediaAssetData['description'],
                     'source' => $mediaAssetData['source'],
+                    'hash' => $mediaAssetData['hash'],
                     'contentType' => $mediaAssetData['content_type'],
                     'width' => $mediaAssetData['width'],
                     'height' => $mediaAssetData['height'],

app/code/Magento/MediaGallery/Model/Asset/Command/GetByPath.php

@@ -86,7 +86,9 @@ public function execute(string $path): AssetInterface
                     'id' => $data['id'],
                     'path' => $data['path'],
                     'title' => $data['title'],
+                    'description' => $data['description'],
                     'source' => $data['source'],
+                    'hash' => $data['hash'],
                     'contentType' => $data['content_type'],
                     'width' => $data['width'],
                     'height' => $data['height'],

app/code/Magento/MediaGallery/Model/ResourceModel/GetAssetsByIds.php

@@ -65,7 +65,9 @@ public function execute(array $ids): array
                         'id' => $assetData['id'],
                         'path' => $assetData['path'],
                         'title' => $assetData['title'],
+                        'description' => $assetData['description'],
                         'source' => $assetData['source'],
+                        'hash' => $assetData['hash'],
                         'contentType' => $assetData['content_type'],
                         'width' => $assetData['width'],
                         'height' => $assetData['height'],

app/code/Magento/MediaGallery/Model/ResourceModel/GetAssetsByPaths.php

@@ -66,7 +66,9 @@ public function execute(array $paths): array
                         'id' => $assetData['id'],
                         'path' => $assetData['path'],
                         'title' => $assetData['title'],
+                        'description' => $assetData['description'],
                         'source' => $assetData['source'],
+                        'hash' => $assetData['hash'],
                         'contentType' => $assetData['content_type'],
                         'width' => $assetData['width'],
                         'height' => $assetData['height'],

app/code/Magento/MediaGallery/Model/ResourceModel/SaveAssets.php

@@ -60,7 +60,9 @@ public function execute(array $assets): void
                     'id' => $asset->getId(),
                     'path' => $asset->getPath(),
                     'title' => $asset->getTitle(),
+                    'description' => $asset->getDescription(),
                     'source' => $asset->getSource(),
+                    'hash' => $asset->getHash(),
                     'content_type' => $asset->getContentType(),
                     'width' => $asset->getWidth(),
                     'height' => $asset->getHeight(),

app/code/Magento/MediaGallery/Test/Unit/Model/Asset/Command/GetByIdExceptionDuringMediaAssetInitializationTest.php

@@ -28,7 +28,9 @@ class GetByIdExceptionDuringMediaAssetInitializationTest extends TestCase
         'id' => 45,
         'path' => 'img.jpg',
         'title' => 'Img',
+        'description' => 'Img Description',
         'source' => 'Adobe Stock',
+        'hash' => 'hash',
         'content_type' => 'image/jpeg',
         'width' => 420,
         'height' => 240,