@bigbinary/neeto-form-frontend 4.2.6 → 4.2.8

package/app/javascript/src/translations/zh-CN.json

@@ -152,19 +152,20 @@
       "changeLanguage": "更改语言"
     },
     "error": {
-      "invalidField": "请输入有效的 {{label}}",
+      "invalidField": "{{label}} 无效",
       "invalidFieldCode": "此字段代码无法使用",
-      "requiredField": "请输入 {{label}}",
+      "requiredField": "{{label}} 是必填项",
       "selectMin": "请至少选择 {{min}} {{entity}}",
       "invalidType": "{{label}} 应为有效的 {{type}}",
       "fieldCantBeEmpty": "{{field, anyCase}} 不能为空",
-      "incompleteCaptcha": "请完成验证码",
+      "incompleteCaptcha": "验证码不完整",
       "captchaVerificationFailed": "验证码验证失败。请再试一次。",
       "invalidDomain": "域名无效",
-      "minOneEntity": "请至少添加一个 {{entity}}",
+      "minOneEntity": "至少需要一个 {{entity}}",
       "emailFromRestrictedDomain": "不接受域名为 {{domain}} 的电子邮件。",
       "mustBeASixDigitNumber": "{{entity}} 必须是 6 位数字",
-      "pleaseVerifyEmail": "请验证您的电子邮件"
+      "pleaseVerifyEmail": "请验证您的电子邮件",
+      "emailNotVerified": "需要进行邮件验证"
     },
     "fileTypes": {
       "documents": "文档",
@@ -176,8 +177,8 @@
       "fileTypes": "文件类型",
       "validations": {
         "waitForUpload": "请等待上传完成",
-        "atLeastOneFileRequired": "请至少上传一个文件",
-        "removeDuplicates": "请删除重复的条目",
+        "atLeastOneFileRequired": "至少上传一个文件",
+        "removeDuplicates": "删除重复项",
         "fileIsRequired": "请上传一个文件"
       },
       "dropzone": {
@@ -189,7 +190,7 @@
         },
         "maxFileSize": "最大允许大小为 {{size}} {{unit, anyCase}}",
         "allowedFileTypes": "允许的文件类型为 {{types}}",
-        "oneFileAllowed": "请仅上传一个文件",
+        "oneFileAllowed": "仅允许上传一个文件",
         "chooseOrDragFile": "<typography>选择文件 <span>或</span> 拖到这里。</typography>"
       },
       "fileSizeInMb": "{{fileSize}} MB",
@@ -208,7 +209,7 @@
       },
       "helpText": "添加域后按空格、制表符或回车键。",
       "removeInvalidDomains": "点击这里删除无效域。",
-      "placeholder": "请输入电子邮件域"
+      "placeholder": "输入邮箱域"
     },
     "emailVerification": {
       "label": "邮箱验证",

package/app/javascript/src/translations/zh-TW.json

@@ -152,19 +152,20 @@
       "changeLanguage": "更改語言"
     },
     "error": {
-      "invalidField": "請輸入有效的 {{label}}",
+      "invalidField": "{{label}} 無效",
       "invalidFieldCode": "此字段代碼無法使用",
-      "requiredField": "請輸入 {{label}}",
+      "requiredField": "{{label}} 為必填欄位",
       "selectMin": "請至少選擇 {{min}} {{entity}}",
       "invalidType": "{{label}} 應為有效的 {{type}}",
       "fieldCantBeEmpty": "{{field, anyCase}} 不能為空",
-      "incompleteCaptcha": "請完成驗證碼",
+      "incompleteCaptcha": "驗證碼不完整",
       "captchaVerificationFailed": "驗證碼驗證失敗。請再試一次。",
       "invalidDomain": "域名無效",
-      "minOneEntity": "請至少添加一個 {{entity}}",
+      "minOneEntity": "至少需要一個 {{entity}}",
       "emailFromRestrictedDomain": "不接受域名為 {{domain}} 的電子郵件。",
       "mustBeASixDigitNumber": "{{entity}} 必須是 6 位數字",
-      "pleaseVerifyEmail": "請驗證您的電子郵件"
+      "pleaseVerifyEmail": "請驗證您的電子郵件",
+      "emailNotVerified": "需要驗證電子郵件"
     },
     "fileTypes": {
       "documents": "文件",
@@ -176,9 +177,9 @@
       "fileTypes": "文件類型",
       "validations": {
         "waitForUpload": "請等待上傳完成",
-        "atLeastOneFileRequired": "請上傳至少一個文件",
-        "removeDuplicates": "請移除重複條目",
-        "fileIsRequired": "請上傳文件"
+        "atLeastOneFileRequired": "至少上傳一個檔案",
+        "removeDuplicates": "刪除重複項目",
+        "fileIsRequired": "必須上傳一個檔案"
       },
       "dropzone": {
         "errors": {
@@ -189,7 +190,7 @@
         },
         "maxFileSize": "最大允許大小為 {{size}} {{unit, anyCase}}",
         "allowedFileTypes": "允許的文件類型為 {{types}}",
-        "oneFileAllowed": "請僅上傳 1 個文件",
+        "oneFileAllowed": "僅允許上傳一個檔案",
         "chooseOrDragFile": "<typography>選擇文件 <span>或</span> 拖到這裡。</typography>"
       },
       "fileSizeInMb": "{{fileSize}} MB",
@@ -208,7 +209,7 @@
       },
       "helpText": "添加域後按空格、標籤或回車鍵。",
       "removeInvalidDomains": "點擊此處以刪除無效域。",
-      "placeholder": "請輸入電子郵件域"
+      "placeholder": "請輸入電子郵件域名"
     },
     "emailVerification": {
       "label": "電子郵件驗證",

package/dist/ExternalForm.js

@@ -26,7 +26,7 @@ import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProper
 import Check from '@bigbinary/neeto-icons/Check';
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { C as CALLOUT_STYLES, b as CALLOUT_POSITIONS, L as LAST_ELEMENTS_THRESHOLD } from './constants-QPLZ_r-D.js';
-import { c as clientI18nInstance, d as getWithExpiry, e as clearEmailVerificationDetails, g as generateInitValues, F as FormikWrap, a as getFieldComponent, b as buildAutoCompleteAttribute, r as renderButtonsInOrder, m as mergeRefs, f as generateFormResponse, h as clearLocalStorageValues } from './utils-GRfGBny0.js';
+import { c as clientI18nInstance, d as getWithExpiry, e as clearEmailVerificationDetails, g as generateInitValues, F as FormikWrap, a as getFieldComponent, b as buildAutoCompleteAttribute, r as renderButtonsInOrder, m as mergeRefs, f as generateFormResponse, h as clearLocalStorageValues } from './utils-Dn-q4QBc.js';
 import { withT } from '@bigbinary/neeto-commons-frontend/react-utils';
 import '@babel/runtime/helpers/toConsumableArray';
 import '@bigbinary/neeto-commons-frontend/constants';

package/dist/UrlBuilder.js

@@ -10,7 +10,7 @@ import Button from '@bigbinary/neetoui/Button';
 import NoData from '@bigbinary/neetoui/NoData';
 import { map, mergeLeft, filter, pluck, isEmpty } from 'ramda';
 import { useTranslation } from 'react-i18next';
-import { g as generateInitValues, F as FormikWrap, a as getFieldComponent, b as buildAutoCompleteAttribute, m as mergeRefs } from './utils-GRfGBny0.js';
+import { g as generateInitValues, F as FormikWrap, a as getFieldComponent, b as buildAutoCompleteAttribute, m as mergeRefs } from './utils-Dn-q4QBc.js';
 import { b as usePublicForm } from './constants-51SEJjzI.js';
 import { parsePhoneNumber } from 'libphonenumber-js';
 import { Q as QUESTIONS_WITHOUT_FIELD_CODE, a as QUESTION_KIND } from './constants-QPLZ_r-D.js';

package/dist/cjs/ExternalForm.js

@@ -28,7 +28,7 @@ var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProp
 var Check = require('@bigbinary/neeto-icons/Check');
 var jsxRuntime = require('react/jsx-runtime');
 var constants = require('../constants-BjWWA3Oq.js');
-var utils = require('../utils-BwFLBXs2.js');
+var utils = require('../utils-Ch7Ggngj.js');
 var reactUtils = require('@bigbinary/neeto-commons-frontend/react-utils');
 require('@babel/runtime/helpers/toConsumableArray');
 require('@bigbinary/neeto-commons-frontend/constants');

package/dist/cjs/UrlBuilder.js

@@ -12,7 +12,7 @@ var Button = require('@bigbinary/neetoui/Button');
 var NoData = require('@bigbinary/neetoui/NoData');
 var ramda = require('ramda');
 var reactI18next = require('react-i18next');
-var utils = require('../utils-BwFLBXs2.js');
+var utils = require('../utils-Ch7Ggngj.js');
 var constants$1 = require('../constants-C9wKMfgo.js');
 var libphonenumberJs = require('libphonenumber-js');
 var constants = require('../constants-BjWWA3Oq.js');

package/dist/cjs/index.js

@@ -70,7 +70,7 @@ require('@bigbinary/neeto-icons/Warning');
 require('@bigbinary/neeto-molecules/PageLoader');
 require('@bigbinary/neetoui/Callout');
 require('@bigbinary/neeto-icons/Check');
-require('../utils-BwFLBXs2.js');
+require('../utils-Ch7Ggngj.js');
 require('libphonenumber-js');
 require('@bigbinary/neeto-editor/EditorContent');
 require('@bigbinary/neetoui/MultiEmailInput');

package/dist/index.js

@@ -68,7 +68,7 @@ import '@bigbinary/neeto-icons/Warning';
 import '@bigbinary/neeto-molecules/PageLoader';
 import '@bigbinary/neetoui/Callout';
 import '@bigbinary/neeto-icons/Check';
-import './utils-GRfGBny0.js';
+import './utils-Dn-q4QBc.js';
 import 'libphonenumber-js';
 import '@bigbinary/neeto-editor/EditorContent';
 import '@bigbinary/neetoui/MultiEmailInput';

package/dist/{utils-BwFLBXs2.js → utils-Ch7Ggngj.js}

@@ -234,10 +234,9 @@ var getRequiredFieldError = function getRequiredFieldError(label) {
     label: label
   });
 };
-var getSelectMinError = function getSelectMinError(min) {
-  var entity = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : t$1("neetoForm.common.option");
-  return t$1("neetoForm.error.selectMin", {
-    min: min,
+var getSelectMinError = function getSelectMinError() {
+  var entity = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : t$1("neetoForm.common.option");
+  return t$1("neetoForm.error.minOneEntity", {
     entity: entity
   });
 };
@@ -250,6 +249,7 @@ var getInvalidTypeError = function getInvalidTypeError(label, type) {
 
 function ownKeys$h(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$h(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$h(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$h(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var resolveQueryParamValue = ramda.when(ramda.is(Array), ramda.last);
 var toEmailValues = function toEmailValues() {
   var values = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   return values.map(function (value) {
@@ -261,10 +261,10 @@ var toEmailValues = function toEmailValues() {
   });
 };
 var getPhoneNumberFromUrl = function getPhoneNumberFromUrl(fieldCodes, fieldCode) {
-  var _fieldCodes$fieldCode;
-  var countryCode = fieldCodes["".concat(fieldCode, ".country")];
-  var phoneNumber = fieldCodes["".concat(fieldCode, ".number")];
-  var phoneNumberWithCountryCode = (_fieldCodes$fieldCode = fieldCodes[fieldCode]) === null || _fieldCodes$fieldCode === void 0 ? void 0 : _fieldCodes$fieldCode.replace(constants.PARENTHESES_REGEX, "");
+  var _resolveQueryParamVal;
+  var countryCode = resolveQueryParamValue(fieldCodes["".concat(fieldCode, ".country")]);
+  var phoneNumber = resolveQueryParamValue(fieldCodes["".concat(fieldCode, ".number")]);
+  var phoneNumberWithCountryCode = (_resolveQueryParamVal = resolveQueryParamValue(fieldCodes[fieldCode])) === null || _resolveQueryParamVal === void 0 ? void 0 : _resolveQueryParamVal.replace(constants.PARENTHESES_REGEX, "");
   if (phoneNumberWithCountryCode) return phoneNumberWithCountryCode;
   if (!countryCode || !phoneNumber) return undefined;
   var formattedValue = getPhoneData(phoneNumber, countryCode);
@@ -276,7 +276,7 @@ var getOptionFromURL = function getOptionFromURL(_ref) {
   var optionsAttributes = _ref.optionsAttributes,
     fieldCodes = _ref.fieldCodes,
     fieldCode = _ref.fieldCode;
-  var preFillOption = fieldCodes[fieldCode];
+  var preFillOption = resolveQueryParamValue(fieldCodes[fieldCode]);
   return (_findBy = neetoCist.findBy({
     label: preFillOption
   }, optionsAttributes)) === null || _findBy === void 0 ? void 0 : _findBy.id;
@@ -285,7 +285,7 @@ var getMultipleOptionsFromURL = function getMultipleOptionsFromURL(_ref2) {
   var optionsAttributes = _ref2.optionsAttributes,
     fieldCodes = _ref2.fieldCodes,
     fieldCode = _ref2.fieldCode;
-  var fieldCodeValue = fieldCodes[fieldCode];
+  var fieldCodeValue = resolveQueryParamValue(fieldCodes[fieldCode]);
   if (!fieldCodeValue) return new Array(optionsAttributes.length).fill(false);
   var allOptions = fieldCodeValue.split(",").map(ramda.trim);
   return optionsAttributes.map(function (option) {
@@ -297,14 +297,14 @@ var getStarRatingFromUrl = function getStarRatingFromUrl(_ref3) {
     maxValue = _ref3.maxValue,
     fieldCodes = _ref3.fieldCodes,
     fieldCode = _ref3.fieldCode;
-  var fieldCodeValue = fieldCodes[fieldCode];
+  var fieldCodeValue = resolveQueryParamValue(fieldCodes[fieldCode]);
   var rating = parseInt(fieldCodeValue);
   return ramda.isNil(rating) || isNaN(rating) ? "" : ramda.clamp(minValue, maxValue, rating);
 };
 var getAdditionalGuestsFromUrl = function getAdditionalGuestsFromUrl(_ref4) {
   var fieldCodes = _ref4.fieldCodes,
     fieldCode = _ref4.fieldCode;
-  var fieldCodeValue = fieldCodes[fieldCode];
+  var fieldCodeValue = resolveQueryParamValue(fieldCodes[fieldCode]);
   var allEmails = fieldCodeValue === null || fieldCodeValue === void 0 ? void 0 : fieldCodeValue.split(",");
   if (!allEmails) return [];
   return allEmails.map(function (email) {
@@ -318,7 +318,7 @@ var getAdditionalGuestsFromUrl = function getAdditionalGuestsFromUrl(_ref4) {
 var getRatingFromUrl = function getRatingFromUrl(_ref5) {
   var fieldCodes = _ref5.fieldCodes,
     fieldCode = _ref5.fieldCode;
-  var fieldCodeValue = fieldCodes[fieldCode];
+  var fieldCodeValue = resolveQueryParamValue(fieldCodes[fieldCode]);
   var allowedValues = Object.values(constants.RATING_VALUES).map(ramda.prop("value"));
   return allowedValues.includes(fieldCodeValue) ? fieldCodeValue : "";
 };
@@ -326,19 +326,19 @@ var getNumberFromUrl = function getNumberFromUrl(_ref6) {
   var fieldCodes = _ref6.fieldCodes,
     fieldCode = _ref6.fieldCode,
     kind = _ref6.kind;
-  var fieldCodeValue = fieldCodes[fieldCode];
+  var fieldCodeValue = resolveQueryParamValue(fieldCodes[fieldCode]);
   var parsedValue = kind === constants.QUESTION_KIND.INTEGER.value ? parseInt(fieldCodeValue) : parseFloat(fieldCodeValue);
   return parsedValue || "";
 };
 var getNameFromUrl = function getNameFromUrl(_ref7, fieldCodes) {
   var isSplitMode = _ref7.isSplitMode,
     fieldCode = _ref7.fieldCode;
-  var fullName = fieldCodes[fieldCode] || "";
-  var firstName = fieldCodes["".concat(fieldCode, ".first_name")] || "";
-  var lastName = fieldCodes["".concat(fieldCode, ".last_name")] || "";
+  var fullName = resolveQueryParamValue(fieldCodes[fieldCode]) || "";
   if (!isSplitMode) return {
     fullName: fullName
   };
+  var firstName = resolveQueryParamValue(fieldCodes["".concat(fieldCode, ".first_name")]) || "";
+  var lastName = resolveQueryParamValue(fieldCodes["".concat(fieldCode, ".last_name")]) || "";
   if (neetoCist.isPresent(firstName) || neetoCist.isPresent(lastName)) {
     return {
       firstName: firstName,
@@ -504,7 +504,7 @@ var generateInitValues = function generateInitValues(_ref9) {
       default:
         {
           var _valuesMap$id$value6, _valuesMap9;
-          initValues[id] = (_valuesMap$id$value6 = (_valuesMap9 = valuesMap) === null || _valuesMap9 === void 0 || (_valuesMap9 = _valuesMap9[id]) === null || _valuesMap9 === void 0 ? void 0 : _valuesMap9.value) !== null && _valuesMap$id$value6 !== void 0 ? _valuesMap$id$value6 : fieldCodes[fieldCode] || "";
+          initValues[id] = (_valuesMap$id$value6 = (_valuesMap9 = valuesMap) === null || _valuesMap9 === void 0 || (_valuesMap9 = _valuesMap9[id]) === null || _valuesMap9 === void 0 ? void 0 : _valuesMap9.value) !== null && _valuesMap$id$value6 !== void 0 ? _valuesMap$id$value6 : resolveQueryParamValue(fieldCodes[fieldCode] || "");
           return;
         }
     }
@@ -690,20 +690,20 @@ var validateSingleChoiceField = function validateSingleChoiceField(_ref5) {
   var label = _ref5.label,
     isRequired = _ref5.isRequired;
   var schema = yup__namespace.string().typeError(getInvalidTypeError(label, "string"));
-  if (isRequired) schema = schema.required(getSelectMinError("an"));
+  if (isRequired) schema = schema.required(getSelectMinError());
   return schema.trim();
 };
 var validateMultiChoiceField = function validateMultiChoiceField(_ref6) {
   var isRequired = _ref6.isRequired;
   var schema = yup__namespace.array().of(yup__namespace["boolean"]());
-  if (isRequired) schema = schema.compact().min(1, getSelectMinError("an"));
+  if (isRequired) schema = schema.compact().min(1, getSelectMinError());
   return schema;
 };
 var validateRatingField = function validateRatingField(_ref7) {
   var label = _ref7.label,
     isRequired = _ref7.isRequired;
   var schema = yup__namespace.string().typeError(getInvalidTypeError(label, "string"));
-  if (isRequired) schema = schema.required(getSelectMinError("an"));
+  if (isRequired) schema = schema.required(getSelectMinError());
   return schema.trim();
 };
 var validateStarRatingField = function validateStarRatingField(_ref8) {
@@ -711,7 +711,7 @@ var validateStarRatingField = function validateStarRatingField(_ref8) {
     isRequired = _ref8.isRequired;
   var schema = yup__namespace.string().typeError(getInvalidTypeError(label, "string"));
   if (isRequired) {
-    schema = schema.required(getSelectMinError("a", t("neetoForm.common.rating")));
+    schema = schema.required(getSelectMinError(t("neetoForm.common.rating")));
   }
   return schema.trim();
 };
@@ -742,7 +742,7 @@ var validateMultiEmailField = function validateMultiEmailField(_ref12) {
     value: yup__namespace.string().email(getInvalidFieldError("Email")).trim()
   })).nullable();
   if (isRequired) {
-    schema = schema.compact().min(1, getSelectMinError("an", t("neetoForm.common.email")));
+    schema = schema.compact().min(1, getSelectMinError(t("neetoForm.common.email")));
   }
   return schema;
 };
@@ -841,7 +841,7 @@ var validateVerificationCode = function validateVerificationCode(context) {
           entity: entity
         }), function (value) {
           return neetoCist.isNotPresent(value) || constants.SIX_DIGIT_NUMBER_REGEX.test(value);
-        }).test("verify code", t("neetoForm.error.pleaseVerifyEmail"), function () {
+        }).test("verify code", t("neetoForm.error.emailNotVerified"), function () {
           var _this$options;
           return this === null || this === void 0 || (_this$options = this.options) === null || _this$options === void 0 || (_this$options = _this$options.context) === null || _this$options === void 0 ? void 0 : _this$options.isCodeVerified;
         });
@@ -2431,4 +2431,4 @@ exports.getFieldComponent = getFieldComponent;
 exports.getWithExpiry = getWithExpiry;
 exports.mergeRefs = mergeRefs;
 exports.renderButtonsInOrder = renderButtonsInOrder;
-//# sourceMappingURL=utils-BwFLBXs2.js.map
+//# sourceMappingURL=utils-Ch7Ggngj.js.map