drf-react-by-schema 0.5.1 → 0.5.3

package/dist/api.js

@@ -333,12 +333,12 @@ const prepareDataBySchema = ({ data, schema, parentIsField = false }) => {
     return dbData;
 };
 const updateDataBySchema = ({ model, modelObjectId, serverEndPoint, data, schema, path = null }) => __awaiter(void 0, void 0, void 0, function* () {
-    // console.log({
-    //     model,
-    //     modelObjectId,
-    //     data,
-    //     schema
-    // });
+    /*console.log({
+        model,
+        modelObjectId,
+        data,
+        schema
+    });*/
     const dbData = prepareDataBySchema({ data, schema });
     if (!path) {
         path = model;
@@ -377,7 +377,7 @@ const getDataGridColumns = (schema, columnFields = [], hiddenFields = [], creata
             field,
             headerName: schema[field].label,
             hide: (hiddenFields.includes(field)),
-            creatable: (creatableFields.includes(field)),
+            creatable: (creatableFields.includes(field) || schema[field].creatable),
             width: 100
         };
         return column;

package/dist/components/DataGridBySchemaEditable/GridDecimalInput.d.ts

@@ -4,6 +4,10 @@ type GridDecimalInputProps = {
     id: number | string;
     value?: any;
     column: object;
+    decimalPlaces?: number;
+    prefix?: string;
+    suffix?: string;
+    isCurrency?: boolean;
 };
-export declare const GridDecimalInput: ({ id, value, field }: GridDecimalInputProps) => JSX.Element;
+export declare const GridDecimalInput: ({ id, value, field, decimalPlaces, prefix, suffix, isCurrency, }: GridDecimalInputProps) => JSX.Element;
 export {};

package/dist/components/DataGridBySchemaEditable/GridDecimalInput.js

@@ -17,16 +17,21 @@ const react_1 = __importDefault(require("react"));
 const x_data_grid_1 = require("@mui/x-data-grid");
 const react_number_format_1 = require("react-number-format");
 const TextField_1 = __importDefault(require("@mui/material/TextField"));
-const GridDecimalInput = ({ id, value, field }) => {
+const GridDecimalInput = ({ id, value, field, decimalPlaces, prefix, suffix, isCurrency, }) => {
     const apiRef = (0, x_data_grid_1.useGridApiContext)();
-    const decimalScale = 2;
-    const disableCurrency = true;
+    const prefixFinal = isCurrency
+        ? 'R$ '
+        : prefix !== ''
+            ? `${prefix} `
+            : '';
+    const suffixFinal = suffix !== '' ? ` ${suffix}` : '';
+    const decimalScale = decimalPlaces || 2;
     const handleChange = (newValue) => __awaiter(void 0, void 0, void 0, function* () {
         yield apiRef.current.setEditCellValue({ id, field, value: newValue });
         apiRef.current.stopCellEditMode({ id, field });
     });
-    return (react_1.default.createElement(react_number_format_1.NumericFormat, { key: field, id: field, onValueChange: (values, sourceInfo) => {
+    return (react_1.default.createElement(react_number_format_1.NumericFormat, { key: field, id: field, onValueChange: (values) => {
             handleChange(values.value);
-        }, value: value, thousandSeparator: '.', decimalSeparator: ',', decimalScale: decimalScale, fixedDecimalScale: true, valueIsNumericString: true, prefix: disableCurrency ? '' : 'R$ ', customInput: TextField_1.default }));
+        }, value: value, thousandSeparator: '.', decimalSeparator: ',', decimalScale: decimalScale, fixedDecimalScale: true, valueIsNumericString: true, prefix: prefixFinal, suffix: suffixFinal, customInput: TextField_1.default }));
 };
 exports.GridDecimalInput = GridDecimalInput;

package/dist/components/DataGridBySchemaEditable/SelectEditInputCell.js

@@ -74,7 +74,8 @@ function SelectEditInputCell({ field, id, value, column, type, optionsAC, isInde
         ? 'id'
         : 'value';
     let creatableProps = {};
-    if (column.creatable || isIndexField) {
+    // if (column.creatable || isIndexField) {
+    if (column.creatable) {
         creatableProps = {
             freesolo: 'true',
             filterOptions: (options, params) => {
@@ -117,7 +118,8 @@ function SelectEditInputCell({ field, id, value, column, type, optionsAC, isInde
         }, getOptionLabel: (option) => {
             return option[labelKey];
         }, onChange: (e, value) => {
-            if (!column.creatable && !isIndexField) {
+            // if (!column.creatable && !isIndexField) {
+            if (!column.creatable) {
                 handleChange(value);
                 return;
             }

package/dist/components/DataGridBySchemaEditable.js

@@ -242,17 +242,21 @@ const DataGridBySchemaEditable = (0, react_1.forwardRef)((_a, ref) => {
                     break;
                 case 'decimal':
                 case 'float':
+                    const decimalScale = schema[col.field].decimal_places || 2;
+                    const prefix = schema[col.field].prefix || '';
+                    const suffix = schema[col.field].suffix || '';
+                    const isCurrency = schema[col.field].is_currency;
                     column.type = 'number';
                     column.valueFormatter = params => {
                         return (!params.value)
                             ? ''
                             : parseFloat(params.value).toLocaleString('pt-BR', {
-                                minimumFractionDigits: 2,
-                                maximumFractionDigits: 2
+                                minimumFractionDigits: decimalScale,
+                                maximumFractionDigits: decimalScale
                             });
                     };
                     if (isEditable) {
-                        column.renderEditCell = (params) => react_1.default.createElement(GridDecimalInput_1.GridDecimalInput, Object.assign({}, params, { column: column }));
+                        column.renderEditCell = (params) => react_1.default.createElement(GridDecimalInput_1.GridDecimalInput, Object.assign({}, params, { decimalScale: decimalScale, isCurrency: isCurrency, prefix: prefix, suffix: suffix, column: column }));
                     }
                     column.filterOperators = (0, utils_2.quantityOnlyOperators)({ type: 'float' });
                     break;

package/dist/context/APIWrapper.js

@@ -72,11 +72,14 @@ function APIWrapper({ setLoading, handleLoading, setSnackBar, setDialog, childre
     const [pageForm, setPageForm] = (0, react_1.useReducer)(utils_1.reducer, initialPageForm);
     const editModel = (0, react_1.useRef)({});
     const jsonSchemaFormRef = (0, react_1.useRef)(null);
-    (0, react_1.useEffect)(() => {
+    const updateUsuaria = () => {
         setUsuaria(null);
         (0, api_1.isLoggedIn)(serverEndPoint).then(usuaria => {
             setUsuaria(usuaria || { erro: 'token inválido' });
         });
+    };
+    (0, react_1.useEffect)(() => {
+        updateUsuaria();
     }, []);
     (0, react_1.useEffect)(() => {
         setPageForm(initialPageForm);
@@ -88,7 +91,7 @@ function APIWrapper({ setLoading, handleLoading, setSnackBar, setDialog, childre
             severity
         });
     };
-    const loadSinglePageData = ({ model, objId, optionsACModels, extraValidators = {} }) => __awaiter(this, void 0, void 0, function* () {
+    const loadSinglePageData = ({ model, objId, optionsACModels, defaults = {}, extraValidators = {} }) => __awaiter(this, void 0, void 0, function* () {
         setLoading(true);
         if (!objId || objId === 'novo') {
             objId = (0, utils_1.getTmpId)();
@@ -105,6 +108,11 @@ function APIWrapper({ setLoading, handleLoading, setSnackBar, setDialog, childre
         }
         setLoading(false);
         populateOptionsAC(optionsACModels);
+        for (const [field, value] of Object.entries(defaults)) {
+            if (!object.data[field]) {
+                object.data[field] = value;
+            }
+        }
         const values = populateInitialValues(Object.assign({ model, id: objId, extraValidators }, object));
         return values;
     });
@@ -326,6 +334,7 @@ function APIWrapper({ setLoading, handleLoading, setSnackBar, setDialog, childre
     });
     return (react_1.default.createElement(APIWrapperContext_1.APIWrapperContext.Provider, { value: {
             usuaria,
+            updateUsuaria,
             onSubmit,
             loadSinglePageData,
             handleLoading,

package/dist/context/APIWrapperContext.d.ts

@@ -7,6 +7,7 @@ export interface LoadSinglePageDataProps {
     objId?: Id;
     objTitleField?: string;
     optionsACModels: string[];
+    defaults?: Item;
     basePath?: string;
     formPath?: string | null;
     extraValidators?: Item;
@@ -57,6 +58,7 @@ export interface DialogType {
 export type DRFReactBySchemaSubmitHandler = (...args: [...[model: string, id: Id], ...Parameters<SubmitHandler<FieldValues>>]) => ReturnType<SubmitHandler<FieldValues>>;
 export interface APIWrapperContextType {
     usuaria: Item | null;
+    updateUsuaria: () => void;
     onSubmit: DRFReactBySchemaSubmitHandler;
     loadSinglePageData: (p: LoadSinglePageDataProps) => Promise<boolean | FieldValues>;
     handleLoading: (p: boolean) => void;

package/dist/utils.d.ts

@@ -16,8 +16,15 @@ export interface Field {
     model_required?: boolean;
     choices?: Choice[];
     max_length?: number | string;
+    max_digits?: number;
+    decimal_places?: number;
     label: string;
     read_only?: boolean;
+    is_currency?: boolean;
+    prefix?: string;
+    suffix?: string;
+    creatable?: boolean;
+    validators_regex?: Item[];
 }
 interface GridBySchemaColDef extends GridColDef {
     isIndexField?: boolean;

package/dist/utils.js

@@ -51,6 +51,8 @@ const emptyByType = (field, forDatabase = false) => {
             return 0;
         case 'array':
             return [];
+        case 'boolean':
+            return false;
         default:
             return null;
     }
@@ -69,8 +71,7 @@ const getChoiceByValue = (value, choices) => {
 exports.getChoiceByValue = getChoiceByValue;
 const populateValues = ({ data, schema }) => {
     const values = {};
-    for (const entry of Object.entries(schema)) {
-        const [key, field] = entry;
+    for (const [key, field] of Object.entries(schema)) {
         if (key === 'id' && (0, exports.isTmpId)(data[key])) {
             continue;
         }
@@ -141,6 +142,7 @@ const getYupValidator = (type) => {
                 yupFunc = Yup.string();
                 break;
             case 'number':
+            case 'decimal':
                 yupFunc = Yup.number();
                 break;
             case 'boolean':
@@ -206,6 +208,20 @@ const buildGenericYupValidationSchema = ({ data, schema, many = false, skipField
         if (field.max_length) {
             yupValidator[key] = yupValidator[key].max(parseInt(field.max_length), `Este campo só pode ter no máximo ${field.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 (!val) {
+                    return true;
+                }
+                return val.toString().length <= maxDigits;
+            });
+        }
+        if (field.validators_regex) {
+            for (const validator of field.validators_regex) {
+                yupValidator[key] = yupValidator[key].matches(validator.regex, validator.message);
+            }
+        }
     }
     // console.log({ yupValidator });
     return (many)

package/package.json

@@ -1,13 +1,12 @@
 {
   "name": "drf-react-by-schema",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "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",
   "scripts": {
     "test": "echo \"There are (still) no tests in this package\"",
     "build": "tsc",
-    "prepare": "install-peers",
     "styleguide": "styleguidist server",
     "styleguide:build": "styleguidist build",
     "release:major": "yarn version --version $(semver $npm_package_version -i major) && yarn publish --tag latest",

package/dist/components/TextFieldBySchema.js

@@ -1,39 +0,0 @@
-"use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const react_1 = __importDefault(require("react"));
-const TextField_1 = __importDefault(require("@mui/material/TextField"));
-const utils_1 = require("../utils");
-function TextFieldBySchema(_a) {
-    var { Controller, name, schema, control, errors, multiline = false, fieldKey = null, index = null, sx = { mr: 2 } } = _a, other = __rest(_a, ["Controller", "name", "schema", "control", "errors", "multiline", "fieldKey", "index", "sx"]);
-    const model = name;
-    if (fieldKey && index >= 0) {
-        name = `${fieldKey}.${index}.${name}`;
-    }
-    const { error, helperText } = (fieldKey && index >= 0)
-        ? (0, utils_1.errorProps)({
-            fieldKey,
-            index,
-            fieldKeyProp: name,
-            errors
-        })
-        : {
-            error: errors && Boolean(errors[name]),
-            helperText: (errors && errors[name]) ? errors[name].message : ''
-        };
-    return (react_1.default.createElement(Controller, { name: name, control: control, render: ({ field }) => (react_1.default.createElement(TextField_1.default, Object.assign({}, field, other, { id: name, key: name, label: schema[model].label, margin: "normal", fullWidth: true, multiline: multiline, error: error, helperText: helperText, sx: sx }))) }));
-}
-exports.default = TextFieldBySchema;