@bento-core/facet-filter 1.0.1-ccdihub.22 → 1.0.1-ccdihub.24

package/dist/FacetFilterController.js

@@ -26,11 +26,20 @@ const FacetFilterController = props => {
    * 2. subject state
    */
   const {
-    filterState,
+    activeFilters,
     data,
     facetsConfig,
     facetSectionConfig
   } = props;
+  const filterState = {};
+  for (const [key, value] of Object.entries(activeFilters)) {
+    if (key !== 'participant_ids') {
+      filterState[key] = {};
+      value.forEach(item => {
+        filterState[key][item] = true;
+      });
+    }
+  }
   const updateFacetState = filterSections => {
     const updateSections = [...filterSections];
     if (!_lodash.default.isEmpty(filterState)) {
@@ -112,11 +121,30 @@ const FacetFilterController = props => {
         } = updateFacet;
         if (data[apiForFiltering]) {
           if (Array.isArray(data[apiForFiltering])) {
+            const validValues = [];
             const updateField = data[apiForFiltering].map(item => {
               const addField = _objectSpread({}, item);
               addField.name = item[field];
+              validValues.push(addField.name);
               return addField;
             });
+            /**
+             * Check if there are orphen filter values and add them to the facet values
+             */
+            if (filterState !== undefined) {
+              const facetFilter = filterState[facet.datafield];
+              if (facetFilter) {
+                for (const [key, value] of Object.entries(facetFilter)) {
+                  if (validValues.indexOf(key) === -1) {
+                    const tmp = {};
+                    tmp.group = key;
+                    tmp.name = key;
+                    tmp.subjects = 0;
+                    updateField.push(tmp);
+                  }
+                }
+              }
+            }
             updateFacet.facetValues = updateField;
           }
           /**
@@ -150,8 +178,5 @@ const FacetFilterController = props => {
     sideBarSections: facetSections
   })));
 };
-const mapStateToProps = state => ({
-  filterState: state.statusReducer.filterState
-});
-var _default = (0, _reactRedux.connect)(mapStateToProps, null)(FacetFilterController);
+var _default = (0, _reactRedux.connect)(null, null)(FacetFilterController);
 exports.default = _default;

package/dist/components/facet/FacetView.js

@@ -27,9 +27,7 @@ const FacetView = _ref => {
     facet,
     onClearFacetSection,
     onClearSliderSection,
-    CustomView,
-    autoComplete,
-    upload
+    CustomView
   } = _ref;
   const [expand, setExpand] = (0, _react.useState)(false);
   const onExpandFacet = () => setExpand(!expand);
@@ -37,11 +35,13 @@ const FacetView = _ref => {
   /**
   * expand section incase of active local search
   */
-  (0, _react.useEffect)(() => {
-    if (autoComplete && autoComplete.length > 0 || upload && upload.length > 0) {
-      setExpand(true);
-    }
-  }, [autoComplete, upload]);
+  // useEffect(() => {
+  //   if ((autoComplete && autoComplete.length > 0)
+  //     || (upload && upload.length > 0)) {
+  //     setExpand(true);
+  //   }
+  // }, [autoComplete, upload]);
+
   const [sortBy, setSortBy] = (0, _react.useState)(null);
   const onSortFacet = type => {
     setSortBy(type);

package/dist/components/facet/ReduxFacetView.js

@@ -10,14 +10,12 @@ var _Actions = require("../../store/actions/Actions");
 var _FacetView = _interopRequireDefault(require("./FacetView"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const ReduxFacetView = props => /*#__PURE__*/_react.default.createElement(_FacetView.default, props);
-const mapStateToProps = state => {
-  var _state$localFind, _state$localFind2;
-  return {
-    filterState: state.statusReducer.filterState,
-    autoComplete: (state === null || state === void 0 ? void 0 : (_state$localFind = state.localFind) === null || _state$localFind === void 0 ? void 0 : _state$localFind.autocomplete) || [],
-    upload: (state === null || state === void 0 ? void 0 : (_state$localFind2 = state.localFind) === null || _state$localFind2 === void 0 ? void 0 : _state$localFind2.upload) || []
-  };
-};
+
+// const mapStateToProps = (state) => ({
+//   autoComplete: state?.localFind?.autocomplete || [],
+//   upload: state?.localFind?.upload || [],
+// });
+
 const mapDispatchToProps = dispatch => ({
   onClearFacetSection: facet => {
     dispatch((0, _Actions.clearFacetSection)(facet));
@@ -26,5 +24,5 @@ const mapDispatchToProps = dispatch => ({
     dispatch((0, _Actions.clearSliderSection)(facet));
   }
 });
-var _default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(ReduxFacetView);
+var _default = (0, _reactRedux.connect)(null, mapDispatchToProps)(ReduxFacetView);
 exports.default = _default;

package/dist/components/inputs/checkbox/ReduxCheckbox.js

@@ -10,11 +10,8 @@ var _Actions = require("../../../store/actions/Actions");
 var _CheckboxView = _interopRequireDefault(require("./CheckboxView"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const ReduxCheckbox = props => /*#__PURE__*/_react.default.createElement(_CheckboxView.default, props);
-const mapStateToProps = state => ({
-  filterState: state.statusReducer.filterState
-});
 const mapDispatchToProps = dispatch => ({
   onToggle: view => dispatch((0, _Actions.toggleCheckBox)(view))
 });
-var _default = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(ReduxCheckbox);
+var _default = (0, _reactRedux.connect)(null, mapDispatchToProps)(ReduxCheckbox);
 exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bento-core/facet-filter",
-  "version": "1.0.1-ccdihub.22",
+  "version": "1.0.1-ccdihub.24",
   "description": "### Bento core sidebar design:",
   "main": "dist/index.js",
   "scripts": {

package/src/FacetFilterController.js

@@ -21,12 +21,22 @@ const FacetFilterController = (props) => {
    * 2. subject state
    */
   const {
-    filterState,
+    activeFilters,
     data,
     facetsConfig,
     facetSectionConfig,
   } = props;
 
+  const filterState = {};
+  for (const [key, value] of Object.entries(activeFilters)) {
+    if (key !== 'participant_ids') {
+      filterState[key] = {};
+      value.forEach((item) => {
+        filterState[key][item] = true;
+      });
+    }
+  }
+
   const updateFacetState = (filterSections) => {
     const updateSections = [...filterSections];
     if (!_.isEmpty(filterState)) {
@@ -97,11 +107,30 @@ const FacetFilterController = (props) => {
         } = updateFacet;
         if (data[apiForFiltering]) {
           if (Array.isArray(data[apiForFiltering])) {
+            const validValues = [];
             const updateField = data[apiForFiltering].map((item) => {
               const addField = { ...item };
               addField.name = item[field];
+              validValues.push(addField.name);
               return addField;
             });
+            /**
+             * Check if there are orphen filter values and add them to the facet values
+             */
+            if (filterState !== undefined) {
+              const facetFilter = filterState[facet.datafield];
+              if (facetFilter) {
+                for (const [key, value] of Object.entries(facetFilter)) {
+                  if (validValues.indexOf(key) === -1) {
+                    const tmp = {};
+                    tmp.group = key;
+                    tmp.name = key;
+                    tmp.subjects = 0;
+                    updateField.push(tmp);
+                  }
+                }
+              }
+            }
             updateFacet.facetValues = updateField;
           }
           /**
@@ -142,8 +171,4 @@ const FacetFilterController = (props) => {
   );
 };
 
-const mapStateToProps = (state) => ({
-  filterState: state.statusReducer.filterState,
-});
-
-export default connect(mapStateToProps, null)(FacetFilterController);
+export default connect(null, null)(FacetFilterController);

package/src/components/facet/FacetView.js

@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React, { useState } from 'react';
 import {
   Accordion,
   List,
@@ -19,8 +19,6 @@ const FacetView = ({
   onClearFacetSection,
   onClearSliderSection,
   CustomView,
-  autoComplete,
-  upload,
 }) => {
   const [expand, setExpand] = useState(false);
   const onExpandFacet = () => setExpand(!expand);
@@ -28,12 +26,12 @@ const FacetView = ({
   /**
   * expand section incase of active local search
   */
-  useEffect(() => {
-    if ((autoComplete && autoComplete.length > 0)
-      || (upload && upload.length > 0)) {
-      setExpand(true);
-    }
-  }, [autoComplete, upload]);
+  // useEffect(() => {
+  //   if ((autoComplete && autoComplete.length > 0)
+  //     || (upload && upload.length > 0)) {
+  //     setExpand(true);
+  //   }
+  // }, [autoComplete, upload]);
 
   const [sortBy, setSortBy] = useState(null);
   const onSortFacet = (type) => {

package/src/components/facet/ReduxFacetView.js

@@ -5,15 +5,14 @@ import FacetView from './FacetView';
 
 const ReduxFacetView = ((props) => <FacetView {...props} />);
 
-const mapStateToProps = (state) => ({
-  filterState: state.statusReducer.filterState,
-  autoComplete: state?.localFind?.autocomplete || [],
-  upload: state?.localFind?.upload || [],
-});
+// const mapStateToProps = (state) => ({
+//   autoComplete: state?.localFind?.autocomplete || [],
+//   upload: state?.localFind?.upload || [],
+// });
 
 const mapDispatchToProps = (dispatch) => ({
   onClearFacetSection: (facet) => { dispatch(clearFacetSection(facet)); },
   onClearSliderSection: (facet) => { dispatch(clearSliderSection(facet)); },
 });
 
-export default connect(mapStateToProps, mapDispatchToProps)(ReduxFacetView);
+export default connect(null, mapDispatchToProps)(ReduxFacetView);

package/src/components/inputs/checkbox/ReduxCheckbox.js

@@ -5,12 +5,8 @@ import CheckboxView from './CheckboxView';
 
 const ReduxCheckbox = ((props) => <CheckboxView {...props} />);
 
-const mapStateToProps = (state) => ({
-  filterState: state.statusReducer.filterState,
-});
-
 const mapDispatchToProps = (dispatch) => ({
   onToggle: (view) => dispatch(toggleCheckBox(view)),
 });
 
-export default connect(mapStateToProps, mapDispatchToProps)(ReduxCheckbox);
+export default connect(null, mapDispatchToProps)(ReduxCheckbox);