@carbon/ibm-products 2.43.2-canary.7 → 2.43.2-canary.70

package/lib/components/ConditionBuilder/ConditionBuilderContext/ConditionBuilderProvider.js

@@ -21,7 +21,6 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var emptyState = {
   operator: 'or',
   groups: [{
-    groupSeparateOperator: null,
     groupOperator: 'and',
     statement: 'if',
     id: uuidv4["default"](),
@@ -58,14 +57,21 @@ var ConditionBuilderProvider = function ConditionBuilderProvider(props) {
     _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
     rootState = _useState2[0],
     setRootState = _useState2[1];
+  var _useState3 = React.useState([]),
+    _useState4 = _rollupPluginBabelHelpers.slicedToArray(_useState3, 2),
+    actionState = _useState4[0],
+    setActionState = _useState4[1];
   return /*#__PURE__*/React__default["default"].createElement(ConditionBuilderContext.Provider, {
     value: {
       rootState: rootState,
       setRootState: setRootState,
+      actionState: actionState,
+      setActionState: setActionState,
       inputConfig: props.inputConfig,
       popOverSearchThreshold: props.popOverSearchThreshold,
       getOptions: props.getOptions,
-      variant: props.variant
+      variant: props.variant,
+      translateWithId: props.translateWithId
     }
   },
   // eslint-disable-next-line react/prop-types
@@ -92,17 +98,22 @@ ConditionBuilderProvider.propTypes = {
    */
   inputConfig: index["default"].shape({
     properties: index["default"].arrayOf(index["default"].shape({
-      id: index["default"].string,
-      label: index["default"].string,
+      id: index["default"].string.isRequired,
+      label: index["default"].string.isRequired,
       icon: index["default"].oneOfType([index["default"].func, index["default"].object]),
-      type: index["default"].oneOf(['text', 'number', 'date', 'option', 'time']),
+      type: index["default"].oneOf(['text', 'textarea', 'number', 'date', 'option', 'time', 'custom']).isRequired,
       config: index["default"].shape({
         options: index["default"].arrayOf(index["default"].shape({
-          id: index["default"].string,
-          label: index["default"].string,
+          id: index["default"].string.isRequired,
+          label: index["default"].string.isRequired,
           icon: index["default"].oneOfType([index["default"].func, index["default"].object])
         })),
-        includeSearch: index["default"].bool
+        component: index["default"].func,
+        operators: index["default"].arrayOf(index["default"].shape({
+          id: index["default"].string.isRequired,
+          label: index["default"].string.isRequired
+        })),
+        long: index["default"].bool
       })
     }))
   }).isRequired,
@@ -110,6 +121,13 @@ ConditionBuilderProvider.propTypes = {
    * Provide an mandatory numeric value that will be used to enable search option in the popovers with list.
    */
   popOverSearchThreshold: index["default"].number.isRequired,
+  /**
+   * Optional prop if you want to pass translation to the texts used . Otherwise this will the defined defaults.
+   * This callback function will receive the message id and you need to return the corresponding text for that id.
+   * The message key will be one of [   "ifText",   "addConditionText",   "addConditionGroupText",   "addSubgroupText",   "conditionText",   "propertyText",   "operatorText",   "valueText",   "connectorText",   "conditionRowText",   "removeConditionText",   "addConditionRowText",   "startText",   "endText",   "clearSearchText",   "actionsText",   "then",   "removeActionText",   "addActionText",   "invalidText",   "invalidNumberWarnText"
+  ]
+   */
+  translateWithId: index["default"].func,
   /**
    * Provide the condition builder variant: sentence/ tree
    */

package/lib/components/ConditionBuilder/ConditionBuilderContext/DataConfigs.d.ts

@@ -1,22 +1,28 @@
 export const statementConfig: {
     label: string;
     id: string;
+    connector: string;
 }[];
 export const connectorConfig: {
     label: string;
     id: string;
 }[];
+export const actionConfig: {
+    label: string;
+    id: string;
+}[];
 export const operatorConfig: {
     label: string;
     id: string;
     type: string;
 }[];
 export const blockClass: string;
-export function translateWithId(key: any): any;
 export namespace valueRenderers {
     function text(val: any): any;
+    function textarea(val: any): any;
     function time(val: any): any;
-    function number(val: any, config: any): any;
+    function number(val: any): any;
     function option(value: any): any;
     function date(value: any): any;
+    function custom(value: any): any;
 }

package/lib/components/ConditionBuilder/ConditionBuilderContext/DataConfigs.js

@@ -10,14 +10,15 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var settings = require('../../../settings.js');
-var translationObject = require('./translationObject.js');
 
 var statementConfig = [{
   label: 'if',
-  id: 'if'
+  id: 'if',
+  connector: 'and'
 }, {
   label: 'excl.if',
-  id: 'excl.if'
+  id: 'excl_if',
+  connector: 'or'
 }];
 var connectorConfig = [{
   label: 'and',
@@ -26,7 +27,6 @@ var connectorConfig = [{
   label: 'or',
   id: 'or'
 }];
-//op types : option, text, number, date,
 var operatorConfig = [{
   label: 'is',
   id: 'is',
@@ -37,7 +37,7 @@ var operatorConfig = [{
   type: 'number'
 }, {
   label: 'is greater than or equal to',
-  id: 'greater-equal',
+  id: 'greaterEqual',
   type: 'number'
 }, {
   label: 'is lower than',
@@ -45,23 +45,23 @@ var operatorConfig = [{
   type: 'number'
 }, {
   label: 'is lower than or equal to',
-  id: 'lower-equal',
+  id: 'lowerEqual',
   type: 'number'
 }, {
   label: 'starts with',
-  id: 'starts-with',
-  type: 'text'
+  id: 'startsWith',
+  type: 'text,textarea'
 }, {
   label: 'ends with',
-  id: 'ends-with',
-  type: 'text'
+  id: 'endsWith',
+  type: 'text,textarea'
 }, {
   label: 'contains',
   id: 'contains',
-  type: 'text'
+  type: 'text,textarea'
 }, {
   label: 'is one of',
-  id: 'one-of',
+  id: 'oneOf',
   type: 'option'
 }, {
   label: 'is before',
@@ -84,32 +84,43 @@ var formatDate = function formatDate(date) {
   var year = date.getFullYear();
   return "".concat(day, "/").concat(month, "/").concat(year);
 };
-var translationsObjectCurrent = translationObject.translationsObject['en']; // TO DO: need to discuss if language is to be passed as prop
-var translateWithId = function translateWithId(key) {
-  var _translationsObjectCu;
-  return (_translationsObjectCu = translationsObjectCurrent[key]) !== null && _translationsObjectCu !== void 0 ? _translationsObjectCu : key;
-};
+//const translationsObjectCurrent = translationsObject['en']; // TO DO: need to discuss if language is to be passed as prop
+
 var valueRenderers = {
   text: function text(val) {
     return val;
   },
+  textarea: function textarea(val) {
+    return val;
+  },
   time: function time(val) {
     return val;
   },
-  number: function number(val, config) {
-    return config.unit && val ? "".concat(val, " ").concat(config.unit) : val;
+  number: function number(val) {
+    return val;
   },
   option: function option(value) {
-    return Array.isArray(value) ? value.join(', ') : value;
+    if (value && typeof value !== 'string') {
+      var selectedValues = Array.isArray(value) ? value : [value];
+      return selectedValues.map(function (option) {
+        return option.label;
+      }).join(', ');
+    }
+    return value;
   },
   date: function date(value) {
     if (Array.isArray(value) && value.length > 1) {
-      var start = value !== null && value !== void 0 && value[0] ? formatDate(new Date(value[0])) : '';
-      var end = value !== null && value !== void 0 && value[1] ? formatDate(new Date(value[1])) : '';
+      var start = value !== null && value !== void 0 && value[0] && !isNaN(new Date(value[0])) ? formatDate(new Date(value[0])) : '';
+      var end = value !== null && value !== void 0 && value[1] && !isNaN(new Date(value[1])) ? formatDate(new Date(value[1])) : '';
       return "".concat(start, " To ").concat(end);
+    } else if (Array.isArray(value) && !isNaN(new Date(value[0]))) {
+      return formatDate(new Date(value[0]));
     } else {
-      return value && new Date(value) ? formatDate(new Date(value)) : value;
+      return value;
     }
+  },
+  custom: function custom(value) {
+    return value;
   }
 };
 
@@ -117,5 +128,4 @@ exports.blockClass = blockClass;
 exports.connectorConfig = connectorConfig;
 exports.operatorConfig = operatorConfig;
 exports.statementConfig = statementConfig;
-exports.translateWithId = translateWithId;
 exports.valueRenderers = valueRenderers;

package/lib/components/ConditionBuilder/ConditionBuilderContext/translationObject.d.ts

@@ -1,38 +1,39 @@
 export namespace translationsObject {
-    let en: {
-        if: string;
-        'excl-if': string;
-        and: string;
-        or: string;
-        is: string;
-        greater: string;
-        'greater-equal': string;
-        lower: string;
-        'lower-equal': string;
-        'starts-with': string;
-        'ends-with': string;
-        contains: string;
-        'one-of': string;
-        before: string;
-        after: string;
-        between: string;
-        'add-condition': string;
-        'add-condition-group': string;
-        'add-condition-sub-group': string;
-        condition: string;
-        property: string;
-        operator: string;
-        value: string;
-        connector: string;
-        condition_row: string;
-        remove_condition: string;
-        add_condition_row: string;
-        start: string;
-        end: string;
-        clear_search: string;
-        actions: string;
-        then: string;
-        remove_action: string;
-        add_action: string;
-    };
+    let ifText: string;
+    let excl_if: string;
+    let and: string;
+    let or: string;
+    let is: string;
+    let greater: string;
+    let greaterEqual: string;
+    let lower: string;
+    let lowerEqual: string;
+    let startsWith: string;
+    let endsWith: string;
+    let contains: string;
+    let oneOf: string;
+    let before: string;
+    let after: string;
+    let between: string;
+    let addConditionText: string;
+    let addConditionGroupText: string;
+    let addSubgroupText: string;
+    let conditionText: string;
+    let propertyText: string;
+    let operatorText: string;
+    let valueText: string;
+    let connectorText: string;
+    let conditionRowText: string;
+    let removeConditionText: string;
+    let addConditionRowText: string;
+    let startText: string;
+    let endText: string;
+    let clearSearchText: string;
+    let actionsText: string;
+    let then: string;
+    let removeActionText: string;
+    let addActionText: string;
+    let invalidText: string;
+    let invalidDateText: string;
+    let invalidNumberWarnText: string;
 }

package/lib/components/ConditionBuilder/ConditionBuilderContext/translationObject.js

@@ -10,42 +10,43 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var translationsObject = {
-  en: {
-    if: 'if',
-    'excl-if': 'excl.if',
-    and: 'and',
-    or: 'or',
-    is: 'is',
-    greater: 'is greater than',
-    'greater-equal': 'is greater than or equal to',
-    lower: 'is lower than',
-    'lower-equal': 'is lower than or equal to',
-    'starts-with': 'starts with',
-    'ends-with': 'ends with',
-    contains: 'contains',
-    'one-of': 'is one of',
-    before: 'is before',
-    after: 'is after',
-    between: 'is between',
-    'add-condition': 'Add Condition',
-    'add-condition-group': 'Add Condition Group',
-    'add-condition-sub-group': 'Add Condition sub group',
-    condition: 'Condition',
-    property: 'Property',
-    operator: 'Operator',
-    value: 'Value',
-    connector: 'Connector',
-    condition_row: 'Condition row',
-    remove_condition: 'Remove condition',
-    add_condition_row: 'Add condition row',
-    start: 'Start',
-    end: 'End',
-    clear_search: 'Clear search input',
-    actions: 'Actions',
-    then: 'then',
-    remove_action: 'Remove Action',
-    add_action: 'Add action'
-  }
+  ifText: 'if',
+  excl_if: 'excl.if',
+  and: 'and',
+  or: 'or',
+  is: 'is',
+  greater: 'is greater than',
+  greaterEqual: 'is greater than or equal to',
+  lower: 'is lower than',
+  lowerEqual: 'is lower than or equal to',
+  startsWith: 'starts with',
+  endsWith: 'ends with',
+  contains: 'contains',
+  oneOf: 'is one of',
+  before: 'is before',
+  after: 'is after',
+  between: 'is between',
+  addConditionText: 'Add condition',
+  addConditionGroupText: 'Add condition group',
+  addSubgroupText: 'Add subgroup',
+  conditionText: 'Condition',
+  propertyText: 'Property',
+  operatorText: 'Operator',
+  valueText: 'Value',
+  connectorText: 'Connector',
+  conditionRowText: 'Condition row',
+  removeConditionText: 'Remove condition',
+  addConditionRowText: 'Add condition row',
+  startText: 'Start',
+  endText: 'End',
+  clearSearchText: 'Clear search input',
+  actionsText: 'Actions',
+  then: 'then',
+  removeActionText: 'Remove Action',
+  addActionText: 'Add action',
+  invalidText: 'Incomplete',
+  invalidDateText: 'Invalid Date',
+  invalidNumberWarnText: 'Invalid number, must be 0 or greater'
 };
 
 exports.translationsObject = translationsObject;

package/lib/components/ConditionBuilder/ConditionBuilderItem/ConditionBuilderItem.d.ts

@@ -1,4 +1,4 @@
-export function ConditionBuilderItem({ children, className, label, renderIcon, title, type, showToolTip, condition, popOverClassName, config, ...rest }: {
+export function ConditionBuilderItem({ children, className, label, renderIcon, title, type, showToolTip, condition, popOverClassName, config, renderChildren, ...rest }: {
     [x: string]: any;
     children: any;
     className: any;
@@ -10,6 +10,7 @@ export function ConditionBuilderItem({ children, className, label, renderIcon, t
     condition: any;
     popOverClassName: any;
     config: any;
+    renderChildren: any;
 }): import("react/jsx-runtime").JSX.Element;
 export namespace ConditionBuilderItem {
     namespace propTypes {
@@ -17,8 +18,9 @@ export namespace ConditionBuilderItem {
         let className: PropTypes.Requireable<string>;
         let condition: PropTypes.Requireable<object>;
         let config: PropTypes.Requireable<object>;
-        let label: PropTypes.Requireable<NonNullable<string | any[] | null | undefined>>;
+        let label: PropTypes.Requireable<NonNullable<string | object | null | undefined>>;
         let popOverClassName: PropTypes.Requireable<string>;
+        let renderChildren: PropTypes.Requireable<(...args: any[]) => any>;
         let renderIcon: PropTypes.Requireable<object>;
         let showToolTip: PropTypes.Requireable<boolean>;
         let title: PropTypes.Requireable<string>;

package/lib/components/ConditionBuilder/ConditionBuilderItem/ConditionBuilderItem.js

@@ -16,12 +16,13 @@ var index = require('../../../node_modules/prop-types/index.js');
 var icons = require('@carbon/react/icons');
 var DataConfigs = require('../ConditionBuilderContext/DataConfigs.js');
 var ConditionBuilderButton = require('../ConditionBuilderButton/ConditionBuilderButton.js');
+var useTranslations = require('../utils/useTranslations.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
-var _excluded = ["children", "className", "label", "renderIcon", "title", "type", "showToolTip", "condition", "popOverClassName", "config"];
+var _excluded = ["children", "className", "label", "renderIcon", "title", "type", "showToolTip", "condition", "popOverClassName", "config", "renderChildren"];
 var ConditionBuilderItem = function ConditionBuilderItem(_ref) {
   var children = _ref.children,
     className = _ref.className,
@@ -33,21 +34,41 @@ var ConditionBuilderItem = function ConditionBuilderItem(_ref) {
     condition = _ref.condition,
     popOverClassName = _ref.popOverClassName,
     config = _ref.config,
+    renderChildren = _ref.renderChildren,
     rest = _rollupPluginBabelHelpers.objectWithoutProperties(_ref, _excluded);
   var contentRef = React.useRef(null);
-  var _useState = React.useState(label),
+  var popoverRef = React.useRef(null);
+  var _useState = React.useState(false),
     _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
-    propertyLabel = _useState2[0],
-    setPropertyLabel = _useState2[1];
-  var _useState3 = React.useState(false),
-    _useState4 = _rollupPluginBabelHelpers.slicedToArray(_useState3, 2),
-    open = _useState4[0],
-    setOpen = _useState4[1];
-  React.useEffect(function () {
-    var propertyId = rest['data-name'] == 'valueField' && type ? DataConfigs.valueRenderers[type](label, config) : label;
-    setPropertyLabel(DataConfigs.translateWithId(propertyId));
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [label]);
+    open = _useState2[0],
+    setOpen = _useState2[1];
+  var _useTranslations = useTranslations.useTranslations(['invalidText', 'addConditionText', label, 'invalidDateText']),
+    _useTranslations2 = _rollupPluginBabelHelpers.slicedToArray(_useTranslations, 4),
+    invalidText = _useTranslations2[0],
+    addConditionText = _useTranslations2[1],
+    labelText = _useTranslations2[2],
+    invalidDateText = _useTranslations2[3];
+  var getPropertyDetails = function getPropertyDetails() {
+    if (label === 'INVALID') {
+      return {
+        propertyLabel: invalidText,
+        isInvalid: true
+      };
+    } else if (label === 'INVALID_DATE') {
+      return {
+        propertyLabel: invalidDateText,
+        isInvalid: true
+      };
+    }
+    var propertyId = rest['data-name'] == 'valueField' && type ? DataConfigs.valueRenderers[type](label, config) : labelText;
+    return {
+      isInvalid: false,
+      propertyLabel: propertyId
+    };
+  };
+  var _getPropertyDetails = getPropertyDetails(),
+    propertyLabel = _getPropertyDetails.propertyLabel,
+    isInvalid = _getPropertyDetails.isInvalid;
   React.useEffect(function () {
     /**
      * rest['data-name'] holds the current field name
@@ -58,59 +79,68 @@ var ConditionBuilderItem = function ConditionBuilderItem(_ref) {
       //if any condition is changed, state prop is triggered
       if (condition.popoverToOpen && currentField !== condition.popoverToOpen) {
         // close the previous popover
-        setOpen(false);
-      } else if (currentField == 'valueField' && type == 'option' && condition.operator !== 'one-of') {
+        closePopover();
+      } else if (currentField == 'valueField' && type == 'option' && condition.operator !== 'oneOf') {
         //close the current popover if the field is valueField and  is a single select dropdown. For all other inputs ,popover need to be open on value changes.
-        setOpen(false);
+        closePopover();
       }
       if (condition.popoverToOpen == currentField) {
         //current popover need to be opened
-        setOpen(true);
+        openPopOver();
       }
     } else {
       // when we change any statement(if/ excl.if) which is not part of condition state, label change is triggered.
       //close popOver when statement is changed.
-      setOpen(false);
+      closePopover();
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [condition, label]);
   React.useEffect(function () {
     //this will focus the first input field in the popover
     if (open && contentRef.current) {
-      var firstFocusableElement = contentRef.current.querySelector('input');
+      var firstFocusableElement = contentRef.current.querySelector('input,textarea');
       if (firstFocusableElement) {
         firstFocusableElement.focus();
       }
     }
   }, [contentRef, open]);
+  var closePopover = function closePopover() {
+    return setOpen(false);
+  };
+  var openPopOver = function openPopOver() {
+    return setOpen(true);
+  };
+  var togglePopover = function togglePopover() {
+    return setOpen(!open);
+  };
   return /*#__PURE__*/React__default["default"].createElement(react.Popover, {
     open: open,
     isTabTip: true,
     role: "gridcell",
     className: popOverClassName,
-    onRequestClose: function onRequestClose() {
-      setOpen(false);
-    }
+    ref: popoverRef,
+    onRequestClose: closePopover
   }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderButton.ConditionBuilderButton, _rollupPluginBabelHelpers["extends"]({
-    label: propertyLabel !== null && propertyLabel !== void 0 ? propertyLabel : DataConfigs.translateWithId('add-condition'),
+    label: propertyLabel !== null && propertyLabel !== void 0 ? propertyLabel : addConditionText,
     hideLabel: !label ? true : false,
-    onClick: function onClick() {
-      children ? setOpen(!open) : null;
-    },
+    onClick: togglePopover,
     className: className,
     "aria-haspopup": true,
     "aria-expanded": open,
     renderIcon: renderIcon ? renderIcon : label == undefined ? icons.Add : null,
-    showToolTip: showToolTip
-  }, rest)), /*#__PURE__*/React__default["default"].createElement(react.PopoverContent, {
+    showToolTip: showToolTip,
+    isInvalid: isInvalid,
+    condition: condition
+  }, rest)), open && /*#__PURE__*/React__default["default"].createElement(react.PopoverContent, {
     className: "".concat(DataConfigs.blockClass, "__item__content"),
     role: "dialog",
-    "aria-label": "".concat(title)
+    "aria-label": title
   }, /*#__PURE__*/React__default["default"].createElement(react.Layer, null, /*#__PURE__*/React__default["default"].createElement("h1", {
     className: "".concat(DataConfigs.blockClass, "__item__title")
   }, title), /*#__PURE__*/React__default["default"].createElement("div", {
-    ref: contentRef
-  }, open && children))));
+    ref: contentRef,
+    className: "".concat(DataConfigs.blockClass, "__popover-content")
+  }, renderChildren ? renderChildren(popoverRef) : children))));
 };
 ConditionBuilderItem.propTypes = {
   /**
@@ -133,11 +163,15 @@ ConditionBuilderItem.propTypes = {
   /**
    * text to be displayed in the field
    */
-  label: index["default"].oneOfType([index["default"].string, index["default"].array]),
+  label: index["default"].oneOfType([index["default"].string, index["default"].array, index["default"].object]),
   /**
    * class name for popover
    */
   popOverClassName: index["default"].string,
+  /**
+   * callback prop that returns the jsx for children
+   */
+  renderChildren: index["default"].func,
   /**
    * Optional prop to allow overriding the icon rendering.
    */

package/lib/components/ConditionBuilder/ConditionBuilderItem/ConditionBuilderItemDate/ConditionBuilderItemDate.d.ts

@@ -1,11 +1,13 @@
-export function ConditionBuilderItemDate({ conditionState, onChange }: {
+export function ConditionBuilderItemDate({ conditionState, onChange, parentRef, }: {
     conditionState: any;
     onChange: any;
+    parentRef: any;
 }): import("react/jsx-runtime").JSX.Element;
 export namespace ConditionBuilderItemDate {
     namespace propTypes {
         let conditionState: PropTypes.Requireable<object>;
         let onChange: PropTypes.Requireable<(...args: any[]) => any>;
+        let parentRef: PropTypes.Requireable<object>;
     }
 }
 import PropTypes from 'prop-types';