Merge "RCFilters: Create one single source of truth for item display"

diff --combined resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
index f7c2aaf,b690bbd..bbc1d7e
--- 1/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
--- 2/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
+++ b/resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
@@@ -20,6 -20,7 +20,7 @@@
  
                this.views = {};
                this.currentView = 'default';
+               this.searchQuery = null;
  
                // Events
                this.aggregate( { update: 'filterItemUpdate' } );
@@@ -401,7 -402,7 +402,7 @@@
                        }
                } );
  
-               this.currentView = 'default';
+               this.setSearch( '' );
  
                this.updateHighlightedState();
  
@@@ -710,7 -711,7 +711,7 @@@
  
                $.each( this.groups, function ( name, model ) {
                        if ( model.isSticky() ) {
 -                              $.extend( true, result, model.getDefaultParams() );
 +                              $.extend( true, result, model.getParamRepresentation() );
                        }
                } );
  
@@@ -1095,19 -1096,6 +1096,6 @@@
                return allSelected;
        };
  
-       /**
-        * Switch the current view
-        *
-        * @param {string} view View name
-        * @fires update
-        */
-       mw.rcfilters.dm.FiltersViewModel.prototype.switchView = function ( view ) {
-               if ( this.views[ view ] && this.currentView !== view ) {
-                       this.currentView = view;
-                       this.emit( 'update' );
-               }
-       };
- 
        /**
         * Get the current view
         *
@@@ -1147,6 -1135,82 +1135,82 @@@
                return result;
        };
  
+       /**
+        * Return a version of the given string that is without any
+        * view triggers.
+        *
+        * @param {string} str Given string
+        * @return {string} Result
+        */
+       mw.rcfilters.dm.FiltersViewModel.prototype.removeViewTriggers = function ( str ) {
+               if ( this.getViewFromString( str ) !== 'default' ) {
+                       str = str.substr( 1 );
+               }
+ 
+               return str;
+       };
+ 
+       /**
+        * Get the view from the given string by a trigger, if it exists
+        *
+        * @param {string} str Given string
+        * @return {string} View name
+        */
+       mw.rcfilters.dm.FiltersViewModel.prototype.getViewFromString = function ( str ) {
+               return this.getViewByTrigger( str.substr( 0, 1 ) );
+       };
+ 
+       /**
+        * Set the current search for the system.
+        * This also dictates what items and groups are visible according
+        * to the search in #findMatches
+        *
+        * @param {string} searchQuery Search query, including triggers
+        * @fires searchChange
+        */
+       mw.rcfilters.dm.FiltersViewModel.prototype.setSearch = function ( searchQuery ) {
+               var visibleGroups, visibleGroupNames;
+ 
+               if ( this.searchQuery !== searchQuery ) {
+                       // Check if the view changed
+                       this.switchView( this.getViewFromString( searchQuery ) );
+ 
+                       visibleGroups = this.findMatches( searchQuery );
+                       visibleGroupNames = Object.keys( visibleGroups );
+ 
+                       // Update visibility of items and groups
+                       $.each( this.getFilterGroups(), function ( groupName, groupModel ) {
+                               // Check if the group is visible at all
+                               groupModel.toggleVisible( visibleGroupNames.indexOf( groupName ) !== -1 );
+                               groupModel.setVisibleItems( visibleGroups[ groupName ] || [] );
+                       } );
+ 
+                       this.searchQuery = searchQuery;
+                       this.emit( 'searchChange', this.searchQuery );
+               }
+       };
+ 
+       /**
+        * Get the current search
+        *
+        * @return {string} Current search query
+        */
+       mw.rcfilters.dm.FiltersViewModel.prototype.getSearch = function () {
+               return this.searchQuery;
+       };
+ 
+       /**
+        * Switch the current view
+        *
+        * @private
+        * @param {string} view View name
+        */
+       mw.rcfilters.dm.FiltersViewModel.prototype.switchView = function ( view ) {
+               if ( this.views[ view ] && this.currentView !== view ) {
+                       this.currentView = view;
+               }
+       };
+ 
        /**
         * Toggle the highlight feature on and off.
         * Propagate the change to filter items.
@@@ -1209,18 -1273,4 +1273,4 @@@
                this.getItemByName( filterName ).clearHighlightColor();
        };
  
-       /**
-        * Return a version of the given string that is without any
-        * view triggers.
-        *
-        * @param {string} str Given string
-        * @return {string} Result
-        */
-       mw.rcfilters.dm.FiltersViewModel.prototype.removeViewTriggers = function ( str ) {
-               if ( this.getViewByTrigger( str.substr( 0, 1 ) ) !== 'default' ) {
-                       str = str.substr( 1 );
-               }
- 
-               return str;
-       };
  }( mediaWiki, jQuery ) );