fix(web): prefer query string over search operators

appbaseio · Jul 8, 2020 · d099ad6 · d099ad6
1 parent 8299936
commit d099ad6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/packages/web/src/components/search/CategorySearch.js b/packages/web/src/components/search/CategorySearch.js
@@ -297,13 +297,14 @@ class CategorySearch extends Component {
 			} else {
 				fields = [props.dataField];
 			}
-			if (props.searchOperators) {
+
+			if (props.queryString) {
 				finalQuery = {
-					simple_query_string: CategorySearch.shouldQuery(value, fields, props),
+					query_string: CategorySearch.shouldQuery(value, fields, props),
 				};
-			} else if (props.queryString) {
+			} else if (props.searchOperators) {
 				finalQuery = {
-					query_string: CategorySearch.shouldQuery(value, fields, props),
+					simple_query_string: CategorySearch.shouldQuery(value, fields, props),
 				};
 			} else {
 				finalQuery = {

diff --git a/packages/web/src/components/search/DataSearch.js b/packages/web/src/components/search/DataSearch.js
@@ -232,13 +232,13 @@ class DataSearch extends Component {
 				fields = [props.dataField];
 			}
 
-			if (props.searchOperators) {
+			if (props.queryString) {
 				finalQuery = {
-					simple_query_string: DataSearch.shouldQuery(value, fields, props),
+					query_string: DataSearch.shouldQuery(value, fields, props),
 				};
-			} else if (props.queryString) {
+			} else if (props.searchOperators) {
 				finalQuery = {
-					query_string: DataSearch.shouldQuery(value, fields, props),
+					simple_query_string: DataSearch.shouldQuery(value, fields, props),
 				};
 			} else {
 				finalQuery = {