drf-react-by-schema 0.20.9 → 0.21.0

package/dist/utils.js

@@ -53,6 +53,8 @@ exports.mergeFilterItems = mergeFilterItems;
 exports.initViewColumns = initViewColumns;
 exports.shouldMemoUpdate = shouldMemoUpdate;
 exports.formatFileSize = formatFileSize;
+exports.getFieldsFromFieldsLayout = getFieldsFromFieldsLayout;
+exports.isFieldRequired = isFieldRequired;
 const dayjs_1 = __importDefault(require("dayjs"));
 const Yup = __importStar(require("yup"));
 const string_mask_1 = __importDefault(require("string-mask"));
@@ -193,27 +195,28 @@ const getYupValidator = (type) => {
     }
     return yupFunc.transform((v) => (v === '' ? null : v)).nullable();
 };
-function buildGenericYupValidationSchema({ data, schema, many = false, skipFields = [], extraValidators, }) {
+function buildGenericYupValidationSchema({ data, schema, many = false, skipFields = [], extraValidators, uiFields, }) {
     const yupValidator = {};
     for (const entry of Object.entries(schema)) {
-        const [key, field] = entry;
-        if (!data || !(key in data) || key === 'id' || skipFields.includes(key)) {
+        const [field, fieldSchema] = entry;
+        if (!data || !(field in data) || field === 'id' || skipFields.includes(field)) {
             continue;
         }
         // OneToMany or ManyToMany:
-        if (field.type === 'field' && field.child) {
-            yupValidator[key] =
-                extraValidators && key in extraValidators
-                    ? extraValidators[key]
+        if (fieldSchema.type === 'field' && fieldSchema.child) {
+            yupValidator[field] =
+                extraValidators && field in extraValidators
+                    ? extraValidators[field]
                     : buildGenericYupValidationSchema({
-                        schema: field.child.children,
+                        schema: fieldSchema.child.children,
                         many: true,
-                        data: data[key],
+                        data: data[field],
+                        uiFields,
                     });
             continue;
         }
         // Nested Object:
-        if (field.type === 'nested object' && field.children) {
+        if (fieldSchema.type === 'nested object' && fieldSchema.children) {
             // yupValidator[key] = buildGenericYupValidationSchema({
             //     schema: field.children,
             //     many: false,
@@ -225,28 +228,28 @@ function buildGenericYupValidationSchema({ data, schema, many = false, skipField
             // }
             // continue;
         }
-        yupValidator[key] =
-            extraValidators && key in extraValidators
-                ? extraValidators[key]
-                : getYupValidator(field.type);
-        if (field.required || field.model_required) {
-            yupValidator[key] = yupValidator[key].required('Este campo é obrigatório');
+        yupValidator[field] =
+            extraValidators && field in extraValidators
+                ? extraValidators[field]
+                : getYupValidator(fieldSchema.type);
+        if (isFieldRequired(fieldSchema, (uiFields || []).includes(field))) {
+            yupValidator[field] = yupValidator[field].required('Este campo é obrigatório');
         }
-        if (field.max_length && field.type === 'string') {
-            yupValidator[key] = yupValidator[key].max(parseInt(field.max_length), `Este campo só pode ter no máximo ${field.max_length} caracteres`);
+        if (fieldSchema.max_length && fieldSchema.type === 'string') {
+            yupValidator[field] = yupValidator[field].max(parseInt(fieldSchema.max_length), `Este campo só pode ter no máximo ${fieldSchema.max_length} caracteres`);
         }
-        if (field.max_digits && field.type === 'decimal') {
-            const maxDigits = field.max_digits;
-            yupValidator[key] = yupValidator[key].test('len', `Este número pode ter no máximo ${maxDigits} dígitos`, (val) => {
+        if (fieldSchema.max_digits && fieldSchema.type === 'decimal') {
+            const maxDigits = fieldSchema.max_digits;
+            yupValidator[field] = yupValidator[field].test('len', `Este número pode ter no máximo ${maxDigits} dígitos`, (val) => {
                 if (!val) {
                     return true;
                 }
                 return val.toString().length <= maxDigits;
             });
         }
-        if (!field.read_only && field.validators_regex) {
-            for (const validator of field.validators_regex) {
-                yupValidator[key] = yupValidator[key].matches(validator.regex, validator.message);
+        if (!fieldSchema.read_only && fieldSchema.validators_regex) {
+            for (const validator of fieldSchema.validators_regex) {
+                yupValidator[field] = yupValidator[field].matches(validator.regex, validator.message);
             }
         }
     }
@@ -595,3 +598,39 @@ function formatFileSize(bytes) {
     });
     return `${formattedValue} ${units[i]}`;
 }
+function getFieldsFromFieldsLayout(fieldsLayout) {
+    const fields = [];
+    for (const section of fieldsLayout) {
+        if (!section.rows) {
+            continue;
+        }
+        for (const row of section.rows) {
+            if (typeof row === 'string') {
+                fields.push(row);
+                continue;
+            }
+            if (Array.isArray(row)) {
+                for (const field of row) {
+                    if (typeof field === 'string') {
+                        fields.push(field);
+                        continue;
+                    }
+                }
+                continue;
+            }
+        }
+    }
+    return fields;
+}
+function isFieldRequired(fieldSchema, isInForm) {
+    if (fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema.required) {
+        return true;
+    }
+    if (fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema.model_required) {
+        return true;
+    }
+    if ((fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema.ui_required) && (typeof isInForm === 'undefined' || isInForm === true)) {
+        return true;
+    }
+    return false;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drf-react-by-schema",
-  "version": "0.20.9",
+  "version": "0.21.0",
   "description": "Components and Tools for building a React App having Django Rest Framework (DRF) as server",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",