Merge pull request #5067 from magento-tsg/2.3.4-develop-pr87

[TSG] Fixes for 2.3 (pr87) (2.3.4-develop)

Author: zakdma

app/code/Magento/Catalog/Model/Indexer/Category/Flat/Action/Full.php

@@ -79,6 +79,7 @@ protected function populateFlatTables(array $stores)
                     }
                     $category['store_id'] = $store->getId();
                     $data[] = $this->prepareValuesToInsert(
+                        // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                         array_merge($category, $attributesData[$category[$linkField]])
                     );
                 }
@@ -183,7 +184,7 @@ private function getActualStoreTablesForCategoryFlat(): array
         foreach ($this->storeManager->getStores() as $store) {
             $actualStoreTables[] = sprintf(
                 '%s_store_%s',
-                $this->connection->getTableName('catalog_category_flat'),
+                $this->connection->getTableName($this->getTableName('catalog_category_flat')),
                 $store->getId()
             );
         }
@@ -199,7 +200,7 @@ private function getActualStoreTablesForCategoryFlat(): array
     private function deleteAbandonedStoreCategoryFlatTables(): void
     {
         $existentTables = $this->connection->getTables(
-            $this->connection->getTableName('catalog_category_flat_store_%')
+            $this->connection->getTableName($this->getTableName('catalog_category_flat_store_%'))
         );
         $actualStoreTables = $this->getActualStoreTablesForCategoryFlat();
 

app/code/Magento/Catalog/Model/Indexer/Product/Flat/AbstractAction.php

@@ -222,7 +222,7 @@ protected function _updateRelationProducts($storeId, $productIds = null)
                     ['t' => $this->_productIndexerHelper->getTable($relation->getTable())],
                     ['entity_table.entity_id', $relation->getChildFieldName(), new \Zend_Db_Expr('1')]
                 )->join(
-                    ['entity_table' => $this->_connection->getTableName('catalog_product_entity')],
+                    ['entity_table' => $this->_productIndexerHelper->getTable('catalog_product_entity')],
                     "entity_table.{$metadata->getLinkField()} = t.{$relation->getParentFieldName()}",
                     []
                 )->join(

app/code/Magento/Catalog/Test/Mftf/Data/CatalogStorefrontConfigData.xml

@@ -60,4 +60,13 @@
     <entity name="DefaultFlatCatalogCategory" type="flat_catalog_category">
         <data key="value">0</data>
     </entity>
+
+    <entity name="DefaultGridPerPageValuesConfigData">
+        <data key="path">catalog/frontend/grid_per_page_values</data>
+        <data key="value">12,24,36</data>
+    </entity>
+    <entity name="CustomGridPerPageValuesConfigData">
+        <data key="path">catalog/frontend/grid_per_page_values</data>
+        <data key="value">1,2</data>
+    </entity>
 </entities>

app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryBottomToolbarSection.xml

@@ -12,5 +12,6 @@
         <element name="previousPage" type="button" selector=".//*[@class='toolbar toolbar-products'][2]//a[contains(@class, 'previous')]" timeout="30"/>
         <element name="pageNumber" type="text" selector="//*[@class='toolbar toolbar-products'][2]//a[contains(@class, 'page')]//span[2][contains(text() ,'{{var1}}')]" parameterized="true"/>
         <element name="perPage" type="select" selector="//*[@class='toolbar toolbar-products'][2]//select[@id='limiter']"/>
+        <element name="currentPage" type="text" selector=".products.wrapper + .toolbar-products .pages .current span:nth-of-type(2)"/>
     </section>
 </sections>

app/code/Magento/CatalogSearch/Test/Mftf/ActionGroup/StorefrontQuickSearchWithPaginationActionGroup.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StorefrontQuickSearchWithPaginationActionGroup">
+        <annotations>
+            <description>Navigate to catalog search page with prepared GET params to get search results with particular page number.</description>
+        </annotations>
+        <arguments>
+            <argument name="phrase" type="string" defaultValue="{{_defaultProduct.name}}"/>
+            <argument name="pageNumber" type="string" defaultValue="1"/>
+        </arguments>
+        <amOnPage url="{{StorefrontCatalogSearchPage.url}}?q={{phrase}}&amp;p={{pageNumber}}" stepKey="navigateToCatalogSearchPageWithPreparedRequest"/>
+        <waitForPageLoad stepKey="waitForCatalogSearchPageLoad"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/DownloadableGraphQl/Model/ResourceModel/GetPurchasedDownloadableProducts.php

@@ -39,13 +39,13 @@ public function execute(int $customerId): array
     {
         $connection = $this->resourceConnection->getConnection();
         $allowedItemsStatuses = [Item::LINK_STATUS_PENDING_PAYMENT, Item::LINK_STATUS_PAYMENT_REVIEW];
-        $downloadablePurchasedTable = $connection->getTableName('downloadable_link_purchased');
+        $downloadablePurchasedTable = $this->resourceConnection->getTableName('downloadable_link_purchased');
 
         /* The fields names are hardcoded since there's no existing name reference in the code */
         $selectQuery = $connection->select()
             ->from($downloadablePurchasedTable)
             ->joinLeft(
-                ['item' => $connection->getTableName('downloadable_link_purchased_item')],
+                ['item' => $this->resourceConnection->getTableName('downloadable_link_purchased_item')],
                 "$downloadablePurchasedTable.purchased_id = item.purchased_id"
             )
             ->where("$downloadablePurchasedTable.customer_id = ?", $customerId)

app/code/Magento/Elasticsearch/Elasticsearch5/Model/Client/Elasticsearch.php

@@ -285,7 +285,7 @@ public function addFieldsMapping(array $fields, $index, $entityType)
                                 'match_mapping_type' => 'string',
                                 'mapping' => [
                                     'type' => 'integer',
-                                    'index' => false,
+                                    'index' => true,
                                 ],
                             ],
                         ],
@@ -296,7 +296,7 @@ public function addFieldsMapping(array $fields, $index, $entityType)
                                 'mapping' => $this->prepareFieldInfo(
                                     [
                                         'type' => 'text',
-                                        'index' => false,
+                                        'index' => true,
                                     ]
                                 ),
                             ],

app/code/Magento/Elasticsearch/Model/Adapter/FieldMapper/Product/FieldProvider/StaticField.php

@@ -62,6 +62,11 @@ class StaticField implements FieldProviderInterface
      */
     private $fieldNameResolver;
 
+    /**
+     * @var array
+     */
+    private $excludedAttributes;
+
     /**
      * @param Config $eavConfig
      * @param FieldTypeConverterInterface $fieldTypeConverter
@@ -70,6 +75,7 @@ class StaticField implements FieldProviderInterface
      * @param FieldIndexResolver $fieldIndexResolver
      * @param AttributeProvider $attributeAdapterProvider
      * @param FieldName\ResolverInterface|null $fieldNameResolver
+     * @param array $excludedAttributes
      */
     public function __construct(
         Config $eavConfig,
@@ -78,7 +84,8 @@ public function __construct(
         FieldTypeResolver $fieldTypeResolver,
         FieldIndexResolver $fieldIndexResolver,
         AttributeProvider $attributeAdapterProvider,
-        FieldName\ResolverInterface $fieldNameResolver = null
+        FieldName\ResolverInterface $fieldNameResolver = null,
+        array $excludedAttributes = []
     ) {
         $this->eavConfig = $eavConfig;
         $this->fieldTypeConverter = $fieldTypeConverter;
@@ -88,6 +95,7 @@ public function __construct(
         $this->attributeAdapterProvider = $attributeAdapterProvider;
         $this->fieldNameResolver = $fieldNameResolver ?: ObjectManager::getInstance()
             ->get(FieldName\ResolverInterface::class);
+        $this->excludedAttributes = $excludedAttributes;
     }
 
     /**
@@ -103,6 +111,9 @@ public function getFields(array $context = []): array
         $allAttributes = [];
 
         foreach ($attributes as $attribute) {
+            if (in_array($attribute->getAttributeCode(), $this->excludedAttributes, true)) {
+                continue;
+            }
             $attributeAdapter = $this->attributeAdapterProvider->getByAttributeCode($attribute->getAttributeCode());
             $fieldName = $this->fieldNameResolver->getFieldName($attributeAdapter);
 

app/code/Magento/Elasticsearch/Model/Client/Elasticsearch.php

@@ -278,7 +278,7 @@ public function addFieldsMapping(array $fields, $index, $entityType)
                                 'match_mapping' => 'string',
                                 'mapping' => [
                                     'type' => 'integer',
-                                    'index' => 'no'
+                                    'index' => 'not_analyzed',
                                 ],
                             ],
                         ],
@@ -288,7 +288,7 @@ public function addFieldsMapping(array $fields, $index, $entityType)
                                 'match_mapping' => 'string',
                                 'mapping' => [
                                     'type' => 'string',
-                                    'index' => 'no'
+                                    'index' => 'not_analyzed',
                                 ],
                             ],
                         ]

app/code/Magento/Elasticsearch/Model/ResourceModel/Fulltext/Collection/SearchResultApplier.php

@@ -60,6 +60,7 @@ public function apply()
     {
         if (empty($this->searchResult->getItems())) {
             $this->collection->getSelect()->where('NULL');
+
             return;
         }
 
@@ -85,13 +86,33 @@ public function apply()
     private function sliceItems(array $items, int $size, int $currentPage): array
     {
         if ($size !== 0) {
-            $offset = ($currentPage - 1) * $size;
-            if ($offset < 0) {
-                $offset = 0;
+            // Check that current page is in a range of allowed page numbers, based on items count and items per page,
+            // than calculate offset for slicing items array.
+            $itemsCount = count($items);
+            $maxAllowedPageNumber = ceil($itemsCount/$size);
+            if ($currentPage < 1) {
+                $currentPage = 1;
+            }
+            if ($currentPage > $maxAllowedPageNumber) {
+                $currentPage = $maxAllowedPageNumber;
             }
-            $items = array_slice($items, $offset, $this->size);
+
+            $offset = $this->getOffset($currentPage, $size);
+            $items = array_slice($items, $offset, $size);
         }
 
         return $items;
     }
+
+    /**
+     * Get offset for given page.
+     *
+     * @param int $pageNumber
+     * @param int $pageSize
+     * @return int
+     */
+    private function getOffset(int $pageNumber, int $pageSize): int
+    {
+        return ($pageNumber - 1) * $pageSize;
+    }
 }