@bento-core/query-bar 1.0.1-ccdiintegrated.1 → 1.0.1-ccdiintegrated.2

package/dist/components/SliderFilter.js

@@ -17,18 +17,49 @@ var _default = _ref => {
   } = _ref;
   const {
     items,
-    section
+    section,
+    unknownAges
   } = data;
+
+  // Determine the display logic based on unknownAges selection
+  const getDisplayContent = () => {
+    const baseLabel = data.label;
+    if (unknownAges === 'only') {
+      // Only: Show base label with unknown ages only, no range
+      return {
+        label: "".concat(baseLabel, " (Unknown Ages Only)"),
+        showRange: false,
+        rangeText: ''
+      };
+    }
+    if (unknownAges === 'exclude') {
+      // Exclude: Show base label with unknown ages excluded, with range only if items exist
+      const hasRange = items && items.length >= 2;
+      return {
+        label: "".concat(baseLabel, " (Unknown Ages Excluded)"),
+        showRange: hasRange,
+        rangeText: hasRange ? "".concat(items[0], " \u2013 ").concat(items[1]) : ''
+      };
+    }
+
+    // Include: Normal display (base label with range)
+    return {
+      label: baseLabel,
+      showRange: true,
+      rangeText: items && items.length >= 2 ? "".concat(items[0], " \u2013 ").concat(items[1]) : ''
+    };
+  };
+  const displayContent = getDisplayContent();
   return /*#__PURE__*/_react.default.createElement("span", null, /*#__PURE__*/_react.default.createElement("span", null, ' ', index !== 0 ? /*#__PURE__*/_react.default.createElement("span", {
     className: classes.operators
   }, " AND ") : '', /*#__PURE__*/_react.default.createElement("span", {
     className: (0, _clsx.default)(classes.filterName, classes["facetSection".concat(section, "Background")]),
     onClick: () => onSectionClick(data)
-  }, data.label), ' '), /*#__PURE__*/_react.default.createElement("span", null, ' ', /*#__PURE__*/_react.default.createElement("span", {
+  }, displayContent.label), ' '), displayContent.showRange && /*#__PURE__*/_react.default.createElement("span", null, ' ', /*#__PURE__*/_react.default.createElement("span", {
     className: classes.operators
   }, "IS BETWEEN", ' '), /*#__PURE__*/_react.default.createElement("span", {
     className: (0, _clsx.default)(classes.filterCheckboxes, classes["facetSection".concat(section)]),
     onClick: () => onItemClick(data, items[0])
-  }, "".concat(items[0], " \u2013 ").concat(items[1]))));
+  }, displayContent.rangeText)));
 };
 exports.default = _default;

package/dist/generators/QueryBarGenerator.js

@@ -81,7 +81,7 @@ const QueryBarGenerator = function QueryBarGenerator() {
         return _objectSpread(_objectSpread({}, facet), {}, {
           items: itemKeys
         });
-      }).filter(facet => facet.items.length > 0);
+      }).filter(facet => facet.items.length > 0 || facet.unknownAges && facet.unknownAges !== 'include');
       if (!hasImportFrom && (mappedInputs.length || autocomplete.length || upload.length) <= 0) {
         return null;
       }
@@ -99,7 +99,7 @@ const QueryBarGenerator = function QueryBarGenerator() {
       }, hasImportFrom && /*#__PURE__*/_react.default.createElement("span", {
         className: (0, _clsx.default)(classes.filterCheckboxes, classes.localFindBackground),
         onClick: clearImportFrom
-      }, "IMPORTED PARTICIPANT SET"), (autocomplete.length || upload.length) && mappedInputs.length ? /*#__PURE__*/_react.default.createElement("span", {
+      }, "IMPORTED PARTICIPANT SET"), hasImportFrom && (mappedInputs.length || autocomplete.length || upload.length) ? /*#__PURE__*/_react.default.createElement("span", {
         className: classes.operators
       }, " AND ") : null, autocomplete.length || upload.length ? /*#__PURE__*/_react.default.createElement("span", null, upload.length && !autocomplete.length ? /*#__PURE__*/_react.default.createElement("span", {
         className: (0, _clsx.default)(classes.filterCheckboxes, classes.localFindBackground),

package/dist/generators/styles.js

@@ -9,9 +9,8 @@ exports.default = void 0;
  */
 var _default = () => ({
   queryWrapper: {
-    height: '120px',
     backgroundColor: '#f1f1f1',
-    padding: '14px 14px 0px 35px',
+    padding: '5px 15px 15px 15px',
     overflowY: 'auto'
   },
   queryContainer: {
@@ -125,41 +124,48 @@ var _default = () => ({
     backgroundColor: '#E1C9E140',
     border: '1px solid #646464'
   },
-  facetSectionTreatment: {
+  facetSectionGeneticanalysis: {
     color: '#4555AB'
   },
-  facetSectionTreatmentBackground: {
+  facetSectionGeneticanalysisBackground: {
     backgroundColor: '#4555AB30',
     border: '1px solid #646464'
   },
-  facetSectionTreatmentresponse: {
+  facetSectionTreatment: {
     color: '#907642'
   },
-  facetSectionTreatmentresponseBackground: {
+  facetSectionTreatmentBackground: {
     backgroundColor: '#F0DFBD40',
     border: '1px solid #646464'
   },
-  facetSectionSurvival: {
+  facetSectionTreatmentresponse: {
     color: '#A85348'
   },
-  facetSectionSurvivalBackground: {
+  facetSectionTreatmentresponseBackground: {
     backgroundColor: '#F8D7D240',
     border: '1px solid #646464'
   },
-  facetSectionSamples: {
+  facetSectionSurvival: {
     color: '#1F6BBF'
   },
-  facetSectionSamplesBackground: {
+  facetSectionSurvivalBackground: {
     backgroundColor: '#CEDEF040',
     border: '1px solid #646464'
   },
-  facetSectionDatacategory: {
+  facetSectionSamples: {
     color: '#14A773'
   },
-  facetSectionDatacategoryBackground: {
+  facetSectionSamplesBackground: {
     backgroundColor: '#DDEAE540',
     border: '1px solid #646464'
   },
+  facetSectionDatacategory: {
+    color: '#357288'
+  },
+  facetSectionDatacategoryBackground: {
+    backgroundColor: '#E4ECE9',
+    border: '1px solid #646464'
+  },
   facetSectionStudy: {
     color: '#357288'
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bento-core/query-bar",
-  "version": "1.0.1-ccdiintegrated.1",
+  "version": "1.0.1-ccdiintegrated.2",
   "description": "This package provides the Query Bar component that displays the current Facet Search and Local Find filters on the Dashboard/Explore page. It also provides the direct ability to reset all or some of the filters with the click of a button. It is designed to be implemented directly with the:",
   "homepage": "https://github.com/CBIIT/bento-frontend#readme",
   "bugs": {

package/src/generators/styles.js

@@ -118,41 +118,48 @@ export default () => ({
     backgroundColor: '#E1C9E140',
     border: '1px solid #646464',
   },
-  facetSectionTreatment: {
+  facetSectionGeneticanalysis: {
     color: '#4555AB',
   },
-  facetSectionTreatmentBackground: {
+  facetSectionGeneticanalysisBackground: {
     backgroundColor: '#4555AB30',
     border: '1px solid #646464',
   },
-  facetSectionTreatmentresponse: {
+  facetSectionTreatment: {
     color: '#907642',
   },
-  facetSectionTreatmentresponseBackground: {
+  facetSectionTreatmentBackground: {
     backgroundColor: '#F0DFBD40',
     border: '1px solid #646464',
   },
-  facetSectionSurvival: {
+  facetSectionTreatmentresponse: {
     color: '#A85348',
   },
-  facetSectionSurvivalBackground: {
+  facetSectionTreatmentresponseBackground: {
     backgroundColor: '#F8D7D240',
     border: '1px solid #646464',
   },
-  facetSectionSamples: {
+  facetSectionSurvival: {
     color: '#1F6BBF',
   },
-  facetSectionSamplesBackground: {
+  facetSectionSurvivalBackground: {
     backgroundColor: '#CEDEF040',
     border: '1px solid #646464',
   },
-  facetSectionDatacategory: {
+  facetSectionSamples: {
     color: '#14A773',
   },
-  facetSectionDatacategoryBackground: {
+  facetSectionSamplesBackground: {
     backgroundColor: '#DDEAE540',
     border: '1px solid #646464',
   },
+  facetSectionDatacategory: {
+    color: '#357288',
+  },
+  facetSectionDatacategoryBackground: {
+    backgroundColor: '#E4ECE9',
+    border: '1px solid #646464',
+  },
   facetSectionStudy: {
     color: '#357288',
   },