🔃 [Magento Community Engineering] Community Contributions - 2.3-devel…

…op latest changes Accepted Community Pull Requests: - #24111: MFTF Low stock reports sections and page. (by @nmalevanec) - #24117: #24116: Webapi schema generation fail in case when Ge� (by @swnsma) - #24109: Update _icons.less (by @Bartlomiejsz) Fixed GitHub Issues: - #24116: Webapi Swager schema generation fail in case when Get endpoint has param with Extension Attributes (reported by @swnsma) has been fixed in #24117 by @swnsma in 2.3-develop branch Related commits: 1. 166a1e0
magento · Aug 21, 2019 · 89e28aa · 89e28aa
2 parents deef245 + 8e10c1a
commit 89e28aa
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 7 deletions.
diff --git a/app/code/Magento/CatalogSearch/Model/Advanced.php b/app/code/Magento/CatalogSearch/Model/Advanced.php
@@ -181,8 +181,8 @@ public function __construct(
     /**
      * Add advanced search filters to product collection
      *
-     * @param   array $values
-     * @return  $this
+     * @param array $values
+     * @return $this
      * @throws LocalizedException
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
@@ -197,6 +197,11 @@ public function addFilters($values)
             if (!isset($values[$attribute->getAttributeCode()])) {
                 continue;
             }
+            if ($attribute->getFrontendInput() == 'text' || $attribute->getFrontendInput() == 'textarea') {
+                if (!trim($values[$attribute->getAttributeCode()])) {
+                    continue;
+                }
+            }
             $value = $values[$attribute->getAttributeCode()];
             $preparedSearchValue = $this->getPreparedSearchCriteria($attribute, $value);
             if (false === $preparedSearchValue) {
@@ -343,9 +348,9 @@ protected function addSearchCriteria($attribute, $value)
      *
      * @todo: Move this code to block
      *
-     * @param   EntityAttribute $attribute
-     * @param   mixed $value
-     * @return  string|bool
+     * @param EntityAttribute $attribute
+     * @param mixed $value
+     * @return string|bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */

diff --git a/app/code/Magento/Reports/Test/Mftf/Page/LowStockReportPage.xml b/app/code/Magento/Reports/Test/Mftf/Page/LowStockReportPage.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="LowStockReportPage" url="reports/report_product/lowstock/" area="admin" module="Reports">
+        <section name="LowStockReportMainSection"/>
+        <section name="LowStockProductGridSection"/>
+    </page>
+</pages>
diff --git a/app/code/Magento/Reports/Test/Mftf/Section/LowStockProductGridSection.xml b/app/code/Magento/Reports/Test/Mftf/Section/LowStockProductGridSection.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="LowStockProductGridSection">
+        <element name="productSku" type="input" selector="//tr[1]/td[@data-column='sku']"/>
+        <element name="productName" type="input" selector="//tr[1]/td[@data-column='name']"/>
+        <element name="productQty" type="input" selector="//tr[1]/td[@data-column='qty']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Reports/Test/Mftf/Section/LowStockReportMainSection.xml b/app/code/Magento/Reports/Test/Mftf/Section/LowStockReportMainSection.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="LowStockReportFilterSection">
+        <element name="productSku" type="input" selector="#gridLowstock_filter_sku"/>
+        <element name="productName" type="input" selector="#gridLowstock_filter_name"/>
+        <element name="qtyFrom" type="input" selector="#gridLowstock_filter_qty_from"/>
+        <element name="qtyTo" type="input" selector="#gridLowstock_filter_qty_to"/>
+        <element name="searchButton" type="button" selector="//button/span[text()='Search']"/>
+        <element name="resetButton" type="button" selector="//button/span[text()='Reset Filter']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php b/app/code/Magento/Webapi/Model/Rest/Swagger/Generator.php
@@ -738,7 +738,8 @@ protected function getQueryParamNames($name, $type, $description, $prefix = '')
      */
     private function handleComplex($name, $type, $prefix, $isArray)
     {
-        $parameters = $this->typeProcessor->getTypeData($type)['parameters'];
+        $typeData = $this->typeProcessor->getTypeData($type);
+        $parameters = $typeData['parameters'] ?? [];
         $queryNames = [];
         foreach ($parameters as $subParameterName => $subParameterInfo) {
             $subParameterType = $subParameterInfo['type'];

diff --git a/lib/web/css/source/lib/_icons.less b/lib/web/css/source/lib/_icons.less
@@ -190,7 +190,7 @@
     display: inline-block;
 
     & when not (@_icon-image = false) {
-        ._lib-icon-text-hide(@_icon-font-text-hide);
+        ._lib-icon-text-hide(@_icon-image-text-hide);
     }
 
     &:after {