drf-react-by-schema 0.5.2 → 0.5.4

package/dist/api.js

@@ -330,6 +330,7 @@ const prepareDataBySchema = ({ data, schema, parentIsField = false }) => {
         // Default:
         dbData[key] = data[key];
     }
+    // console.log({dbData});
     return dbData;
 };
 const updateDataBySchema = ({ model, modelObjectId, serverEndPoint, data, schema, path = null }) => __awaiter(void 0, void 0, void 0, function* () {
@@ -377,7 +378,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/SelectEditInputCell.js

@@ -63,6 +63,7 @@ const filter = (0, Autocomplete_1.createFilterOptions)();
 function SelectEditInputCell({ field, id, value, column, type, optionsAC, isIndexField, multiple = false, onEditModel, sx = {} }) {
     // TODO: allow edit option label, as in formautocomplete!
     const apiRef = (0, x_data_grid_1.useGridApiContext)();
+    console.log(column);
     const handleChange = (newValue) => __awaiter(this, void 0, void 0, function* () {
         yield apiRef.current.setEditCellValue({ id, field, value: newValue });
         apiRef.current.stopCellEditMode({ id, field });
@@ -74,7 +75,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 +119,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

@@ -160,6 +160,9 @@ const DataGridBySchemaEditable = (0, react_1.forwardRef)((_a, ref) => {
                 col.isIndexField = true;
             }
             column.editable = (isEditable) && (!schema[col.field].read_only || ['field', 'nested object'].includes(schema[col.field].type));
+            if (['field', 'nested object'].includes(schema[col.field].type)) {
+                column.creatable = 'related_editable' in schema[col.field] ? schema[col.field].related_editable : column.creatable;
+            }
             switch (schema[col.field].type) {
                 case 'date':
                     column.type = 'date';

package/dist/context/APIWrapper.js

@@ -62,7 +62,7 @@ function APIWrapper({ setLoading, handleLoading, setSnackBar, setDialog, childre
         return (react_1.default.createElement(react_1.default.Fragment, null, children));
     }
     const [usuaria, setUsuaria] = (0, react_1.useState)(null);
-    const [optionsAC, setOptionsAC] = (0, react_1.useReducer)(utils_1.reducer, {});
+    const [optionsAC, setOptionsAC] = (0, react_1.useReducer)(utils_1.reducer, null);
     const initialPageForm = {
         id: '',
         schema: null,
@@ -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, defaults = {}, extraValidators = {} }) => __awaiter(this, void 0, void 0, function* () {
+    const loadSinglePageData = ({ model, objId, optionsACModels = null, defaults = {}, extraValidators = {} }) => __awaiter(this, void 0, void 0, function* () {
         setLoading(true);
         if (!objId || objId === 'novo') {
             objId = (0, utils_1.getTmpId)();
@@ -104,7 +107,9 @@ function APIWrapper({ setLoading, handleLoading, setSnackBar, setDialog, childre
             return false;
         }
         setLoading(false);
-        populateOptionsAC(optionsACModels);
+        if (optionsACModels) {
+            populateOptionsAC(optionsACModels);
+        }
         for (const [field, value] of Object.entries(defaults)) {
             if (!object.data[field]) {
                 object.data[field] = value;
@@ -114,6 +119,10 @@ function APIWrapper({ setLoading, handleLoading, setSnackBar, setDialog, childre
         return values;
     });
     const onSubmit = (model, id, data) => __awaiter(this, void 0, void 0, function* () {
+        if (!pageForm) {
+            console.log('there must be a pageForm!');
+            return false;
+        }
         setLoading(true);
         const response = yield (0, api_1.updateDataBySchema)({
             model,
@@ -331,6 +340,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

@@ -6,7 +6,7 @@ export interface LoadSinglePageDataProps {
     model: string;
     objId?: Id;
     objTitleField?: string;
-    optionsACModels: string[];
+    optionsACModels: string[] | null;
     defaults?: Item;
     basePath?: string;
     formPath?: string | null;
@@ -58,15 +58,12 @@ 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;
-    optionsACState: [{
-        [x: string]: any;
-    }, React.Dispatch<OptionsACType>];
-    pageFormState: [{
-        [x: string]: any;
-    }, React.Dispatch<PageFormType>];
+    optionsACState: [OptionsACType | null, React.Dispatch<OptionsACType>];
+    pageFormState: [Record<string, any> | null, React.Dispatch<PageFormType>];
     onEditModel: (p: OnEditModelType) => void;
     onDeleteModel: (model: string, id: Id, onSuccess?: (e: React.BaseSyntheticEvent) => any) => void;
     onEditRelatedModelSave: (p: OnEditRelatedModelType) => Promise<boolean | Id | ItemSchemaColumnsType>;

package/dist/utils.d.ts

@@ -23,6 +23,9 @@ export interface Field {
     is_currency?: boolean;
     prefix?: string;
     suffix?: string;
+    creatable?: boolean;
+    related_editable?: boolean;
+    validators_regex?: Item[];
 }
 interface GridBySchemaColDef extends GridColDef {
     isIndexField?: boolean;
@@ -74,9 +77,7 @@ export declare const errorProps: ({ type, errors, fieldKey, fieldKeyProp, index
 };
 export declare const getTmpId: () => string;
 export declare const isTmpId: (id: string | number | undefined | null) => boolean;
-export declare const reducer: (state: Record<string, any>, newState: Record<string, any>) => {
-    [x: string]: any;
-};
+export declare const reducer: (state: Record<string, any> | null, newState: Record<string, any>) => Record<string, any> | null;
 export declare const getPatternFormat: (type: string) => string;
 export type AddParametersToEnd<TFunction extends (...args: any) => any, TParameters extends [...args: any]> = (...args: [...Parameters<TFunction>, ...TParameters]) => ReturnType<TFunction>;
 export {};

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;
     }
@@ -215,6 +217,11 @@ const buildGenericYupValidationSchema = ({ data, schema, many = false, skipField
                 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);
+            }
+        }
     }
     // console.log({ yupValidator });
     return (many)
@@ -249,6 +256,12 @@ const isTmpId = (id) => {
 };
 exports.isTmpId = isTmpId;
 const reducer = (state, newState) => {
+    if (newState === null) {
+        return null;
+    }
+    if (state === null) {
+        return newState;
+    }
     return Object.assign(Object.assign({}, state), newState);
 };
 exports.reducer = reducer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drf-react-by-schema",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "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",