Merge remote-tracking branch 'upstream/2.3-develop' into 2.3-develop-pr

Author: Joan He

.travis.yml

@@ -54,7 +54,6 @@ cache:
     - $HOME/node_modules
     - $HOME/yarn.lock
 before_install:
-  - curl -O https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.3.0/elasticsearch-2.3.0.deb && sudo dpkg -i --force-confnew elasticsearch-2.3.0.deb && sudo service elasticsearch restart
   - ./dev/travis/before_install.sh
 install: composer install --no-interaction
 before_script: ./dev/travis/before_script.sh

CHANGELOG.md

@@ -489,7 +489,7 @@ Tests:
     * Fixed an issue where found records in global search in Backend could not be selected via keyboard
     * Fixed an issue where Category menu items went out of screen when page side was reached
     * Fixed an issue where subcategories in menu were shown instantly when user moved mouse quickly
-    * Fixed an issue where popup header was our of window range while creating group product
+    * Fixed an issue where popup header was out of window range while creating group product
     * Fixed an issue where region field was absent in customer address form on backend for "United Kingdom" country
     * Fixed an ability to edit the Order from Admin panel
     * Fixed an issue where email could not be retrieved from \Magento\Quote\Api\Data\AddressInterface after adding an address on OnePageCheckout

app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html

@@ -69,7 +69,7 @@
 
                         <!-- ko foreach: { data: $record().elems(), as: 'elem'}  -->
                         <td if="elem.template"
-                            visible="elem.visible"
+                            visible="elem.visible() && elem.formElement !== 'hidden'"
                             disable="elem.disabled"
                             css="$parent.setClasses(elem)"
                             template="elem.template"

app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/CustomOptions.php

@@ -871,6 +871,7 @@ protected function getPositionFieldConfig($sortOrder)
                         'formElement' => Hidden::NAME,
                         'dataScope' => static::FIELD_SORT_ORDER_NAME,
                         'dataType' => Number::NAME,
+                        'visible' => false,
                         'sortOrder' => $sortOrder,
                     ],
                 ],

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

@@ -25,8 +25,6 @@ class Config implements ClientOptionsInterface
      */
     const ENGINE_NAME = 'elasticsearch';
 
-    private const ENGINE_NAME_5 = 'elasticsearch5';
-
     /**
      * Elasticsearch Entity type
      */
@@ -64,23 +62,31 @@ class Config implements ClientOptionsInterface
     private $engineResolver;
 
     /**
-     * Constructor
+     * Available Elasticsearch engines.
      *
+     * @var array
+     */
+    private $engineList;
+
+    /**
      * @param ScopeConfigInterface $scopeConfig
      * @param ClientResolver|null $clientResolver
      * @param EngineResolverInterface|null $engineResolver
      * @param string|null $prefix
+     * @param array $engineList
      */
     public function __construct(
         ScopeConfigInterface $scopeConfig,
         ClientResolver $clientResolver = null,
         EngineResolverInterface $engineResolver = null,
-        $prefix = null
+        $prefix = null,
+        $engineList = []
     ) {
         $this->scopeConfig = $scopeConfig;
         $this->clientResolver = $clientResolver ?: ObjectManager::getInstance()->get(ClientResolver::class);
         $this->engineResolver = $engineResolver ?: ObjectManager::getInstance()->get(EngineResolverInterface::class);
         $this->prefix = $prefix ?: $this->clientResolver->getCurrentEngine();
+        $this->engineList = $engineList;
     }
 
     /**
@@ -138,7 +144,7 @@ public function getSearchConfigData($field, $storeId = null)
      */
     public function isElasticsearchEnabled()
     {
-        return in_array($this->engineResolver->getCurrentSearchEngine(), [self::ENGINE_NAME, self::ENGINE_NAME_5]);
+        return in_array($this->engineResolver->getCurrentSearchEngine(), $this->engineList);
     }
 
     /**

app/code/Magento/Elasticsearch/etc/di.xml

@@ -13,6 +13,14 @@
     <preference for="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\ConverterInterface" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldIndex\Converter" />
     <preference for="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\ConverterInterface" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProvider\FieldType\Converter" />
     <preference for="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\FieldProviderInterface" type="Magento\Elasticsearch\Model\Adapter\FieldMapper\Product\CompositeFieldProvider" />
+    <type name="Magento\Elasticsearch\Model\Config">
+        <arguments>
+            <argument name="engineList" xsi:type="array">
+                <item name="elasticsearch" xsi:type="string">elasticsearch</item>
+                <item name="elasticsearch5" xsi:type="string">elasticsearch5</item>
+            </argument>
+        </arguments>
+    </type>
 
     <virtualType name="Magento\Elasticsearch\Model\Layer\Search\Context" type="Magento\Catalog\Model\Layer\Search\Context">
         <arguments>

app/code/Magento/Elasticsearch6/Model/Config.php

@@ -9,7 +9,7 @@
 use Magento\Store\Model\ScopeInterface;
 use Magento\Search\Model\QueryInterface;
 use Magento\AdvancedSearch\Model\SuggestedQueriesInterface;
-use Magento\Elasticsearch6\Model\Config;
+use Magento\Elasticsearch\Model\Config;
 use Magento\Elasticsearch\SearchAdapter\ConnectionManager;
 use Magento\Search\Model\QueryResultFactory;
 use Magento\Framework\App\Config\ScopeConfigInterface;

app/code/Magento/Elasticsearch6/Model/DataProvider/Suggestions.php

@@ -67,7 +67,7 @@ class SuggestionsTest extends \PHPUnit\Framework\TestCase
      */
     protected function setUp()
     {
-        $this->config = $this->getMockBuilder(\Magento\Elasticsearch6\Model\Config::class)
+        $this->config = $this->getMockBuilder(\Magento\Elasticsearch\Model\Config::class)
             ->disableOriginalConstructor()
             ->setMethods(['isElasticsearchEnabled'])
             ->getMock();

app/code/Magento/Elasticsearch6/Test/Unit/Model/DataProvider/SuggestionsTest.php

@@ -6,6 +6,14 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Elasticsearch\Model\Config">
+        <arguments>
+            <argument name="engineList" xsi:type="array">
+                <item name="elasticsearch6" xsi:type="string">elasticsearch6</item>
+            </argument>
+        </arguments>
+    </type>
+
     <type name="Magento\Search\Model\Adminhtml\System\Config\Source\Engine">
         <arguments>
             <argument name="engines" xsi:type="array">
@@ -44,7 +52,7 @@
                 <item name="elasticsearch6" xsi:type="string">\Magento\Elasticsearch6\Model\Client\ElasticsearchFactory</item>
             </argument>
             <argument name="clientOptions" xsi:type="array">
-                <item name="elasticsearch6" xsi:type="string">\Magento\Elasticsearch6\Model\Config</item>
+                <item name="elasticsearch6" xsi:type="string">\Magento\Elasticsearch\Model\Config</item>
             </argument>
         </arguments>
     </type>