@bigbinary/neeto-rules-frontend 0.6.4 → 0.6.6

package/app/javascript/src/translations/en.json

@@ -180,7 +180,8 @@
       "inValidEmail": "Email is invalid",
       "inValidURL": "URL is invalid",
       "noBlankSpaces": "Value should not contain blank spaces",
-      "inValidDecimal": "Value should be a decimal number",
+      "positiveDecimal": "Value should be a positive decimal number.",
+      "decimal": "Value should be a decimal number.",
       "atLeastOne": {
         "option": "At least one option is required",
         "email": "At least one email is required",
@@ -189,7 +190,8 @@
       "atLeastOneValue": "At least one value is required",
       "emailList": "Please make sure all emails are valid.",
       "positiveInteger": "Value must be a positive integer.",
-      "positiveNumber": "Value must be a positive number.",
+      "positiveNumber": "Value must be a positive whole number.",
+      "number": "Value must be a whole number.",
       "leadingSpace": "Can not have leading white space",
       "slack": {
         "invalidChannel": "Could not connect to the channel, please select other options.",

package/dist/index.cjs.js

@@ -415,15 +415,13 @@ var getConditionsSchema = function getConditionsSchema(element) {
       field: yup__namespace.string().required(i18next.t("neetoRules.validations.required.condition")),
       metadata: yup__namespace.mixed().when(["field", "verb"], function (field, verb, schema) {
         var _selectedCondition$no;
-        var selectedCondition = conditionOptions.find(function (option) {
-          return option.value === field;
-        });
+        var selectedCondition = neetoCist.findBy({
+          value: field
+        }, conditionOptions);
         var type = selectedCondition === null || selectedCondition === void 0 ? void 0 : selectedCondition.type;
         if (selectedCondition !== null && selectedCondition !== void 0 && selectedCondition.additionalData) {
           var value = selectedCondition === null || selectedCondition === void 0 ? void 0 : selectedCondition.additionalData[verb];
-          if (value) {
-            type = value;
-          }
+          if (value) type = value;
         }
         if (selectedCondition !== null && selectedCondition !== void 0 && (_selectedCondition$no = selectedCondition.noValueForVerbs) !== null && _selectedCondition$no !== void 0 && _selectedCondition$no.includes(verb)) {
           return yup__namespace.object();
@@ -454,9 +452,11 @@ var getConditionsSchema = function getConditionsSchema(element) {
             }).required(i18next.t("neetoRules.validations.required.value"))
           });
         } else if ([CONDITION_VALUE_TYPES.number].includes(type)) {
-          return yup__namespace.object().shape({
-            value: yup__namespace.string().test("are-all-number", i18next.t("neetoRules.validations.positiveNumber"), function (value) {
-              return POSITIVE_NUMBER_REGEX.test(value);
+          var message = selectedCondition !== null && selectedCondition !== void 0 && selectedCondition.onlyPositive ? i18next.t("neetoRules.validations.positiveNumber") : i18next.t("neetoRules.validations.number");
+          var regex = selectedCondition !== null && selectedCondition !== void 0 && selectedCondition.onlyPositive ? POSITIVE_NUMBER_REGEX : NUMBER_REGEX;
+          return yup__namespace.object({
+            value: yup__namespace.string().test("are-all-number", message, function (value) {
+              return regex.test(value);
             })
           });
         } else if ([CONDITION_VALUE_TYPES.url].includes(type)) {
@@ -471,9 +471,11 @@ var getConditionsSchema = function getConditionsSchema(element) {
             }).required(i18next.t("neetoRules.validations.required.value"))
           });
         } else if ([CONDITION_VALUE_TYPES.decimal].includes(type)) {
-          return yup__namespace.object().shape({
-            value: yup__namespace.string().test("are-all-number", i18next.t("neetoRules.validations.inValidDecimal"), function (value) {
-              return DECIMAL_NUMBER_REGEX.test(value);
+          var _message = selectedCondition !== null && selectedCondition !== void 0 && selectedCondition.onlyPositive ? i18next.t("neetoRules.validations.positiveDecimal") : i18next.t("neetoRules.validations.decimal");
+          var _regex = selectedCondition !== null && selectedCondition !== void 0 && selectedCondition.onlyPositive ? POSITIVE_DECIMAL_NUMBER_REGEX : DECIMAL_NUMBER_REGEX;
+          return yup__namespace.object({
+            value: yup__namespace.string().test("are-all-number", _message, function (value) {
+              return _regex.test(value);
             }).required(i18next.t("neetoRules.validations.required.decimal"))
           });
         } else if ([CONDITION_VALUE_TYPES.textarea].includes(type)) {
@@ -557,15 +559,19 @@ var getActionsSchema = function getActionsSchema(element, customData) {
             }).required(i18next.t("neetoRules.validations.required.value"))
           });
         } else if ((selectedAction === null || selectedAction === void 0 ? void 0 : selectedAction.type) === ACTION_TYPES.number) {
+          var message = selectedAction !== null && selectedAction !== void 0 && selectedAction.onlyPositive ? i18next.t("neetoRules.validations.positiveNumber") : i18next.t("neetoRules.validations.number");
+          var regex = selectedAction !== null && selectedAction !== void 0 && selectedAction.onlyPositive ? POSITIVE_NUMBER_REGEX : NUMBER_REGEX;
           return yup__namespace.object({
-            value: yup__namespace.string().test("are-all-number", i18next.t("neetoRules.validations.positiveNumber"), function (value) {
-              return POSITIVE_NUMBER_REGEX.test(value);
+            value: yup__namespace.string().test("are-all-number", message, function (value) {
+              return regex.test(value);
             })
           });
         } else if ((selectedAction === null || selectedAction === void 0 ? void 0 : selectedAction.type) === ACTION_TYPES.decimal) {
+          var _message2 = selectedAction !== null && selectedAction !== void 0 && selectedAction.onlyPositive ? i18next.t("neetoRules.validations.positiveDecimal") : i18next.t("neetoRules.validations.decimal");
+          var _regex2 = selectedAction !== null && selectedAction !== void 0 && selectedAction.onlyPositive ? POSITIVE_DECIMAL_NUMBER_REGEX : DECIMAL_NUMBER_REGEX;
           return yup__namespace.object({
-            value: yup__namespace.string().test("are-all-number", i18next.t("neetoRules.validations.inValidDecimal"), function (value) {
-              return DECIMAL_NUMBER_REGEX.test(value);
+            value: yup__namespace.string().test("are-all-number", _message2, function (value) {
+              return _regex2.test(value);
             }).required(i18next.t("neetoRules.validations.required.decimal"))
           });
         } else if ((selectedAction === null || selectedAction === void 0 ? void 0 : selectedAction.type) === ACTION_TYPES.longText) {
@@ -617,8 +623,10 @@ var FIELD_TYPES = {
 };
 var MAXIMUM_OPTION_LENGTH$1 = 7;
 var VALIDATION_SCHEMA = (_VALIDATION_SCHEMA = {}, _defineProperty$1(_VALIDATION_SCHEMA, FIELD_TYPES.text, getSchemaForStrings), _defineProperty$1(_VALIDATION_SCHEMA, FIELD_TYPES.longText, getSchemaForStrings), _defineProperty$1(_VALIDATION_SCHEMA, FIELD_TYPES.dropdown, getSchemaForStrings), _defineProperty$1(_VALIDATION_SCHEMA, FIELD_TYPES.radio, getSchemaForStrings), _defineProperty$1(_VALIDATION_SCHEMA, FIELD_TYPES.events, getEventsSchema), _defineProperty$1(_VALIDATION_SCHEMA, FIELD_TYPES.condition, getConditionsSchema), _defineProperty$1(_VALIDATION_SCHEMA, FIELD_TYPES.actions, getActionsSchema), _defineProperty$1(_VALIDATION_SCHEMA, FIELD_TYPES.multiSelect, getSchemaForArray), _VALIDATION_SCHEMA);
-var DECIMAL_NUMBER_REGEX = /^\d*\.?\d+$/;
-var POSITIVE_NUMBER_REGEX = /^[0-9]+$/;
+var DECIMAL_NUMBER_REGEX = /^-?\d*\.?\d+$/;
+var NUMBER_REGEX = /^-?\d+$/;
+var POSITIVE_DECIMAL_NUMBER_REGEX = /^\d*\.?\d+$/;
+var POSITIVE_NUMBER_REGEX = /^\d+$/;
 
 function ownKeys$a(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$9(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$a(Object(t), !0).forEach(function (r) { _defineProperty$1(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$a(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -12096,7 +12104,9 @@ var Conditions = function Conditions(_ref) {
     isCallback = _ref$isCallback === void 0 ? false : _ref$isCallback,
     previewCallback = _ref.previewCallback,
     _ref$isWithEvents = _ref.isWithEvents,
-    isWithEvents = _ref$isWithEvents === void 0 ? false : _ref$isWithEvents;
+    isWithEvents = _ref$isWithEvents === void 0 ? false : _ref$isWithEvents,
+    _ref$allowEmpty = _ref.allowEmpty,
+    allowEmpty = _ref$allowEmpty === void 0 ? true : _ref$allowEmpty;
   var _useField = formik.useField(name),
     _useField2 = _slicedToArray$1(_useField, 3),
     field = _useField2[0],
@@ -12161,8 +12171,8 @@ var Conditions = function Conditions(_ref) {
       }, index === conditions.length - 1 && /*#__PURE__*/React__default["default"].createElement(Button__default["default"], {
         "data-cy": "add-condition-button",
         icon: neetoIcons.Plus,
-        size: 24,
-        style: "icon",
+        size: "small",
+        style: "text",
         tooltipProps: {
           content: t("neetoRules.form.addCondition"),
           position: "top"
@@ -12170,11 +12180,11 @@ var Conditions = function Conditions(_ref) {
         onClick: function onClick() {
           return handleAddCondition(arrayHelpers, condition.joinType);
         }
-      }), /*#__PURE__*/React__default["default"].createElement(Button__default["default"], {
+      }), (allowEmpty || index !== 0) && /*#__PURE__*/React__default["default"].createElement(Button__default["default"], {
         "data-cy": "delete-condition-button-".concat(index),
         icon: neetoIcons.Delete,
-        size: 24,
-        style: "icon",
+        size: "small",
+        style: "text",
         tooltipProps: {
           content: t("neetoRules.common.delete"),
           position: "top"