@carbon/ibm-products 2.43.2-canary.1 → 2.43.2-canary.101

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

@@ -5,35 +5,43 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+import { slicedToArray as _slicedToArray, objectSpread2 as _objectSpread2 } from '../../../_virtual/_rollupPluginBabelHelpers.js';
 import React__default, { useContext } from 'react';
 import { ConditionBuilderItem } from '../ConditionBuilderItem/ConditionBuilderItem.js';
-import { blockClass, translateWithId, connectorConfig } from '../ConditionBuilderContext/DataConfigs.js';
-import { ConditionBuilderItemOption } from '../ConditionBuilderItem/ConditionBuilderItemOption/ConditionBuilderItemOption.js';
-import { focusThisField } from '../utils/util.js';
+import { blockClass, connectorConfig } from '../ConditionBuilderContext/DataConfigs.js';
+import { ItemOption } from '../ConditionBuilderItem/ConditionBuilderItemOption/ItemOption.js';
 import { ConditionBuilderContext } from '../ConditionBuilderContext/ConditionBuilderProvider.js';
+import { useTranslations } from '../utils/useTranslations.js';
 
 var GroupConnector = function GroupConnector() {
   var _useContext = useContext(ConditionBuilderContext),
-    rootState = _useContext.rootState;
+    rootState = _useContext.rootState,
+    setRootState = _useContext.setRootState;
+  var _useTranslations = useTranslations(['conditionText']),
+    _useTranslations2 = _slicedToArray(_useTranslations, 1),
+    conditionText = _useTranslations2[0];
+  var onStatementChangeHandler = function onStatementChangeHandler(updatedStatement) {
+    setRootState(_objectSpread2(_objectSpread2({}, rootState), {}, {
+      operator: updatedStatement
+    }));
+  };
   return /*#__PURE__*/React__default.createElement("div", {
-    className: "".concat(blockClass, "__group-separator"),
+    className: "".concat(blockClass, "__group-separator ").concat(blockClass, "__group-separator-row"),
     role: "row",
     tabIndex: -1,
     "aria-level": 1
   }, /*#__PURE__*/React__default.createElement(ConditionBuilderItem, {
     label: rootState.operator,
-    title: translateWithId('condition'),
+    title: conditionText,
     "data-name": "connectorField",
     popOverClassName: "".concat(blockClass, "__gap"),
     className: "".concat(blockClass, "__statement-button")
-  }, /*#__PURE__*/React__default.createElement(ConditionBuilderItemOption, {
+  }, /*#__PURE__*/React__default.createElement(ItemOption, {
     conditionState: {
       value: rootState.operator,
-      label: translateWithId('condition')
-    },
-    onChange: function onChange(v, e) {
-      focusThisField(e);
+      label: conditionText
     },
+    onChange: onStatementChangeHandler,
     config: {
       options: connectorConfig
     }

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

@@ -1,30 +1,26 @@
 export default ConditionBuilderContent;
-declare function ConditionBuilderContent({ startConditionLabel, conditionBuilderRef, getConditionState, initialState, }: {
+declare function ConditionBuilderContent({ startConditionLabel, 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/es/components/ConditionBuilder/ConditionBuilderContent/ConditionBuilderContent.js

@@ -5,33 +5,34 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import { slicedToArray as _slicedToArray, objectSpread2 as _objectSpread2, extends as _extends, toConsumableArray as _toConsumableArray } from '../../../_virtual/_rollupPluginBabelHelpers.js';
+import { slicedToArray as _slicedToArray, objectSpread2 as _objectSpread2, toConsumableArray as _toConsumableArray } from '../../../_virtual/_rollupPluginBabelHelpers.js';
 import React__default, { useContext, useState, useEffect, useCallback } from 'react';
 import PropTypes from '../../../node_modules/prop-types/index.js';
 import { Button, Section, Heading } from '@carbon/react';
 import { Add, TextNewLine } from '@carbon/react/icons';
 import ConditionGroupBuilder from '../ConditionGroupBuilder/ConditionGroupBuilder.js';
 import { ConditionBuilderContext, emptyState } from '../ConditionBuilderContext/ConditionBuilderProvider.js';
-import { blockClass, translateWithId } from '../ConditionBuilderContext/DataConfigs.js';
+import { blockClass } from '../ConditionBuilderContext/DataConfigs.js';
 import { ConditionBuilderButton } from '../ConditionBuilderButton/ConditionBuilderButton.js';
 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';
+import { useTranslations } from '../utils/useTranslations.js';
 
-var _Heading, _GroupConnector, _ConditionPreview;
+var _GroupConnector;
 var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
   var _rootState$groups2;
   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],
@@ -40,6 +41,16 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     showConditionGroupPreview = _useState4[0],
     setShowConditionGroupPreview = _useState4[1];
+  var _useTranslations = useTranslations(['addConditionGroupText', 'conditionHeadingText']),
+    _useTranslations2 = _slicedToArray(_useTranslations, 2),
+    addConditionGroupText = _useTranslations2[0],
+    conditionHeadingText = _useTranslations2[1];
+  var showConditionGroupPreviewHandler = function showConditionGroupPreviewHandler() {
+    setShowConditionGroupPreview(true);
+  };
+  var hideConditionGroupPreviewHandler = function hideConditionGroupPreviewHandler() {
+    setShowConditionGroupPreview(false);
+  };
   useEffect(function () {
     var _rootState$groups;
     if (rootState !== null && rootState !== void 0 && (_rootState$groups = rootState.groups) !== null && _rootState$groups !== void 0 && _rootState$groups.length) {
@@ -53,11 +64,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 +93,6 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
   };
   var addConditionGroupHandler = function addConditionGroupHandler() {
     var newGroup = {
-      groupSeparateOperator: 'and',
-      // 'or'|'and'|'null',
       groupOperator: 'and',
       //'and|or',
       statement: 'if',
@@ -102,24 +110,22 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
       groups: [].concat(_toConsumableArray(rootState.groups), [newGroup])
     }));
   };
-  return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, !isConditionBuilderActive && /*#__PURE__*/React__default.createElement(Button, {
-    className: "".concat(blockClass, "__add-condition-button"),
-    renderIcon: function renderIcon(props) {
-      return /*#__PURE__*/React__default.createElement(Add, _extends({
-        size: 16
-      }, props));
-    },
-    iconDescription: startConditionLabel,
-    kind: "ghost",
-    size: "sm",
-    onClick: onStartConditionBuilder
-  }, startConditionLabel), isConditionBuilderActive &&
-  /*#__PURE__*/
-  // <h5 >Condition</h5>
-  React__default.createElement(Section, {
+  if (!isConditionBuilderActive) {
+    return /*#__PURE__*/React__default.createElement(Button, {
+      className: "".concat(blockClass, "__addConditionText-button"),
+      renderIcon: function renderIcon(props) {
+        return /*#__PURE__*/React__default.createElement(Add, props);
+      },
+      iconDescription: startConditionLabel,
+      kind: "ghost",
+      size: "sm",
+      onClick: onStartConditionBuilder
+    }, startConditionLabel);
+  }
+  return /*#__PURE__*/React__default.createElement(React__default.Fragment, null, /*#__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", {
+  }, /*#__PURE__*/React__default.createElement(Heading, null, conditionHeadingText)), /*#__PURE__*/React__default.createElement("div", {
     className: "".concat(blockClass, "__content-container"),
     role: "treegrid",
     "aria-label": "condition builder tree"
@@ -140,32 +146,37 @@ var ConditionBuilderContent = function ConditionBuilderContent(_ref) {
       },
       onChange: function onChange(updatedGroup) {
         onChangeHandler(updatedGroup, groupIndex);
-      },
-      conditionBuilderRef: conditionBuilderRef
+      }
     }), groupIndex < rootState.groups.length - 1 && (_GroupConnector || (_GroupConnector = /*#__PURE__*/React__default.createElement(GroupConnector, null))));
-  })), isConditionBuilderActive && /*#__PURE__*/React__default.createElement(React__default.Fragment, null, variant == 'tree' && /*#__PURE__*/React__default.createElement("div", {
+  })), variant == 'tree' && /*#__PURE__*/React__default.createElement("div", {
     role: "row",
     tabIndex: -1,
-    "aria-level": 1
+    "aria-level": 1,
+    className: "".concat(blockClass, "__add-group")
   }, /*#__PURE__*/React__default.createElement(ConditionBuilderButton, {
     renderIcon: TextNewLine,
     onClick: addConditionGroupHandler,
-    onMouseEnter: function onMouseEnter() {
-      setShowConditionGroupPreview(true);
-    },
-    onMouseLeave: function onMouseLeave() {
-      setShowConditionGroupPreview(false);
-    },
+    onMouseEnter: showConditionGroupPreviewHandler,
+    onMouseLeave: hideConditionGroupPreviewHandler,
+    onFocus: showConditionGroupPreviewHandler,
+    onBlur: hideConditionGroupPreviewHandler,
     className: "".concat(blockClass, "__add-condition-group "),
     hideLabel: true,
-    label: translateWithId('add-condition-sub-group'),
+    label: addConditionGroupText,
     wrapperProps: {
       role: 'gridcell',
-      'aria-label': translateWithId('add-condition-sub-group')
+      'aria-label': addConditionGroupText
+    }
+  })), showConditionGroupPreview && /*#__PURE__*/React__default.createElement(ConditionPreview, {
+    previewType: "newGroup",
+    group: {
+      groupOperator: rootState.operator
     }
-  })), showConditionGroupPreview && (_ConditionPreview || (_ConditionPreview = /*#__PURE__*/React__default.createElement(ConditionPreview, {
-    previewType: "newGroup"
-  }))))));
+  })), actions && /*#__PURE__*/React__default.createElement(ConditionBuilderActions, {
+    actions: actions,
+    className: "".concat(blockClass, "__actions-container"),
+    variant: variant
+  }));
 };
 var ConditionBuilderContent$1 = ConditionBuilderContent;
 ConditionBuilderContent.propTypes = {
@@ -173,13 +184,9 @@ 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
-   */
-  conditionBuilderRef: PropTypes.object,
   /**
    * callback functions that will provide the updated action state back.
    */
@@ -193,15 +200,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;
@@ -19,24 +18,31 @@ export function ConditionBuilderProvider(props: any): import("react/jsx-runtime"
 export namespace ConditionBuilderProvider {
     namespace propTypes {
         let children: PropTypes.Validator<NonNullable<PropTypes.ReactNodeLike>>;
+        let conditionBuilderRef: PropTypes.Requireable<object>;
         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>;
+                id: PropTypes.Validator<string>;
+                label: PropTypes.Validator<string>;
                 icon: PropTypes.Requireable<object>;
-                type: PropTypes.Requireable<string>;
+                type: PropTypes.Validator<string>;
                 config: PropTypes.Requireable<PropTypes.InferProps<{
                     options: PropTypes.Requireable<(PropTypes.InferProps<{
-                        id: PropTypes.Requireable<string>;
-                        label: PropTypes.Requireable<string>;
+                        id: PropTypes.Validator<string>;
+                        label: PropTypes.Validator<string>;
                         icon: PropTypes.Requireable<object>;
                     }> | null | undefined)[]>;
-                    includeSearch: PropTypes.Requireable<boolean>;
+                    component: PropTypes.Requireable<(...args: any[]) => any>;
+                    operators: PropTypes.Requireable<(PropTypes.InferProps<{
+                        id: PropTypes.Validator<string>;
+                        label: PropTypes.Validator<string>;
+                    }> | null | undefined)[]>;
+                    long: PropTypes.Requireable<boolean>;
                 }>>;
             }> | null | undefined)[]>;
         }>>>;
         let popOverSearchThreshold: PropTypes.Validator<number>;
+        let translateWithId: PropTypes.Requireable<(...args: any[]) => any>;
         let variant: PropTypes.Validator<string>;
     }
 }

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,14 +49,22 @@ 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,
-      variant: props.variant
+      variant: props.variant,
+      translateWithId: props.translateWithId,
+      conditionBuilderRef: props.conditionBuilderRef
     }
   },
   // eslint-disable-next-line react/prop-types
@@ -68,6 +75,10 @@ ConditionBuilderProvider.propTypes = {
    * Provide the contents of the ConditionBuilder.
    */
   children: PropTypes.node.isRequired,
+  /**
+   * ref of condition builder
+   */
+  conditionBuilderRef: PropTypes.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.
@@ -84,17 +95,22 @@ ConditionBuilderProvider.propTypes = {
    */
   inputConfig: PropTypes.shape({
     properties: PropTypes.arrayOf(PropTypes.shape({
-      id: PropTypes.string,
-      label: PropTypes.string,
+      id: PropTypes.string.isRequired,
+      label: PropTypes.string.isRequired,
       icon: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
-      type: PropTypes.oneOf(['text', 'number', 'date', 'option', 'time']),
+      type: PropTypes.oneOf(['text', 'textarea', 'number', 'date', 'option', 'time', 'custom']).isRequired,
       config: PropTypes.shape({
         options: PropTypes.arrayOf(PropTypes.shape({
-          id: PropTypes.string,
-          label: PropTypes.string,
+          id: PropTypes.string.isRequired,
+          label: PropTypes.string.isRequired,
           icon: PropTypes.oneOfType([PropTypes.func, PropTypes.object])
         })),
-        includeSearch: PropTypes.bool
+        component: PropTypes.func,
+        operators: PropTypes.arrayOf(PropTypes.shape({
+          id: PropTypes.string.isRequired,
+          label: PropTypes.string.isRequired
+        })),
+        long: PropTypes.bool
       })
     }))
   }).isRequired,
@@ -102,6 +118,13 @@ ConditionBuilderProvider.propTypes = {
    * Provide an mandatory numeric value that will be used to enable search option in the popovers with list.
    */
   popOverSearchThreshold: PropTypes.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: PropTypes.func,
   /**
    * Provide the condition builder variant: sentence/ tree
    */

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

@@ -6,14 +6,15 @@
  */
 
 import { pkg } from '../../../settings.js';
-import { translationsObject } from './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',
@@ -22,7 +23,6 @@ var connectorConfig = [{
   label: 'or',
   id: 'or'
 }];
-//op types : option, text, number, date,
 var operatorConfig = [{
   label: 'is',
   id: 'is',
@@ -33,7 +33,7 @@ var operatorConfig = [{
   type: 'number'
 }, {
   label: 'is greater than or equal to',
-  id: 'greater-equal',
+  id: 'greaterEqual',
   type: 'number'
 }, {
   label: 'is lower than',
@@ -41,23 +41,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',
@@ -80,33 +80,44 @@ var formatDate = function formatDate(date) {
   var year = date.getFullYear();
   return "".concat(day, "/").concat(month, "/").concat(year);
 };
-var translationsObjectCurrent = 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;
   }
 };
 
-export { blockClass, connectorConfig, operatorConfig, statementConfig, translateWithId, valueRenderers };
+export { blockClass, connectorConfig, operatorConfig, statementConfig, valueRenderers };