@carbon/ibm-products 2.43.2-canary.15 → 2.43.2-canary.152

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

@@ -21,25 +21,26 @@ 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');
+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 _Heading, _GroupConnector, _ConditionPreview;
+var _GroupConnector;
 var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
-  var _rootState$groups2;
+  var _rootState$groups4;
   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],
@@ -48,6 +49,16 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
     _useState4 = _rollupPluginBabelHelpers.slicedToArray(_useState3, 2),
     showConditionGroupPreview = _useState4[0],
     setShowConditionGroupPreview = _useState4[1];
+  var _useTranslations = useTranslations.useTranslations(['addConditionGroupText', 'conditionHeadingText']),
+    _useTranslations2 = _rollupPluginBabelHelpers.slicedToArray(_useTranslations, 2),
+    addConditionGroupText = _useTranslations2[0],
+    conditionHeadingText = _useTranslations2[1];
+  var showConditionGroupPreviewHandler = function showConditionGroupPreviewHandler() {
+    setShowConditionGroupPreview(true);
+  };
+  var hideConditionGroupPreviewHandler = function hideConditionGroupPreviewHandler() {
+    setShowConditionGroupPreview(false);
+  };
   React.useEffect(function () {
     var _rootState$groups;
     if (rootState !== null && rootState !== void 0 && (_rootState$groups = rootState.groups) !== null && _rootState$groups !== void 0 && _rootState$groups.length) {
@@ -56,27 +67,27 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
       setIsConditionBuilderActive(false);
     }
     if (getConditionState) {
-      getConditionState(rootState);
+      getConditionState(rootState !== null && rootState !== void 0 ? rootState : {});
     }
 
     // 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 !== null && actionState !== void 0 ? actionState : []);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [actionState]);
   var onStartConditionBuilder = function onStartConditionBuilder() {
     //when add condition button is clicked.
     setIsConditionBuilderActive(true);
-    setRootState(initialState !== null && initialState !== void 0 ? initialState : ConditionBuilderProvider.emptyState); //here we can set an empty skeleton object for an empty condition builder,
+    setRootState === null || setRootState === void 0 || setRootState(initialState !== null && initialState !== void 0 ? initialState : ConditionBuilderProvider.emptyState); //here we can set an empty skeleton object for an empty condition builder,
     //or we can even pre-populate some existing builder and continue editing
   };
   var _onRemove = React.useCallback(function (groupId) {
-    setRootState(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, rootState), {}, {
-      groups: rootState.groups.filter(function (group) {
-        return groupId !== group.id;
-      })
+    var _rootState$groups2;
+    setRootState === null || setRootState === void 0 || setRootState(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, rootState), {}, {
+      groups: rootState ? rootState === null || rootState === void 0 || (_rootState$groups2 = rootState.groups) === null || _rootState$groups2 === void 0 ? void 0 : _rootState$groups2.filter(function (group) {
+        return groupId !== (group === null || group === void 0 ? void 0 : group.id);
+      }) : []
     }));
   }, [setRootState, rootState]);
   var onChangeHandler = function onChangeHandler(updatedGroup, groupIndex) {
@@ -84,19 +95,18 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
      * This method is triggered from inner components. This will be called every time when any change is to be updated in the rootState.
      * This gets the updated group as argument.
      */
-    var groups = [].concat(_rollupPluginBabelHelpers.toConsumableArray(rootState.groups.slice(0, groupIndex)), [updatedGroup], _rollupPluginBabelHelpers.toConsumableArray(rootState.groups.slice(groupIndex + 1)));
-    setRootState(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, rootState), {}, {
-      groups: groups
-    }));
+    if (rootState && rootState.groups) {
+      var groups = [].concat(_rollupPluginBabelHelpers.toConsumableArray(rootState.groups ? rootState.groups.slice(0, groupIndex) : []), [updatedGroup], _rollupPluginBabelHelpers.toConsumableArray(rootState.groups ? rootState.groups.slice(groupIndex + 1) : []));
+      setRootState === null || setRootState === void 0 || setRootState(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, rootState), {}, {
+        groups: groups
+      }));
+    }
   };
   var addConditionGroupHandler = function addConditionGroupHandler() {
     var newGroup = {
-      groupSeparateOperator: 'and',
-      // 'or'|'and'|'null',
-      groupOperator: 'and',
-      //'and|or',
       statement: 'if',
       // 'if|exclude if',
+      groupOperator: 'and',
       id: uuidv4["default"](),
       conditions: [{
         property: undefined,
@@ -106,32 +116,36 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
         id: uuidv4["default"]()
       }]
     };
-    setRootState(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, rootState), {}, {
-      groups: [].concat(_rollupPluginBabelHelpers.toConsumableArray(rootState.groups), [newGroup])
+    setRootState === null || setRootState === void 0 || setRootState(_rollupPluginBabelHelpers.objectSpread2(_rollupPluginBabelHelpers.objectSpread2({}, rootState), {}, {
+      groups: rootState && rootState.groups ? [].concat(_rollupPluginBabelHelpers.toConsumableArray(rootState.groups), [newGroup]) : [newGroup]
     }));
   };
-  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"),
-    renderIcon: function renderIcon(props) {
-      return /*#__PURE__*/React__default["default"].createElement(icons.Add, _rollupPluginBabelHelpers["extends"]({
-        size: 16
-      }, props));
-    },
-    iconDescription: startConditionLabel,
-    kind: "ghost",
-    size: "sm",
-    onClick: onStartConditionBuilder
-  }, startConditionLabel), isConditionBuilderActive &&
-  /*#__PURE__*/
-  // <h5 >Condition</h5>
-  React__default["default"].createElement(react.Section, {
+  var getColorIndex = function getColorIndex() {
+    var _rootState$groups$len, _rootState$groups3;
+    var groupLength = (_rootState$groups$len = rootState === null || rootState === void 0 || (_rootState$groups3 = rootState.groups) === null || _rootState$groups3 === void 0 ? void 0 : _rootState$groups3.length) !== null && _rootState$groups$len !== void 0 ? _rootState$groups$len : 0;
+    return groupLength % 5;
+  };
+  if (!isConditionBuilderActive) {
+    return /*#__PURE__*/React__default["default"].createElement(react.Button, {
+      className: "".concat(DataConfigs.blockClass, "__addConditionText-button"),
+      renderIcon: function renderIcon(props) {
+        return /*#__PURE__*/React__default["default"].createElement(icons.Add, props);
+      },
+      iconDescription: startConditionLabel,
+      kind: "ghost",
+      size: "sm",
+      onClick: onStartConditionBuilder
+    }, startConditionLabel);
+  }
+  return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__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", {
+  }, /*#__PURE__*/React__default["default"].createElement(react.Heading, null, conditionHeadingText)), /*#__PURE__*/React__default["default"].createElement("div", {
     className: "".concat(DataConfigs.blockClass, "__content-container"),
     role: "treegrid",
     "aria-label": "condition builder tree"
-  }, rootState && (rootState === null || rootState === void 0 || (_rootState$groups2 = rootState.groups) === null || _rootState$groups2 === void 0 ? void 0 : _rootState$groups2.map(function (eachGroup, groupIndex) {
+  }, rootState && (rootState === null || rootState === void 0 || (_rootState$groups4 = rootState.groups) === null || _rootState$groups4 === void 0 ? void 0 : _rootState$groups4.map(function (eachGroup, groupIndex) {
+    var _ref2;
     return /*#__PURE__*/React__default["default"].createElement("div", {
       key: eachGroup.id,
       className: "".concat(DataConfigs.blockClass, "__group-wrapper")
@@ -140,7 +154,7 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
       aria: {
         level: 1,
         posinset: groupIndex * 2 + 1,
-        setsize: rootState.groups.length * 2
+        setsize: (_ref2 = rootState.groups && rootState.groups.length * 2) !== null && _ref2 !== void 0 ? _ref2 : 0
       },
       group: eachGroup,
       onRemove: function onRemove() {
@@ -148,46 +162,47 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
       },
       onChange: function onChange(updatedGroup) {
         onChangeHandler(updatedGroup, groupIndex);
-      },
-      conditionBuilderRef: conditionBuilderRef
-    }), groupIndex < rootState.groups.length - 1 && (_GroupConnector || (_GroupConnector = /*#__PURE__*/React__default["default"].createElement(GroupConnector["default"], null))));
-  })), isConditionBuilderActive && /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, variant == 'tree' && /*#__PURE__*/React__default["default"].createElement("div", {
+      }
+    }), rootState.groups && groupIndex < rootState.groups.length - 1 && (_GroupConnector || (_GroupConnector = /*#__PURE__*/React__default["default"].createElement(GroupConnector["default"], null))));
+  })), variant == 'tree' && /*#__PURE__*/React__default["default"].createElement("div", {
     role: "row",
     tabIndex: -1,
-    "aria-level": 1
+    "aria-level": 1,
+    className: "".concat(DataConfigs.blockClass, "__add-group")
   }, /*#__PURE__*/React__default["default"].createElement(ConditionBuilderButton.ConditionBuilderButton, {
     renderIcon: icons.TextNewLine,
     onClick: addConditionGroupHandler,
-    onMouseEnter: function onMouseEnter() {
-      setShowConditionGroupPreview(true);
-    },
-    onMouseLeave: function onMouseLeave() {
-      setShowConditionGroupPreview(false);
-    },
+    onMouseEnter: showConditionGroupPreviewHandler,
+    onMouseLeave: hideConditionGroupPreviewHandler,
+    onFocus: showConditionGroupPreviewHandler,
+    onBlur: hideConditionGroupPreviewHandler,
     className: "".concat(DataConfigs.blockClass, "__add-condition-group "),
     hideLabel: true,
-    label: DataConfigs.translateWithId('add-condition-sub-group'),
+    label: addConditionGroupText,
     wrapperProps: {
       role: 'gridcell',
-      'aria-label': DataConfigs.translateWithId('add-condition-sub-group')
+      'aria-label': addConditionGroupText
     }
-  })), showConditionGroupPreview && (_ConditionPreview || (_ConditionPreview = /*#__PURE__*/React__default["default"].createElement(ConditionPreview["default"], {
-    previewType: "newGroup"
-  }))))));
+  })), showConditionGroupPreview && /*#__PURE__*/React__default["default"].createElement(ConditionPreview["default"], {
+    previewType: "newGroup",
+    colorIndex: getColorIndex(),
+    group: {
+      groupOperator: rootState === null || rootState === void 0 ? void 0 : rootState.operator,
+      id: uuidv4["default"]()
+    }
+  })), actions && /*#__PURE__*/React__default["default"].createElement(ConditionBuilderActions["default"], {
+    actions: actions,
+    className: "".concat(DataConfigs.blockClass, "__actions-container")
+  }));
 };
-var ConditionBuilderContent$1 = ConditionBuilderContent;
 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
-   */
-  conditionBuilderRef: index["default"].object,
   /**
    * callback functions that will provide the updated action state back.
    */
@@ -201,19 +216,25 @@ 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({
+      conditions: index["default"].arrayOf(index["default"].oneOfType([index["default"].shape({
         property: index["default"].string,
         operator: index["default"].string,
-        value: index["default"].string
-      }))
-    }))
+        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
    */
   startConditionLabel: index["default"].string.isRequired
 };
 
-exports["default"] = ConditionBuilderContent$1;
+exports["default"] = ConditionBuilderContent;

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

@@ -1,44 +1,11 @@
-export namespace emptyState {
-    let operator: string;
-    let groups: {
-        groupSeparateOperator: null;
-        groupOperator: string;
-        statement: string;
-        id: any;
-        conditions: {
-            property: undefined;
-            operator: string;
-            value: string;
-            popoverToOpen: string;
-            id: any;
-        }[];
-    }[];
-}
-export const ConditionBuilderContext: React.Context<any>;
-export function ConditionBuilderProvider(props: any): import("react/jsx-runtime").JSX.Element;
-export namespace ConditionBuilderProvider {
-    namespace propTypes {
-        let children: PropTypes.Validator<NonNullable<PropTypes.ReactNodeLike>>;
-        let getOptions: PropTypes.Requireable<(...args: any[]) => any>;
-        let inputConfig: PropTypes.Validator<NonNullable<PropTypes.InferProps<{
-            properties: PropTypes.Requireable<(PropTypes.InferProps<{
-                id: PropTypes.Requireable<string>;
-                label: PropTypes.Requireable<string>;
-                icon: PropTypes.Requireable<object>;
-                type: PropTypes.Requireable<string>;
-                config: PropTypes.Requireable<PropTypes.InferProps<{
-                    options: PropTypes.Requireable<(PropTypes.InferProps<{
-                        id: PropTypes.Requireable<string>;
-                        label: PropTypes.Requireable<string>;
-                        icon: PropTypes.Requireable<object>;
-                    }> | null | undefined)[]>;
-                    includeSearch: PropTypes.Requireable<boolean>;
-                }>>;
-            }> | null | undefined)[]>;
-        }>>>;
-        let popOverSearchThreshold: PropTypes.Validator<number>;
-        let variant: PropTypes.Validator<string>;
-    }
-}
+/**
+ * Copyright IBM Corp. 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.
+ */
 import React from 'react';
-import PropTypes from 'prop-types';
+import { ConditionBuilderContextProps, ConditionBuilderState } from '../ConditionBuilder.types';
+export declare const emptyState: ConditionBuilderState;
+export declare const ConditionBuilderContext: React.Context<ConditionBuilderContextProps>;
+export declare const ConditionBuilderProvider: React.FC<ConditionBuilderContextProps>;

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"](),
@@ -34,23 +33,11 @@ var emptyState = {
     }]
   }]
 };
-var ConditionBuilderContext = /*#__PURE__*/React.createContext();
-
-// const rootReducer=(state,action)=>{
-//   switch(action.type){
-//   case 'update':
-//      ;
-//     return {
-//       ...state,
-//       ...action.payload
-//     }
-//     break;
-//     default:
-//       return state;
-//   }
-
-// }
-
+var ConditionBuilderContext = /*#__PURE__*/React.createContext({
+  rootState: {
+    groups: []
+  }
+});
 var ConditionBuilderProvider = function ConditionBuilderProvider(props) {
   var _useState = React.useState({
       groups: []
@@ -58,15 +45,24 @@ 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];
+  var contextValue = {
+    rootState: rootState,
+    setRootState: setRootState,
+    actionState: actionState,
+    setActionState: setActionState,
+    inputConfig: props.inputConfig,
+    popOverSearchThreshold: props.popOverSearchThreshold,
+    getOptions: props.getOptions,
+    variant: props.variant,
+    translateWithId: props.translateWithId,
+    conditionBuilderRef: props.conditionBuilderRef
+  };
   return /*#__PURE__*/React__default["default"].createElement(ConditionBuilderContext.Provider, {
-    value: {
-      rootState: rootState,
-      setRootState: setRootState,
-      inputConfig: props.inputConfig,
-      popOverSearchThreshold: props.popOverSearchThreshold,
-      getOptions: props.getOptions,
-      variant: props.variant
-    }
+    value: contextValue
   },
   // eslint-disable-next-line react/prop-types
   props.children);
@@ -76,6 +72,11 @@ ConditionBuilderProvider.propTypes = {
    * Provide the contents of the ConditionBuilder.
    */
   children: index["default"].node.isRequired,
+  /**
+   * ref of condition builder
+   */
+  /**@ts-ignore */
+  conditionBuilderRef: index["default"].object,
   /**
    * This is an optional callback function that will be triggered when options array is not passed in the inputConfig against a property. 
    * This can be a asynchronous function that need  to  return a promise, so it will allow to fetch options from API call.
@@ -90,19 +91,25 @@ ConditionBuilderProvider.propTypes = {
    * This is a mandatory prop that defines the input to the condition builder.
     
    */
+  /**@ts-ignore */
   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 +117,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;