MAGETWO-71520: Product Grid filtered to Store View is broken if corresponding Store is deleted

- fix CR

Author: cpartica

app/code/Magento/Ui/Controller/Adminhtml/Index/Render.php

@@ -9,44 +9,47 @@
 use Magento\Framework\View\Element\UiComponentInterface;
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\View\Element\UiComponentFactory;
+use Psr\Log\LoggerInterface;
+use Magento\Framework\Escaper;
+use Magento\Framework\Controller\Result\JsonFactory;
 
 class Render extends AbstractAction
 {
     /**
-     * @var \Magento\Framework\Controller\Result\JsonFactory
+     * @var JsonFactory
      */
     private $resultJsonFactory;
 
     /**
-     * @var \Magento\Framework\Escaper
+     * @var Escaper
      */
     private $escaper;
 
     /**
-     * @var \Psr\Log\LoggerInterface
+     * @var LoggerInterface
      */
     private $logger;
 
     /**
      * @param Context $context
      * @param UiComponentFactory $factory
-     * @param \Magento\Framework\Controller\Result\JsonFactory|null $resultJsonFactory
-     * @param \Magento\Framework\Escaper|null $escaper
-     * @param \Psr\Log\LoggerInterface|null $logger
+     * @param JsonFactory|null $resultJsonFactory
+     * @param Escaper|null $escaper
+     * @param LoggerInterface|null $logger
      */
     public function __construct(
         Context $context,
         UiComponentFactory $factory,
-        \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory = null,
-        \Magento\Framework\Escaper $escaper = null,
-        \Psr\Log\LoggerInterface $logger = null
+        JsonFactory $resultJsonFactory = null,
+        Escaper $escaper = null,
+        LoggerInterface $logger = null
     ) {
         parent::__construct($context, $factory);
-        $this->resultJsonFactory = $resultJsonFactory ?: $this->_objectManager
+        $this->resultJsonFactory = $resultJsonFactory ?: \Magento\Framework\App\ObjectManager::getInstance()
             ->get(\Magento\Framework\Controller\Result\JsonFactory::class);
-        $this->escaper = $escaper ?: $this->_objectManager
+        $this->escaper = $escaper ?: \Magento\Framework\App\ObjectManager::getInstance()
             ->get(\Magento\Framework\Escaper::class);
-        $this->logger = $logger ?: $this->_objectManager
+        $this->logger = $logger ?: \Magento\Framework\App\ObjectManager::getInstance()
             ->get(\Psr\Log\LoggerInterface::class);
     }
 

app/code/Magento/Ui/Test/Unit/Controller/Adminhtml/Index/RenderTest.php

@@ -5,7 +5,7 @@
  */
 namespace Magento\Ui\Test\Unit\Controller\Adminhtml\Index;
 
-use \Magento\Ui\Controller\Adminhtml\Index\Render;
+use Magento\Ui\Controller\Adminhtml\Index\Render;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 
 /**

app/code/Magento/Ui/view/base/web/js/grid/filters/filters.js

@@ -355,15 +355,6 @@ define([
             return this.active.length;
         },
 
-        /**
-         * Assigns filters index change.
-         *
-         * @param {integer} index - Selected index of the filter.
-         */
-        onActiveIndexChange: function (index) {
-            this.activeIndex = index;
-        },
-
         /**
          * Extract previews of a specified filters.
          *
@@ -393,10 +384,10 @@ define([
          * @param {bool} isError - Selected index of the filter.
          */
         onBackendError: function (isError) {
-            var defaultMessage = 'Something went wrong with processing the default view and we have restored the' +
-                    ' filter to its original state.',
-                customMessage  = 'Something went wrong with processing current custom view and filters have been' +
-                    ' reset to its original state. Please edit filters then click apply.';
+            var defaultMessage = 'Something went wrong with processing the default view and we have restored the filter' +
+                    ' to its original state.',
+                customMessage  = 'Something went wrong with processing current custom view and filters have been reset' +
+                    ' to its original state. Please edit filters then click apply.';
 
             if (isError) {
                 this.clear();

app/code/Magento/Ui/view/base/web/js/grid/provider.js

@@ -21,6 +21,7 @@ define([
     return Element.extend({
         defaults: {
             firstLoad: true,
+            lastError: false,
             storageConfig: {
                 component: 'Magento_Ui/js/grid/data-storage',
                 provider: '${ $.storageConfig.name }',

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/GridFilteringDeletedEntityTest.xml

@@ -23,7 +23,7 @@
             </data>
             <data name="pageClass" xsi:type="string">Magento\Catalog\Test\Page\Adminhtml\CatalogProductIndex</data>
             <data name="gridRetriever" xsi:type="string">getProductGrid</data>
-            <constraint name="\Magento\Catalog\Test\Constraint\AssertProductGridIsRendered"/>
+            <constraint name="Magento\Catalog\Test\Constraint\AssertProductGridIsRendered"/>
             <constraint name="Magento\Catalog\Test\Constraint\AssertResetFilterMessage"/>
         </variation>
     </testCase>