PXP-9144 ConnectedFilter: allow specifying extra fields to query (#129)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gen3/guppy",
-  "version": "0.14.0",
+  "version": "0.14.3",
   "description": "Server that support GraphQL queries on data from elasticsearch",
   "main": "src/server/server.js",
   "directories": {

src/components/ConnectedFilter/index.jsx

@@ -28,9 +28,10 @@ class ConnectedFilter extends React.Component {
     super(props);
 
     const filterConfigsFields = getAllFieldsFromFilterConfigs(props.filterConfig.tabs);
-    const allFields = props.accessibleFieldCheckList
+    let allFields = props.accessibleFieldCheckList
       ? _.union(filterConfigsFields, props.accessibleFieldCheckList)
       : filterConfigsFields;
+    allFields = _.union(allFields, this.props.extraAggsFields);
 
     this.initialTabsOptions = {};
     let initialFilter = this.props.adminAppliedPreFilters;
@@ -315,6 +316,7 @@ ConnectedFilter.propTypes = {
       searchFields: PropTypes.arrayOf(PropTypes.string),
     })),
   }).isRequired,
+  extraAggsFields: PropTypes.arrayOf(PropTypes.string),
   guppyConfig: PropTypes.shape({
     path: PropTypes.string.isRequired,
     type: PropTypes.string.isRequired,
@@ -341,6 +343,7 @@ ConnectedFilter.propTypes = {
 };
 
 ConnectedFilter.defaultProps = {
+  extraAggsFields: [],
   onFilterChange: () => {},
   onReceiveNewAggsData: () => {},
   className: '',

src/components/Utils/queries.js

@@ -242,7 +242,8 @@ export const getGQLFilter = (filterObj) => {
       // This filter only has a combine setting so far. We can ignore it.
       return;
     } else {
-      throw new Error(`Invalid filter object ${filterValues}`);
+      console.error(filterValues);
+      throw new Error('Invalid filter object');
     }
     if (fieldSplitted.length > 1) { // nested field
       fieldSplitted.pop();