@carbon/ibm-products 2.43.2-canary.2 → 2.43.2-canary.20

package/es/components/ConditionBuilder/ConditionBuilderContent/ConditionBuilderContent.js

@@ -17,6 +17,7 @@ import { ConditionBuilderButton } from '../ConditionBuilderButton/ConditionBuild
 import uuidv4 from '../../../global/js/utils/uuidv4.js';
 import ConditionPreview from '../ConditionPreview/ConditionPreview.js';
 import GroupConnector from '../ConditionBuilderConnector/GroupConnector.js';
+import ConditionBuilderActions from '../ConditionBuilderActions/ConditionBuilderActions.js';
 
 var _Heading, _GroupConnector, _ConditionPreview;
 var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
@@ -24,14 +25,14 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
   var startConditionLabel = _ref.startConditionLabel,
     conditionBuilderRef = _ref.conditionBuilderRef,
     getConditionState = _ref.getConditionState,
-    initialState = _ref.initialState;
-  // const { rootState, setRootState, variant, actionState } = useContext(
-  //   ConditionBuilderContext
-  // );
+    getActionsState = _ref.getActionsState,
+    initialState = _ref.initialState,
+    actions = _ref.actions;
   var _useContext = useContext(ConditionBuilderContext),
     rootState = _useContext.rootState,
     setRootState = _useContext.setRootState,
-    variant = _useContext.variant;
+    variant = _useContext.variant,
+    actionState = _useContext.actionState;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isConditionBuilderActive = _useState2[0],
@@ -53,11 +54,10 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [rootState]);
-
-  // useEffect(() => {
-  //   getActionsState?.(actionState);
-  //   // eslint-disable-next-line react-hooks/exhaustive-deps
-  // }, [actionState]);
+  useEffect(function () {
+    getActionsState === null || getActionsState === void 0 || getActionsState(actionState);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [actionState]);
   var onStartConditionBuilder = function onStartConditionBuilder() {
     //when add condition button is clicked.
     setIsConditionBuilderActive(true);
@@ -83,8 +83,6 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
   };
   var addConditionGroupHandler = function addConditionGroupHandler() {
     var newGroup = {
-      groupSeparateOperator: 'and',
-      // 'or'|'and'|'null',
       groupOperator: 'and',
       //'and|or',
       statement: 'if',
@@ -103,7 +101,7 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
     }));
   };
   return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, !isConditionBuilderActive && /*#__PURE__*/React__default.createElement(Button, {
-    className: "".concat(blockClass, "__add-condition-button"),
+    className: "".concat(blockClass, "__add_condition-button"),
     renderIcon: function renderIcon(props) {
       return /*#__PURE__*/React__default.createElement(Add, _extends({
         size: 16
@@ -113,10 +111,7 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
     kind: "ghost",
     size: "sm",
     onClick: onStartConditionBuilder
-  }, startConditionLabel), isConditionBuilderActive &&
-  /*#__PURE__*/
-  // <h5 >Condition</h5>
-  React__default.createElement(Section, {
+  }, startConditionLabel), isConditionBuilderActive && /*#__PURE__*/React__default.createElement(Section, {
     className: "".concat(blockClass, "__heading"),
     level: 4
   }, _Heading || (_Heading = /*#__PURE__*/React__default.createElement(Heading, null, "Condition"))), /*#__PURE__*/React__default.createElement("div", {
@@ -156,16 +151,19 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
     onMouseLeave: function onMouseLeave() {
       setShowConditionGroupPreview(false);
     },
-    className: "".concat(blockClass, "__add-condition-group "),
+    className: "".concat(blockClass, "__add_condition_group "),
     hideLabel: true,
-    label: translateWithId('add-condition-sub-group'),
+    label: translateWithId('add_condition_group'),
     wrapperProps: {
       role: 'gridcell',
-      'aria-label': translateWithId('add-condition-sub-group')
+      'aria-label': translateWithId('add_condition_group')
     }
   })), showConditionGroupPreview && (_ConditionPreview || (_ConditionPreview = /*#__PURE__*/React__default.createElement(ConditionPreview, {
     previewType: "newGroup"
-  }))))));
+  }))))), isConditionBuilderActive && actions && /*#__PURE__*/React__default.createElement(ConditionBuilderActions, {
+    actions: actions,
+    className: "".concat(blockClass, "__actions-container")
+  }));
 };
 var ConditionBuilderContent$1 = ConditionBuilderContent;
 ConditionBuilderContent.propTypes = {
@@ -173,8 +171,8 @@ ConditionBuilderContent.propTypes = {
    * optional array of object that give the list of actions.
    */
   actions: PropTypes.arrayOf(PropTypes.shape({
-    id: PropTypes.number,
-    label: PropTypes.string
+    id: PropTypes.oneOfType([PropTypes.string, PropTypes.number]).isRequired,
+    label: PropTypes.string.isRequired
   })),
   /**
    * ref of condition builder
@@ -193,15 +191,21 @@ ConditionBuilderContent.propTypes = {
    */
   initialState: PropTypes.shape({
     groups: PropTypes.arrayOf(PropTypes.shape({
-      groupSeparateOperator: PropTypes.string,
-      groupOperator: PropTypes.string,
-      statement: PropTypes.string,
-      conditions: PropTypes.arrayOf(PropTypes.shape({
-        property: PropTypes.string,
-        operator: PropTypes.string,
-        value: PropTypes.string
-      }))
-    }))
+      groupOperator: PropTypes.string.isRequired,
+      statement: PropTypes.string.isRequired,
+      conditions: PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.shape({
+        property: PropTypes.string.isRequired,
+        operator: PropTypes.string.isRequired,
+        value: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.shape({
+          id: PropTypes.string,
+          label: PropTypes.string
+        })), PropTypes.shape({
+          id: PropTypes.string,
+          label: PropTypes.string
+        })])
+      }), PropTypes.object]))
+    })),
+    operator: PropTypes.string
   }),
   /* Provide a label to the button that starts condition builder
    */

package/es/components/ConditionBuilder/ConditionBuilderContext/ConditionBuilderProvider.d.ts

@@ -1,7 +1,6 @@
 export namespace emptyState {
     let operator: string;
     let groups: {
-        groupSeparateOperator: null;
         groupOperator: string;
         statement: string;
         id: any;

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

@@ -13,7 +13,6 @@ import uuidv4 from '../../../global/js/utils/uuidv4.js';
 var emptyState = {
   operator: 'or',
   groups: [{
-    groupSeparateOperator: null,
     groupOperator: 'and',
     statement: 'if',
     id: uuidv4(),
@@ -50,10 +49,16 @@ var ConditionBuilderProvider = function ConditionBuilderProvider(props) {
     _useState2 = _slicedToArray(_useState, 2),
     rootState = _useState2[0],
     setRootState = _useState2[1];
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    actionState = _useState4[0],
+    setActionState = _useState4[1];
   return /*#__PURE__*/React__default.createElement(ConditionBuilderContext.Provider, {
     value: {
       rootState: rootState,
       setRootState: setRootState,
+      actionState: actionState,
+      setActionState: setActionState,
       inputConfig: props.inputConfig,
       popOverSearchThreshold: props.popOverSearchThreshold,
       getOptions: props.getOptions,
@@ -87,7 +92,7 @@ ConditionBuilderProvider.propTypes = {
       id: PropTypes.string,
       label: PropTypes.string,
       icon: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
-      type: PropTypes.oneOf(['text', 'number', 'date', 'option', 'time']),
+      type: PropTypes.oneOf(['text', 'number', 'date', 'option', 'time', 'custom']),
       config: PropTypes.shape({
         options: PropTypes.arrayOf(PropTypes.shape({
           id: PropTypes.string,

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

@@ -6,6 +6,10 @@ export const connectorConfig: {
     label: string;
     id: string;
 }[];
+export const actionConfig: {
+    label: string;
+    id: string;
+}[];
 export const operatorConfig: {
     label: string;
     id: string;
@@ -16,7 +20,8 @@ export function translateWithId(key: any): any;
 export namespace valueRenderers {
     function text(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/es/components/ConditionBuilder/ConditionBuilderContext/DataConfigs.js

@@ -13,7 +13,7 @@ var statementConfig = [{
   id: 'if'
 }, {
   label: 'excl.if',
-  id: 'excl.if'
+  id: 'excl_if'
 }];
 var connectorConfig = [{
   label: 'and',
@@ -22,7 +22,6 @@ var connectorConfig = [{
   label: 'or',
   id: 'or'
 }];
-//op types : option, text, number, date,
 var operatorConfig = [{
   label: 'is',
   id: 'is',
@@ -33,7 +32,7 @@ var operatorConfig = [{
   type: 'number'
 }, {
   label: 'is greater than or equal to',
-  id: 'greater-equal',
+  id: 'greater_equal',
   type: 'number'
 }, {
   label: 'is lower than',
@@ -41,15 +40,15 @@ var operatorConfig = [{
   type: 'number'
 }, {
   label: 'is lower than or equal to',
-  id: 'lower-equal',
+  id: 'lower_equal',
   type: 'number'
 }, {
   label: 'starts with',
-  id: 'starts-with',
+  id: 'starts_with',
   type: 'text'
 }, {
   label: 'ends with',
-  id: 'ends-with',
+  id: 'ends_with',
   type: 'text'
 }, {
   label: 'contains',
@@ -57,7 +56,7 @@ var operatorConfig = [{
   type: 'text'
 }, {
   label: 'is one of',
-  id: 'one-of',
+  id: 'one_of',
   type: 'option'
 }, {
   label: 'is before',
@@ -92,11 +91,17 @@ var valueRenderers = {
   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) {
@@ -106,6 +111,9 @@ var valueRenderers = {
     } else {
       return value && new Date(value) ? formatDate(new Date(value)) : value;
     }
+  },
+  custom: function custom(value) {
+    return value;
   }
 };
 

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

@@ -1,38 +1,41 @@
 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;
-    };
+    namespace en {
+        let _if: string;
+        export { _if as if };
+        export let excl_if: string;
+        export let and: string;
+        export let or: string;
+        export let is: string;
+        export let greater: string;
+        export let greater_equal: string;
+        export let lower: string;
+        export let lower_equal: string;
+        export let starts_with: string;
+        export let ends_with: string;
+        export let contains: string;
+        export let one_of: string;
+        export let before: string;
+        export let after: string;
+        export let between: string;
+        export let add_condition: string;
+        export let add_condition_group: string;
+        export let add_subgroup: string;
+        export let condition: string;
+        export let property: string;
+        export let operator: string;
+        export let value: string;
+        export let connector: string;
+        export let condition_row: string;
+        export let remove_condition: string;
+        export let add_condition_row: string;
+        export let start: string;
+        export let end: string;
+        export let clear_search: string;
+        export let actions: string;
+        export let then: string;
+        export let remove_action: string;
+        export let add_action: string;
+        export let invalid_text: string;
+        export let text_invalid_number: string;
+    }
 }

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

@@ -8,24 +8,24 @@
 var translationsObject = {
   en: {
     if: 'if',
-    'excl-if': 'excl.if',
+    excl_if: 'excl.if',
     and: 'and',
     or: 'or',
     is: 'is',
     greater: 'is greater than',
-    'greater-equal': 'is greater than or equal to',
+    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',
+    lower_equal: 'is lower than or equal to',
+    starts_with: 'starts with',
+    ends_with: 'ends with',
     contains: 'contains',
-    'one-of': 'is one of',
+    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',
+    add_condition: 'Add condition',
+    add_condition_group: 'Add condition group',
+    add_subgroup: 'Add subgroup',
     condition: 'Condition',
     property: 'Property',
     operator: 'Operator',
@@ -40,7 +40,9 @@ var translationsObject = {
     actions: 'Actions',
     then: 'then',
     remove_action: 'Remove Action',
-    add_action: 'Add action'
+    add_action: 'Add action',
+    invalid_text: 'Incomplete',
+    text_invalid_number: 'Invalid number, must be 0 or greater'
   }
 };
 

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

@@ -17,7 +17,7 @@ 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 renderIcon: PropTypes.Requireable<object>;
         let showToolTip: PropTypes.Requireable<boolean>;

package/es/components/ConditionBuilder/ConditionBuilderItem/ConditionBuilderItem.js

@@ -10,7 +10,7 @@ import React__default, { useRef, useState, useEffect } from 'react';
 import { Popover, PopoverContent, Layer } from '@carbon/react';
 import PropTypes from '../../../node_modules/prop-types/index.js';
 import { Add } from '@carbon/react/icons';
-import { valueRenderers, translateWithId, blockClass } from '../ConditionBuilderContext/DataConfigs.js';
+import { translateWithId, blockClass, valueRenderers } from '../ConditionBuilderContext/DataConfigs.js';
 import { ConditionBuilderButton } from '../ConditionBuilderButton/ConditionBuilderButton.js';
 
 var _excluded = ["children", "className", "label", "renderIcon", "title", "type", "showToolTip", "condition", "popOverClassName", "config"];
@@ -27,19 +27,26 @@ var ConditionBuilderItem = function ConditionBuilderItem(_ref) {
     config = _ref.config,
     rest = _objectWithoutProperties(_ref, _excluded);
   var contentRef = useRef(null);
-  var _useState = useState(label),
+  var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
-    propertyLabel = _useState2[0],
-    setPropertyLabel = _useState2[1];
-  var _useState3 = useState(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    open = _useState4[0],
-    setOpen = _useState4[1];
-  useEffect(function () {
+    open = _useState2[0],
+    setOpen = _useState2[1];
+  var getPropertyDetails = function getPropertyDetails() {
+    if (label === 'INVALID') {
+      return {
+        propertyLabel: translateWithId('invalid_text'),
+        isInvalid: true
+      };
+    }
     var propertyId = rest['data-name'] == 'valueField' && type ? valueRenderers[type](label, config) : label;
-    setPropertyLabel(translateWithId(propertyId));
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [label]);
+    return {
+      isInvalid: false,
+      propertyLabel: translateWithId(propertyId)
+    };
+  };
+  var _getPropertyDetails = getPropertyDetails(),
+    propertyLabel = _getPropertyDetails.propertyLabel,
+    isInvalid = _getPropertyDetails.isInvalid;
   useEffect(function () {
     /**
      * rest['data-name'] holds the current field name
@@ -51,7 +58,7 @@ var ConditionBuilderItem = function ConditionBuilderItem(_ref) {
       if (condition.popoverToOpen && currentField !== condition.popoverToOpen) {
         // close the previous popover
         setOpen(false);
-      } else if (currentField == 'valueField' && type == 'option' && condition.operator !== 'one-of') {
+      } else if (currentField == 'valueField' && type == 'option' && condition.operator !== 'one_of') {
         //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);
       }
@@ -84,7 +91,7 @@ var ConditionBuilderItem = function ConditionBuilderItem(_ref) {
       setOpen(false);
     }
   }, /*#__PURE__*/React__default.createElement(ConditionBuilderButton, _extends({
-    label: propertyLabel !== null && propertyLabel !== void 0 ? propertyLabel : translateWithId('add-condition'),
+    label: propertyLabel !== null && propertyLabel !== void 0 ? propertyLabel : translateWithId('add_condition'),
     hideLabel: !label ? true : false,
     onClick: function onClick() {
       children ? setOpen(!open) : null;
@@ -93,7 +100,8 @@ var ConditionBuilderItem = function ConditionBuilderItem(_ref) {
     "aria-haspopup": true,
     "aria-expanded": open,
     renderIcon: renderIcon ? renderIcon : label == undefined ? Add : null,
-    showToolTip: showToolTip
+    showToolTip: showToolTip,
+    isInvalid: isInvalid
   }, rest)), /*#__PURE__*/React__default.createElement(PopoverContent, {
     className: "".concat(blockClass, "__item__content"),
     role: "dialog",
@@ -125,7 +133,7 @@ ConditionBuilderItem.propTypes = {
   /**
    * text to be displayed in the field
    */
-  label: PropTypes.oneOfType([PropTypes.string, PropTypes.array]),
+  label: PropTypes.oneOfType([PropTypes.string, PropTypes.array, PropTypes.object]),
   /**
    * class name for popover
    */

package/es/components/ConditionBuilder/ConditionBuilderItem/ConditionBuilderItemNumber/ConditionBuilderItemNumber.js

@@ -7,10 +7,9 @@
 
 import React__default from 'react';
 import { NumberInput } from '@carbon/react';
-import { pkg } from '../../../../settings.js';
 import PropTypes from '../../../../node_modules/prop-types/index.js';
+import { blockClass, translateWithId } from '../../ConditionBuilderContext/DataConfigs.js';
 
-var blockClass = "".concat(pkg.prefix, "--condition-builder");
 var ConditionBuilderItemNumber = function ConditionBuilderItemNumber(_ref) {
   var _conditionState$prope;
   var conditionState = _ref.conditionState,
@@ -18,18 +17,34 @@ var ConditionBuilderItemNumber = function ConditionBuilderItemNumber(_ref) {
     onChange = _ref.onChange;
   var onChangeHandler = function onChangeHandler(e, _ref2) {
     var value = _ref2.value;
-    onChange(value + '');
+    if (checkIfValid(value)) {
+      var _config$unit;
+      onChange("".concat(value, " ").concat((_config$unit = config.unit) !== null && _config$unit !== void 0 ? _config$unit : ''));
+    } else {
+      onChange('INVALID');
+    }
+  };
+  var checkIfValid = function checkIfValid(value) {
+    if (value > config.max || value < config.min) {
+      return false;
+    }
+    return true;
+  };
+  var getDefaultValue = function getDefaultValue() {
+    var _conditionState$value;
+    return (_conditionState$value = conditionState.value) === null || _conditionState$value === void 0 || (_conditionState$value = _conditionState$value.split(' ')) === null || _conditionState$value === void 0 ? void 0 : _conditionState$value[0];
   };
   return /*#__PURE__*/React__default.createElement("div", {
     className: "".concat(blockClass, "__item-number")
   }, /*#__PURE__*/React__default.createElement(NumberInput, {
     label: conditionState.property,
     hideLabel: true,
+    defaultValue: getDefaultValue(),
     id: (_conditionState$prope = conditionState.property) === null || _conditionState$prope === void 0 ? void 0 : _conditionState$prope.replace(/\s/g, ''),
-    value: conditionState.value ? conditionState.value.split(' ')[0] : conditionState.value,
     min: config.min,
     max: config.max,
     step: config.step,
+    invalidText: translateWithId('text_invalid_number'),
     allowEmpty: true,
     onChange: onChangeHandler
   }));

package/es/components/ConditionBuilder/ConditionBuilderItem/ConditionBuilderItemOption/ItemOption.d.ts

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