@bento-core/query-bar 1.0.1-icdc.1 → 1.0.1-icdc.3

package/README.md

@@ -58,6 +58,16 @@ const CONFIG = {
      * @var {number}
      */
     maxItems: 2,
+    /**
+     * overirdes maxItems to display all the active filter items
+     * @var {boolean}
+     */
+    displayAllActiveFilters: false,
+    /**
+     * key to access label text
+     * @var {boolean}
+     */
+    group: 'group',
   },
 
   /* Component Helper Functions */

package/dist/generators/QueryBarGenerator.js

@@ -38,6 +38,10 @@ const QueryBarGenerator = function QueryBarGenerator() {
   const styles = () => _objectSpread(_objectSpread({}, (0, _styles.default)()), customStyles);
   const maxItems = config && typeof config.maxItems === 'number' ? config.maxItems : _config.default.config.maxItems;
   const displayAllActiveFilters = config && typeof config.displayAllActiveFilters === 'boolean' ? config.displayAllActiveFilters : _config.default.config.displayAllActiveFilters;
+
+  // const group = config && typeof config.group === 'string'
+  //   ? config.group : DEFAULT_CONFIG.config.group;
+
   const clearAll = functions && typeof functions.clearAll === 'function' ? functions.clearAll : _config.default.functions.clearAll;
   const clearUpload = functions && typeof functions.clearUpload === 'function' ? functions.clearUpload : _config.default.functions.clearUpload;
   const clearAutocomplete = functions && typeof functions.clearAutocomplete === 'function' ? functions.clearAutocomplete : _config.default.functions.clearAutocomplete;
@@ -76,7 +80,6 @@ const QueryBarGenerator = function QueryBarGenerator() {
           return facet;
         }
         const {
-          data,
           items
         } = facet;
         const itemKeys = Object.keys(items);
@@ -84,28 +87,19 @@ const QueryBarGenerator = function QueryBarGenerator() {
 
         /* Find any SELECTED CHECKBOXES that do NOT have any data
          * and remove them from the list of selected checkboxes artificially */
-        itemKeys.forEach(item => {
-          if (data.findIndex(d => d.group === item) < 0) {
-            itemKeys.splice(itemKeys.indexOf(item), 1);
-          }
-        });
-        // return { ...facet, items: itemKeys };
+        // itemKeys.forEach((item) => {
+        //   if (data.findIndex((d) => d.group === item) < 0) {
+        //     itemKeys.splice(itemKeys.indexOf(item), 1);
+        //   }
+        // });
+
         /**
-        * Maintain consistant behavior with facet filter component
-        * Display the active filter items based on the count value
-        * Display active filter items in query bar only if count is greater than 0
-        * behavior similar to filter component
+        * commenting out line 89-93
+        * to display all the active filters in the query bar
+        * ICDC-3287
         */
-        const displayItems = itemKeys.reduce((accumulator, item) => {
-          const itemList = data.filter(d => d.group === item && d.count > 0) || [];
-          if (itemList.length > 0) {
-            const labels = itemList.map(filter => filter.group);
-            accumulator.push(labels);
-          }
-          return accumulator;
-        }, []);
         return _objectSpread(_objectSpread({}, facet), {}, {
-          items: displayItems
+          items: itemKeys
         });
       }).filter(facet => facet.items.length > 0);
       if ((mappedInputs.length || autocomplete.length || upload.length) <= 0) {

package/dist/generators/config.js

@@ -17,7 +17,12 @@ var _default = {
      * overirdes maxItems to display all the active filter items
      * @var {boolean}
      */
-    displayAllActiveFilters: false
+    displayAllActiveFilters: false,
+    /**
+     * key to access label text
+     * @var {boolean}
+     */
+    group: 'group'
   },
   /* Component Helper Functions */
   functions: {

package/package.json

@@ -1,17 +1,14 @@
 {
   "name": "@bento-core/query-bar",
-  "version": "1.0.1-icdc.1",
-  "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:",
+  "version": "1.0.1-icdc.3",
+  "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,10 +24,5 @@
     "lodash": "^4.17.20"
   },
   "author": "CTOS Bento Team",
-  "license": "ISC",
-  "bugs": {
-    "url": "https://github.com/CBIIT/bento-frontend/issues"
-  },
-  "homepage": "https://github.com/CBIIT/bento-frontend#readme",
-  "devDependencies": {}
+  "license": "ISC"
 }

package/src/generators/QueryBarGenerator.js

@@ -27,6 +27,9 @@ export const QueryBarGenerator = (uiConfig = DEFAULT_CONFIG) => {
     ? config.displayAllActiveFilters
     : DEFAULT_CONFIG.config.displayAllActiveFilters;
 
+  // const group = config && typeof config.group === 'string'
+  //   ? config.group : DEFAULT_CONFIG.config.group;
+
   const clearAll = functions && typeof functions.clearAll === 'function'
     ? functions.clearAll
     : DEFAULT_CONFIG.functions.clearAll;
@@ -77,34 +80,24 @@ export const QueryBarGenerator = (uiConfig = DEFAULT_CONFIG) => {
         .map((facet) => {
           if (facet.type !== CHECKBOX) { return facet; }
 
-          const { data, items } = facet;
+          const { items } = facet;
           const itemKeys = Object.keys(items);
           itemKeys.sort((a, b) => a.localeCompare(b));
 
           /* Find any SELECTED CHECKBOXES that do NOT have any data
            * and remove them from the list of selected checkboxes artificially */
-          itemKeys.forEach((item) => {
-            if (data.findIndex((d) => d.group === item) < 0) {
-              itemKeys.splice(itemKeys.indexOf(item), 1);
-            }
-          });
-          // return { ...facet, items: itemKeys };
+          // itemKeys.forEach((item) => {
+          //   if (data.findIndex((d) => d.group === item) < 0) {
+          //     itemKeys.splice(itemKeys.indexOf(item), 1);
+          //   }
+          // });
+
           /**
-          * Maintain consistant behavior with facet filter component
-          * Display the active filter items based on the count value
-          * Display active filter items in query bar only if count is greater than 0
-          * behavior similar to filter component
+          * commenting out line 89-93
+          * to display all the active filters in the query bar
+          * ICDC-3287
           */
-          const displayItems = itemKeys.reduce((accumulator, item) => {
-            const itemList = data.filter((d) => (d.group === item && d.count > 0)) || [];
-            if (itemList.length > 0) {
-              const labels = itemList.map((filter) => filter.group);
-              accumulator.push(labels);
-            }
-            return accumulator;
-          }, []);
-
-          return { ...facet, items: displayItems };
+          return { ...facet, items: itemKeys };
         })
         .filter((facet) => facet.items.length > 0);
 

package/src/generators/config.js

@@ -12,6 +12,11 @@ export default {
      * @var {boolean}
      */
     displayAllActiveFilters: false,
+    /**
+     * key to access label text
+     * @var {boolean}
+     */
+    group: 'group',
   },
 
   /* Component Helper Functions */