uc-cdis · ocshawn · Apr 20, 2021 · Apr 19, 2021 · Apr 19, 2021 · Apr 19, 2021
diff --git a/genData/genData.js b/genData/genData.js
@@ -96,7 +96,7 @@ async function run() {
     const dCopy = { ...d };
     Object.keys(dCopy).forEach((key) => {
       if (fieldValues[key]) {
-        const index = getRandomInt(0, fieldValues[key].length - 1);
+        const index = getRandomInt(0, fieldValues[key].length);
         dCopy[key] = fieldValues[key][index];
       } else {
         switch (schema.items.properties[key].rawType) {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gen3/guppy",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "description": "Server that support GraphQL queries on data from elasticsearch",
   "main": "src/server/server.js",
   "directories": {

diff --git a/src/components/ConnectedFilter/index.jsx b/src/components/ConnectedFilter/index.jsx
@@ -253,7 +253,8 @@ class ConnectedFilter extends React.Component {
     const tabs = this.props.filterConfig.tabs.map(({ fields, searchFields }, index) => {
       const sections = getFilterSections(fields, searchFields, fieldMapping, processedTabsOptions,
         this.state.initialAggsData, this.state.adminAppliedPreFilters,
-        this.props.guppyConfig, this.arrayFields);
+        this.props.guppyConfig, this.arrayFields,
+        this.props.filterValuesToHide);
       const filterStatus = this.state.filterStatusArray
         ? this.state.filterStatusArray[index] : null;
       return (
@@ -336,6 +337,7 @@ ConnectedFilter.propTypes = {
   hidden: PropTypes.bool,
   userFilterFromURL: PropTypes.object,
   hideEmptyFilterSection: PropTypes.bool,
+  filterValuesToHide: PropTypes.arrayOf(PropTypes.string),
 };
 
 ConnectedFilter.defaultProps = {
@@ -354,6 +356,7 @@ ConnectedFilter.defaultProps = {
   hidden: false,
   userFilterFromURL: {},
   hideEmptyFilterSection: false,
+  filterValuesToHide: [],
 };
 
 export default ConnectedFilter;
diff --git a/src/components/ConnectedFilter/utils.js b/src/components/ConnectedFilter/utils.js
@@ -8,7 +8,7 @@ export const getFilterGroupConfig = (filterConfig) => ({
   })),
 });
 
-const getSingleFilterOption = (histogramResult, initHistogramRes) => {
+const getSingleFilterOption = (histogramResult, initHistogramRes, filterValuesToHide) => {
   if (!histogramResult || !histogramResult.histogram) {
     throw new Error(`Error parsing field options ${JSON.stringify(histogramResult)}`);
   }
@@ -28,8 +28,14 @@ const getSingleFilterOption = (histogramResult, initHistogramRes) => {
     });
     return rangeOptions;
   }
-
-  const textOptions = histogramResult.histogram.map((item) => ({
+  let rawtextOptions = histogramResult.histogram;
+  // hide filterValuesToHide from filters
+  // filterValuesToHide added to guppyConfig in data-portal
+  if (filterValuesToHide.length > 0) {
+    rawtextOptions = histogramResult.histogram
+      .filter((item) => filterValuesToHide.indexOf(item.key) < 0);
+  }
+  const textOptions = rawtextOptions.map((item) => ({
     text: item.key,
     filterType: 'singleSelect',
     count: item.count,
@@ -104,6 +110,7 @@ export const checkIsArrayField = (field, arrayFields) => {
 export const getFilterSections = (
   fields, searchFields, fieldMapping, tabsOptions,
   initialTabsOptions, adminAppliedPreFilters, guppyConfig, arrayFields,
+  filterValuesToHide,
 ) => {
   let searchFieldSections = [];
 
@@ -129,6 +136,7 @@ export const getFilterSections = (
         selectedOptions = getSingleFilterOption(
           tabsOptionsFiltered,
           initialTabsOptions ? initialTabsOptions[field] : undefined,
+          filterValuesToHide,
         );
       }
 
@@ -155,6 +163,7 @@ export const getFilterSections = (
     const defaultOptions = getSingleFilterOption(
       tabsOptionsFiltered,
       initialTabsOptions ? initialTabsOptions[field] : undefined,
+      filterValuesToHide,
     );
 
     const fieldIsArrayField = checkIsArrayField(field, arrayFields);

diff --git a/stories/connectedFilter.jsx b/stories/connectedFilter.jsx
@@ -48,6 +48,20 @@ storiesOf('ConnectedFilter', module)
       />
     );
   })
+  .add('Filter Hidden "no data"', () => {
+    const processFilterAggsData = (aggsData) => aggsData;
+    return (
+      <ConnectedFilter
+        filterConfig={filterConfig}
+        guppyConfig={guppyConfig}
+        onFilterChange={action('filter change')}
+        fieldMapping={fieldMapping}
+        onProcessFilterAggsData={processFilterAggsData}
+        tierAccessLimit={guppyConfig.tierAccessLimit}
+        filterValuesToHide={["no data"]}
+      />
+    );
+  })
   .add('SwitchableFilterExample', () => (
     <SwitchableFilterExample />
   ));