@bento-core/query-bar 1.0.1-ccdihub.13 → 1.0.1-ccdihub.15

package/dist/components/QueryUrl.js

@@ -14,14 +14,13 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 const QueryUrl = _ref => {
   let {
     classes,
-    rootPath,
     queryUrlCharacterLimit = 70
   } = _ref;
   const [display, setDisplay] = (0, _react.useState)(false);
   const toggleDisplay = () => setDisplay(prevDisplay => !prevDisplay);
   const [open, setOpen] = (0, _react.useState)(false);
   const toggleOpen = () => setOpen(prevOpen => !prevOpen);
-  const url = rootPath.slice(0, rootPath.length - 1);
+  const url = window.location.href;
   const copyUrl = async () => {
     toggleOpen();
     await navigator.clipboard.writeText(url);

package/dist/generators/QueryBarGenerator.js

@@ -35,13 +35,13 @@ const QueryBarGenerator = function QueryBarGenerator() {
   } = _facetFilter.InputTypes;
   const maxItems = config && typeof config.maxItems === 'number' ? config.maxItems : _config.default.config.maxItems;
   const clearAll = functions && typeof functions.clearAll === 'function' ? functions.clearAll : _config.default.functions.clearAll;
+  const clearImportFrom = functions && typeof functions.clearImportFrom === 'function' ? functions.clearImportFrom : _config.default.functions.clearImportFrom;
   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;
   const deleteAutocompleteItem = functions && typeof functions.deleteAutocompleteItem === 'function' ? functions.deleteAutocompleteItem : _config.default.functions.deleteAutocompleteItem;
   const resetFacetSection = functions && typeof functions.resetFacetSection === 'function' ? functions.resetFacetSection : _config.default.functions.resetFacetSection;
   const resetFacetCheckbox = functions && typeof functions.resetFacetCheckbox === 'function' ? functions.resetFacetCheckbox : _config.default.functions.resetFacetCheckbox;
   const resetFacetSlider = functions && typeof functions.resetFacetSlider === 'function' ? functions.resetFacetSlider : _config.default.functions.resetFacetSlider;
-  const queryURLRootPath = config && typeof config.rootPath === 'string' ? config.rootPath : _config.default.config.rootPath;
   const viewQueryURL = config && typeof config.viewQueryURL === 'boolean' ? config.viewQueryURL : _config.default.config.viewQueryURL;
   const queryUrlCharacterLimit = config && typeof config.queryUrlCharacterLimit === 'number' ? config.queryUrlCharacterLimit : _config.default.config.queryUrlCharacterLimit;
   return {
@@ -49,6 +49,7 @@ const QueryBarGenerator = function QueryBarGenerator() {
       withTheme: true
     })(props => {
       const {
+        hasImportFrom,
         statusReducer,
         localFind,
         classes
@@ -81,7 +82,7 @@ const QueryBarGenerator = function QueryBarGenerator() {
           items: itemKeys
         });
       }).filter(facet => facet.items.length > 0);
-      if ((mappedInputs.length || autocomplete.length || upload.length) <= 0) {
+      if (!hasImportFrom && (mappedInputs.length || autocomplete.length || upload.length) <= 0) {
         return null;
       }
       return /*#__PURE__*/_react.default.createElement("div", {
@@ -95,7 +96,12 @@ const QueryBarGenerator = function QueryBarGenerator() {
         className: classes.divider
       }), /*#__PURE__*/_react.default.createElement("span", {
         className: classes.queryContainer
-      }, autocomplete.length || upload.length ? /*#__PURE__*/_react.default.createElement("span", null, upload.length && !autocomplete.length ? /*#__PURE__*/_react.default.createElement("span", {
+      }, hasImportFrom && /*#__PURE__*/_react.default.createElement("span", {
+        className: (0, _clsx.default)(classes.filterCheckboxes, classes.localFindBackground),
+        onClick: clearImportFrom
+      }, "IMPORT PARTICIPANT SET"), (autocomplete.length || upload.length) && mappedInputs.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),
         onClick: clearUpload
       }, "INPUT PARTICIPANT SET") : null, autocomplete.length ? /*#__PURE__*/_react.default.createElement("span", null, ' ', /*#__PURE__*/_react.default.createElement("span", {
@@ -124,11 +130,10 @@ const QueryBarGenerator = function QueryBarGenerator() {
         classes: classes,
         onSectionClick: filter.type === CHECKBOX ? resetFacetSection : resetFacetSlider,
         onItemClick: filter.type === CHECKBOX ? resetFacetCheckbox : resetFacetSlider
-      }))), viewQueryURL && queryURLRootPath && /*#__PURE__*/_react.default.createElement(_QueryUrl.default, {
+      }))), viewQueryURL && /*#__PURE__*/_react.default.createElement(_QueryUrl.default, {
         classes: classes,
         localFind: localFind,
         filterItems: mappedInputs,
-        rootPath: queryURLRootPath,
         queryUrlCharacterLimit: queryUrlCharacterLimit
       }));
     })

package/dist/generators/config.js

@@ -13,11 +13,6 @@ var _default = {
      * @var {number}
      */
     maxItems: 2,
-    /**
-     * set root path for copy url
-     * @var {boolean}
-     */
-    rootPath: "".concat(window.location.href, "/"),
     /**
      * display copy url button
      * @var {boolean}
@@ -37,6 +32,12 @@ var _default = {
      * @returns {void}
      */
     clearAll: () => {},
+    /**
+     * Clear import from filter
+     *
+     * @returns {void}
+     */
+    clearImportFrom: () => {},
     /**
      * Clear all active Local Find file upload filters
      *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bento-core/query-bar",
-  "version": "1.0.1-ccdihub.13",
+  "version": "1.0.1-ccdihub.15",
   "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:",
   "main": "dist/index.js",
   "scripts": {

package/src/components/QueryUrl.js

@@ -14,7 +14,6 @@ import CopyIcon from '../assets/CopyIcon.svg';
 
 const QueryUrl = ({
   classes,
-  rootPath,
   queryUrlCharacterLimit = 70,
 }) => {
   const [display, setDisplay] = useState(false);
@@ -23,7 +22,7 @@ const QueryUrl = ({
   const [open, setOpen] = useState(false);
   const toggleOpen = () => setOpen((prevOpen) => !prevOpen);
 
-  const url = rootPath.slice(0, rootPath.length - 1);
+  const url = window.location.href;
 
   const copyUrl = async () => {
     toggleOpen();
@@ -39,7 +38,7 @@ const QueryUrl = ({
           onClick={toggleDisplay}
           className={classes.viewLinkToggleBtn}
         >
-          { (display) ? 'Hide Query URL' : 'Show Query URL'}
+          {(display) ? 'Hide Query URL' : 'Show Query URL'}
         </Button>
         {
           (display) && (

package/src/generators/QueryBarGenerator.js

@@ -25,6 +25,10 @@ export const QueryBarGenerator = (uiConfig = DEFAULT_CONFIG) => {
     ? functions.clearAll
     : DEFAULT_CONFIG.functions.clearAll;
 
+  const clearImportFrom = functions && typeof functions.clearImportFrom === 'function'
+    ? functions.clearImportFrom
+    : DEFAULT_CONFIG.functions.clearImportFrom;
+
   const clearUpload = functions && typeof functions.clearUpload === 'function'
     ? functions.clearUpload
     : DEFAULT_CONFIG.functions.clearUpload;
@@ -49,10 +53,6 @@ export const QueryBarGenerator = (uiConfig = DEFAULT_CONFIG) => {
     ? functions.resetFacetSlider
     : DEFAULT_CONFIG.functions.resetFacetSlider;
 
-  const queryURLRootPath = config && typeof config.rootPath === 'string'
-    ? config.rootPath
-    : DEFAULT_CONFIG.config.rootPath;
-
   const viewQueryURL = config && typeof config.viewQueryURL === 'boolean'
     ? config.viewQueryURL
     : DEFAULT_CONFIG.config.viewQueryURL;
@@ -63,8 +63,9 @@ export const QueryBarGenerator = (uiConfig = DEFAULT_CONFIG) => {
 
   return {
     QueryBar: withStyles(DEFAULT_STYLES, { withTheme: true })((props) => {
-      const { statusReducer, localFind, classes } = props;
-
+      const {
+        hasImportFrom, statusReducer, localFind, classes,
+      } = props;
       const { autocomplete, upload } = localFind;
 
       // Remove any sections without checkboxes selected
@@ -88,7 +89,7 @@ export const QueryBarGenerator = (uiConfig = DEFAULT_CONFIG) => {
         })
         .filter((facet) => facet.items.length > 0);
 
-      if ((mappedInputs.length || autocomplete.length || upload.length) <= 0) {
+      if (!hasImportFrom && (mappedInputs.length || autocomplete.length || upload.length) <= 0) {
         return null;
       }
 
@@ -106,6 +107,20 @@ export const QueryBarGenerator = (uiConfig = DEFAULT_CONFIG) => {
           <span className={classes.queryContainer}>
             {/* Local Find Selections */}
             {/* TODO: Refactor this into a separate component */}
+            {
+              hasImportFrom
+              && (
+                <span
+                  className={clsx(classes.filterCheckboxes, classes.localFindBackground)}
+                  onClick={clearImportFrom}
+                >
+                  IMPORTED PARTICIPANT SET
+                </span>
+              )
+            }
+            {((autocomplete.length || upload.length) && mappedInputs.length)
+              ? <span className={classes.operators}> AND </span>
+              : null}
             {(autocomplete.length || upload.length) ? (
               <span>
                 {/* Standalone case set button */}
@@ -192,12 +207,11 @@ export const QueryBarGenerator = (uiConfig = DEFAULT_CONFIG) => {
             ))}
           </span>
           {
-            (viewQueryURL && queryURLRootPath) && (
+            viewQueryURL && (
               <QueryUrl
                 classes={classes}
                 localFind={localFind}
                 filterItems={mappedInputs}
-                rootPath={queryURLRootPath}
                 queryUrlCharacterLimit={queryUrlCharacterLimit}
               />
             )

package/src/generators/config.js

@@ -7,11 +7,6 @@ export default {
      * @var {number}
      */
     maxItems: 2,
-    /**
-     * set root path for copy url
-     * @var {boolean}
-     */
-    rootPath: `${window.location.href}/`,
     /**
      * display copy url button
      * @var {boolean}
@@ -33,6 +28,13 @@ export default {
      */
     clearAll: () => { },
 
+    /**
+     * Clear import from filter
+     *
+     * @returns {void}
+     */
+    clearImportFrom: () => { },
+
     /**
      * Clear all active Local Find file upload filters
      *