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

package/lib/components/ConditionBuilder/ConditionBuilderActions/ConditionBuilderActions.js

@@ -0,0 +1,137 @@
+/**
+ * Copyright IBM Corp. 2020, 2024
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _rollupPluginBabelHelpers = require('../../../_virtual/_rollupPluginBabelHelpers.js');
+var React = require('react');
+var index = require('../../../node_modules/prop-types/index.js');
+var icons = require('@carbon/react/icons');
+var react = require('@carbon/react');
+var ConditionBuilderItem = require('../ConditionBuilderItem/ConditionBuilderItem.js');
+var DataConfigs = require('../ConditionBuilderContext/DataConfigs.js');
+var ItemOption = require('../ConditionBuilderItem/ConditionBuilderItemOption/ItemOption.js');
+var ConditionBuilderProvider = require('../ConditionBuilderContext/ConditionBuilderProvider.js');
+var ConditionBuilderAdd = require('../ConditionBuilderAdd/ConditionBuilderAdd.js');
+var uuidv4 = require('../../../global/js/utils/uuidv4.js');
+var ConditionBuilderButton = require('../ConditionBuilderButton/ConditionBuilderButton.js');
+var util = require('../utils/util.js');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+
+var ConditionBuilderActions = function ConditionBuilderActions(_ref) {
+  var actions = _ref.actions,
+    className = _ref.className;
+  var _useContext = React.useContext(ConditionBuilderProvider.ConditionBuilderContext),
+    actionState = _useContext.actionState,
+    setActionState = _useContext.setActionState;
+  var addActionHandler = function addActionHandler() {
+    var action = {
+      id: uuidv4["default"](),
+      label: undefined,
+      popoverToOpen: 'actionField'
+    };
+    setActionState([].concat(_rollupPluginBabelHelpers.toConsumableArray(actionState), [action]));
+  };
+  var onchangeHandler = function onchangeHandler(evt, selectedId, actionIndex, currentAction) {
+    var action = actions.find(function (action) {
+      return action.id === selectedId;
+    }); //fetch the selected action from the input action array
+
+    //if the action is duplicate, that action is added with a new id, else the same action is used.
+    // same actions can be added multiple times
+    var newAction = util.checkDuplicateAction(actionState, selectedId, currentAction.id) ? _rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, action), {}, {
+      id: uuidv4["default"]()
+    }) : action;
+    setActionState([].concat(_rollupPluginBabelHelpers.toConsumableArray(actionState.slice(0, actionIndex)), [newAction], _rollupPluginBabelHelpers.toConsumableArray(actionState.slice(actionIndex + 1))));
+    util.focusThisField(evt);
+  };
+  var onRemove = function onRemove(selectedId) {
+    setActionState(actionState.filter(function (action) {
+      return action.id !== selectedId;
+    }));
+  };
+  return /*#__PURE__*/React__default["default"].createElement("div", {
+    className: "".concat(className)
+  }, /*#__PURE__*/React__default["default"].createElement(react.Section, {
+    className: "".concat(DataConfigs.blockClass, "__heading"),
+    level: 4
+  }, /*#__PURE__*/React__default["default"].createElement(react.Heading, null, DataConfigs.translateWithId('actions'))), /*#__PURE__*/React__default["default"].createElement("div", {
+    className: "".concat(DataConfigs.blockClass, "__condition-wrapper")
+  }, actionState === null || actionState === void 0 ? void 0 : actionState.map(function (action, index) {
+    return /*#__PURE__*/React__default["default"].createElement("div", {
+      key: action.id,
+      "aria-hidden": true,
+      className: "".concat(DataConfigs.blockClass, "__condition-block conditionBlockWrapper ").concat(DataConfigs.blockClass, "__gap ").concat(DataConfigs.blockClass, "__gap-bottom ")
+    }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
+      className: "".concat(DataConfigs.blockClass, "__statement-button"),
+      popOverClassName: "".concat(DataConfigs.blockClass, "__gap"),
+      label: index === 0 ? DataConfigs.translateWithId('then') : DataConfigs.translateWithId('and')
+    }), /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItem.ConditionBuilderItem, {
+      label: action.label,
+      title: DataConfigs.translateWithId('actions'),
+      popOverClassName: "".concat(DataConfigs.blockClass, "__gap"),
+      condition: action,
+      "data-name": "actionField"
+    }, /*#__PURE__*/React__default["default"].createElement(ItemOption.ItemOption, {
+      conditionState: {
+        value: action.label
+      },
+      onChange: function onChange(selectedId, evt) {
+        return onchangeHandler(evt, selectedId, index, action);
+      },
+      config: {
+        options: actions
+      }
+    })), /*#__PURE__*/React__default["default"].createElement("span", {
+      role: "gridcell",
+      "aria-label": DataConfigs.translateWithId('remove_action')
+    }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderButton.ConditionBuilderButton, {
+      hideLabel: true,
+      label: DataConfigs.translateWithId('remove_action'),
+      onClick: function onClick() {
+        return onRemove(action.id);
+      }
+      //   onMouseEnter={handleShowDeletionPreview}
+      //   onMouseLeave={handleHideDeletionPreview}
+      //   onFocus={handleShowDeletionPreview}
+      //   onBlur={handleHideDeletionPreview}
+      ,
+      renderIcon: icons.Close,
+      className: "".concat(DataConfigs.blockClass, "__close-condition"),
+      "data-name": "closeCondition"
+    })), actionState.length === index + 1 && /*#__PURE__*/React__default["default"].createElement(ConditionBuilderAdd["default"], {
+      onClick: addActionHandler,
+      className: "".concat(DataConfigs.blockClass, "__gap ").concat(DataConfigs.blockClass, "__gap-left"),
+      buttonLabel: DataConfigs.translateWithId('add_action')
+    }));
+  }), actionState.length === 0 && /*#__PURE__*/React__default["default"].createElement(ConditionBuilderAdd["default"], {
+    onClick: addActionHandler,
+    className: "".concat(DataConfigs.blockClass, "__gap ").concat(DataConfigs.blockClass, "__gap-left"),
+    buttonLabel: DataConfigs.translateWithId('add_action')
+  })));
+};
+var ConditionBuilderActions$1 = ConditionBuilderActions;
+ConditionBuilderActions.propTypes = {
+  /**
+   * optional array of object that give the list of actions.
+   */
+  actions: index["default"].arrayOf(index["default"].shape({
+    id: index["default"].number,
+    label: index["default"].string
+  })),
+  /**
+   * Provide an optional class to be applied to the containing node.
+   */
+  className: index["default"].string
+};
+
+exports["default"] = ConditionBuilderActions$1;

package/lib/components/ConditionBuilder/ConditionBuilderAdd/ConditionBuilderAdd.js

@@ -11,6 +11,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _rollupPluginBabelHelpers = require('../../../_virtual/_rollupPluginBabelHelpers.js');
 var React = require('react');
+var cx = require('classnames');
 var icons = require('@carbon/react/icons');
 var ConditionBuilderButton = require('../ConditionBuilderButton/ConditionBuilderButton.js');
 var index = require('../../../node_modules/prop-types/index.js');
@@ -19,6 +20,7 @@ var DataConfigs = require('../ConditionBuilderContext/DataConfigs.js');
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 
 var ConditionBuilderAdd = function ConditionBuilderAdd(_ref) {
   var className = _ref.className,
@@ -81,13 +83,14 @@ var ConditionBuilderAdd = function ConditionBuilderAdd(_ref) {
     "data-name": "addButton",
     label: buttonLabel !== null && buttonLabel !== void 0 ? buttonLabel : DataConfigs.translateWithId('add-condition'),
     wrapperProps: wrapperProps
-  })), isAddSubgroup && enableSubGroup && /*#__PURE__*/React__default["default"].createElement(ConditionBuilderButton.ConditionBuilderButton, _rollupPluginBabelHelpers["extends"]({
+  })), enableSubGroup && /*#__PURE__*/React__default["default"].createElement(ConditionBuilderButton.ConditionBuilderButton, _rollupPluginBabelHelpers["extends"]({
     renderIcon: icons.TextNewLine,
     onClick: addConditionSubGroupHandler,
-    className: "".concat(DataConfigs.blockClass, "__add-condition-group ").concat(DataConfigs.blockClass, "__gap-left"),
+    className: cx__default["default"]("".concat(DataConfigs.blockClass, "__add_condition_group ").concat(DataConfigs.blockClass, "__gap-left")),
     hideLabel: true,
     label: DataConfigs.translateWithId('add-condition'),
-    wrapperProps: wrapperProps
+    wrapperProps: wrapperProps,
+    wrapperClassName: cx__default["default"]("".concat(DataConfigs.blockClass, "__add_condition_group-wrapper"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__add_condition_group-wrapper--show"), isAddSubgroup))
   }, previewHandlersForSubgroup())));
 };
 var ConditionBuilderAdd$1 = ConditionBuilderAdd;

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

@@ -1,4 +1,4 @@
-export function ConditionBuilderButton({ className, label, hideLabel, tooltipAlign, renderIcon: Icon, onClick, showToolTip, wrapperProps, onBlur, onFocus, onMouseEnter, onMouseLeave, }: {
+export function ConditionBuilderButton({ className, label, hideLabel, tooltipAlign, renderIcon: Icon, onClick, showToolTip, wrapperProps, onBlur, onFocus, onMouseEnter, onMouseLeave, isInvalid, wrapperClassName, }: {
     className: any;
     label: any;
     hideLabel: any;
@@ -11,11 +11,14 @@ export function ConditionBuilderButton({ className, label, hideLabel, tooltipAli
     onFocus: any;
     onMouseEnter: any;
     onMouseLeave: any;
+    isInvalid: any;
+    wrapperClassName: any;
 }): import("react/jsx-runtime").JSX.Element;
 export namespace ConditionBuilderButton {
     namespace propTypes {
         let className: PropTypes.Requireable<string>;
         let hideLabel: PropTypes.Requireable<boolean>;
+        let isInvalid: PropTypes.Requireable<boolean>;
         let label: PropTypes.Requireable<string>;
         let onBlur: PropTypes.Requireable<(...args: any[]) => any>;
         let onClick: PropTypes.Requireable<(...args: any[]) => any>;
@@ -25,6 +28,7 @@ export namespace ConditionBuilderButton {
         let renderIcon: PropTypes.Requireable<object>;
         let showToolTip: PropTypes.Requireable<boolean>;
         let tooltipAlign: PropTypes.Requireable<string>;
+        let wrapperClassName: PropTypes.Requireable<string>;
         let wrapperProps: PropTypes.Requireable<object>;
     }
 }

package/lib/components/ConditionBuilder/ConditionBuilderButton/ConditionBuilderButton.js

@@ -15,12 +15,14 @@ var cx = require('classnames');
 var index = require('../../../node_modules/prop-types/index.js');
 var react = require('@carbon/react');
 var DataConfigs = require('../ConditionBuilderContext/DataConfigs.js');
+var icons = require('@carbon/react/icons');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 
+var _WarningAltFilled;
 var ConditionBuilderButton = function ConditionBuilderButton(_ref) {
   var _Icon, _span;
   var className = _ref.className,
@@ -34,24 +36,26 @@ var ConditionBuilderButton = function ConditionBuilderButton(_ref) {
     onBlur = _ref.onBlur,
     onFocus = _ref.onFocus,
     onMouseEnter = _ref.onMouseEnter,
-    onMouseLeave = _ref.onMouseLeave;
+    onMouseLeave = _ref.onMouseLeave,
+    isInvalid = _ref.isInvalid,
+    wrapperClassName = _ref.wrapperClassName;
   var Button = function Button() {
     return /*#__PURE__*/React__default["default"].createElement("button", {
       // role={'gridcell'}
       tabIndex: -1,
-      className: cx__default["default"]([className, "".concat(DataConfigs.blockClass, "__button"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__text-ellipsis"), showToolTip && !hideLabel)]),
+      className: cx__default["default"]([className, "".concat(DataConfigs.blockClass, "__button"), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__text-ellipsis"), showToolTip && !hideLabel && !isInvalid), _rollupPluginBabelHelpers.defineProperty({}, "".concat(DataConfigs.blockClass, "__invalid-input"), isInvalid)]),
       type: "button",
       onClick: onClick,
       onBlur: onBlur,
       onFocus: onFocus,
       onMouseEnter: onMouseEnter,
       onMouseLeave: onMouseLeave
-    }, Icon && (_Icon || (_Icon = /*#__PURE__*/React__default["default"].createElement(Icon, null))), !hideLabel && (_span || (_span = /*#__PURE__*/React__default["default"].createElement("span", null, label))));
+    }, Icon && (_Icon || (_Icon = /*#__PURE__*/React__default["default"].createElement(Icon, null))), !hideLabel && (_span || (_span = /*#__PURE__*/React__default["default"].createElement("span", null, label))), isInvalid && (_WarningAltFilled || (_WarningAltFilled = /*#__PURE__*/React__default["default"].createElement(icons.WarningAltFilled, null))));
   };
   return hideLabel || showToolTip ? /*#__PURE__*/React__default["default"].createElement(react.Tooltip, _rollupPluginBabelHelpers["extends"]({
     label: label,
     align: tooltipAlign,
-    className: "".concat(DataConfigs.blockClass, "__con-tooltip")
+    className: "".concat(wrapperClassName)
   }, wrapperProps), Button()) : /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, Button());
 };
 ConditionBuilderButton.propTypes = {
@@ -63,6 +67,10 @@ ConditionBuilderButton.propTypes = {
    * decides if label and tooltip to be hidden
    */
   hideLabel: index["default"].bool,
+  /**
+   * boolean to know the updated value in not valid
+   */
+  isInvalid: index["default"].bool,
   /**
    * label of the button
    */
@@ -92,6 +100,10 @@ ConditionBuilderButton.propTypes = {
    * tooltip position
    */
   tooltipAlign: index["default"].string,
+  /**
+   * classname applies to the wrapper of popover
+   */
+  wrapperClassName: index["default"].string,
   /**
    * optional props for tree grid to add role and aria-label to wrapper span
    */

package/lib/components/ConditionBuilder/ConditionBuilderConnector/ConditionConnector.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _rollupPluginBabelHelpers = require('../../../_virtual/_rollupPluginBabelHelpers.js');
 var React = require('react');
 var ConditionBuilderItem = require('../ConditionBuilderItem/ConditionBuilderItem.js');
-var ConditionBuilderItemOption = require('../ConditionBuilderItem/ConditionBuilderItemOption/ConditionBuilderItemOption.js');
+var ItemOption = require('../ConditionBuilderItem/ConditionBuilderItemOption/ItemOption.js');
 var DataConfigs = require('../ConditionBuilderContext/DataConfigs.js');
 var index = require('../../../node_modules/prop-types/index.js');
 var util = require('../utils/util.js');
@@ -65,7 +65,7 @@ var ConditionConnector = function ConditionConnector(_ref) {
   }, rest, {
     popOverClassName: className,
     className: "".concat(DataConfigs.blockClass, "__connector-button ")
-  }), /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItemOption.ConditionBuilderItemOption, {
+  }), /*#__PURE__*/React__default["default"].createElement(ItemOption.ItemOption, {
     config: {
       options: DataConfigs.connectorConfig
     },

package/lib/components/ConditionBuilder/ConditionBuilderConnector/GroupConnector.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var React = require('react');
 var ConditionBuilderItem = require('../ConditionBuilderItem/ConditionBuilderItem.js');
 var DataConfigs = require('../ConditionBuilderContext/DataConfigs.js');
-var ConditionBuilderItemOption = require('../ConditionBuilderItem/ConditionBuilderItemOption/ConditionBuilderItemOption.js');
+var ItemOption = require('../ConditionBuilderItem/ConditionBuilderItemOption/ItemOption.js');
 var util = require('../utils/util.js');
 var ConditionBuilderProvider = require('../ConditionBuilderContext/ConditionBuilderProvider.js');
 
@@ -34,7 +34,7 @@ var GroupConnector = function GroupConnector() {
     "data-name": "connectorField",
     popOverClassName: "".concat(DataConfigs.blockClass, "__gap"),
     className: "".concat(DataConfigs.blockClass, "__statement-button")
-  }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderItemOption.ConditionBuilderItemOption, {
+  }, /*#__PURE__*/React__default["default"].createElement(ItemOption.ItemOption, {
     conditionState: {
       value: rootState.operator,
       label: DataConfigs.translateWithId('condition')

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

@@ -1,30 +1,28 @@
 export default ConditionBuilderContent;
-declare function ConditionBuilderContent({ startConditionLabel, conditionBuilderRef, getConditionState, initialState, }: {
+declare function ConditionBuilderContent({ startConditionLabel, conditionBuilderRef, getConditionState, getActionsState, initialState, actions, }: {
     startConditionLabel: any;
     conditionBuilderRef: any;
     getConditionState: any;
+    getActionsState: any;
     initialState: any;
+    actions: any;
 }): import("react/jsx-runtime").JSX.Element;
 declare namespace ConditionBuilderContent {
     namespace propTypes {
         let actions: PropTypes.Requireable<(PropTypes.InferProps<{
-            id: PropTypes.Requireable<number>;
-            label: PropTypes.Requireable<string>;
+            id: PropTypes.Validator<NonNullable<NonNullable<string | number | null | undefined>>>;
+            label: PropTypes.Validator<string>;
         }> | null | undefined)[]>;
         let conditionBuilderRef: PropTypes.Requireable<object>;
         let getActionsState: PropTypes.Requireable<(...args: any[]) => any>;
         let getConditionState: PropTypes.Validator<(...args: any[]) => any>;
         let initialState: PropTypes.Requireable<PropTypes.InferProps<{
             groups: PropTypes.Requireable<(PropTypes.InferProps<{
-                groupSeparateOperator: PropTypes.Requireable<string>;
-                groupOperator: PropTypes.Requireable<string>;
-                statement: PropTypes.Requireable<string>;
-                conditions: PropTypes.Requireable<(PropTypes.InferProps<{
-                    property: PropTypes.Requireable<string>;
-                    operator: PropTypes.Requireable<string>;
-                    value: PropTypes.Requireable<string>;
-                }> | null | undefined)[]>;
+                groupOperator: PropTypes.Validator<string>;
+                statement: PropTypes.Validator<string>;
+                conditions: PropTypes.Requireable<(object | null | undefined)[]>;
             }> | null | undefined)[]>;
+            operator: PropTypes.Requireable<string>;
         }>>;
         let startConditionLabel: PropTypes.Validator<string>;
     }

package/lib/components/ConditionBuilder/ConditionBuilderContent/ConditionBuilderContent.js

@@ -21,6 +21,7 @@ var ConditionBuilderButton = require('../ConditionBuilderButton/ConditionBuilder
 var uuidv4 = require('../../../global/js/utils/uuidv4.js');
 var ConditionPreview = require('../ConditionPreview/ConditionPreview.js');
 var GroupConnector = require('../ConditionBuilderConnector/GroupConnector.js');
+var ConditionBuilderActions = require('../ConditionBuilderActions/ConditionBuilderActions.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -32,14 +33,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 = React.useContext(ConditionBuilderProvider.ConditionBuilderContext),
     rootState = _useContext.rootState,
     setRootState = _useContext.setRootState,
-    variant = _useContext.variant;
+    variant = _useContext.variant,
+    actionState = _useContext.actionState;
   var _useState = React.useState(false),
     _useState2 = _rollupPluginBabelHelpers.slicedToArray(_useState, 2),
     isConditionBuilderActive = _useState2[0],
@@ -61,11 +62,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]);
+  React.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);
@@ -91,8 +91,6 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
   };
   var addConditionGroupHandler = function addConditionGroupHandler() {
     var newGroup = {
-      groupSeparateOperator: 'and',
-      // 'or'|'and'|'null',
       groupOperator: 'and',
       //'and|or',
       statement: 'if',
@@ -111,7 +109,7 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
     }));
   };
   return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, !isConditionBuilderActive && /*#__PURE__*/React__default["default"].createElement(react.Button, {
-    className: "".concat(DataConfigs.blockClass, "__add-condition-button"),
+    className: "".concat(DataConfigs.blockClass, "__add_condition-button"),
     renderIcon: function renderIcon(props) {
       return /*#__PURE__*/React__default["default"].createElement(icons.Add, _rollupPluginBabelHelpers["extends"]({
         size: 16
@@ -121,10 +119,7 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
     kind: "ghost",
     size: "sm",
     onClick: onStartConditionBuilder
-  }, startConditionLabel), isConditionBuilderActive &&
-  /*#__PURE__*/
-  // <h5 >Condition</h5>
-  React__default["default"].createElement(react.Section, {
+  }, startConditionLabel), isConditionBuilderActive && /*#__PURE__*/React__default["default"].createElement(react.Section, {
     className: "".concat(DataConfigs.blockClass, "__heading"),
     level: 4
   }, _Heading || (_Heading = /*#__PURE__*/React__default["default"].createElement(react.Heading, null, "Condition"))), /*#__PURE__*/React__default["default"].createElement("div", {
@@ -164,16 +159,19 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
     onMouseLeave: function onMouseLeave() {
       setShowConditionGroupPreview(false);
     },
-    className: "".concat(DataConfigs.blockClass, "__add-condition-group "),
+    className: "".concat(DataConfigs.blockClass, "__add_condition_group "),
     hideLabel: true,
-    label: DataConfigs.translateWithId('add-condition-sub-group'),
+    label: DataConfigs.translateWithId('add_condition_group'),
     wrapperProps: {
       role: 'gridcell',
-      'aria-label': DataConfigs.translateWithId('add-condition-sub-group')
+      'aria-label': DataConfigs.translateWithId('add_condition_group')
     }
   })), showConditionGroupPreview && (_ConditionPreview || (_ConditionPreview = /*#__PURE__*/React__default["default"].createElement(ConditionPreview["default"], {
     previewType: "newGroup"
-  }))))));
+  }))))), isConditionBuilderActive && actions && /*#__PURE__*/React__default["default"].createElement(ConditionBuilderActions["default"], {
+    actions: actions,
+    className: "".concat(DataConfigs.blockClass, "__actions-container")
+  }));
 };
 var ConditionBuilderContent$1 = ConditionBuilderContent;
 ConditionBuilderContent.propTypes = {
@@ -181,8 +179,8 @@ ConditionBuilderContent.propTypes = {
    * optional array of object that give the list of actions.
    */
   actions: index["default"].arrayOf(index["default"].shape({
-    id: index["default"].number,
-    label: index["default"].string
+    id: index["default"].oneOfType([index["default"].string, index["default"].number]).isRequired,
+    label: index["default"].string.isRequired
   })),
   /**
    * ref of condition builder
@@ -201,15 +199,21 @@ ConditionBuilderContent.propTypes = {
    */
   initialState: index["default"].shape({
     groups: index["default"].arrayOf(index["default"].shape({
-      groupSeparateOperator: index["default"].string,
-      groupOperator: index["default"].string,
-      statement: index["default"].string,
-      conditions: index["default"].arrayOf(index["default"].shape({
-        property: index["default"].string,
-        operator: index["default"].string,
-        value: index["default"].string
-      }))
-    }))
+      groupOperator: index["default"].string.isRequired,
+      statement: index["default"].string.isRequired,
+      conditions: index["default"].arrayOf(index["default"].oneOfType([index["default"].shape({
+        property: index["default"].string.isRequired,
+        operator: index["default"].string.isRequired,
+        value: index["default"].oneOfType([index["default"].string, index["default"].arrayOf(index["default"].shape({
+          id: index["default"].string,
+          label: index["default"].string
+        })), index["default"].shape({
+          id: index["default"].string,
+          label: index["default"].string
+        })])
+      }), index["default"].object]))
+    })),
+    operator: index["default"].string
   }),
   /* Provide a label to the button that starts condition builder
    */

package/lib/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/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,10 +57,16 @@ 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,
@@ -95,7 +100,7 @@ ConditionBuilderProvider.propTypes = {
       id: index["default"].string,
       label: index["default"].string,
       icon: index["default"].oneOfType([index["default"].func, index["default"].object]),
-      type: index["default"].oneOf(['text', 'number', 'date', 'option', 'time']),
+      type: index["default"].oneOf(['text', 'number', 'date', 'option', 'time', 'custom']),
       config: index["default"].shape({
         options: index["default"].arrayOf(index["default"].shape({
           id: index["default"].string,

package/lib/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/lib/components/ConditionBuilder/ConditionBuilderContext/DataConfigs.js

@@ -17,7 +17,7 @@ var statementConfig = [{
   id: 'if'
 }, {
   label: 'excl.if',
-  id: 'excl.if'
+  id: 'excl_if'
 }];
 var connectorConfig = [{
   label: 'and',
@@ -26,7 +26,6 @@ var connectorConfig = [{
   label: 'or',
   id: 'or'
 }];
-//op types : option, text, number, date,
 var operatorConfig = [{
   label: 'is',
   id: 'is',
@@ -37,7 +36,7 @@ var operatorConfig = [{
   type: 'number'
 }, {
   label: 'is greater than or equal to',
-  id: 'greater-equal',
+  id: 'greater_equal',
   type: 'number'
 }, {
   label: 'is lower than',
@@ -45,15 +44,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',
@@ -61,7 +60,7 @@ var operatorConfig = [{
   type: 'text'
 }, {
   label: 'is one of',
-  id: 'one-of',
+  id: 'one_of',
   type: 'option'
 }, {
   label: 'is before',
@@ -96,11 +95,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) {
@@ -110,6 +115,9 @@ var valueRenderers = {
     } else {
       return value && new Date(value) ? formatDate(new Date(value)) : value;
     }
+  },
+  custom: function custom(value) {
+    return value;
   }
 };