@elliemae/ds-query-builder 2.0.0-alpha.1 → 2.0.0-alpha.13

package/esm/components/helpers/dependencies.js

@@ -1,8 +1,16 @@
+import 'core-js/modules/esnext.async-iterator.every.js';
+import 'core-js/modules/esnext.iterator.constructor.js';
+import 'core-js/modules/esnext.iterator.every.js';
+import 'core-js/modules/esnext.async-iterator.some.js';
+import 'core-js/modules/esnext.iterator.some.js';
+import 'core-js/modules/esnext.async-iterator.reduce.js';
+import 'core-js/modules/esnext.iterator.reduce.js';
 import { get } from 'lodash';
 import * as operators from '@elliemae/ds-utilities/operators';
 import { QB_GROUP_CONDITION_TYPES } from './types.js';
 
-const resolveCondition = (condition, state, resolveBy = QB_GROUP_CONDITION_TYPES.AND) => {
+const resolveCondition = function (condition, state) {
+  let resolveBy = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : QB_GROUP_CONDITION_TYPES.AND;
   if (condition.length === 0 || !condition) return true; // resolve by AND: all the conditions must be true
 
   if (resolveBy) {
@@ -29,13 +37,14 @@ const resolveCondition = (condition, state, resolveBy = QB_GROUP_CONDITION_TYPES
 };
 
 const resolveDependencies = (state, fields) => {
-  const fieldsToRender = fields.reduce((result, {
-    target,
-    component,
-    condition,
-    resolveBy,
-    validation
-  }) => {
+  const fieldsToRender = fields.reduce((result, _ref) => {
+    let {
+      target,
+      component,
+      condition,
+      resolveBy,
+      validation
+    } = _ref;
     if (resolveCondition(condition, state, resolveBy)) result.push({
       target,
       component,

package/esm/components/helpers/store.js

@@ -1,4 +1,9 @@
+import 'core-js/modules/esnext.async-iterator.filter.js';
+import 'core-js/modules/esnext.iterator.filter.js';
 import _defineProperty from '@babel/runtime/helpers/esm/defineProperty';
+import 'core-js/modules/esnext.async-iterator.for-each.js';
+import 'core-js/modules/esnext.iterator.constructor.js';
+import 'core-js/modules/esnext.iterator.for-each.js';
 import { createNewFilter, createNewGroup, addFilterToMap, addFilterToMainItem, findItemFilterById, addFilterToItem, removeFilterItem, addGroupFilterToItem, addGroupToMap, unGroupFilterToItem, changeGroupOperator, changeFilterItem } from './actions.js';
 import QueryBuilderFormat from '../format/format.js';
 
@@ -19,36 +24,30 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 class QueryBuilderStore {
   constructor(init, _format) {
-    _defineProperty(this, "items", []);
+    this.items = [];
+    this.step = 0;
+    this.steps = {};
+    this.mapFilters = {};
+    this.mapGroups = {};
+    this.main = null;
+    this.format = null;
 
-    _defineProperty(this, "step", 0);
+    this.createNewFilter = idGroup => createNewFilter.call(this, idGroup);
 
-    _defineProperty(this, "steps", {});
+    this.createNewGroup = parentIdGroup => createNewGroup.call(this, parentIdGroup);
 
-    _defineProperty(this, "mapFilters", {});
-
-    _defineProperty(this, "mapGroups", {});
-
-    _defineProperty(this, "main", null);
-
-    _defineProperty(this, "format", null);
-
-    _defineProperty(this, "createNewFilter", idGroup => createNewFilter.call(this, idGroup));
-
-    _defineProperty(this, "createNewGroup", parentIdGroup => createNewGroup.call(this, parentIdGroup));
-
-    _defineProperty(this, "onOrderDragAndDrop", items => {
+    this.onOrderDragAndDrop = items => {
       this.items = items;
       return this.getState();
-    });
+    };
 
-    _defineProperty(this, "addFilterNextToFilterId", (idGroup, idFilter) => {
+    this.addFilterNextToFilterId = (idGroup, idFilter) => {
       // eslint-disable-line
       this.addFilter(idGroup);
       return this.getState();
-    });
+    };
 
-    _defineProperty(this, "addFilter", idGroup => {
+    this.addFilter = idGroup => {
       const newFilter = this.createNewFilter(idGroup);
       addFilterToMap.call(this, newFilter); // new API
 
@@ -63,22 +62,22 @@ class QueryBuilderStore {
       }
 
       return this.getState();
-    });
+    };
 
-    _defineProperty(this, "onRemoveFilter", idFilter => {
+    this.onRemoveFilter = idFilter => {
       // new API
       removeFilterItem.call(this, idFilter);
       return this.getState();
-    });
+    };
 
-    _defineProperty(this, "addRuleContainerInPlace", (idGroup, idFilter) => {
+    this.addRuleContainerInPlace = (idGroup, idFilter) => {
       // Create a new group
       const newGroup = this.createNewGroup(idGroup);
       addGroupFilterToItem.call(this, idGroup, idFilter, newGroup);
       return this.getState();
-    });
+    };
 
-    _defineProperty(this, "addRuleContainer", (idGroup, idFilter) => {
+    this.addRuleContainer = (idGroup, idFilter) => {
       // eslint-disable-line
       const newGroup = this.createNewGroup(idGroup);
       addGroupToMap.call(this, newGroup);
@@ -94,33 +93,33 @@ class QueryBuilderStore {
       }
 
       return this.getState();
-    });
+    };
 
-    _defineProperty(this, "unGroup", idGroup => {
+    this.unGroup = idGroup => {
       unGroupFilterToItem.call(this, idGroup);
       return this.getState();
-    });
+    };
 
-    _defineProperty(this, "changeGroupOperator", (idGroup, value) => {
+    this.changeGroupOperator = (idGroup, value) => {
       this.getGroupById(idGroup).condition = value;
       changeGroupOperator.call(this, idGroup, value);
       return this.getState();
-    });
+    };
 
-    _defineProperty(this, "changeFilter", data => {
+    this.changeFilter = data => {
       const {
         idFilter
       } = data;
       this.mapFilters[idFilter] = _objectSpread(_objectSpread({}, this.mapFilters[idFilter]), data);
       changeFilterItem.call(this, data);
       return this.getState();
-    });
+    };
 
-    _defineProperty(this, "getGroupById", idGroup => this.mapGroups[idGroup] || {});
+    this.getGroupById = idGroup => this.mapGroups[idGroup] || {};
 
-    _defineProperty(this, "getFilterById", idFilter => this.mapFilters[idFilter]);
+    this.getFilterById = idFilter => this.mapFilters[idFilter];
 
-    _defineProperty(this, "getInitialState", () => {
+    this.getInitialState = () => {
       const newFilters = {
         step: this.step,
         mapFilters: _objectSpread({}, this.mapFilters),
@@ -132,9 +131,9 @@ class QueryBuilderStore {
       return _objectSpread(_objectSpread({}, newFilters), {}, {
         format
       });
-    });
+    };
 
-    _defineProperty(this, "getState", () => {
+    this.getState = () => {
       this.step += 1;
       const newFilters = {
         step: this.step,
@@ -147,7 +146,7 @@ class QueryBuilderStore {
       return _objectSpread(_objectSpread({}, newFilters), {}, {
         format
       });
-    });
+    };
 
     this.firstLoad = true;
     this.format = _format;

package/esm/index.js

@@ -1,4 +1,4 @@
-export { DSQueryBuilderWithSchema, default } from './DSQueryBuilder.js';
+export { DSQueryBuilder, DSQueryBuilderWithSchema, DSQueryBuilder as default } from './DSQueryBuilder.js';
 export { QB_ADD_FILTER_METHOD_TYPES, QB_DRAG_LOCATIONS, QB_DRAG_TYPES, QB_EXPORT_FORMAT_TYPES, QB_FIELD_SHARED_ACTIONS, QB_FIELD_TYPES, QB_GROUP_CONDITION_TYPES, QB_GROUP_FILTER_METHOD_TYPES, QB_OPERATOR_TYPES } from './components/helpers/types.js';
 export { QB_DEFAULT_VALUES_OPTIONS, QB_FIELD_OPTIONS, QB_LOAN_VALUES_OPTIONS, QB_OPERATOR_OPTIONS, QB_SUBJECT_VALUES_OPTIONS } from './components/helpers/selectors.js';
 export { default as QueryBuilderFormat } from './components/format/format.js';

package/esm/propTypes.js

@@ -73,6 +73,7 @@ const props = {
 
   /** remove filter callback */
   onRemoveFilter: PropTypes.func.description('remove filter callback'),
+  displayFixedOutput: PropTypes.string.description("Label for fixed output.Using this props it will ignore 'displayOutput' and 'displayOutputLabel' \n  and it will always render the output without the ability to close it. \n  ").defaultValue(''),
 
   /** show output */
   displayOutput: PropTypes.bool.description('show output'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elliemae/ds-query-builder",
-  "version": "2.0.0-alpha.1",
+  "version": "2.0.0-alpha.13",
   "license": "MIT",
   "description": "ICE MT - Dimsum - Query Builder",
   "module": "./esm/index.js",
@@ -168,14 +168,21 @@
     "build": "node ../../scripts/build/build.js"
   },
   "dependencies": {
-    "@elliemae/ds-basic": "2.0.0-alpha.1",
-    "@elliemae/ds-classnames": "2.0.0-alpha.1",
-    "@elliemae/ds-icons": "2.0.0-alpha.1",
-    "@elliemae/ds-shared": "2.0.0-alpha.1",
-    "@elliemae/ds-utilities": "2.0.0-alpha.1",
+    "@elliemae/ds-accordion": "2.0.0-alpha.13",
+    "@elliemae/ds-button": "2.0.0-alpha.13",
+    "@elliemae/ds-classnames": "2.0.0-alpha.13",
+    "@elliemae/ds-form": "2.0.0-alpha.13",
+    "@elliemae/ds-grid": "2.0.0-alpha.13",
+    "@elliemae/ds-icon": "2.0.0-alpha.13",
+    "@elliemae/ds-icons": "2.0.0-alpha.13",
+    "@elliemae/ds-popper": "2.0.0-alpha.13",
+    "@elliemae/ds-shared": "2.0.0-alpha.13",
+    "@elliemae/ds-tooltip": "2.0.0-alpha.13",
+    "@elliemae/ds-utilities": "2.0.0-alpha.13",
     "classnames": "~2.2.6",
     "prop-types": "~15.7.2",
-    "react-addons-update": "~15.6.3"
+    "react-addons-update": "~15.6.3",
+    "react-desc": "~4.1.3"
   },
   "peerDependencies": {
     "lodash": "^4.17.21",

package/types/DSQueryBuilder.d.ts

@@ -1,9 +1,10 @@
+/// <reference path="../../../../shared/typings/react-desc.d.ts" />
 /// <reference types="react" />
 import { QB_FIELD_TYPES, QB_OPERATOR_TYPES, QB_GROUP_CONDITION_TYPES, QB_DRAG_TYPES, QB_DRAG_LOCATIONS, QB_EXPORT_FORMAT_TYPES, QB_ADD_FILTER_METHOD_TYPES, QB_GROUP_FILTER_METHOD_TYPES, QB_FIELD_SHARED_ACTIONS } from './components/helpers/types';
 import { QB_OPERATOR_OPTIONS, QB_DEFAULT_VALUES_OPTIONS, QB_FIELD_OPTIONS, QB_LOAN_VALUES_OPTIONS, QB_SUBJECT_VALUES_OPTIONS } from './components/helpers/selectors';
 import QueryBuilderFormat from './components/format/format';
 declare const DSQueryBuilder: {
-    ({ containerProps, addFilterMethod, groupFilterMethod, onChange, fields, fieldsSharedActions, format, init, ruleContainerClassName, handleDrop, handleDropFilter, handleDropGroup, handleFieldChange, handleRuleContainerOperator, handleRuleContainerUnGroup, onAddFilter, onAddRuleContainer, onRemoveFilter, displayOutput, displayOutputLabel, singleRow, toolTipZIndex, }: {
+    ({ containerProps, addFilterMethod, groupFilterMethod, onChange, fields, fieldsSharedActions, format, init, ruleContainerClassName, handleDrop, handleDropFilter, handleDropGroup, handleFieldChange, handleRuleContainerOperator, handleRuleContainerUnGroup, onAddFilter, onAddRuleContainer, onRemoveFilter, displayFixedOutput, displayOutput, displayOutputLabel, singleRow, toolTipZIndex, }: {
         containerProps?: {} | undefined;
         addFilterMethod?: string | undefined;
         groupFilterMethod?: string | undefined;
@@ -26,6 +27,7 @@ declare const DSQueryBuilder: {
         onAddFilter?: (() => null) | undefined;
         onAddRuleContainer?: (() => null) | undefined;
         onRemoveFilter?: (() => null) | undefined;
+        displayFixedOutput: any;
         displayOutput?: boolean | undefined;
         displayOutputLabel?: {
             show: string;
@@ -35,30 +37,175 @@ declare const DSQueryBuilder: {
         toolTipZIndex?: number | undefined;
     }): JSX.Element;
     propTypes: {
-        containerProps: any;
-        addFilterMethod: any;
-        groupFilterMethod: any;
-        onChange: any;
-        fields: any;
-        fieldsSharedActions: any;
-        format: any;
-        init: any;
-        ruleContainerClassName: any;
-        handleDrop: any;
-        handleDropFilter: any;
-        handleDropGroup: any;
-        handleFieldChange: any;
-        handleRuleContainerOperator: any;
-        handleRuleContainerUnGroup: any;
-        onAddFilter: any;
-        onAddRuleContainer: any;
-        onRemoveFilter: any;
-        displayOutput: any;
-        displayOutputLabel: any;
-        singleRow: any;
-        toolTipZIndex: any;
+        containerProps: {
+            defaultValue<T = unknown>(arg: T): {
+                deprecated: import("react-desc").PropTypesDescValidator;
+            };
+            isRequired: import("react-desc").PropTypesDescValidator;
+        };
+        addFilterMethod: {
+            defaultValue<T = unknown>(arg: T): {
+                deprecated: import("react-desc").PropTypesDescValidator;
+            };
+            isRequired: import("react-desc").PropTypesDescValidator;
+        };
+        groupFilterMethod: {
+            defaultValue<T = unknown>(arg: T): {
+                deprecated: import("react-desc").PropTypesDescValidator;
+            };
+            isRequired: import("react-desc").PropTypesDescValidator;
+        };
+        onChange: {
+            defaultValue<T = unknown>(arg: T): {
+                deprecated: import("react-desc").PropTypesDescValidator;
+            };
+            isRequired: import("react-desc").PropTypesDescValidator;
+        };
+        fields: {
+            defaultValue<T = unknown>(arg: T): {
+                deprecated: import("react-desc").PropTypesDescValidator;
+            };
+            isRequired: import("react-desc").PropTypesDescValidator;
+        };
+        fieldsSharedActions: {
+            defaultValue<T = unknown>(arg: T): {
+                deprecated: import("react-desc").PropTypesDescValidator;
+            };
+            isRequired: import("react-desc").PropTypesDescValidator;
+        };
+        format: {
+            defaultValue<T = unknown>(arg: T): {
+                deprecated: import("react-desc").PropTypesDescValidator;
+            };
+            isRequired: import("react-desc").PropTypesDescValidator;
+        };
+        init: {
+            defaultValue<T = unknown>(arg: T): {
+                deprecated: import("react-desc").PropTypesDescValidator;
+            };
+            isRequired: import("react-desc").PropTypesDescValidator;
+        };
+        ruleContainerClassName: {
+            defaultValue<T = unknown>(arg: T): {
+                deprecated: import("react-desc").PropTypesDescValidator;
+            };
+            isRequired: import("react-desc").PropTypesDescValidator;
+        };
+        handleDrop: {
+            defaultValue<T = unknown>(arg: T): {
+                deprecated: import("react-desc").PropTypesDescValidator;
+            };
+            isRequired: import("react-desc").PropTypesDescValidator;
+        };
+        handleDropFilter: {
+            defaultValue<T = unknown>(arg: T): {
+                deprecated: import("react-desc").PropTypesDescValidator;
+            };
+            isRequired: import("react-desc").PropTypesDescValidator;
+        };
+        handleDropGroup: {
+            defaultValue<T = unknown>(arg: T): {
+                deprecated: import("react-desc").PropTypesDescValidator;
+            };
+            isRequired: import("react-desc").PropTypesDescValidator;
+        };
+        handleFieldChange: {
+            defaultValue<T = unknown>(arg: T): {
+                deprecated: import("react-desc").PropTypesDescValidator;
+            };
+            isRequired: import("react-desc").PropTypesDescValidator;
+        };
+        handleRuleContainerOperator: {
+            defaultValue<T = unknown>(arg: T): {
+                deprecated: import("react-desc").PropTypesDescValidator;
+            };
+            isRequired: import("react-desc").PropTypesDescValidator;
+        };
+        handleRuleContainerUnGroup: {
+            defaultValue<T = unknown>(arg: T): {
+                deprecated: import("react-desc").PropTypesDescValidator;
+            };
+            isRequired: import("react-desc").PropTypesDescValidator;
+        };
+        onAddFilter: {
+            defaultValue<T = unknown>(arg: T): {
+                deprecated: import("react-desc").PropTypesDescValidator;
+            };
+            isRequired: import("react-desc").PropTypesDescValidator;
+        };
+        onAddRuleContainer: {
+            defaultValue<T = unknown>(arg: T): {
+                deprecated: import("react-desc").PropTypesDescValidator;
+            };
+            isRequired: import("react-desc").PropTypesDescValidator;
+        };
+        onRemoveFilter: {
+            defaultValue<T = unknown>(arg: T): {
+                deprecated: import("react-desc").PropTypesDescValidator;
+            };
+            isRequired: import("react-desc").PropTypesDescValidator;
+        };
+        displayFixedOutput: {
+            deprecated: import("react-desc").PropTypesDescValidator;
+        };
+        displayOutput: {
+            defaultValue<T = unknown>(arg: T): {
+                deprecated: import("react-desc").PropTypesDescValidator;
+            };
+            isRequired: import("react-desc").PropTypesDescValidator;
+        };
+        displayOutputLabel: {
+            defaultValue<T = unknown>(arg: T): {
+                deprecated: import("react-desc").PropTypesDescValidator;
+            };
+            isRequired: import("react-desc").PropTypesDescValidator;
+        };
+        singleRow: {
+            defaultValue<T = unknown>(arg: T): {
+                deprecated: import("react-desc").PropTypesDescValidator;
+            };
+            isRequired: import("react-desc").PropTypesDescValidator;
+        };
+        toolTipZIndex: {
+            deprecated: import("react-desc").PropTypesDescValidator;
+        };
     };
 };
-declare const DSQueryBuilderWithSchema: any;
-export { QB_FIELD_SHARED_ACTIONS, QB_FIELD_TYPES, QB_OPERATOR_TYPES, QB_OPERATOR_OPTIONS, QB_DEFAULT_VALUES_OPTIONS, QB_FIELD_OPTIONS, QB_LOAN_VALUES_OPTIONS, QB_SUBJECT_VALUES_OPTIONS, QB_GROUP_CONDITION_TYPES, QB_DRAG_TYPES, QB_DRAG_LOCATIONS, QB_EXPORT_FORMAT_TYPES, QB_ADD_FILTER_METHOD_TYPES, QB_GROUP_FILTER_METHOD_TYPES, QueryBuilderFormat, DSQueryBuilderWithSchema, };
+declare const DSQueryBuilderWithSchema: {
+    (props?: {
+        containerProps?: {} | undefined;
+        addFilterMethod?: string | undefined;
+        groupFilterMethod?: string | undefined;
+        onChange?: (() => null) | undefined;
+        fields?: never[] | undefined;
+        fieldsSharedActions?: {
+            onFieldChange: never[];
+            onOperatorChange: never[];
+            onValueChange: never[];
+        } | undefined;
+        format?: string | undefined;
+        init?: null | undefined;
+        ruleContainerClassName?: string | undefined;
+        handleDrop?: (() => null) | undefined;
+        handleDropFilter?: (() => null) | undefined;
+        handleDropGroup?: (() => null) | undefined;
+        handleFieldChange?: (() => null) | undefined;
+        handleRuleContainerOperator?: (() => null) | undefined;
+        handleRuleContainerUnGroup?: (() => null) | undefined;
+        onAddFilter?: (() => null) | undefined;
+        onAddRuleContainer?: (() => null) | undefined;
+        onRemoveFilter?: (() => null) | undefined;
+        displayFixedOutput: any;
+        displayOutput?: boolean | undefined;
+        displayOutputLabel?: {
+            show: string;
+            hide: string;
+        } | undefined;
+        singleRow?: boolean | undefined;
+        toolTipZIndex?: number | undefined;
+    } | undefined): JSX.Element;
+    propTypes: unknown;
+    toTypescript: () => import("react-desc").TypescriptSchema;
+};
+export { QB_FIELD_SHARED_ACTIONS, QB_FIELD_TYPES, QB_OPERATOR_TYPES, QB_OPERATOR_OPTIONS, QB_DEFAULT_VALUES_OPTIONS, QB_FIELD_OPTIONS, QB_LOAN_VALUES_OPTIONS, QB_SUBJECT_VALUES_OPTIONS, QB_GROUP_CONDITION_TYPES, QB_DRAG_TYPES, QB_DRAG_LOCATIONS, QB_EXPORT_FORMAT_TYPES, QB_ADD_FILTER_METHOD_TYPES, QB_GROUP_FILTER_METHOD_TYPES, QueryBuilderFormat, DSQueryBuilderWithSchema, DSQueryBuilder, };
 export default DSQueryBuilder;

package/types/components/AndOrController/AndOrController.d.ts

@@ -16,17 +16,17 @@ declare class AndOrController extends Component {
         condition: boolean;
         showDragController: boolean;
         allowUnGroup: boolean;
-        buttonActionSize: any;
+        buttonActionSize: string;
         buttonActionType: string;
-        toogleActionSize: any;
+        toogleActionSize: string;
         onAddFilter: () => null;
         multipleSize: boolean;
         delayClose: number;
         delayOpen: number;
         step: null;
         toolBarAnimationDuration: number;
-        toolBarInteractionType: any;
-        toolBarPosition: any;
+        toolBarInteractionType: string;
+        toolBarPosition: string;
     };
     constructor(props: any);
     handleMouseEnterRow: (e: any) => void;

package/types/components/ConditionController/ConditionController.d.ts

@@ -4,9 +4,9 @@ declare const ConditionController: ({ onAddFilter, onAddRuleContainer, onRemoveF
     onAddRuleContainer?: (() => null) | undefined;
     onRemoveFilter?: (() => null) | undefined;
     handleTooltipRow?: (() => null) | undefined;
-    buttonTriggerSize?: any;
+    buttonTriggerSize?: string | undefined;
     buttonTriggerType?: string | undefined;
-    buttonActionSize?: any;
+    buttonActionSize?: string | undefined;
     buttonActionType?: string | undefined;
     delayClose?: number | undefined;
     delayOpen?: number | undefined;

package/types/components/DragContainerController/DragContainerController.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="react" />
 declare const DragContainerController: ({ color, icon: Icon, size, multipleSize, onClick, }: {
-    color?: any;
-    icon?: any;
-    size?: any;
+    color?: string[] | undefined;
+    icon?: ((rest: any) => JSX.Element) | undefined;
+    size?: string | undefined;
     multipleSize?: boolean | undefined;
     onClick: any;
 }) => JSX.Element;

package/types/components/DragControllerRow/DragControllerRow.d.ts

@@ -3,7 +3,7 @@ declare const DragControllerRow: ({ className, color, icon: Icon, size, ...rest
     [x: string]: any;
     className?: string | undefined;
     color?: string[] | undefined;
-    icon?: any;
-    size?: any;
+    icon?: ((rest: any) => JSX.Element) | undefined;
+    size?: string | undefined;
 }) => JSX.Element;
 export default DragControllerRow;