Merge pull request #308 from magento-obsessive-owls/PB-69

[Owls] PB-69 Manually add products into ProductList by name/SKU and sort them by the order they added into the list

Author: eug123

app/code/Magento/PageBuilder/Model/Catalog/Sorting/SimpleOption.php

@@ -37,14 +37,14 @@ class SimpleOption implements OptionInterface
 
     /**
      * @param string $label
-     * @param string $sortDirection
-     * @param string $attributeField
+     * @param string|null $sortDirection
+     * @param string|null $attributeField
      * @param string|null $secondarySortDirection
      */
     public function __construct(
         string $label,
-        string $sortDirection,
-        string $attributeField,
+        string $sortDirection = null,
+        string $attributeField = null,
         string $secondarySortDirection = null
     ) {
         $this->label = $label;
@@ -59,10 +59,11 @@ public function __construct(
     public function sort(
         \Magento\Catalog\Model\ResourceModel\Product\Collection $collection
     ): \Magento\Catalog\Model\ResourceModel\Product\Collection {
-        $collection->getSelect()->reset(Select::ORDER);
-        $collection->addAttributeToSort($this->attributeField, $this->sortDirection);
-        $collection->addAttributeToSort('entity_id', $this->secondarySortDirection);
-
+        if ($this->attributeField && $this->sortDirection) {
+            $collection->getSelect()->reset(Select::ORDER);
+            $collection->addAttributeToSort($this->attributeField, $this->sortDirection);
+            $collection->addAttributeToSort('entity_id', $this->secondarySortDirection);
+        }
         return $collection;
     }
 

app/code/Magento/PageBuilder/Plugin/Catalog/Block/Product/ProductsListPlugin.php

@@ -60,7 +60,8 @@ public function afterCreateCollection(
         \Magento\CatalogWidget\Block\Product\ProductsList $subject,
         \Magento\Catalog\Model\ResourceModel\Product\Collection $result
     ) {
-        $categoryId = $subject->getData('category_ids');
+        $conditionOption = $subject->getData('condition_option');
+        $categoryId = $conditionOption === 'category_ids' ? $subject->getData('condition_option_value') : null;
         $sortOption = $subject->getData('sort_order');
 
         $this->stock->addIsInStockFilterToCollection($result);
@@ -93,6 +94,7 @@ public function afterCreateCollection(
     public function afterGetCacheKeyInfo(\Magento\CatalogWidget\Block\Product\ProductsList $subject, array $cacheKeys)
     {
         $cacheKeys[] = $subject->getData('sort_order');
+        $cacheKeys[] = $subject->getData('condition_option');
         return $cacheKeys;
     }
 
@@ -105,7 +107,8 @@ public function afterGetCacheKeyInfo(\Magento\CatalogWidget\Block\Product\Produc
      */
     public function afterGetIdentities(\Magento\CatalogWidget\Block\Product\ProductsList $subject, array $result)
     {
-        $categoryId = $subject->getData('category_ids');
+        $conditionOption = $subject->getData('condition_option');
+        $categoryId = $conditionOption === 'category_ids' ? $subject->getData('condition_option_value') : null;
         $sortOption = $subject->getData('sort_order');
 
         if (!empty($categoryId) && $sortOption === 'position') {

app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ContentTypeProductsActionGroup.xml

@@ -60,6 +60,7 @@
             <argument name="property" defaultValue="PageBuilderProductsSelectCategoryDropDown"/>
             <argument name="category" type="string"/>
         </arguments>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
         <waitForElementVisible time="2" selector="{{EditPanelForm.panelMultiSelectFieldControl(property.section, property.fieldName)}}" stepKey="waitForMultiSelectFieldVisible"/>
         <click selector="{{EditPanelForm.panelMultiSelectFieldControl(property.section, property.fieldName)}}" stepKey="clickMultiSelectField"/>
         <waitForElementVisible selector="{{EditPanelForm.panelMultiSelectFieldControlInput(property.section, property.fieldName)}}" stepKey="waitForSearchField"/>
@@ -70,6 +71,17 @@
         <waitForElementNotVisible selector="{{EditPanelForm.panelMultiSelectFieldControlInput(property.section, property.fieldName)}}" stepKey="waitForSearchFieldNotVisible"/>
         <see selector="{{EditPanelForm.panelMultiSelectFieldControl(property.section, property.fieldName)}}" userInput="{{category}}" stepKey="seeResultInField"/>
     </actionGroup>
+    <actionGroup name="addSKUsToSelectProductsBySKU">
+        <arguments>
+            <argument name="property" defaultValue="PageBuilderProductsEnterSKUsInput"/>
+            <argument name="SKUs" type="string"/>
+        </arguments>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+        <waitForElement time="2" selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" stepKey="waitForElementVisible"/>
+        <see userInput="{{property.name}}" selector="{{EditPanelForm.panelFieldLabel(property.section, property.fieldName, property.section, property.name)}}" stepKey="seePropertyLabel"/>
+        <fillField selector="{{EditPanelForm.panelFieldControl(property.section, property.fieldName)}}" userInput="{{SKUs}}" stepKey="fillPropertyField"/>
+        <click selector="{{EditPanelForm.panelFieldLabel(property.section, property.fieldName, property.section, property.name)}}" stepKey="clickOnFieldLabel"/>
+    </actionGroup>
     <actionGroup name="addConditionToProductConditions">
         <arguments>
             <argument name="conditionType" defaultValue="PageBuilderProductsConditionCategory"/>

app/code/Magento/PageBuilder/Test/Mftf/Data/ProductsData.xml

@@ -24,6 +24,12 @@
         <data key="fieldName">condition_option</data>
         <data key="value">category_ids</data>
     </entity>
+    <entity name="PageBuilderProductsSelectProductsBySKU" type="pagebuilder_select_products_by_types">
+        <data key="name">Select Products By</data>
+        <data key="section">general</data>
+        <data key="fieldName">condition_option</data>
+        <data key="value">sku</data>
+    </entity>
     <entity name="PageBuilderProductsSelectProductsByCondition" type="pagebuilder_select_products_by_types">
         <data key="name">Select Products By</data>
         <data key="section">general</data>
@@ -36,6 +42,12 @@
         <data key="section">general</data>
         <data key="fieldName">category_ids</data>
     </entity>
+    <!-- SKU -->
+    <entity name="PageBuilderProductsEnterSKUsInput" type="pagebuilder_products_sorting_types">
+        <data key="name">Product SKUs</data>
+        <data key="section">sku</data>
+        <data key="fieldName">sku</data>
+    </entity>
     <!-- Conditions -->
     <entity name="PageBuilderProductsConditionCombination" type="pagebuilder_products_condition_types">
         <data key="name">Conditions Combination</data>
@@ -72,6 +84,12 @@
         <data key="fieldName">sort_order</data>
         <data key="value">position</data>
     </entity>
+    <entity name="PageBuilderProductsSortBySKUPosition" type="pagebuilder_products_sorting_types">
+        <data key="name">Sort By</data>
+        <data key="section">general</data>
+        <data key="fieldName">sort_order</data>
+        <data key="value">position_by_sku</data>
+    </entity>
     <!-- Number of Products to Display -->
     <entity name="PageBuilderProductsCountPropertyOne" type="pagebuilder_content_type">
         <data key="name">Number of Products to Display</data>