@bento-core/facet-filter 1.0.1-icdc.1 → 1.0.1-icdc.10

package/README.md

@@ -72,12 +72,17 @@ import FacetFilter from 'bento-core';
 ```
 import { InputTypes } from 'bento-core';
 
+// fields for labelds and counts
+const GROUP = 'group'; // access labels
+const COUNT = 'subjects'; // access count value
+
 export const facetsConfig = [{ 
   section: CASES,
   label: 'Program', 
   apiForFiltering: 'filterSubjectCountByProgram', 
   datafield: 'programs', 
-  field: GROUP, 
+  field: GROUP,
+  count: COUNT,
   type: InputTypes.CHECKBOX, 
   sort_type: sortType.ALPHABET,
   show: true, 
@@ -265,11 +270,29 @@ const CustomClearAllFiltersBtn = ({ onClearAllFilters, disable }) => {
 ```
 // response 
 // filterCaseCountByProgram: [{group: "COP", subjects: 301}]
+
+// facet = { 
+//  section: CASES,
+//  label: 'Program', 
+//  apiForFiltering: 'filterSubjectCountByProgram', 
+//  datafield: 'programs', 
+//  field: GROUP,
+//  count: COUNT,
+//  type: InputTypes.CHECKBOX, 
+//  sort_type: sortType.ALPHABET,
+//  show: true, 
+//  customCount = (text) => `(${text})`,
+// }
+
+const {
+  field = 'group',
+  count = 'subjects',
+  customCount = (text) => `(${text})`,
+} = facet;
 const {
-  name,
-  customName,
-  subjects,
-  customSubjects,
+  isChecked = false,
+  index,
+  section,
   tooltip,
 } = checkboxItem;
 

package/dist/FacetFilterView.js

@@ -17,7 +17,9 @@ const BentoFacetFilter = _ref => {
   let {
     sideBarSections,
     CustomFacetSection,
-    CustomFacetView
+    CustomFacetView,
+    enableClearSection,
+    enableFacetCollapse
   } = _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",
@@ -27,7 +29,9 @@ const BentoFacetFilter = _ref => {
     CustomSection: CustomFacetSection
   }, section.items.map(facet => /*#__PURE__*/_react.default.createElement(_ReduxFacetView.default, {
     facet: facet,
-    CustomView: CustomFacetView
+    CustomView: CustomFacetView,
+    enableClearSection: enableClearSection,
+    enableFacetCollapse: enableFacetCollapse
   }))))));
 };
 var _default = (0, _core.withStyles)(_FacetFilterStyle.default)(BentoFacetFilter);

package/dist/components/facet/FacetStyle.js

@@ -20,6 +20,13 @@ var _default = () => ({
       position: 'initial'
     }
   },
+  subSectionSummaryTextWrapper: {
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+    width: '100%',
+    paddingRight: '15px'
+  },
   subSectionSummaryText: {
     marginLeft: '10px',
     lineHeight: 0,
@@ -34,21 +41,26 @@ var _default = () => ({
     marginBottom: '5px',
     borderTop: '1px solid #B1B1B1',
     textAlign: 'left',
-    marginLeft: '-5px'
+    // marginLeft: '-5px',
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'space-around'
   },
   sortGroupIcon: {
     cursor: 'pointer',
     fontFamily: 'Nunito',
-    fontSize: '10px',
-    marginRight: '12px',
-    marginLeft: '16px'
+    fontSize: '10px'
+    // marginRight: '12px',
+    // marginLeft: '16px',
   },
+
   sortGroupItem: {
     cursor: 'pointer',
     fontFamily: 'Nunito',
-    fontSize: '10px',
-    marginRight: '32px'
+    fontSize: '10px'
+    // marginRight: '32px',
   },
+
   NonSortGroup: {
     marginBottom: '5px',
     borderTop: '1px solid #B1B1B1',
@@ -63,11 +75,12 @@ var _default = () => ({
   sortGroupItemCounts: {
     cursor: 'pointer',
     fontFamily: 'Nunito',
-    fontSize: '10px',
-    float: 'right',
-    marginRight: '10px',
-    marginTop: '5px'
+    fontSize: '10px'
+    // float: 'right',
+    // marginRight: '10px',
+    // marginTop: '5px',
   },
+
   highlight: {
     color: '#b2c6d6'
   },

package/dist/components/facet/FacetView.js

@@ -7,12 +7,15 @@ exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _core = require("@material-ui/core");
 var _clsx = _interopRequireDefault(require("clsx"));
+var _Refresh = _interopRequireDefault(require("@material-ui/icons/Refresh"));
+var _IconButton = _interopRequireDefault(require("@material-ui/core/IconButton"));
 var _AccordionSummaryView = _interopRequireDefault(require("../summary/AccordionSummaryView"));
 var _Types = require("../inputs/Types");
 var _FacetStyle = _interopRequireDefault(require("./FacetStyle"));
 var _FilterItems = _interopRequireDefault(require("../inputs/FilterItems"));
 var _Sort = require("../../utils/Sort");
 var _clearIcon = _interopRequireDefault(require("./assets/clearIcon.svg"));
+var _ActionTypes = require("../../store/actions/ActionTypes");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -25,18 +28,50 @@ const FacetView = _ref => {
   let {
     classes,
     facet,
+    enableClearSection,
     onClearFacetSection,
     onClearSliderSection,
     CustomView,
     autoComplete,
-    upload
+    upload,
+    filterState,
+    currentActionType = {},
+    enableFacetCollapse
   } = _ref;
   const [expand, setExpand] = (0, _react.useState)(false);
   const onExpandFacet = () => setExpand(!expand);
+  const {
+    datafield
+  } = facet;
+  /**
+   * Collapse expanded facet or facets
+   * 1. on clear facet section
+   * 2. on clear all
+   * 3. on uncheck facet from DQB
+   */
+  (0, _react.useEffect)(() => {
+    if (enableFacetCollapse) {
+      const actionType = currentActionType[datafield];
+      // collapse facet if uncheck from DQB
+      if (actionType && actionType === _ActionTypes.sideBarActionTypes.FACET_VALUE_CHANGED) {
+        const {
+          isFacetOrigin
+        } = currentActionType;
+        if (!isFacetOrigin) {
+          if (Object.keys(filterState[datafield] || {}).length === 0) {
+            setExpand(false);
+          }
+        }
+      }
+      if (actionType && actionType === _ActionTypes.sideBarActionTypes.CLEAR_FACET_SECTION || currentActionType === _ActionTypes.sideBarActionTypes.CLEAR_ALL_FILTERS) {
+        setExpand(false);
+      }
+    }
+  }, [filterState]);
 
   /**
-  * expand section incase of active local search
-  */
+   * expand section incase of active local search
+   */
   (0, _react.useEffect)(() => {
     if (autoComplete && autoComplete.length > 0 || upload && upload.length > 0) {
       setExpand(true);
@@ -48,10 +83,13 @@ const FacetView = _ref => {
   };
   const onClearSection = () => {
     setSortBy(null);
-    if (facet.type === _Types.InputTypes.SLIDER) {
-      onClearSliderSection(facet);
-    } else {
-      onClearFacetSection(facet);
+    const activeFilterItems = filterState[datafield];
+    if (activeFilterItems && Object.keys(activeFilterItems).length > 0) {
+      if (facet.type === _Types.InputTypes.SLIDER) {
+        onClearSliderSection(facet);
+      } else {
+        onClearFacetSection(facet);
+      }
     }
   };
   /**
@@ -75,14 +113,25 @@ const FacetView = _ref => {
     },
     id: facet.section
   }, CustomView ? /*#__PURE__*/_react.default.createElement(CustomView, {
+    clearFacetSectionValues: onClearSection,
+    hasSelections: selectedItems.length,
     facet: facet,
     facetClasses: isActiveFacet ? "activeFacet".concat(facet.section) : "inactiveFacet".concat(facet.section)
-  }) : /*#__PURE__*/_react.default.createElement(_AccordionSummaryView.default, null, /*#__PURE__*/_react.default.createElement("div", {
+  }) : /*#__PURE__*/_react.default.createElement(_AccordionSummaryView.default, null, !enableClearSection ? /*#__PURE__*/_react.default.createElement("div", {
+    id: "filterGroup_ ".concat(facet.datafield, "\n                ").concat(facet.label),
+    className: (0, _clsx.default)(classes.subSectionSummaryText, {
+      ["activeFacet".concat(facet.section)]: isActiveFacet
+    })
+  }, facet.label) : /*#__PURE__*/_react.default.createElement("div", {
+    className: classes.subSectionSummaryTextWrapper
+  }, /*#__PURE__*/_react.default.createElement("div", {
     id: "filterGroup_ ".concat(facet.datafield, "\n                ").concat(facet.label),
     className: (0, _clsx.default)(classes.subSectionSummaryText, {
       ["activeFacet".concat(facet.section)]: isActiveFacet
     })
-  }, facet.label)), (facet.type === _Types.InputTypes.SLIDER || facetValues.length === 0) && /*#__PURE__*/_react.default.createElement("div", {
+  }, facet.label), selectedItems.length ? /*#__PURE__*/_react.default.createElement(_IconButton.default, {
+    onClick: onClearSection
+  }, /*#__PURE__*/_react.default.createElement(_Refresh.default, null)) : null)), (facet.type === _Types.InputTypes.SLIDER || facetValues.length === 0) && /*#__PURE__*/_react.default.createElement("div", {
     className: classes.NonSortGroup
   }, /*#__PURE__*/_react.default.createElement("span", {
     className: classes.NonSortGroupItem

package/dist/components/facet/ReduxFacetView.js

@@ -14,11 +14,13 @@ const mapStateToProps = state => {
   var _state$localFind, _state$localFind2;
   return {
     filterState: state.statusReducer.filterState,
+    currentActionType: state.statusReducer.currentActionType,
     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 mapDispatchToProps = dispatch => ({
+  onToggle: facet => dispatch((0, _Actions.toggleCheckBox)(facet)),
   onClearFacetSection: facet => {
     dispatch((0, _Actions.clearFacetSection)(facet));
   },

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

@@ -10,6 +10,7 @@ var _core = require("@material-ui/core");
 var _clsx = _interopRequireDefault(require("clsx"));
 var _icons = require("@material-ui/icons");
 var _CheckboxStyle = _interopRequireDefault(require("./CheckboxStyle"));
+var _ActionTypes = require("../../../store/actions/ActionTypes");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /* eslint-disable no-unused-vars */
 /* eslint-disable no-unused-vars */
@@ -46,7 +47,11 @@ const CheckBoxView = _ref => {
     const toggleCheckBoxItem = {
       name: name,
       datafield: datafield,
-      isChecked: !isChecked
+      isChecked: !isChecked,
+      actionType: {
+        [datafield]: _ActionTypes.sideBarActionTypes.FACET_VALUE_CHANGED,
+        isFacetOrigin: true
+      }
     };
     onToggle(toggleCheckBoxItem);
   };

package/dist/components/inputs/slider/SliderView.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _core = require("@material-ui/core");
+var _clsx = _interopRequireDefault(require("clsx"));
 var _SliderStyle = _interopRequireDefault(require("./SliderStyle"));
 var _Types = require("../Types");
 var _InputMinMaxView = _interopRequireDefault(require("./InputMinMaxView"));
@@ -63,9 +64,9 @@ const SliderView = _ref => {
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
     className: classes.sliderRoot
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: classes.minMaxInputs
+    className: (0, _clsx.default)(classes.minMaxInputs, 'minMaxInputs')
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: classes.minValue
+    className: (0, _clsx.default)(classes.minValue, 'min_input_box')
   }, /*#__PURE__*/_react.default.createElement(_core.Typography, {
     className: classes.minInputLabel
   }, "Min:"), /*#__PURE__*/_react.default.createElement(_InputMinMaxView.default, {
@@ -76,7 +77,7 @@ const SliderView = _ref => {
     type: _Types.silderTypes.INPUT_MIN,
     onInputChange: handleChangeCommittedSlider
   })), /*#__PURE__*/_react.default.createElement("div", {
-    className: classes.maxValue
+    className: (0, _clsx.default)(classes.maxValue, 'max_input_box')
   }, /*#__PURE__*/_react.default.createElement(_core.Typography, {
     className: classes.maxInputLabel
   }, "Max:"), /*#__PURE__*/_react.default.createElement(_InputMinMaxView.default, {
@@ -87,7 +88,7 @@ const SliderView = _ref => {
     type: _Types.silderTypes.INPUT_MAX,
     onInputChange: handleChangeCommittedSlider
   }))), /*#__PURE__*/_react.default.createElement("div", {
-    className: classes.slider
+    className: (0, _clsx.default)(classes.slider, 'slider')
   }, /*#__PURE__*/_react.default.createElement(_core.Slider, {
     disableSwap: true,
     getAriaValueText: valuetext,

package/dist/components/summary/AccordionSummaryView.js

@@ -11,6 +11,7 @@ var _AccordionSummaryStyle = _interopRequireDefault(require("./AccordionSummaryS
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const Summary = (0, _core.withStyles)({
   root: {
+    width: '307px',
     marginBottom: -1,
     minHeight: 48,
     paddingLeft: 14,

package/dist/index.js

@@ -81,6 +81,12 @@ Object.defineProperty(exports, "onToggleStateUpdate", {
     return _SideBarReducer.onToggleStateUpdate;
   }
 });
+Object.defineProperty(exports, "sideBarActionTypes", {
+  enumerable: true,
+  get: function get() {
+    return _ActionTypes.sideBarActionTypes;
+  }
+});
 Object.defineProperty(exports, "sideBarReducerGenerator", {
   enumerable: true,
   get: function get() {
@@ -129,6 +135,7 @@ var _filter = require("./utils/filter");
 var _Types = require("./components/inputs/Types");
 var _SideBarReducer = require("./store/reducers/SideBarReducer");
 var _Actions = require("./store/actions/Actions");
+var _ActionTypes = require("./store/actions/ActionTypes");
 var _component = require("./generator/component");
 var _ReduxClearAllBtn = _interopRequireDefault(require("./components/reset/ReduxClearAllBtn"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/dist/store/reducers/SideBarReducer.js

@@ -44,7 +44,10 @@ const onClearFacetSection = _ref2 => {
   if (updatedState[datafield]) {
     updatedState[datafield] = {};
   }
-  return updatedState;
+  return {
+    updatedState,
+    datafield
+  };
 };
 exports.onClearFacetSection = onClearFacetSection;
 const onClearSliderSection = _ref3 => {
@@ -87,31 +90,47 @@ function sideBarReducerGenerator() {
       switch (type) {
         case _ActionTypes.sideBarActionTypes.FACET_VALUE_CHANGED:
           updateState = onToggleStateUpdate(_objectSpread(_objectSpread({}, state), payload));
+          const {
+            actionType = _ActionTypes.sideBarActionTypes.FACET_VALUE_CHANGED
+          } = payload;
           return _objectSpread(_objectSpread({}, state), {}, {
-            filterState: _objectSpread({}, updateState)
+            filterState: _objectSpread({}, updateState),
+            currentActionType: actionType
           });
         case _ActionTypes.sideBarActionTypes.ON_TOGGLE_SLIDER:
           updateState = updateSiderValue(_objectSpread(_objectSpread({}, state), payload));
           return _objectSpread(_objectSpread({}, state), {}, {
-            filterState: _objectSpread({}, updateState)
+            filterState: _objectSpread({}, updateState),
+            currentActionType: _ActionTypes.sideBarActionTypes.ON_TOGGLE_SLIDER
           });
         case _ActionTypes.sideBarActionTypes.CLEAR_ALL_FILTERS:
           return _objectSpread(_objectSpread({}, state), {}, {
-            filterState: {}
+            filterState: {},
+            currentActionType: _ActionTypes.sideBarActionTypes.CLEAR_ALL_FILTERS
           });
         case _ActionTypes.sideBarActionTypes.CLEAR_FACET_SECTION:
-          updateState = onClearFacetSection(_objectSpread(_objectSpread({}, payload), state));
+          const {
+            updatedState: updtState,
+            datafield
+          } = onClearFacetSection(_objectSpread(_objectSpread({}, payload), state));
+          updateState = updtState;
+          const currentActionType = {
+            [datafield]: _ActionTypes.sideBarActionTypes.CLEAR_FACET_SECTION
+          };
           return _objectSpread(_objectSpread({}, state), {}, {
-            filterState: _objectSpread({}, updateState)
+            filterState: _objectSpread({}, updateState),
+            currentActionType
           });
         case _ActionTypes.sideBarActionTypes.CLEAR_SLIDER_SECTION:
           updateState = onClearSliderSection(_objectSpread(_objectSpread({}, payload), state));
           return _objectSpread(_objectSpread({}, state), {}, {
-            filterState: _objectSpread({}, updateState)
+            filterState: _objectSpread({}, updateState),
+            currentActionType: _ActionTypes.sideBarActionTypes.CLEAR_SLIDER_SECTION
           });
         case _ActionTypes.sideBarActionTypes.CLEAR_AND_SELECT_FACET_VALUE:
           return {
-            filterState: payload
+            filterState: payload,
+            currentActionType: _ActionTypes.sideBarActionTypes.CLEAR_AND_SELECT_FACET_VALUE
           };
         default:
           return state;

package/package.json

@@ -1,17 +1,14 @@
 {
   "name": "@bento-core/facet-filter",
-  "version": "1.0.1-icdc.1",
-  "description": "### Bento core sidebar design:",
+  "version": "1.0.1-icdc.10",
+  "description": "",
   "main": "dist/index.js",
   "scripts": {
     "build": "npm run lint && cross-env-shell rm -rf dist && NODE_ENV=production BABEL_ENV=es babel src --out-dir dist --copy-files",
     "test": "echo \"Error: no test specified\" && exit 1",
     "lint": "eslint src"
   },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/CBIIT/bento-frontend.git"
-  },
+  "repository": "https://github.com/CBIIT/bento-frontend",
   "publishConfig": {
     "access": "public"
   },
@@ -27,9 +24,5 @@
     "react-redux": "^7.2.1"
   },
   "author": "CTOS Bento Team",
-  "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/CBIIT/bento-frontend/issues"
-  },
-  "homepage": "https://github.com/CBIIT/bento-frontend#readme"
+  "license": "ISC"
 }

package/src/FacetFilterView.js

@@ -1,10 +1,7 @@
 /* eslint-disable arrow-body-style */
 /* eslint-disable padded-blocks */
 import React from 'react';
-import {
-  Divider,
-  withStyles,
-} from '@material-ui/core';
+import { Divider, withStyles } from '@material-ui/core';
 import styles from './FacetFilterStyle';
 import FacetSectionView from './components/section/FacetSectionView';
 import FacetView from './components/facet/ReduxFacetView';
@@ -13,30 +10,29 @@ const BentoFacetFilter = ({
   sideBarSections,
   CustomFacetSection,
   CustomFacetView,
+  enableClearSection,
+  enableFacetCollapse,
 }) => {
   return (
     <>
-      {
-        sideBarSections.map((section, index) => (
-          <>
-            <Divider
-              variant="middle"
-              className={`divider${index}`}
-            />
-            <FacetSectionView
-              section={section}
-              CustomSection={CustomFacetSection}
-            >
-              {section.items.map((facet) => (
-                <FacetView
-                  facet={facet}
-                  CustomView={CustomFacetView}
-                />
-              ))}
-            </FacetSectionView>
-          </>
-        ))
-      }
+      {sideBarSections.map((section, index) => (
+        <>
+          <Divider variant="middle" className={`divider${index}`} />
+          <FacetSectionView
+            section={section}
+            CustomSection={CustomFacetSection}
+          >
+            {section.items.map((facet) => (
+              <FacetView
+                facet={facet}
+                CustomView={CustomFacetView}
+                enableClearSection={enableClearSection}
+                enableFacetCollapse={enableFacetCollapse}
+              />
+            ))}
+          </FacetSectionView>
+        </>
+      ))}
     </>
   );
 };

package/src/components/facet/FacetStyle.js

@@ -14,6 +14,13 @@ export default () => ({
       position: 'initial',
     },
   },
+  subSectionSummaryTextWrapper: {
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+    width: '100%',
+    paddingRight: '15px',
+  },
   subSectionSummaryText: {
     marginLeft: '10px',
     lineHeight: 0,
@@ -28,20 +35,23 @@ export default () => ({
     marginBottom: '5px',
     borderTop: '1px solid #B1B1B1',
     textAlign: 'left',
-    marginLeft: '-5px',
+    // marginLeft: '-5px',
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'space-around',
   },
   sortGroupIcon: {
     cursor: 'pointer',
     fontFamily: 'Nunito',
     fontSize: '10px',
-    marginRight: '12px',
-    marginLeft: '16px',
+    // marginRight: '12px',
+    // marginLeft: '16px',
   },
   sortGroupItem: {
     cursor: 'pointer',
     fontFamily: 'Nunito',
     fontSize: '10px',
-    marginRight: '32px',
+    // marginRight: '32px',
   },
   NonSortGroup: {
     marginBottom: '5px',
@@ -58,9 +68,9 @@ export default () => ({
     cursor: 'pointer',
     fontFamily: 'Nunito',
     fontSize: '10px',
-    float: 'right',
-    marginRight: '10px',
-    marginTop: '5px',
+    // float: 'right',
+    // marginRight: '10px',
+    // marginTop: '5px',
   },
   highlight: {
     color: '#b2c6d6',

package/src/components/facet/FacetView.js

@@ -1,36 +1,68 @@
 import React, { useEffect, useState } from 'react';
 import {
-  Accordion,
-  List,
-  withStyles,
-  Icon,
+  Accordion, List, withStyles, Icon,
 } from '@material-ui/core';
 import clsx from 'clsx';
+import RefreshIcon from '@material-ui/icons/Refresh';
+import IconButton from '@material-ui/core/IconButton';
 import CustomAccordionSummary from '../summary/AccordionSummaryView';
 import { InputTypes } from '../inputs/Types';
 import styles from './FacetStyle';
 import FilterItems from '../inputs/FilterItems';
 import { sortType } from '../../utils/Sort';
 import clearIcon from './assets/clearIcon.svg';
+import { sideBarActionTypes } from '../../store/actions/ActionTypes';
 
 const FacetView = ({
   classes,
   facet,
+  enableClearSection,
   onClearFacetSection,
   onClearSliderSection,
   CustomView,
   autoComplete,
   upload,
+  filterState,
+  currentActionType = {},
+  enableFacetCollapse,
 }) => {
   const [expand, setExpand] = useState(false);
   const onExpandFacet = () => setExpand(!expand);
 
+  const { datafield } = facet;
   /**
-  * expand section incase of active local search
-  */
+   * Collapse expanded facet or facets
+   * 1. on clear facet section
+   * 2. on clear all
+   * 3. on uncheck facet from DQB
+   */
+  useEffect(() => {
+    if (enableFacetCollapse) {
+      const actionType = currentActionType[datafield];
+      // collapse facet if uncheck from DQB
+      if (actionType && actionType === sideBarActionTypes.FACET_VALUE_CHANGED) {
+        const { isFacetOrigin } = currentActionType;
+        if (!isFacetOrigin) {
+          if (Object.keys(filterState[datafield] || {}).length === 0) {
+            setExpand(false);
+          }
+        }
+      }
+      if ((actionType && actionType === sideBarActionTypes.CLEAR_FACET_SECTION)
+        || currentActionType === sideBarActionTypes.CLEAR_ALL_FILTERS) {
+        setExpand(false);
+      }
+    }
+  }, [filterState]);
+
+  /**
+   * expand section incase of active local search
+   */
   useEffect(() => {
-    if ((autoComplete && autoComplete.length > 0)
-      || (upload && upload.length > 0)) {
+    if (
+      (autoComplete && autoComplete.length > 0)
+      || (upload && upload.length > 0)
+    ) {
       setExpand(true);
     }
   }, [autoComplete, upload]);
@@ -42,10 +74,13 @@ const FacetView = ({
 
   const onClearSection = () => {
     setSortBy(null);
-    if (facet.type === InputTypes.SLIDER) {
-      onClearSliderSection(facet);
-    } else {
-      onClearFacetSection(facet);
+    const activeFilterItems = filterState[datafield];
+    if (activeFilterItems && Object.keys(activeFilterItems).length > 0) {
+      if (facet.type === InputTypes.SLIDER) {
+        onClearSliderSection(facet);
+      } else {
+        onClearFacetSection(facet);
+      }
     }
   };
   /**
@@ -57,6 +92,7 @@ const FacetView = ({
   displayFacet.facetValues = selectedItems;
   const isActiveFacet = [...selectedItems].length > 0;
   const limitCheckBoxCount = facet?.showCheckboxCount || 5;
+
   return (
     <>
       <Accordion
@@ -68,119 +104,103 @@ const FacetView = ({
         }}
         id={facet.section}
       >
-        { CustomView ? (
+        {CustomView ? (
           <CustomView
+            clearFacetSectionValues={onClearSection}
+            hasSelections={selectedItems.length}
             facet={facet}
             facetClasses={
-            isActiveFacet ? `activeFacet${facet.section}`
-              : `inactiveFacet${facet.section}`
+              isActiveFacet
+                ? `activeFacet${facet.section}`
+                : `inactiveFacet${facet.section}`
             }
           />
         ) : (
           <CustomAccordionSummary>
-            <div
-              id={
-                `filterGroup_ ${facet.datafield}
-                ${facet.label}`
-              }
-              className={clsx(classes.subSectionSummaryText, {
-                [`activeFacet${facet.section}`]: isActiveFacet,
-              })}
-            >
-              {facet.label}
-            </div>
+            {!enableClearSection ? (
+              <div
+                id={`filterGroup_ ${facet.datafield}
+                ${facet.label}`}
+                className={clsx(classes.subSectionSummaryText, {
+                  [`activeFacet${facet.section}`]: isActiveFacet,
+                })}
+              >
+                {facet.label}
+              </div>
+            ) : (
+              <div className={classes.subSectionSummaryTextWrapper}>
+                <div
+                  id={`filterGroup_ ${facet.datafield}
+                ${facet.label}`}
+                  className={clsx(classes.subSectionSummaryText, {
+                    [`activeFacet${facet.section}`]: isActiveFacet,
+                  })}
+                >
+                  {facet.label}
+                </div>
+                {selectedItems.length ? (
+                  <IconButton onClick={onClearSection}>
+                    <RefreshIcon />
+                  </IconButton>
+                ) : null}
+              </div>
+            )}
           </CustomAccordionSummary>
         )}
-        {
-          (facet.type === InputTypes.SLIDER || facetValues.length === 0)
-          && (
+        {(facet.type === InputTypes.SLIDER || facetValues.length === 0) && (
           <div className={classes.NonSortGroup}>
-            <span
-              className={classes.NonSortGroupItem}
-            >
+            <span className={classes.NonSortGroupItem}>
               No data for this field
             </span>
           </div>
-          )
-        }
-        {
-          (facet.type === InputTypes.SLIDER || facetValues.length > 0)
-          && (
+        )}
+        {(facet.type === InputTypes.SLIDER || facetValues.length > 0) && (
           <div className={classes.sortGroup}>
             <span className={classes.sortGroupIcon}>
-              <Icon
-                style={{ fontSize: 10 }}
-                onClick={onClearSection}
-              >
-                <img
-                  src={clearIcon}
-                  height={12}
-                  width={12}
-                  alt="clear-icon"
-                />
+              <Icon style={{ fontSize: 10 }} onClick={onClearSection}>
+                <img src={clearIcon} height={12} width={12} alt="clear-icon" />
               </Icon>
             </span>
-            { (facet.type === InputTypes.CHECKBOX && facetValues.length > 0)
-          && (
-          <>
-            <span
-              className={
-                    clsx(classes.sortGroupItem, {
-                      [classes.highlight]: sortBy === sortType.ALPHABET,
-                    })
-                  }
-              onClick={() => {
-                onSortFacet(sortType.ALPHABET);
-              }}
-            >
-              Sort alphabetically
-            </span>
-            <span
-              className={
-                    clsx(classes.sortGroupItemCounts, {
-                      [classes.highlight]: sortBy === sortType.NUMERIC,
-                    })
-                  }
-              onClick={() => {
-                onSortFacet(sortType.NUMERIC);
-              }}
-            >
-              Sort by count
-            </span>
-          </>
-          )}
+            {facet.type === InputTypes.CHECKBOX && facetValues.length > 0 && (
+              <>
+                <span
+                  className={clsx(classes.sortGroupItem, {
+                    [classes.highlight]: sortBy === sortType.ALPHABET,
+                  })}
+                  onClick={() => {
+                    onSortFacet(sortType.ALPHABET);
+                  }}
+                >
+                  Sort alphabetically
+                </span>
+                <span
+                  className={clsx(classes.sortGroupItemCounts, {
+                    [classes.highlight]: sortBy === sortType.NUMERIC,
+                  })}
+                  onClick={() => {
+                    onSortFacet(sortType.NUMERIC);
+                  }}
+                >
+                  Sort by count
+                </span>
+              </>
+            )}
           </div>
-          )
-}
-        {(expand)
-          && (
-          <FilterItems
-            facet={facet}
-            sortBy={sortBy}
-          />
-          )}
+        )}
+        {expand && <FilterItems facet={facet} sortBy={sortBy} />}
       </Accordion>
-      {
-        (!expand && type === InputTypes.CHECKBOX && selectedItems.length > 0) && (
-          <>
-            <List id="filter_Items">
-              <FilterItems
-                facet={displayFacet}
-              />
-            </List>
-          </>
-        )
-      }
-      {
-        (!expand && selectedItems.length > limitCheckBoxCount) && (
-          <div
-            className={classes.showMore}
-            onClick={onExpandFacet}
-          >
-            ...expand to see all selections
-          </div>
-        )
-      }
+      {!expand && type === InputTypes.CHECKBOX && selectedItems.length > 0 && (
+        <>
+          <List id="filter_Items">
+            <FilterItems facet={displayFacet} />
+          </List>
+        </>
+      )}
+      {!expand && selectedItems.length > limitCheckBoxCount && (
+        <div className={classes.showMore} onClick={onExpandFacet}>
+          ...expand to see all selections
+        </div>
+      )}
     </>
   );
 };

package/src/components/facet/ReduxFacetView.js

@@ -1,19 +1,29 @@
 import React from 'react';
 import { connect } from 'react-redux';
-import { clearFacetSection, clearSliderSection } from '../../store/actions/Actions';
+import {
+  clearFacetSection,
+  clearSliderSection,
+  toggleCheckBox,
+} from '../../store/actions/Actions';
 import FacetView from './FacetView';
 
-const ReduxFacetView = ((props) => <FacetView {...props} />);
+const ReduxFacetView = (props) => <FacetView {...props} />;
 
 const mapStateToProps = (state) => ({
   filterState: state.statusReducer.filterState,
+  currentActionType: state.statusReducer.currentActionType,
   autoComplete: state?.localFind?.autocomplete || [],
   upload: state?.localFind?.upload || [],
 });
 
 const mapDispatchToProps = (dispatch) => ({
-  onClearFacetSection: (facet) => { dispatch(clearFacetSection(facet)); },
-  onClearSliderSection: (facet) => { dispatch(clearSliderSection(facet)); },
+  onToggle: (facet) => dispatch(toggleCheckBox(facet)),
+  onClearFacetSection: (facet) => {
+    dispatch(clearFacetSection(facet));
+  },
+  onClearSliderSection: (facet) => {
+    dispatch(clearSliderSection(facet));
+  },
 });
 
 export default connect(mapStateToProps, mapDispatchToProps)(ReduxFacetView);

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

@@ -20,9 +20,11 @@ import {
 } from '@material-ui/core';
 import clsx from 'clsx';
 import {
-  CheckBox as CheckBoxIcon, CheckBoxOutlineBlank as CheckBoxBlankIcon,
+  CheckBox as CheckBoxIcon,
+  CheckBoxOutlineBlank as CheckBoxBlankIcon,
 } from '@material-ui/icons';
 import styles from './CheckboxStyle';
+import { sideBarActionTypes } from '../../../store/actions/ActionTypes';
 
 const CheckBoxView = ({
   classes,
@@ -31,12 +33,7 @@ const CheckBoxView = ({
   onToggle,
   facet,
 }) => {
-  const {
-    isChecked = false,
-    index,
-    section,
-    tooltip,
-  } = checkboxItem;
+  const { isChecked = false, index, section, tooltip } = checkboxItem;
   const {
     field = 'group',
     count = 'subjects',
@@ -53,6 +50,10 @@ const CheckBoxView = ({
       name: name,
       datafield: datafield,
       isChecked: !isChecked,
+      actionType: {
+        [datafield]: sideBarActionTypes.FACET_VALUE_CHANGED,
+        isFacetOrigin: true,
+      },
     };
     onToggle(toggleCheckBoxItem);
   };
@@ -65,9 +66,7 @@ const CheckBoxView = ({
         [`${checkedSection}NameChecked`]: isChecked,
       })}
     >
-      <Typography className={classes.checkboxName}>
-        {name}
-      </Typography>
+      <Typography className={classes.checkboxName}>{name}</Typography>
     </Box>
   );
 
@@ -79,7 +78,9 @@ const CheckBoxView = ({
         alignItems="flex-start"
         onClick={handleToggle}
         classes={{ gutters: classes.listItemGutters }}
-        className={clsx({ [`${checkedSection}Checked${indexType}`]: isChecked })}
+        className={clsx({
+          [`${checkedSection}Checked${indexType}`]: isChecked,
+        })}
       >
         <Checkbox
           id={`checkbox_${facet.label}_${name}`}
@@ -91,23 +92,21 @@ const CheckBoxView = ({
           }
           onClick={handleToggle}
           checked={isChecked}
-          checkedIcon={(
+          checkedIcon={
             <CheckBoxIcon
               style={{
                 fontSize: 18,
               }}
               className={`${checkedSection}CheckedIcon`}
             />
-          )}
+          }
           disableRipple
           color="secondary"
           classes={{ root: classes.checkboxRoot }}
         />
-        { tooltip ? (
+        {tooltip ? (
           <Tooltip id={datafield} title={tooltip}>
-            <div className={datafield}>
-              {name}
-            </div>
+            <div className={datafield}>{name}</div>
           </Tooltip>
         ) : (
           <LabelComponent />

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

@@ -3,7 +3,7 @@ import { connect } from 'react-redux';
 import { toggleCheckBox } from '../../../store/actions/Actions';
 import CheckboxView from './CheckboxView';
 
-const ReduxCheckbox = ((props) => <CheckboxView {...props} />);
+const ReduxCheckbox = (props) => <CheckboxView {...props} />;
 
 const mapStateToProps = (state) => ({
   filterState: state.statusReducer.filterState,

package/src/components/inputs/slider/SliderView.js

@@ -4,6 +4,7 @@
 /* eslint-disable object-curly-newline */
 import React, { useEffect, useState } from 'react';
 import { withStyles, Slider, Typography, Box } from '@material-ui/core';
+import clsx from 'clsx';
 import styles from './SliderStyle';
 import { silderTypes } from '../Types';
 import InputMinMaxView from './InputMinMaxView';
@@ -53,8 +54,8 @@ const SliderView = ({
   return (
     <>
       <div className={classes.sliderRoot}>
-        <div className={classes.minMaxInputs}>
-          <div className={classes.minValue}>
+        <div className={clsx(classes.minMaxInputs, 'minMaxInputs')}>
+          <div className={clsx(classes.minValue, 'min_input_box')}>
             <Typography className={classes.minInputLabel}>
               Min:
             </Typography>
@@ -67,7 +68,7 @@ const SliderView = ({
               onInputChange={handleChangeCommittedSlider}
             />
           </div>
-          <div className={classes.maxValue}>
+          <div className={clsx(classes.maxValue, 'max_input_box')}>
             <Typography className={classes.maxInputLabel}>
               Max:
             </Typography>
@@ -81,7 +82,7 @@ const SliderView = ({
             />
           </div>
         </div>
-        <div className={classes.slider}>
+        <div className={clsx(classes.slider, 'slider')}>
           {/* Change to red if invalid range */}
           <Slider
             disableSwap

package/src/components/summary/AccordionSummaryView.js

@@ -1,15 +1,11 @@
 import React from 'react';
-import {
-  AccordionSummary,
-  withStyles,
-} from '@material-ui/core';
-import {
-  ExpandMore as ExpandMoreIcon,
-} from '@material-ui/icons';
+import { AccordionSummary, withStyles } from '@material-ui/core';
+import { ExpandMore as ExpandMoreIcon } from '@material-ui/icons';
 import style from './AccordionSummaryStyle';
 
 const Summary = withStyles({
   root: {
+    width: '307px',
     marginBottom: -1,
     minHeight: 48,
     paddingLeft: 14,
@@ -27,10 +23,7 @@ const Summary = withStyles({
   expanded: {},
 })(AccordionSummary);
 
-const CustomAccordionSummary = ({
-  children,
-  classes,
-}) => (
+const CustomAccordionSummary = ({ children, classes }) => (
   <Summary
     expandIcon={(
       <ExpandMoreIcon

package/src/index.js

@@ -23,6 +23,9 @@ export {
   clearSliderSection,
   clearAllAndSelectFacet,
 } from './store/actions/Actions';
+export {
+  sideBarActionTypes,
+} from './store/actions/ActionTypes';
 export {
   generateFacetSectionView,
 } from './generator/component';

package/src/store/reducers/SideBarReducer.js

@@ -30,7 +30,7 @@ export const onClearFacetSection = ({
   if (updatedState[datafield]) {
     updatedState[datafield] = {};
   }
-  return updatedState;
+  return { updatedState, datafield };
 };
 
 export const onClearSliderSection = ({
@@ -64,36 +64,48 @@ export function sideBarReducerGenerator() {
       switch (type) {
         case sideBarActionTypes.FACET_VALUE_CHANGED:
           updateState = onToggleStateUpdate({ ...state, ...payload });
+          const { actionType = sideBarActionTypes.FACET_VALUE_CHANGED } = payload;
           return {
             ...state,
             filterState: { ...updateState },
+            currentActionType: actionType,
           };
         case sideBarActionTypes.ON_TOGGLE_SLIDER:
           updateState = updateSiderValue({ ...state, ...payload });
           return {
             ...state,
             filterState: { ...updateState },
+            currentActionType: sideBarActionTypes.ON_TOGGLE_SLIDER,
           };
         case sideBarActionTypes.CLEAR_ALL_FILTERS:
           return {
             ...state,
             filterState: {},
+            currentActionType: sideBarActionTypes.CLEAR_ALL_FILTERS,
           };
         case sideBarActionTypes.CLEAR_FACET_SECTION:
-          updateState = onClearFacetSection({ ...payload, ...state });
+          const {
+            updatedState: updtState,
+            datafield,
+          } = onClearFacetSection({ ...payload, ...state });
+          updateState = updtState;
+          const currentActionType = { [datafield]: sideBarActionTypes.CLEAR_FACET_SECTION };
           return {
             ...state,
             filterState: { ...updateState },
+            currentActionType,
           };
         case sideBarActionTypes.CLEAR_SLIDER_SECTION:
           updateState = onClearSliderSection({ ...payload, ...state });
           return {
             ...state,
             filterState: { ...updateState },
+            currentActionType: sideBarActionTypes.CLEAR_SLIDER_SECTION,
           };
         case sideBarActionTypes.CLEAR_AND_SELECT_FACET_VALUE:
           return {
             filterState: payload,
+            currentActionType: sideBarActionTypes.CLEAR_AND_SELECT_FACET_VALUE,
           };
         default:
           return state;