Merge branch 'MAGETWO-40157' into last_bugs

Author: akaplya

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

@@ -40,8 +40,12 @@ define([
     return Collapsible.extend({
         defaults: {
             template: 'ui/grid/filters/filters',
-            applied: {},
-            filters: {},
+            applied: {
+                placeholder: true
+            },
+            filters: {
+                placeholder: true
+            },
             chipsConfig: {
                 name: '${ $.name }_chips',
                 provider: '${ $.chipsConfig.name }',
@@ -151,25 +155,11 @@ define([
          * @returns {Filters} Chainable.
          */
         cancel: function () {
-            this.convertToObject();
             this.set('filters', utils.copy(this.applied));
 
             return this;
         },
 
-        /**
-         * Convert empty array to empty object.
-         *
-         * @returns {Filters} Chainable.
-         */
-        convertToObject: function() {
-            if ( _.isArray(this.applied) && _.isEmpty(this.applied) ) {
-                this.applied = {};
-            }
-
-            return this;
-        },
-
         /**
          * Tells wether filters pannel should be opened.
          *

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

@@ -16,6 +16,7 @@ define([
             template: 'ui/grid/search/search',
             placeholder: $t('Search by keyword'),
             label: $t('Keyword'),
+            value: '',
             imports: {
                 inputValue: 'value',
                 updatePreview: 'value'