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

package/dist/NewFacetFilterView.js

@@ -19,7 +19,8 @@ const BentoFacetFilter = _ref => {
     facetSection,
     CustomFacetSection,
     CustomFacetView,
-    queryParams
+    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,
@@ -29,13 +30,15 @@ const BentoFacetFilter = _ref => {
       return /*#__PURE__*/_react.default.createElement(_ReduxNewSearchFacetView.default, {
         facet: facet,
         queryParams: queryParams,
-        CustomView: CustomFacetView
+        CustomView: CustomFacetView,
+        basePath: basePath
       });
     }
     return /*#__PURE__*/_react.default.createElement(_ReduxNewFacetView.default, {
       facet: facet,
       queryParams: queryParams,
-      CustomView: CustomFacetView
+      CustomView: CustomFacetView,
+      basePath: basePath
     }, /*#__PURE__*/_react.default.createElement(_core.List, {
       className: "List_".concat(facet.label)
     }, /*#__PURE__*/_react.default.createElement(_FilterItems.default, {

package/dist/components/facet/NewFacetView.js

@@ -38,7 +38,8 @@ const NewFacetView = _ref => {
     onTimeUnitChange,
     unknownAgesState,
     expandState,
-    onToggleFacetExpand
+    onToggleFacetExpand,
+    basePath
   } = _ref;
   const expand = expandState[facet.datafield] !== undefined ? expandState[facet.datafield] : facet.expanded !== undefined && typeof facet.expanded === 'boolean' ? facet.expanded : false;
   const isUserInitiated = (0, _react.useRef)(false);
@@ -93,7 +94,7 @@ const NewFacetView = _ref => {
       paramValue[unknownAgesField] = '';
     }
     const queryStr = (0, _util.generateQueryStr)(query, queryParams, paramValue);
-    navigate("/exploreParticipants".concat(queryStr), {
+    navigate("".concat(basePath).concat(queryStr), {
       replace: true
     });
     setSortBy(null);
@@ -203,12 +204,14 @@ const NewFacetView = _ref => {
     facet: facet,
     queryParams: queryParams,
     sortBy: sortBy,
-    timeUnit: timeUnit
+    timeUnit: timeUnit,
+    basePath: basePath
   })), !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,
-    queryParams: queryParams
+    queryParams: queryParams,
+    basePath: basePath
   }))), !expand && selectedItems.length > limitCheckBoxCount && /*#__PURE__*/_react.default.createElement("div", {
     className: classes.showMore,
     onClick: onExpandFacet

package/dist/components/facet/NewSearchFacetView.js

@@ -60,7 +60,8 @@ const SearchFacetView = _ref => {
     queryParams,
     unknownAgesState,
     expandState,
-    onToggleFacetExpand
+    onToggleFacetExpand,
+    basePath
   } = _ref;
   const expand = expandState[facet.datafield] !== undefined ? expandState[facet.datafield] : facet.expanded !== undefined && typeof facet.expanded === 'boolean' ? facet.expanded : false;
   const isUserInitiated = (0, _react.useRef)(false);
@@ -93,7 +94,7 @@ const SearchFacetView = _ref => {
       paramValue[unknownAgesField] = '';
     }
     const queryStr = (0, _util.generateQueryStr)(query, queryParams, paramValue);
-    navigate("/exploreParticipants".concat(queryStr), {
+    navigate("".concat(basePath).concat(queryStr), {
       replace: true
     });
     onSortChange(facet.datafield, null);

package/dist/components/inputs/FilterItems.js

@@ -20,7 +20,8 @@ const FilterItems = _ref => {
     facet,
     queryParams,
     sortBy,
-    timeUnit
+    timeUnit,
+    basePath
   } = _ref;
   const {
     type,
@@ -40,13 +41,15 @@ const FilterItems = _ref => {
           }),
           datafield: datafield,
           facet: facet,
-          queryParams: queryParams
+          queryParams: queryParams,
+          basePath: basePath
         }));
       case _Types.InputTypes.SLIDER:
         return /*#__PURE__*/_react.default.createElement(_ReduxSlider.default, {
           facet: facet,
           queryParams: queryParams,
-          timeUnit: timeUnit
+          timeUnit: timeUnit,
+          basePath: basePath
         });
       default:
         return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);

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

@@ -24,7 +24,8 @@ const CheckBoxView = _ref => {
     datafield,
     onToggle,
     facet,
-    queryParams
+    queryParams,
+    basePath
   } = _ref;
   const {
     name,
@@ -71,7 +72,7 @@ const CheckBoxView = _ref => {
       paramValue[datafield] = '';
     }
     const queryStr = (0, _util.generateQueryStr)(query, queryParams, paramValue);
-    navigate("/exploreParticipants".concat(queryStr));
+    navigate("".concat(basePath).concat(queryStr));
     onToggle(toggleCheckBoxItem);
   };
   const LabelComponent = () => /*#__PURE__*/_react.default.createElement(_core.Box, {

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

@@ -28,7 +28,8 @@ const SliderView = _ref => {
     queryParams,
     timeUnit = 'days',
     unknownAgesState,
-    onUnknownAgesChange
+    onUnknownAgesChange,
+    basePath
   } = _ref;
   const {
     minLowerBound,
@@ -102,7 +103,7 @@ const SliderView = _ref => {
       const paramValue = {};
       paramValue[datafield] = daysValue;
       const queryStr = (0, _util.generateQueryStr)(query, queryParams, paramValue);
-      navigate("/exploreParticipants".concat(queryStr));
+      navigate("".concat(basePath).concat(queryStr));
       onSliderToggle(_objectSpread({
         sliderValue: daysValue
       }, facet));
@@ -138,7 +139,7 @@ const SliderView = _ref => {
       paramValue[datafield] = ''; // Clear the age range filter
       paramValue["".concat(datafield, "_unknownAges")] = 'only'; // Set the unknownAges parameter to only
       const queryStr = (0, _util.generateQueryStr)(query, queryParams, paramValue);
-      navigate("/exploreParticipants".concat(queryStr));
+      navigate("".concat(basePath).concat(queryStr));
 
       // Keep the current slider values for display (don't reset to defaults)
       // The slider will be disabled but show the user's previous selection
@@ -159,7 +160,7 @@ const SliderView = _ref => {
         paramValue[datafield] = ''; // Clear the age range filter
         paramValue["".concat(datafield, "_unknownAges")] = ''; // Clear the unknownAges parameter
         const queryStr = (0, _util.generateQueryStr)(query, queryParams, paramValue);
-        navigate("/exploreParticipants".concat(queryStr));
+        navigate("".concat(basePath).concat(queryStr));
 
         // Clear the slider state in the parent component
         onSliderToggle(_objectSpread({
@@ -171,7 +172,7 @@ const SliderView = _ref => {
         paramValue[datafield] = currentSliderValues;
         paramValue["".concat(datafield, "_unknownAges")] = ''; // Clear the unknownAges parameter since "include" is default
         const queryStr = (0, _util.generateQueryStr)(query, queryParams, paramValue);
-        navigate("/exploreParticipants".concat(queryStr));
+        navigate("".concat(basePath).concat(queryStr));
 
         // Restore the slider state in the parent component
         onSliderToggle(_objectSpread({
@@ -185,7 +186,7 @@ const SliderView = _ref => {
       paramValue[datafield] = currentSliderValues;
       paramValue["".concat(datafield, "_unknownAges")] = 'exclude'; // Set the unknownAges parameter to exclude
       const queryStr = (0, _util.generateQueryStr)(query, queryParams, paramValue);
-      navigate("/exploreParticipants".concat(queryStr));
+      navigate("".concat(basePath).concat(queryStr));
 
       // Restore the slider state in the parent component
       onSliderToggle(_objectSpread({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bento-core/facet-filter",
-  "version": "1.0.1-ccdiintegrated.1",
+  "version": "1.0.1-ccdiintegrated.2",
   "description": "### Bento core sidebar design:",
   "homepage": "https://github.com/CBIIT/bento-frontend#readme",
   "bugs": {

package/src/NewFacetFilterView.js

@@ -15,6 +15,7 @@ const BentoFacetFilter = ({
   CustomFacetSection,
   CustomFacetView,
   queryParams,
+  basePath,
 }) => {
   return (
     <>
@@ -30,6 +31,7 @@ const BentoFacetFilter = ({
               facet={facet}
               queryParams={queryParams}
               CustomView={CustomFacetView}
+              basePath={basePath}
             />
           );
         }
@@ -38,6 +40,7 @@ const BentoFacetFilter = ({
             facet={facet}
             queryParams={queryParams}
             CustomView={CustomFacetView}
+            basePath={basePath}
           >
             <List className={`List_${facet.label}`}>
               <FilterItems

package/src/components/facet/NewFacetView.js

@@ -33,6 +33,7 @@ const NewFacetView = ({
   unknownAgesState,
   expandState,
   onToggleFacetExpand,
+  basePath,
 }) => {
   const expand = expandState[facet.datafield] !== undefined ? expandState[facet.datafield] : (facet.expanded !== undefined && typeof facet.expanded === 'boolean' ? facet.expanded : false);
 
@@ -94,7 +95,7 @@ const NewFacetView = ({
     }
 
     const queryStr = generateQueryStr(query, queryParams, paramValue);
-    navigate(`/exploreParticipants${queryStr}`, { replace: true });
+    navigate(`${basePath}${queryStr}`, { replace: true });
     setSortBy(null);
 
     // Reset the corresponding unknownAges parameter in Redux state
@@ -258,6 +259,7 @@ const NewFacetView = ({
           queryParams={queryParams}
           sortBy={sortBy}
           timeUnit={timeUnit}
+          basePath={basePath}
         />
       </Accordion>
       {
@@ -267,6 +269,7 @@ const NewFacetView = ({
               <FilterItems
                 facet={displayFacet}
                 queryParams={queryParams}
+                basePath={basePath}
               />
             </List>
           </>

package/src/components/facet/NewSearchFacetView.js

@@ -58,6 +58,7 @@ const SearchFacetView = ({
   unknownAgesState,
   expandState,
   onToggleFacetExpand,
+  basePath,
 }) => {
   const expand = expandState[facet.datafield] !== undefined ? expandState[facet.datafield] : (facet.expanded !== undefined && typeof facet.expanded === 'boolean' ? facet.expanded : false);
 
@@ -96,7 +97,7 @@ const SearchFacetView = ({
     }
 
     const queryStr = generateQueryStr(query, queryParams, paramValue);
-    navigate(`/exploreParticipants${queryStr}`, { replace: true });
+    navigate(`${basePath}${queryStr}`, { replace: true });
     onSortChange(facet.datafield, null);
 
     // Reset the corresponding unknownAges parameter in Redux state

package/src/components/inputs/FilterItems.js

@@ -11,6 +11,7 @@ const FilterItems = ({
   queryParams,
   sortBy,
   timeUnit,
+  basePath,
 }) => {
   const {
     type, datafield, section,
@@ -25,10 +26,16 @@ const FilterItems = ({
             datafield={datafield}
             facet={facet}
             queryParams={queryParams}
+            basePath={basePath}
           />
         ));
       case InputTypes.SLIDER:
-        return (<ReduxSlider facet={facet} queryParams={queryParams} timeUnit={timeUnit} />);
+        return (<ReduxSlider
+          facet={facet}
+          queryParams={queryParams}
+          timeUnit={timeUnit}
+          basePath={basePath}
+        />);
       default:
         return (<></>);
     }

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

@@ -39,6 +39,7 @@ const CheckBoxView = ({
   onToggle,
   facet,
   queryParams,
+  basePath,
 }) => {
   const {
     name,
@@ -83,7 +84,7 @@ const CheckBoxView = ({
       paramValue[datafield] = '';
     }
     const queryStr = generateQueryStr(query, queryParams, paramValue);
-    navigate(`/exploreParticipants${queryStr}`);
+    navigate(`${basePath}${queryStr}`);
     onToggle(toggleCheckBoxItem);
   };
 

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

@@ -31,6 +31,7 @@ const SliderView = ({
   timeUnit = 'days',
   unknownAgesState,
   onUnknownAgesChange,
+  basePath,
 }) => {
   const { minLowerBound, maxUpperBound, quantifier, datafield, facetValues } = facet;
   const lowerBoundValue = facetValues[0];
@@ -106,7 +107,7 @@ const SliderView = ({
       const paramValue = {};
       paramValue[datafield] = daysValue;
       const queryStr = generateQueryStr(query, queryParams, paramValue);
-      navigate(`/exploreParticipants${queryStr}`);
+      navigate(`${basePath}${queryStr}`);
       onSliderToggle({ sliderValue: daysValue, ...facet });
     }
   };
@@ -149,7 +150,7 @@ const SliderView = ({
       paramValue[datafield] = ''; // Clear the age range filter
       paramValue[`${datafield}_unknownAges`] = 'only'; // Set the unknownAges parameter to only
       const queryStr = generateQueryStr(query, queryParams, paramValue);
-      navigate(`/exploreParticipants${queryStr}`);
+      navigate(`${basePath}${queryStr}`);
 
       // Keep the current slider values for display (don't reset to defaults)
       // The slider will be disabled but show the user's previous selection
@@ -170,7 +171,7 @@ const SliderView = ({
         paramValue[datafield] = ''; // Clear the age range filter
         paramValue[`${datafield}_unknownAges`] = ''; // Clear the unknownAges parameter
         const queryStr = generateQueryStr(query, queryParams, paramValue);
-        navigate(`/exploreParticipants${queryStr}`);
+        navigate(`${basePath}${queryStr}`);
 
         // Clear the slider state in the parent component
         onSliderToggle({ sliderValue: [], ...facet });
@@ -180,7 +181,7 @@ const SliderView = ({
         paramValue[datafield] = currentSliderValues;
         paramValue[`${datafield}_unknownAges`] = ''; // Clear the unknownAges parameter since "include" is default
         const queryStr = generateQueryStr(query, queryParams, paramValue);
-        navigate(`/exploreParticipants${queryStr}`);
+        navigate(`${basePath}${queryStr}`);
 
         // Restore the slider state in the parent component
         onSliderToggle({ sliderValue: currentSliderValues, ...facet });
@@ -192,7 +193,7 @@ const SliderView = ({
       paramValue[datafield] = currentSliderValues;
       paramValue[`${datafield}_unknownAges`] = 'exclude'; // Set the unknownAges parameter to exclude
       const queryStr = generateQueryStr(query, queryParams, paramValue);
-      navigate(`/exploreParticipants${queryStr}`);
+      navigate(`${basePath}${queryStr}`);
 
       // Restore the slider state in the parent component
       onSliderToggle({ sliderValue: currentSliderValues, ...facet });