Merge remote-tracking branch 'origin/2.3-develop' into MAGETWO-90349

Author: ameysar

app/code/Magento/Catalog/Model/Indexer/Category/Product/TableMaintainer.php

@@ -13,6 +13,9 @@
 use Magento\Catalog\Model\Indexer\Category\Product\AbstractAction;
 use Magento\Framework\Indexer\ScopeResolver\IndexScopeResolver as TableResolver;
 
+/**
+ * Class encapsulate logic of work with tables per store in Category Product indexer
+ */
 class TableMaintainer
 {
     /**
@@ -202,9 +205,14 @@ public function createMainTmpTable(int $storeId)
      * @param $storeId
      *
      * @return string
+     *
+     * @throws \Exception
      */
     public function getMainTmpTable(int $storeId)
     {
+        if (!isset($this->mainTmpTable[$storeId])) {
+            throw new \Exception('Temporary table does not exist');
+        }
         return $this->mainTmpTable[$storeId];
     }
 }

app/code/Magento/Catalog/Ui/Component/UrlInput/Category.php

@@ -46,6 +46,7 @@ public function getConfig(): array
             'sortOrder' => 30,
             'missingValuePlaceholder' => __('Category with ID: %s doesn\'t exist'),
             'isDisplayMissingValuePlaceholder' => true,
+            'isRemoveSelectedIcon' => true,
         ];
     }
 }

app/code/Magento/Catalog/Ui/Component/UrlInput/Product.php

@@ -50,6 +50,7 @@ public function getConfig(): array
             'emptyOptionsHtml' => __('Start typing to find products'),
             'missingValuePlaceholder' => __('Product with ID: %s doesn\'t exist'),
             'isDisplayMissingValuePlaceholder' => true,
+            'isRemoveSelectedIcon' => true,
             'validationUrl' => $this->urlBuilder->getUrl('catalog/product/getSelected'),
         ];
     }

app/code/Magento/Catalog/etc/adminhtml/di.xml

@@ -220,7 +220,4 @@
             <argument name="filter" xsi:type="object">Magento\Catalog\Ui\DataProvider\Product\AddSearchKeyConditionToCollection</argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\App\ResourceConnection">
-        <plugin name="get_catalog_category_product_index_table_name" type="Magento\Catalog\Model\Indexer\Category\Product\Plugin\TableResolver"/>
-    </type>
 </config>

app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js

@@ -176,7 +176,7 @@ define([
             pageLimit: 50,
             deviation: 30,
             validationLoading: false,
-            isRemoveSelectedIcon: true,
+            isRemoveSelectedIcon: false,
             debounce: 300,
             missingValuePlaceholder: $t('Entity with ID: %s doesn\'t exist'),
             isDisplayMissingValuePlaceholder: false,

dev/tests/integration/testsuite/Magento/Test/Integrity/StaticFilesTest.php

@@ -6,8 +6,11 @@
 
 namespace Magento\Test\Integrity;
 
+use Magento\Framework\App\Filesystem\DirectoryList;
+
 /**
  * An integrity test that searches for references to static files and asserts that they are resolved via fallback
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class StaticFilesTest extends \PHPUnit\Framework\TestCase
 {
@@ -36,6 +39,23 @@ class StaticFilesTest extends \PHPUnit\Framework\TestCase
      */
     private $baseTheme;
 
+    /**
+     * @var \Magento\Framework\View\Design\FileResolution\Fallback\Resolver\Alternative
+     */
+    private $alternativeResolver;
+
+    /**
+     * Factory for simple rule
+     *
+     * @var \Magento\Framework\View\Design\Fallback\Rule\SimpleFactory
+     */
+    private $simpleFactory;
+
+    /**
+     * @var \Magento\Framework\Filesystem
+     */
+    private $filesystem;
+
     protected function setUp()
     {
         $om = \Magento\TestFramework\Helper\Bootstrap::getObjectmanager();
@@ -46,6 +66,11 @@ protected function setUp()
         $this->themeRepo = $om->get(\Magento\Framework\View\Design\Theme\FlyweightFactory::class);
         $this->design = $om->get(\Magento\Framework\View\DesignInterface::class);
         $this->baseTheme = $om->get(\Magento\Framework\View\Design\ThemeInterface::class);
+        $this->alternativeResolver = $om->get(
+            \Magento\Framework\View\Design\FileResolution\Fallback\Resolver\Alternative::class
+        );
+        $this->simpleFactory = $om->get(\Magento\Framework\View\Design\Fallback\Rule\SimpleFactory::class);
+        $this->filesystem = $om->get(\Magento\Framework\Filesystem::class);
     }
 
     /**
@@ -93,8 +118,17 @@ public function testReferencesFromStaticFiles($area, $themePath, $locale, $modul
                 $relatedPath = \Magento\Framework\View\FileSystem::getRelatedPath($filePath, $relatedResource);
             }
             // the $relatedPath will be suitable for feeding to the fallback system
+            $staticFile = $this->getStaticFile($area, $themePath, $locale, $relatedPath, $fallbackModule);
+            if (empty($staticFile) && substr($relatedPath, 0, 2) === '..') {
+                //check if static file exists on lib level
+                $path = substr($relatedPath, 2);
+                $libDir = rtrim($this->filesystem->getDirectoryRead(DirectoryList::LIB_WEB)->getAbsolutePath(), '/');
+                $rule = $this->simpleFactory->create(['pattern' => $libDir]);
+                $params = ['area' => $area, 'theme' => $themePath, 'locale' => $locale];
+                $staticFile = $this->alternativeResolver->resolveFile($rule, $path, $params);
+            }
             $this->assertNotEmpty(
-                $this->getStaticFile($area, $themePath, $locale, $relatedPath, $fallbackModule),
+                $staticFile,
                 "The related resource cannot be resolved through fallback: '{$relatedResource}'"
             );
         }
@@ -132,7 +166,7 @@ private function getDefaultThemePath($area)
      * @param bool $isExplicit
      * @return bool|string
      */
-    private function getStaticFile($area, $theme, $locale, $filePath, $module, $isExplicit = false)
+    private function getStaticFile($area, $theme, $locale, $filePath, $module = null, $isExplicit = false)
     {
         if ($area == 'base') {
             $theme = $this->baseTheme;