@bigbinary/neeto-form-frontend 1.2.22 → 1.2.24

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

@@ -35,8 +35,8 @@
       "addAdditionalGuests": "Add additional guests"
     },
     "fields": {
-      "mcf": "Checkbox",
-      "scf": "Radio button",
+      "mcf": "Multiple choice",
+      "scf": "Single choice",
       "def": "Paragraph",
       "drf": "Dropdown",
       "qif": "Multiple lines text",

package/dist/index.cjs.js

@@ -18,8 +18,8 @@ var reactI18next = require('react-i18next');
 var reactUtils = require('@bigbinary/neeto-commons-frontend/react-utils');
 var zustand = require('zustand');
 var classnames = require('classnames');
-var yup = require('yup');
 var neetoEditor = require('@bigbinary/neeto-editor');
+var yup = require('yup');
 var utils = require('@bigbinary/neeto-commons-frontend/utils');
 var useHotkeys = require('@bigbinary/neeto-hotkeys');
 var dayjs = require('dayjs');
@@ -844,6 +844,7 @@ var THUMBS_UP = {
   icon: "👍",
   className: "w-20"
 };
+var QUESTIONS_WITH_FIELD_CODE = ["paragraph", "termsandcondition", "condition", "file_upload"];
 var RESERVED_FIELD_CODES = ["month", "date", "time"];
 
 function _arrayWithHoles$3(arr) {
@@ -10174,41 +10175,6 @@ var TextAreaWithMaxLength = function TextAreaWithMaxLength(_ref) {
   }));
 };
 
-var validateSchema = function validateSchema(schema) {
-  return function (values) {
-    try {
-      schema.validateSync(values, {
-        abortEarly: true
-      });
-      return undefined;
-    } catch (err) {
-      return err.errors[0];
-    }
-  };
-};
-var getActiveQuestionKindDetails = function getActiveQuestionKindDetails(_ref) {
-  var allQuestionKinds = _ref.allQuestionKinds,
-    item = _ref.item;
-  var kind = item.kind,
-    label = item.label;
-  var _findBy = neetoCist.findBy({
-      type: kind
-    }, allQuestionKinds),
-    FieldComponent = _findBy.component,
-    FieldIcon = _findBy.icon,
-    isSingular = _findBy.isSingular;
-  return {
-    kind: kind,
-    label: label,
-    FieldComponent: FieldComponent,
-    FieldIcon: FieldIcon,
-    isSingular: isSingular
-  };
-};
-var validateFieldCode = validateSchema(yup__namespace.string().trim().required(i18next.t("neetoForm.common.fieldReq", {
-  field: i18next.t("neetoForm.questions.common.questionFields.field.fieldCode")
-})).notOneOf(RESERVED_FIELD_CODES, i18next.t("neetoForm.error.invalidFieldCode")));
-
 var FieldCode = reactUtils.withT(function (_ref) {
   var t = _ref.t,
     name = _ref.name;
@@ -10217,7 +10183,6 @@ var FieldCode = reactUtils.withT(function (_ref) {
     className: "mt-14",
     label: t("neetoForm.questions.common.questionFields.field.fieldCode"),
     name: "".concat(name, ".fieldCode"),
-    validate: validateFieldCode,
     labelProps: {
       helpIconProps: {
         icon: neetoIcons.Info,
@@ -11182,7 +11147,7 @@ var QUESTION_KINDS = [{
   type: "checkbox",
   label: i18next.t("neetoForm.fields.mcf"),
   isSingular: false,
-  icon: neetoIcons.MultipleChoice,
+  icon: neetoIcons.Checkbox,
   component: MultipleChoice,
   defaults: {
     label: "",
@@ -11195,7 +11160,7 @@ var QUESTION_KINDS = [{
   type: "radio",
   label: i18next.t("neetoForm.fields.scf"),
   isSingular: false,
-  icon: neetoIcons.ListDot,
+  icon: neetoIcons.Radio,
   component: SingleChoice,
   defaults: {
     label: "",
@@ -11840,6 +11805,26 @@ var Form = function Form(_ref) {
   }))));
 };
 
+var getActiveQuestionKindDetails = function getActiveQuestionKindDetails(_ref) {
+  var allQuestionKinds = _ref.allQuestionKinds,
+    item = _ref.item;
+  var kind = item.kind,
+    label = item.label;
+  var _findBy = neetoCist.findBy({
+      type: kind
+    }, allQuestionKinds),
+    FieldComponent = _findBy.component,
+    FieldIcon = _findBy.icon,
+    isSingular = _findBy.isSingular;
+  return {
+    kind: kind,
+    label: label,
+    FieldComponent: FieldComponent,
+    FieldIcon: FieldIcon,
+    isSingular: isSingular
+  };
+};
+
 /* eslint-disable @bigbinary/neeto/file-name-and-export-name-standards */
 var requiredLabel = function requiredLabel() {
   var errorMessage = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : i18next__default["default"].t("neetoForm.common.fieldReq", {
@@ -11854,6 +11839,11 @@ var formValidationSchema = yup.object().shape({
       then: requiredLabel(i18next__default["default"].t("neetoForm.common.paragraphCantBeEmpty"))
     }),
     kind: yup.string().required(),
+    fieldCode: yup.string().trim().notOneOf(RESERVED_FIELD_CODES, i18next__default["default"].t("neetoForm.error.invalidFieldCode")).when("kind", function (kind, schema) {
+      return QUESTIONS_WITH_FIELD_CODE.includes(kind) ? schema.notRequired() : schema.required(i18next__default["default"].t("neetoForm.common.fieldReq", {
+        field: i18next__default["default"].t("neetoForm.questions.common.questionFields.field.fieldCode")
+      }));
+    }),
     optionsAttributes: yup.array().when("kind", function (kind, schema) {
       return ["radio", "checkbox", "dropdown"].includes(kind) ? schema.of(yup.object().shape({
         label: requiredLabel(i18next__default["default"].t("neetoForm.common.fieldReq", {