[search] Make empty component a prop

klee-contrib · Jun 13, 2015 · 71e1557 · pierr · Jun 13, 2015 · pierr
1 parent 7330021
commit 71e1557
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/page/search/common/group-by-mixin.js b/page/search/common/group-by-mixin.js
@@ -30,7 +30,12 @@ let GroupByMixin = {
             orderableColumnList: {},
             lineComponentMapper() {
                 throw new ArgumentNullException('Please provide a inferLineComponentFromList(list) function.');
-            }
+            },
+            emptyComponent: (
+                <div data-focus='empty-result'>
+                    {this.i18n('search.empty')}
+                </div>
+            )
         });
     },
     /**
@@ -47,7 +52,7 @@ let GroupByMixin = {
     getResultListComponent(advancedSearch) {
         // First check if there is any result
         if (this.state.totalRecords === 0) {
-            return this._getEmptyResultList();
+            return this.props.emptyComponent;
         }
         let isBounded = keys(this.state.map).length > 1;
         let noDecoration = keys(this.state.map).length === 1;
@@ -73,7 +78,7 @@ let GroupByMixin = {
     },
     _getSingleTypeResultList(groupKey, list, maxRows) {
         if (list.length === 0) {
-            return this._getEmptyResultList();
+            return this.emptyComponent;
         }
         if (maxRows) {
             list = list.slice(0, maxRows);
@@ -97,13 +102,6 @@ let GroupByMixin = {
                 />
         );
     },
-    _getEmptyResultList() {
-        return (
-            <div data-focus='empty-result'>
-                {this.i18n('search.empty')}
-            </div>
-        );
-    },
     renderGroupByBlock(groupKey, list, maxRows) {
         let GroupWrapper = this.props.groupComponent;
         return (

diff --git a/page/search/common/search-mixin.js b/page/search/common/search-mixin.js
@@ -57,6 +57,12 @@ let SearchMixin = {
         if(!isFunction(this.props.searchAction)){
           console.warn(`Your page seems to miss a search action, add in your props a {searchAction: function(scope, query, facets){}}`, this.props.searchAction);
         }
+<<<<<<< Updated upstream
+=======
+        return this._buildSearchCriteria(this.state.scope, this.state.query, facets);
+    },
+    search() {
+>>>>>>> Stashed changes
         this.props.searchAction(
             this.getSearchCriteria(this.state.scope, this.state.query, facets)
         );