Merge pull request #5925 from magento-tsg/2.4-develop-pr66

[TSG] Fixes for 2.4 (pr66) (2.4-develop)

Author: zakdma

app/code/Magento/SalesSequence/Model/Sequence/DeleteByStore.php

@@ -58,7 +58,7 @@ public function execute($storeId): void
         $metadataIds = $this->getMetadataIdsByStoreId($storeId);
         $profileIds = $this->getProfileIdsByMetadataIds($metadataIds);
 
-        $this->appResource->getConnection()->delete(
+        $this->appResource->getConnection('sales')->delete(
             $this->appResource->getTableName('sales_sequence_profile'),
             ['profile_id IN (?)' => $profileIds]
         );
@@ -70,7 +70,7 @@ public function execute($storeId): void
                 continue;
             }
 
-            $this->appResource->getConnection()->dropTable(
+            $this->appResource->getConnection('sales')->dropTable(
                 $metadata->getSequenceTable()
             );
             $this->resourceMetadata->delete($metadata);
@@ -85,7 +85,7 @@ public function execute($storeId): void
      */
     private function getMetadataIdsByStoreId($storeId)
     {
-        $connection = $this->appResource->getConnection();
+        $connection = $this->appResource->getConnection('sales');
         $bind = ['store_id' => $storeId];
         $select = $connection->select()->from(
             $this->appResource->getTableName('sales_sequence_meta'),
@@ -105,7 +105,7 @@ private function getMetadataIdsByStoreId($storeId)
      */
     private function getProfileIdsByMetadataIds(array $metadataIds)
     {
-        $connection = $this->appResource->getConnection();
+        $connection = $this->appResource->getConnection('sales');
         $select = $connection->select()
             ->from(
                 $this->appResource->getTableName('sales_sequence_profile'),

app/code/Magento/SalesSequence/Test/Unit/Model/Sequence/DeleteByStoreTest.php

@@ -110,6 +110,7 @@ static function ($tableName) {
                 }
             );
         $this->resourceMock->method('getConnection')
+            ->with('sales')
             ->willReturn($this->connectionMock);
         $this->connectionMock
             ->method('select')

dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_cyrillic_symbols.php

@@ -0,0 +1,45 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\Data\ProductInterfaceFactory;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Type;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Framework\ObjectManagerInterface;
+use Magento\Store\Api\WebsiteRepositoryInterface;
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+
+/** @var ObjectManagerInterface $objectManager */
+$objectManager = Bootstrap::getObjectManager();
+/** @var WebsiteRepositoryInterface $websiteRepository */
+$websiteRepository = $objectManager->get(WebsiteRepositoryInterface::class);
+$baseWebsiteId = $websiteRepository->get('base')->getId();
+
+$productFactory = $objectManager->get(ProductInterfaceFactory::class);
+$product = $productFactory->create();
+$product->setTypeId(Type::TYPE_SIMPLE)
+    ->setAttributeSetId($product->getDefaultAttributeSetId())
+    ->setWebsiteIds([$baseWebsiteId])
+    ->setName('Простий продукт')
+    ->setSku('Продукт')
+    ->setDescription('Повний опис продукту')
+    ->setShortDescription('Короткий опис')
+    ->setPrice(10)
+    ->setTaxClassId(0)
+    ->setVisibility(Visibility::VISIBILITY_BOTH)
+    ->setStatus(Status::STATUS_ENABLED)
+    ->setStockData(
+        [
+            'qty' => 100,
+            'is_in_stock' => 1,
+            'manage_stock' => 1,
+        ]
+    );
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->get(ProductRepositoryInterface::class);
+$productRepository->save($product);

dev/tests/integration/testsuite/Magento/Catalog/_files/simple_product_cyrillic_symbols_rollback.php

@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\Registry;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/** @var Registry $registry */
+$registry = Bootstrap::getObjectManager()->get(Registry::class);
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', true);
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = Bootstrap::getObjectManager()->get(ProductRepositoryInterface::class);
+
+try {
+    $product = $productRepository->get('Продукт', false, null, true);
+    $productRepository->delete($product);
+} catch (NoSuchEntityException $exception) {
+    //Product already removed
+}
+
+$registry->unregister('isSecureArea');
+$registry->register('isSecureArea', false);

lib/web/mage/validation.js

@@ -1972,7 +1972,7 @@ define([
 
             if (firstActive.length) {
                 $('html, body').stop().animate({
-                    scrollTop: firstActive.offset().top - windowHeight / 2
+                    scrollTop: firstActive.parent().offset().top - windowHeight / 2
                 });
                 firstActive.focus();
             }