@bento-core/facet-filter 1.0.1-ccdihub.9 → 1.0.1-ccdiintegrated.2

package/dist/FacetFilterController.js

@@ -26,11 +26,19 @@ const FacetFilterController = props => {
    * 2. subject state
    */
   const {
-    filterState,
+    activeFilters,
     data,
     facetsConfig,
-    facetSectionConfig
+    facetSectionConfig,
+    unknownAgesState
   } = props;
+  const filterState = {};
+  // console.log(activeFilters);
+  for (const [key, value] of Object.entries(activeFilters)) {
+    if (key !== 'participant_ids') {
+      filterState[key] = value;
+    }
+  }
   const updateFacetState = filterSections => {
     const updateSections = [...filterSections];
     if (!_lodash.default.isEmpty(filterState)) {
@@ -38,7 +46,8 @@ const FacetFilterController = props => {
         updateSections.forEach(sideBar => {
           if (sideBar.type === _Types.InputTypes.CHECKBOX && sideBar.datafield === key) {
             sideBar.facetValues.forEach(item => {
-              item.isChecked = value[item.name] ? value[item.name] : false;
+              // item.isChecked = value[item.name] ? value[item.name] : false;
+              item.isChecked = value.indexOf(item.name) > -1;
             });
           }
           if (sideBar.type === _Types.InputTypes.SLIDER && sideBar.datafield === key) {
@@ -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) {
+                facetFilter.forEach(item => {
+                  if (validValues.indexOf(item) === -1) {
+                    const tmp = {};
+                    tmp.group = item;
+                    tmp.name = item;
+                    tmp.subjects = 0;
+                    updateField.push(tmp);
+                  }
+                });
+              }
+            }
             updateFacet.facetValues = updateField;
           }
           /**
@@ -125,8 +153,10 @@ const FacetFilterController = props => {
           if (facet.type === _Types.InputTypes.SLIDER) {
             const lowerBound = data[apiForFiltering][ApiLowerBoundName];
             const upperBound = data[apiForFiltering][ApiUpperBoundName];
+            const unknownAges = (unknownAgesState === null || unknownAgesState === void 0 ? void 0 : unknownAgesState[facet.datafield]) || 'include';
             updateFacet.minLowerBound = lowerBound;
             updateFacet.maxUpperBound = upperBound;
+            updateFacet.unknownAges = unknownAges;
             updateFacet.facetValues = [lowerBound, upperBound];
             updateFacet.style = facet.style;
           }
@@ -150,8 +180,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/FacetFilterView.js

@@ -10,6 +10,7 @@ var _FacetFilterStyle = _interopRequireDefault(require("./FacetFilterStyle"));
 var _FacetSectionView = _interopRequireDefault(require("./components/section/FacetSectionView"));
 var _ReduxFacetView = _interopRequireDefault(require("./components/facet/ReduxFacetView"));
 var _FilterItems = _interopRequireDefault(require("./components/inputs/FilterItems"));
+var _ReduxSearchFacetView = _interopRequireDefault(require("./components/facet/ReduxSearchFacetView"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /* eslint-disable arrow-body-style */
 /* eslint-disable padded-blocks */
@@ -18,7 +19,8 @@ const BentoFacetFilter = _ref => {
   let {
     sideBarSections,
     CustomFacetSection,
-    CustomFacetView
+    CustomFacetView,
+    queryParams
   } = _ref;
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, sideBarSections.map((section, index) => /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_core.Divider, {
     variant: "middle",
@@ -26,14 +28,24 @@ const BentoFacetFilter = _ref => {
   }), /*#__PURE__*/_react.default.createElement(_FacetSectionView.default, {
     section: section,
     CustomSection: CustomFacetSection
-  }, section.items.map(facet => /*#__PURE__*/_react.default.createElement(_ReduxFacetView.default, {
-    facet: facet,
-    CustomView: CustomFacetView
-  }, /*#__PURE__*/_react.default.createElement(_core.List, {
-    className: "List_".concat(facet.label)
-  }, /*#__PURE__*/_react.default.createElement(_FilterItems.default, {
-    facet: facet
-  }))))))));
+  }, section.items.map(facet => {
+    if (facet.search) {
+      return /*#__PURE__*/_react.default.createElement(_ReduxSearchFacetView.default, {
+        facet: facet,
+        queryParams: queryParams,
+        CustomView: CustomFacetView
+      });
+    }
+    return /*#__PURE__*/_react.default.createElement(_ReduxFacetView.default, {
+      facet: facet,
+      queryParams: queryParams,
+      CustomView: CustomFacetView
+    }, /*#__PURE__*/_react.default.createElement(_core.List, {
+      className: "List_".concat(facet.label)
+    }, /*#__PURE__*/_react.default.createElement(_FilterItems.default, {
+      facet: facet
+    })));
+  })))));
 };
 var _default = (0, _core.withStyles)(_FacetFilterStyle.default)(BentoFacetFilter);
 exports.default = _default;

package/dist/NewFacetFilterController.js

@@ -0,0 +1,192 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _lodash = _interopRequireDefault(require("lodash"));
+var _react = _interopRequireDefault(require("react"));
+var _reactRedux = require("react-redux");
+var _Types = require("./components/inputs/Types");
+var _NewFacetFilterView = _interopRequireDefault(require("./NewFacetFilterView"));
+const _excluded = ["section"];
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+const NewFacetFilterController = props => {
+  /**
+   * update checkbox state
+   * 1. checkbox state
+   * 2. subject state
+   */
+  const {
+    activeFilters,
+    data,
+    facetsConfig,
+    facetSectionConfig,
+    selectedSection,
+    unknownAgesState
+  } = props;
+  const filterState = {};
+  // console.log(activeFilters);
+  for (const [key, value] of Object.entries(activeFilters)) {
+    if (key !== 'participant_ids') {
+      filterState[key] = value;
+    }
+  }
+  const updateFacetState = filterSections => {
+    const updateSections = [...filterSections];
+    if (!_lodash.default.isEmpty(filterState)) {
+      for (const [key, value] of Object.entries(filterState)) {
+        updateSections.forEach(sideBar => {
+          if (sideBar.type === _Types.InputTypes.CHECKBOX && sideBar.datafield === key) {
+            sideBar.facetValues.forEach(item => {
+              // item.isChecked = value[item.name] ? value[item.name] : false;
+              item.isChecked = value.indexOf(item.name) > -1;
+            });
+          }
+          if (sideBar.type === _Types.InputTypes.SLIDER && sideBar.datafield === key) {
+            sideBar.facetValues = value;
+          }
+        });
+      }
+    } else {
+      updateSections.forEach(sideBar => {
+        if (sideBar.type === _Types.InputTypes.CHECKBOX) {
+          sideBar.facetValues.forEach(item => {
+            item.isChecked = false;
+          });
+        }
+        /**
+         * set default value for slider - on clear all filter
+         */
+        if (sideBar.type === _Types.InputTypes.SLIDER) {
+          const {
+            minLowerBound,
+            maxUpperBound
+          } = sideBar;
+          sideBar.facetValues = [minLowerBound, maxUpperBound];
+        }
+      });
+    }
+    return updateSections;
+  };
+  const arrangeBySections = arr => {
+    const sideBar = {};
+    arr.forEach(_ref => {
+      let {
+          section
+        } = _ref,
+        item = _objectWithoutProperties(_ref, _excluded);
+      const {
+        isExpanded
+      } = facetSectionConfig[section];
+      if (!sideBar[section]) {
+        sideBar[section] = {
+          name: section,
+          sectionName: section,
+          expandSection: isExpanded !== undefined && typeof isExpanded === 'boolean' ? isExpanded : true,
+          items: []
+        };
+      }
+      sideBar[section].items.push(_objectSpread({
+        section
+      }, item));
+    });
+    return Object.values(sideBar);
+  };
+
+  /**
+   * Construct filter object
+   * 1. add facet values to facets
+   * 2. add 'name' key to each facet value
+   */
+  const addFacetValues = facets => {
+    const updateFacets = [];
+    if (facets) {
+      facets.forEach(facet => {
+        const updateFacet = _objectSpread(_objectSpread({}, facet), {}, {
+          facetValues: []
+        });
+        const {
+          field,
+          ApiLowerBoundName,
+          ApiUpperBoundName,
+          apiForFiltering
+        } = 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) {
+                facetFilter.forEach(item => {
+                  if (validValues.indexOf(item) === -1) {
+                    const tmp = {};
+                    tmp.group = item;
+                    tmp.name = item;
+                    tmp.subjects = 0;
+                    updateField.push(tmp);
+                  }
+                });
+              }
+            }
+            updateFacet.facetValues = updateField;
+          }
+          /**
+          * add object to facet values
+          */
+          if (facet.type === _Types.InputTypes.SLIDER) {
+            const lowerBound = data[apiForFiltering][ApiLowerBoundName];
+            const upperBound = data[apiForFiltering][ApiUpperBoundName];
+            const unknownAges = (unknownAgesState === null || unknownAgesState === void 0 ? void 0 : unknownAgesState[facet.datafield]) || 'include';
+            updateFacet.minLowerBound = lowerBound;
+            updateFacet.maxUpperBound = upperBound;
+            updateFacet.unknownAges = unknownAges;
+            updateFacet.facetValues = [lowerBound, upperBound];
+            updateFacet.style = facet.style;
+          }
+        }
+        updateFacets.push(updateFacet);
+      });
+    }
+    return updateFacets;
+  };
+
+  /**
+   * Generate facet sections state
+   *
+   */
+  // const displayFacets = facetsConfig.filter((facet) => facet.show).slice(0, 16);
+  const displayFacets = facetsConfig.filter(facet => facet.show);
+  const facetStates = addFacetValues(displayFacets);
+  const updateState = updateFacetState(facetStates);
+  const facetSections = arrangeBySections(updateState);
+  const facetSection = facetSections[selectedSection];
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_NewFacetFilterView.default, _extends({}, props, {
+    facetSection: facetSection
+  })));
+};
+const mapStateToProps = state => {
+  var _state$statusReducer;
+  return {
+    unknownAgesState: (state === null || state === void 0 ? void 0 : (_state$statusReducer = state.statusReducer) === null || _state$statusReducer === void 0 ? void 0 : _state$statusReducer.unknownAgesState) || {}
+  };
+};
+var _default = (0, _reactRedux.connect)(mapStateToProps, null)(NewFacetFilterController);
+exports.default = _default;

package/dist/NewFacetFilterView.js

@@ -0,0 +1,50 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _core = require("@material-ui/core");
+var _FacetFilterStyle = _interopRequireDefault(require("./FacetFilterStyle"));
+var _ReduxNewFacetView = _interopRequireDefault(require("./components/facet/ReduxNewFacetView"));
+var _FilterItems = _interopRequireDefault(require("./components/inputs/FilterItems"));
+var _ReduxNewSearchFacetView = _interopRequireDefault(require("./components/facet/ReduxNewSearchFacetView"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/* eslint-disable arrow-body-style */
+/* eslint-disable padded-blocks */
+
+const BentoFacetFilter = _ref => {
+  let {
+    facetSection,
+    CustomFacetSection,
+    CustomFacetView,
+    queryParams,
+    basePath
+  } = _ref;
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, CustomFacetSection && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(CustomFacetSection, {
+    section: facetSection,
+    expanded: true
+  })), facetSection.items.map(facet => {
+    if (facet.search) {
+      return /*#__PURE__*/_react.default.createElement(_ReduxNewSearchFacetView.default, {
+        facet: facet,
+        queryParams: queryParams,
+        CustomView: CustomFacetView,
+        basePath: basePath
+      });
+    }
+    return /*#__PURE__*/_react.default.createElement(_ReduxNewFacetView.default, {
+      facet: facet,
+      queryParams: queryParams,
+      CustomView: CustomFacetView,
+      basePath: basePath
+    }, /*#__PURE__*/_react.default.createElement(_core.List, {
+      className: "List_".concat(facet.label)
+    }, /*#__PURE__*/_react.default.createElement(_FilterItems.default, {
+      facet: facet
+    })));
+  }));
+};
+var _default = (0, _core.withStyles)(_FacetFilterStyle.default)(BentoFacetFilter);
+exports.default = _default;

package/dist/components/facet/FacetModal.js

@@ -0,0 +1,101 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _reactRouterDom = require("react-router-dom");
+var _util = require("@bento-core/util");
+var _core = require("@material-ui/core");
+var _Close = _interopRequireDefault(require("@material-ui/icons/Close"));
+var _styles = require("@material-ui/core/styles");
+var _ModalStyle = _interopRequireDefault(require("./ModalStyle"));
+var _ModalFilterItems = _interopRequireDefault(require("../inputs/ModalFilterItems"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const resetIcon = {
+  src: 'https://raw.githubusercontent.com/CBIIT/datacommons-assets/main/bento/images/icons/svgs/Clear-icon.svg',
+  alt: 'Reset icon',
+  size: '12 px'
+};
+const ModalView = _ref => {
+  let {
+    classes,
+    facet,
+    sortBy,
+    searchText,
+    open,
+    onClose,
+    onClearFacetSection,
+    onSearchTextChange,
+    onSortChange,
+    queryParams
+  } = _ref;
+  const query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
+  const navigate = (0, _reactRouterDom.useNavigate)();
+  const onClearSection = () => {
+    const field = facet.datafield;
+    const paramValue = {};
+    paramValue[field] = '';
+    const queryStr = (0, _util.generateQueryStr)(query, queryParams, paramValue);
+    navigate("/exploreParticipants".concat(queryStr), {
+      replace: true
+    });
+    onSortChange(null);
+    onClearFacetSection(facet);
+  };
+  return /*#__PURE__*/_react.default.createElement(_core.Modal, {
+    open: open,
+    onClose: onClose,
+    "aria-labelledby": "".concat(facet.datafield, "-search-modal")
+  }, /*#__PURE__*/_react.default.createElement(_core.Box, {
+    className: classes.modalBody
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: classes.header
+  }, /*#__PURE__*/_react.default.createElement(_core.Typography, {
+    id: "modal-modal-title",
+    className: classes.modalTitle
+  }, "".concat(facet.label, " Facet Search")), /*#__PURE__*/_react.default.createElement(_core.IconButton, {
+    "aria-label": "close",
+    onClick: onClose,
+    className: classes.closeButton,
+    sx: theme => ({
+      position: 'absolute',
+      right: 8,
+      top: 8,
+      color: theme.palette.grey[500]
+    })
+  }, /*#__PURE__*/_react.default.createElement(_Close.default, {
+    fontSize: "small"
+  }))), /*#__PURE__*/_react.default.createElement("div", {
+    className: classes.searchContainer
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: classes.searchInputbox
+  }, "Search ".concat(facet.label)), /*#__PURE__*/_react.default.createElement("input", {
+    className: classes.searchBox,
+    value: searchText,
+    type: "text",
+    placeholder: "e.g. A1CF, CREB3L1, PIK3CA",
+    onChange: e => onSearchTextChange(facet.datafield, e.target.value)
+  }), /*#__PURE__*/_react.default.createElement(_core.Button, {
+    variant: "outlined",
+    onClick: () => onSearchTextChange(facet.datafield, ''),
+    className: classes.resetIcon
+  }, /*#__PURE__*/_react.default.createElement("img", {
+    src: resetIcon.src,
+    height: resetIcon.size,
+    width: resetIcon.size,
+    alt: resetIcon.alt
+  }))), /*#__PURE__*/_react.default.createElement("div", {
+    className: classes.itemContainer
+  }, /*#__PURE__*/_react.default.createElement(_ModalFilterItems.default, {
+    searchText: searchText,
+    facet: facet,
+    sortBy: sortBy,
+    onClearSection: onClearSection,
+    onSortChange: onSortChange,
+    queryParams: queryParams
+  }))));
+};
+var _default = (0, _styles.withStyles)(_ModalStyle.default)(ModalView);
+exports.default = _default;

package/dist/components/facet/FacetStyle.js

@@ -4,6 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _Search_Icon = _interopRequireDefault(require("./assets/Search_Icon.svg"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var _default = () => ({
   expansionPanelDetailsRoot: {
     display: 'block'
@@ -32,16 +34,16 @@ var _default = () => ({
   sortGroup: {
     paddingTop: '10px',
     marginBottom: '5px',
-    borderTop: '1px solid #B1B1B1',
     textAlign: 'left',
-    marginLeft: '-5px'
+    marginLeft: '-5px',
+    borderTop: 'none'
   },
   sortGroupIcon: {
     cursor: 'pointer',
     fontFamily: 'Nunito',
     fontSize: '10px',
     marginRight: '12px',
-    marginLeft: '16px'
+    marginLeft: '24px'
   },
   sortGroupItem: {
     cursor: 'pointer',
@@ -77,6 +79,53 @@ var _default = () => ({
     cursor: 'pointer',
     fontSize: '10px',
     width: '100%'
+  },
+  searchContainer: {
+    display: 'flex',
+    justifyContent: 'center',
+    position: 'relative'
+  },
+  searchBox: {
+    fontSize: '11px',
+    fontFamily: 'Nunito',
+    width: 'calc(100% - 26px)',
+    height: '30px',
+    marginTop: '12px',
+    borderRadius: '5px',
+    background: "url(".concat(_Search_Icon.default, ") right 5px center no-repeat"),
+    marginLeft: '6px',
+    border: '1px solid',
+    padding: '5px'
+  },
+  searchBoxWithText: {
+    fontSize: '11px',
+    fontFamily: 'Nunito',
+    width: 'calc(100% - 26px)',
+    height: '30px',
+    marginTop: '12px',
+    borderRadius: '5px',
+    marginLeft: '6px',
+    border: '1px solid',
+    padding: '5px'
+  },
+  expandedDisplayButton: {
+    backgroundColor: '#4D889E !important',
+    color: 'white',
+    width: 'calc(100% - 26px)',
+    height: '30px',
+    marginBottom: '5px',
+    marginLeft: '6px',
+    borderRadius: '5px',
+    fontSize: '12px',
+    fontWeight: '600',
+    top: '8px'
+  },
+  clearTextButton: {
+    padding: '0px',
+    height: '20px',
+    position: 'absolute',
+    right: '14px',
+    top: '14px'
   }
 });
 exports.default = _default;

package/dist/components/facet/FacetView.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
+var _reactRouterDom = require("react-router-dom");
+var _util = require("@bento-core/util");
 var _core = require("@material-ui/core");
 var _clsx = _interopRequireDefault(require("clsx"));
 var _AccordionSummaryView = _interopRequireDefault(require("../summary/AccordionSummaryView"));
@@ -27,27 +29,50 @@ const FacetView = _ref => {
     facet,
     onClearFacetSection,
     onClearSliderSection,
+    onUnknownAgesChange,
     CustomView,
-    autoComplete,
-    upload
+    queryParams,
+    unknownAgesState
   } = _ref;
-  const [expand, setExpand] = (0, _react.useState)(false);
+  const [expand, setExpand] = (0, _react.useState)(facet.expanded !== undefined && typeof facet.expanded === 'boolean' ? facet.expanded : false);
   const onExpandFacet = () => setExpand(!expand);
+  const query = new URLSearchParams((0, _reactRouterDom.useLocation)().search);
+  const navigate = (0, _reactRouterDom.useNavigate)();
 
   /**
   * 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);
   };
   const onClearSection = () => {
+    const field = facet.datafield;
+    const paramValue = {};
+    paramValue[field] = '';
+
+    // Also clear the corresponding unknownAges parameter if it exists
+    const unknownAgesField = "".concat(field, "_unknownAges");
+    if (queryParams.includes(unknownAgesField)) {
+      paramValue[unknownAgesField] = '';
+    }
+    const queryStr = (0, _util.generateQueryStr)(query, queryParams, paramValue);
+    navigate("/exploreParticipants".concat(queryStr), {
+      replace: true
+    });
     setSortBy(null);
+
+    // Reset the corresponding unknownAges parameter in Redux state
+    if (queryParams.includes(unknownAgesField) && onUnknownAgesChange) {
+      onUnknownAgesChange(field, 'include');
+    }
     if (facet.type === _Types.InputTypes.SLIDER) {
       onClearSliderSection(facet);
     } else {
@@ -64,7 +89,12 @@ const FacetView = _ref => {
   const selectedItems = facetValues && facetValues.filter(item => item.isChecked);
   const displayFacet = _objectSpread({}, facet);
   displayFacet.facetValues = selectedItems;
-  const isActiveFacet = [...selectedItems].length > 0;
+
+  // Check if facet is active based on selected items or unknown ages selection
+  const hasSelectedItems = [...selectedItems].length > 0;
+  const unknownAges = (unknownAgesState === null || unknownAgesState === void 0 ? void 0 : unknownAgesState[facet.datafield]) || 'include';
+  const hasUnknownAgesSelection = unknownAges !== 'include';
+  const isActiveFacet = hasSelectedItems || type === _Types.InputTypes.SLIDER && hasUnknownAgesSelection;
   const limitCheckBoxCount = (facet === null || facet === void 0 ? void 0 : facet.showCheckboxCount) || 5;
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_core.Accordion, {
     square: true,
@@ -116,15 +146,23 @@ const FacetView = _ref => {
     }
   }, "Sort by count"))), /*#__PURE__*/_react.default.createElement(_FilterItems.default, {
     facet: facet,
+    queryParams: queryParams,
     sortBy: sortBy
   })), !expand && type === _Types.InputTypes.CHECKBOX && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_core.List, {
     id: "filter_Items"
   }, /*#__PURE__*/_react.default.createElement(_FilterItems.default, {
-    facet: displayFacet
+    facet: displayFacet,
+    queryParams: queryParams
   }))), !expand && selectedItems.length > limitCheckBoxCount && /*#__PURE__*/_react.default.createElement("div", {
     className: classes.showMore,
     onClick: onExpandFacet
-  }, "...expand to see all selections"));
+  }, "...expand to see all selections"), expand && type === _Types.InputTypes.SLIDER && /*#__PURE__*/_react.default.createElement("div", {
+    style: {
+      marginTop: '20px',
+      marginBottom: '0px',
+      borderBottom: '1px solid rgb(204, 204, 204)'
+    }
+  }));
 };
 var _default = (0, _core.withStyles)(_FacetStyle.default)(FacetView);
 exports.default = _default;