Merge branch '2.4-develop' into Arrows_Delivery_07022024

nishant04412 · web-flow · commit 8b1d1c39b565 · 2024-08-19T10:57:11.000+05:30
diff --git a/app/code/Magento/Backend/view/adminhtml/web/js/media-uploader.js b/app/code/Magento/Backend/view/adminhtml/web/js/media-uploader.js
@@ -75,7 +75,7 @@ define([
                         byteConvert(currentFile.size);
 
                     // check if file is allowed to upload and resize
-                    allowedResize = $.inArray(currentFile.extension, allowedExt) !== -1;
+                    allowedResize = $.inArray(currentFile.extension?.toLowerCase(), allowedExt) !== -1;
 
                     if (!allowedResize)  {
                         fileUploader.aggregateError(currentFile.name,
diff --git a/app/code/Magento/GraphQlCache/Controller/Plugin/GraphQl.php b/app/code/Magento/GraphQlCache/Controller/Plugin/GraphQl.php
@@ -98,12 +98,12 @@ public function beforeDispatch(
     ): void {
         try {
             $this->requestProcessor->validateRequest($request);
+            /** @var \Magento\Framework\App\Request\Http $request */
+            $this->requestProcessor->processHeaders($request);
+            $this->request = $request;
         } catch (\Exception $error) {
             $this->logger->critical($error->getMessage());
         }
-        /** @var \Magento\Framework\App\Request\Http $request */
-        $this->requestProcessor->processHeaders($request);
-        $this->request = $request;
     }
 
     /**
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/masonry.js b/app/code/Magento/Ui/view/base/web/js/grid/masonry.js
@@ -100,7 +100,6 @@ define([
             }
             this.imageMargin = parseInt(this.imageMargin, 10);
             this.container = $('[data-id="' + this.containerId + '"]')[0];
-
             this.setLayoutStyles();
             this.setEventListener();
 
@@ -129,38 +128,47 @@ define([
         /**
          * Set layout styles inside the container
          */
-        setLayoutStyles: function () {
-            var containerWidth = parseInt(this.container.clientWidth, 10),
+        setLayoutStyles: function (callback) {
+            var containerWidth, rowImages, ratio, rowHeight, calcHeight, isLastRow, rowNumber;
+
+            if (typeof this.container != 'undefined') {
+                containerWidth = parseInt(this.container.clientWidth, 10),
                 rowImages = [],
                 ratio = 0,
                 rowHeight = 0,
                 calcHeight = 0,
                 isLastRow = false,
                 rowNumber = 1;
 
-            this.setMinRatio();
+                this.setMinRatio();
 
-            this.rows().forEach(function (image, index) {
-                ratio += parseFloat((image.width / image.height).toFixed(2));
-                rowImages.push(image);
+                this.rows().forEach(function (image, index) {
+                    ratio += parseFloat((image.width / image.height).toFixed(2));
+                    rowImages.push(image);
 
-                if (ratio < this.minRatio && index + 1 !== this.rows().length) {
-                    // Row has more space for images and the image is not the last one - proceed to the next iteration
-                    return;
-                }
+                    if (ratio < this.minRatio && index + 1 !== this.rows().length) {
+                        /**
+                         * Row has more space for images and the image is not the last one -
+                         * Proceed to the next iteration
+                         */
+                        return;
+                    }
 
-                ratio = Math.max(ratio, this.minRatio);
-                calcHeight = (containerWidth - this.imageMargin * rowImages.length) / ratio;
-                rowHeight = calcHeight < this.maxImageHeight ? calcHeight : this.maxImageHeight;
-                isLastRow = index + 1 === this.rows().length;
+                    ratio = Math.max(ratio, this.minRatio);
+                    calcHeight = (containerWidth - this.imageMargin * rowImages.length) / ratio;
+                    rowHeight = calcHeight < this.maxImageHeight ? calcHeight : this.maxImageHeight;
+                    isLastRow = index + 1 === this.rows().length;
 
-                this.assignImagesToRow(rowImages, rowNumber, rowHeight, isLastRow);
+                    this.assignImagesToRow(rowImages, rowNumber, rowHeight, isLastRow);
 
-                rowImages = [];
-                ratio = 0;
-                rowNumber++;
+                    rowImages = [];
+                    ratio = 0;
+                    rowNumber++;
 
-            }.bind(this));
+                }.bind(this));
+            } else {
+                setTimeout(callback, 0);
+            }
         },
 
         /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/GraphQlCache/GraphQlTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/GraphQlCache/GraphQlTest.php
@@ -8,12 +8,96 @@
 namespace Magento\GraphQl\GraphQlCache;
 
 use Magento\Customer\Test\Fixture\Customer;
+use Magento\Framework\Registry;
 use Magento\TestFramework\Fixture\DataFixture;
 use Magento\TestFramework\Fixture\DataFixtureStorageManager;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
+use Magento\Framework\App\FrontControllerInterface;
+use Magento\Framework\App\Request\Http;
+use Magento\Framework\App\Response\Http as ResponseHttp;
+use Magento\GraphQl\Controller\HttpRequestProcessor;
+use Magento\GraphQlCache\Controller\Plugin\GraphQl;
+use Magento\GraphQlCache\Model\CacheableQuery;
+use Magento\GraphQlCache\Model\CacheId\CacheIdCalculator;
+use Magento\PageCache\Model\Config;
+use PHPUnit\Framework\MockObject\MockObject;
+use Psr\Log\LoggerInterface;
 
 class GraphQlTest extends GraphQlAbstract
 {
+    /**
+     * @var GraphQl
+     */
+    private $graphql;
+
+    /**
+     * @var CacheableQuery|MockObject
+     */
+    private $cacheableQueryMock;
+
+    /**
+     * @var Config|MockObject
+     */
+    private $configMock;
+
+    /**
+     * @var HttpRequestProcessor|MockObject
+     */
+    private $requestProcessorMock;
+
+    /**
+     * @var CacheIdCalculator|MockObject
+     */
+    private $cacheIdCalculatorMock;
+
+    /**
+     * @var LoggerInterface|MockObject
+     */
+    private $loggerMock;
+
+    /**
+     * @var FrontControllerInterface|MockObject
+     */
+    private $subjectMock;
+
+    /**
+     * @var Http|MockObject
+     */
+    private $requestMock;
+
+    /**
+     * @var Registry
+     */
+    private $registryMock;
+
+    protected function setUp(): void
+    {
+        $this->cacheableQueryMock = $this->createMock(CacheableQuery::class);
+        $this->cacheIdCalculatorMock = $this->createMock(CacheIdCalculator::class);
+        $this->configMock = $this->createMock(Config::class);
+        $this->loggerMock = $this->getMockBuilder(LoggerInterface::class)
+            ->onlyMethods(['critical'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->requestProcessorMock = $this->getMockBuilder(HttpRequestProcessor::class)
+            ->onlyMethods(['validateRequest','processHeaders'])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->registryMock = $this->createMock(Registry::class);
+        $this->subjectMock = $this->createMock(FrontControllerInterface::class);
+        $this->requestMock = $this
+            ->getMockBuilder(Http::class)
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+        $this->graphql = new GraphQl(
+            $this->cacheableQueryMock,
+            $this->cacheIdCalculatorMock,
+            $this->configMock,
+            $this->loggerMock,
+            $this->requestProcessorMock,
+            $this->registryMock
+        );
+    }
     #[
         DataFixture(Customer::class, as: 'customer'),
     ]
@@ -40,4 +124,33 @@ public function testMutation(): void
             $tokenResponse['headers']['Cache-Control']
         );
     }
+
+    public function testBeforeDispatch(): void
+    {
+        $this->requestProcessorMock
+            ->expects($this->once())
+            ->method('validateRequest');
+        $this->requestProcessorMock
+            ->expects($this->once())
+            ->method('processHeaders');
+        $this->loggerMock
+            ->expects($this->never())
+            ->method('critical');
+        $this->assertNull($this->graphql->beforeDispatch($this->subjectMock, $this->requestMock));
+    }
+
+    public function testBeforeDispatchForException(): void
+    {
+        $this->requestProcessorMock
+            ->expects($this->once())
+            ->method('validateRequest')
+            ->willThrowException(new \Exception('Invalid Headers'));
+        $this->requestProcessorMock
+            ->expects($this->never())
+            ->method('processHeaders');
+        $this->loggerMock
+            ->expects($this->once())
+            ->method('critical');
+        $this->assertNull($this->graphql->beforeDispatch($this->subjectMock, $this->requestMock));
+    }
 }
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/ProductInMultipleStoresCacheTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/PageCache/ProductInMultipleStoresCacheTest.php
@@ -219,6 +219,13 @@ public function testProductFromSpecificAndDefaultStoreWithMultiCurrency()
         $productNameInFixtureStore = 'Product\'s Name in Fixture Store';
         $product->setName($productNameInFixtureStore)->setStoreId($storeId)->save();
 
+        // test cached response store + currency header with non existing currency, and no valid response, no cache
+        $headerMap = ['Store' => $storeCodeFromFixture, 'Content-Currency' => 'SOMECURRENCY'];
+        $this->expectExceptionMessage(
+            'GraphQL response contains errors: Please correct the target currency'
+        );
+        $this->graphQlQuery($query, [], '', $headerMap);
+
         // test store header only, query is cached at this point in EUR
         $headerMap = ['Store' => $storeCodeFromFixture];
         $response = $this->graphQlQuery($query, [], '', $headerMap);
@@ -302,12 +309,5 @@ public function testProductFromSpecificAndDefaultStoreWithMultiCurrency()
             $response['products']['items'][0]['price']['minimalPrice']['amount']['currency'],
             'Currency code USD in fixture store default is unexpected'
         );
-
-        // test cached response store + currency header with non existing currency, and no valid response, no cache
-        $headerMap = ['Store' => $storeCodeFromFixture, 'Content-Currency' => 'SOMECURRENCY'];
-        $this->expectExceptionMessage(
-            'GraphQL response contains errors: Please correct the target currency'
-        );
-        $this->graphQlQuery($query, [], '', $headerMap);
     }
 }
diff --git a/lib/internal/Magento/Framework/Logger/LoggerProxy.php b/lib/internal/Magento/Framework/Logger/LoggerProxy.php
@@ -23,7 +23,7 @@ class LoggerProxy implements LoggerInterface, NoninterceptableInterface, ResetAf
      * @var ObjectManagerInterface
      * phpcs:disable Magento2.Commenting.ClassPropertyPHPDocFormatting
      */
-    private readonly ObjectManagerInterface $objectManager;
+    private ObjectManagerInterface $objectManager;
 
     /**
      * @var LoggerInterface|null
