@headless-adminapp/app 1.2.0 → 1.2.1

package/dataform/utils/index.js

@@ -33,6 +33,8 @@ const utils_1 = require("../../dataform/DataFormProvider/utils");
 const utils_2 = require("../../locale/utils");
 var saveRecord_1 = require("./saveRecord");
 Object.defineProperty(exports, "saveRecord", { enumerable: true, get: function () { return saveRecord_1.saveRecord; } });
+const guidRegex = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+const objectIdRegex = /^[0-9a-f]{24}$/i;
 function getInitialValues({ cloneRecord, form, record, recordId, schema, defaultParameters, }) {
     const formColumns = (0, utils_1.getColumns)(form, schema);
     const editableGridControls = (0, utils_1.getControls)(form).filter((control) => control.type === 'editablegrid' && control.alias !== false);
@@ -253,6 +255,14 @@ function createAttributeValidationSchema(attribute) {
         case 'lookups':
             validationSchema = yup.array().nullable();
             break;
+        case 'id':
+            if ('number' in attribute && attribute.number) {
+                validationSchema = yup.number().nullable();
+            }
+            else {
+                validationSchema = yup.string().nullable();
+            }
+            break;
         default:
             validationSchema = yup.mixed().nullable();
             break;
@@ -284,6 +294,14 @@ function extendAttributeValidationSchema({ attribute, validationSchema, label, s
                 strings,
             });
             break;
+        case 'id':
+            validationSchema = extendAttributeIdValidationSchema({
+                attribute,
+                validationSchema: validationSchema,
+                label,
+                strings,
+            });
+            break;
         default:
             break;
     }
@@ -337,6 +355,15 @@ function extendAttributeAttachmentsValidationSchema({ attribute, validationSchem
     }
     return validationSchema;
 }
+function extendAttributeIdValidationSchema({ attribute, validationSchema, label, strings, }) {
+    if ('guid' in attribute && attribute.guid) {
+        validationSchema = validationSchema.matches(guidRegex, `${label}: ${strings.invalidIdFormat}`);
+    }
+    else if ('objectId' in attribute && attribute.objectId) {
+        validationSchema = validationSchema.matches(objectIdRegex, `${label}: ${strings.invalidIdFormat}`);
+    }
+    return validationSchema;
+}
 exports.generateAttributeValidationSchema = (0, lodash_1.memoize)(function generateAttributeValidationSchema(attribute, language, strings, region) {
     let validationSchema = createAttributeValidationSchema(attribute);
     const label = (0, utils_2.localizedLabel)(language, attribute);

package/form/FormValidationStringContext.d.ts

@@ -7,6 +7,7 @@ export interface FormValidationStringSet {
     invalidPhoneNumber: string;
     atLeastOneRowRequired: string;
     fileSizeExceeded: string;
+    invalidIdFormat: string;
 }
 export declare const defaultFormValidationStrings: FormValidationStringSet;
 export declare const FormValidationStringContext: import("react").Context<FormValidationStringSet>;

package/form/FormValidationStringContext.js

@@ -12,6 +12,7 @@ exports.defaultFormValidationStrings = {
     invalidPhoneNumber: 'Invalid phone number.',
     atLeastOneRowRequired: 'At least one row required.',
     fileSizeExceeded: 'File size exceeded.',
+    invalidIdFormat: 'Invalid ID format.',
 };
 exports.FormValidationStringContext = (0, react_1.createContext)(exports.defaultFormValidationStrings);
 function useFormValidationStrings() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@headless-adminapp/app",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "",
   "main": "index.js",
   "types": "index.d.ts",
@@ -36,5 +36,5 @@
     "uuid": "11.0.3",
     "yup": "^1.4.0"
   },
-  "gitHead": "3c59cbbf000e71e39b81c9440a71363b729e6e3c"
+  "gitHead": "1cf9322dda84c1898cc90f1e92278b79ed9f2902"
 }