drf-react-by-schema 0.3.1 → 0.5.0

package/dist/api.d.ts

@@ -1,6 +1,5 @@
-import { AxiosResponse } from 'axios';
 import { serverEndPointType } from './context/DRFReactBySchemaContext';
-import { Item, SchemaType, DataSchemaColumnsType, ItemSchemaColumnsType } from './utils';
+import { Item, SchemaType, modelOptionsType, DataSchemaColumnsType, ItemSchemaColumnsType } from './utils';
 type Id = string | number | null;
 /**
  * Interface for CRUD on API
@@ -24,11 +23,11 @@ interface TargetApiParamsOptionalId {
  * @param param0
  * @returns Id when succesfully updated, false otherwise
  */
-export declare const updateData: ({ path, serverEndPoint, data, id }: TargetApiParams) => Promise<false | Id | AxiosResponse<any, any>>;
-export declare const partialUpdateData: ({ path, serverEndPoint, data, id }: TargetApiParams) => Promise<Id | AxiosResponse<any, any>>;
-export declare const createData: ({ path, serverEndPoint, data }: Omit<TargetApiParams, 'id'>) => Promise<false | AxiosResponse<any, any>>;
+export declare const updateData: ({ path, serverEndPoint, data, id }: TargetApiParams) => Promise<any>;
+export declare const partialUpdateData: ({ path, serverEndPoint, data, id }: TargetApiParams) => Promise<any>;
+export declare const createData: ({ path, serverEndPoint, data }: Omit<TargetApiParams, 'id'>) => Promise<any>;
 export declare const deleteData: (path: string, serverEndPoint: serverEndPointType | null, id: Id) => Promise<boolean>;
-export declare const createOrUpdateData: ({ path, serverEndPoint, data, id }: TargetApiParamsOptionalId) => Promise<false | Id | AxiosResponse<any, any>>;
+export declare const createOrUpdateData: ({ path, serverEndPoint, data, id }: TargetApiParamsOptionalId) => Promise<any>;
 export declare const updateDataBySchema: ({ model, modelObjectId, serverEndPoint, data, schema, path }: {
     model: string;
     modelObjectId: Id;
@@ -36,13 +35,13 @@ export declare const updateDataBySchema: ({ model, modelObjectId, serverEndPoint
     data: Item;
     schema: SchemaType;
     path?: string | null | undefined;
-}) => Promise<false | Id | AxiosResponse<any, any>>;
+}) => Promise<any>;
 export declare const addExistingRelatedModel: ({ model, serverEndPoint, id, data }: {
     model: string;
     serverEndPoint: serverEndPointType | null;
     id: Id;
     data: Item;
-}) => Promise<Id | AxiosResponse<any, any>>;
+}) => Promise<any>;
 export declare const getAutoComplete: ({ model, serverEndPoint }: {
     model: string;
     serverEndPoint: serverEndPointType | null;
@@ -72,8 +71,9 @@ export interface getGenericModelListProps {
     creatableFields?: string[];
     isInBatches?: boolean;
     loadedSchema?: SchemaType | boolean;
+    loadedModelOptions?: modelOptionsType | boolean;
 }
-export declare const getGenericModelList: ({ model, serverEndPoint, id, relatedModel, relatedModelId, columnFields, hiddenFields, creatableFields, isInBatches, loadedSchema }: getGenericModelListProps) => Promise<false | DataSchemaColumnsType>;
+export declare const getGenericModelList: ({ model, serverEndPoint, id, relatedModel, relatedModelId, columnFields, hiddenFields, creatableFields, isInBatches, loadedSchema, loadedModelOptions, }: getGenericModelListProps) => Promise<false | DataSchemaColumnsType>;
 export declare const getGenericModel: ({ model, serverEndPoint, id, relatedModel, relatedModelId }: {
     model: string;
     serverEndPoint: serverEndPointType | null;

package/dist/api.js

@@ -73,7 +73,11 @@ const getSchema = (path, serverEndPoint) => __awaiter(void 0, void 0, void 0, fu
             }
         }
     }
-    return options.actions.POST;
+    const modelOptions = Object.assign({}, options);
+    delete modelOptions.renders;
+    delete modelOptions.parses;
+    delete modelOptions.actions;
+    return { schema: options.actions.POST, modelOptions };
 });
 const getData = (path, serverEndPoint, route = 'api') => __awaiter(void 0, void 0, void 0, function* () {
     var _b;
@@ -532,10 +536,11 @@ const isLoggedIn = (serverEndPoint) => __awaiter(void 0, void 0, void 0, functio
 });
 exports.isLoggedIn = isLoggedIn;
 ;
-const getGenericModelList = ({ model, serverEndPoint, id = '', relatedModel = '', relatedModelId = '', columnFields, hiddenFields = ['id'], creatableFields = [], isInBatches = false, loadedSchema }) => __awaiter(void 0, void 0, void 0, function* () {
+const getGenericModelList = ({ model, serverEndPoint, id = '', relatedModel = '', relatedModelId = '', columnFields, hiddenFields = ['id'], creatableFields = [], isInBatches = false, loadedSchema, loadedModelOptions, }) => __awaiter(void 0, void 0, void 0, function* () {
     let path = `${model}/${id}`;
     let schemaPath = model;
     let schema = loadedSchema;
+    let modelOptions = loadedModelOptions;
     let columns;
     if (!(0, utils_1.isTmpId)(id) && relatedModel) {
         path += `/${relatedModel}/${relatedModelId}`;
@@ -543,10 +548,12 @@ const getGenericModelList = ({ model, serverEndPoint, id = '', relatedModel = ''
     }
     // Only get schema and columns if not in batches or in first batch:
     if (!schema) {
-        schema = yield getSchema(schemaPath, serverEndPoint);
-        if (!schema) {
+        const options = yield getSchema(schemaPath, serverEndPoint);
+        if (!options) {
             return false;
         }
+        schema = options.schema;
+        modelOptions = options.modelOptions;
         columns = getDataGridColumns(schema, columnFields, hiddenFields, creatableFields);
         if (!columns) {
             return false;
@@ -590,7 +597,7 @@ const getGenericModelList = ({ model, serverEndPoint, id = '', relatedModel = ''
         return { data };
     }
     // DEBUG  console.log({ path, data, columns, schema });
-    return { data, columns, schema };
+    return { data, columns, schema, modelOptions };
 });
 exports.getGenericModelList = getGenericModelList;
 const getGenericModel = ({ model, serverEndPoint, id = '', relatedModel = '', relatedModelId = '' }) => __awaiter(void 0, void 0, void 0, function* () {
@@ -600,14 +607,15 @@ const getGenericModel = ({ model, serverEndPoint, id = '', relatedModel = '', re
         path += `/${relatedModel}/${relatedModelId}`;
         schemaPath += `/${id}/${relatedModel}`;
     }
-    const schema = yield getSchema(schemaPath, serverEndPoint);
-    if (!schema) {
+    const options = yield getSchema(schemaPath, serverEndPoint);
+    if (!options) {
         return false;
     }
+    const { schema, modelOptions } = options;
     const data = (!id || (id && relatedModel && !relatedModelId))
         ? {}
         : yield getData(path, serverEndPoint);
     // console.log({ schema, data }); // DEBUG
-    return { schema, data };
+    return { schema, modelOptions, data };
 });
 exports.getGenericModel = getGenericModel;

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

@@ -0,0 +1,24 @@
+/// <reference types="react" />
+import { SxProps } from '@mui/material';
+import { GridEnrichedBySchemaColDef } from '../../utils';
+interface BooleanInputCellProps {
+    field: string;
+    id: number | string;
+    value?: any;
+    column: GridEnrichedBySchemaColDef;
+    sx?: SxProps;
+}
+/**
+ *
+ *
+ * @param {BooleanInputCellProps} {
+ *     field,
+ *     id,
+ *     value,
+ *     column,
+ *     sx = {}
+ * }
+ * @returns {*}  {JSX.Element}
+ */
+export declare function BooleanInputCell({ field, id, value, sx }: BooleanInputCellProps): JSX.Element;
+export {};

package/dist/components/DataGridBySchemaEditable/BooleanInputCell.js

@@ -0,0 +1,42 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BooleanInputCell = void 0;
+const react_1 = __importDefault(require("react"));
+const x_data_grid_1 = require("@mui/x-data-grid");
+const Checkbox_1 = __importDefault(require("@mui/material/Checkbox"));
+/**
+ *
+ *
+ * @param {BooleanInputCellProps} {
+ *     field,
+ *     id,
+ *     value,
+ *     column,
+ *     sx = {}
+ * }
+ * @returns {*}  {JSX.Element}
+ */
+function BooleanInputCell({ field, id, value, sx = {} }) {
+    // TODO: allow edit option label, as in formautocomplete!
+    const apiRef = (0, x_data_grid_1.useGridApiContext)();
+    const handleChange = (newValue) => __awaiter(this, void 0, void 0, function* () {
+        yield apiRef.current.setEditCellValue({ id, field, value: newValue });
+        apiRef.current.stopCellEditMode({ id, field });
+    });
+    return (react_1.default.createElement(Checkbox_1.default, { key: field, id: field, checked: value, inputProps: { 'aria-label': 'controlled' }, onChange: (event) => {
+            handleChange(event.target.checked);
+        }, sx: sx }));
+}
+exports.BooleanInputCell = BooleanInputCell;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { GridEnrichedBySchemaColDef } from '../../utils';
 type CustomToolbarProps = {
     preparedColumns: GridEnrichedBySchemaColDef[];

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { Item } from '../../utils';
 type FooterToolbarProps = {
     name: string;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 type GridDecimalInputProps = {
     field: string;
     id: number | string;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 type GridPatternInputProps = {
     field: string;
     id: number | string;

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

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export declare const InputNumberInterval: (props: any) => JSX.Element;
 export declare const InputDateInterval: (props: any) => JSX.Element;
 export declare const InputFloatInterval: (props: any) => JSX.Element;

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

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { GridApi, GridFilterOperator } from "@mui/x-data-grid";
+import { GridApi } from "@mui/x-data-grid";
 import { GridEnrichedBySchemaColDef } from "../../utils";
 export type ResizeType = 'condense' | 'maxContent' | 'fitScreen';
 /**
@@ -12,4 +12,4 @@ export type ResizeType = 'condense' | 'maxContent' | 'fitScreen';
 export declare function resizeColumns(columns: GridEnrichedBySchemaColDef[], resizeType: ResizeType, apiRef: React.MutableRefObject<GridApi>): GridEnrichedBySchemaColDef[];
 export declare const quantityOnlyOperators: ({ type }: {
     type: string;
-}) => GridFilterOperator<any, any, any>[];
+}) => GridFilterOperator[];

package/dist/components/DataGridBySchemaEditable.js

@@ -66,6 +66,7 @@ const CustomToolbar_1 = require("./DataGridBySchemaEditable/CustomToolbar");
 const SelectEditInputCell_1 = require("./DataGridBySchemaEditable/SelectEditInputCell");
 const GridDecimalInput_1 = require("./DataGridBySchemaEditable/GridDecimalInput");
 const GridPatternInput_1 = require("./DataGridBySchemaEditable/GridPatternInput");
+const BooleanInputCell_1 = require("./DataGridBySchemaEditable/BooleanInputCell");
 const FooterToolbar_1 = require("./DataGridBySchemaEditable/FooterToolbar");
 const ConfirmDialog_1 = require("./DataGridBySchemaEditable/ConfirmDialog");
 const APIWrapperContext_1 = require("../context/APIWrapperContext");
@@ -227,6 +228,18 @@ const DataGridBySchemaEditable = (0, react_1.forwardRef)((_a, ref) => {
                         return (!params.value) ? '' : params.value.display_name;
                     };
                     break;
+                case 'boolean':
+                    if (isEditable) {
+                        column.valueFormatter = params => {
+                            return (params.value) ? 'Sim' : 'Não';
+                        };
+                        column.renderEditCell = (params) => react_1.default.createElement(BooleanInputCell_1.BooleanInputCell, Object.assign({}, params, { column: column }));
+                        break;
+                    }
+                    column.valueGetter = params => {
+                        return (params.value) ? 'Sim' : 'Não';
+                    };
+                    break;
                 case 'decimal':
                 case 'float':
                     column.type = 'number';

package/dist/components/DataTotals.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { AlertColor } from '@mui/material/Alert';
 import { GridRowId } from '@mui/x-data-grid';
 import { Item } from '../utils';

package/dist/components/DialogJSONSchemaForm.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { Item, SchemaType } from '../utils';
 interface DialogJSONSchemaFormProps {
     jsonSchemaFormRef: any;

package/dist/components/FormButtons.d.ts

@@ -1,14 +1,21 @@
-import PropTypes from 'prop-types';
-import { SxProps } from '@mui/material';
+import React from 'react';
+import { Id } from '../utils';
 interface FormButtonsProps {
+    model: string;
+    objId: Id;
     title: string;
-    objId?: string | number;
     formDisabled: boolean;
-    cancelBtn?: PropTypes.func;
+    cancelBtn?: (e: React.BaseSyntheticEvent) => any;
+    cancelBtnLabel?: string;
+    deleteBtnLabel?: string;
+    saveAndCreateNewBtnLabel?: string;
+    saveAndContinueBtnLabel?: string;
+    saveBtnLabel?: string;
+    onSuccess?: (e: React.BaseSyntheticEvent) => any;
     bottom?: boolean;
     borderBottom?: boolean;
     saveAndContinue?: boolean;
-    sx?: SxProps;
+    sx?: any;
 }
-export default function FormButtons({ title, objId, formDisabled, cancelBtn, sx, bottom, borderBottom, saveAndContinue }: FormButtonsProps): JSX.Element;
+export default function FormButtons({ model, objId, title, formDisabled, cancelBtn, cancelBtnLabel, deleteBtnLabel, saveAndCreateNewBtnLabel, saveAndContinueBtnLabel, saveBtnLabel, onSuccess, bottom, borderBottom, saveAndContinue, sx }: FormButtonsProps): JSX.Element;
 export {};

package/dist/components/FormButtons.js

@@ -4,36 +4,40 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = __importDefault(require("react"));
-const react_router_dom_1 = require("react-router-dom");
-const Typography_1 = __importDefault(require("@mui/material/Typography"));
 const Box_1 = __importDefault(require("@mui/material/Box"));
 const Button_1 = __importDefault(require("@mui/material/Button"));
-// import UndoIcon from '@mui/icons-material/Undo';
+// import { SxProps } from '@mui/material';
+const Typography_1 = __importDefault(require("@mui/material/Typography"));
 const styles_1 = require("../styles");
-const utils_1 = require("../utils/utils");
-function FormButtons({ title, objId, formDisabled, cancelBtn, sx = {}, bottom = false, borderBottom = true, saveAndContinue = true }) {
-    const navigate = (0, react_router_dom_1.useNavigate)();
-    if (bottom && borderBottom && objId && objId !== 'novo') {
+const utils_1 = require("../utils");
+const APIWrapperContext_1 = require("../context/APIWrapperContext");
+function FormButtons({ model, objId, title, formDisabled, cancelBtn, cancelBtnLabel = 'Cancel', deleteBtnLabel = 'Delete', saveAndCreateNewBtnLabel = 'Save and Create New', saveAndContinueBtnLabel = 'Save and Continue', saveBtnLabel = 'Save', onSuccess, bottom = false, borderBottom = true, saveAndContinue = true, sx = {} }) {
+    const apiContext = react_1.default.useContext(APIWrapperContext_1.APIWrapperContext);
+    if (!apiContext) {
+        console.error('Error on drf-react-by-schema: there is no serverEndPoint configuration!');
+        return (react_1.default.createElement(react_1.default.Fragment, null));
+    }
+    const onDeleteModel = apiContext.onDeleteModel;
+    if (bottom && borderBottom && objId && objId !== 'novo' && sx !== null) {
         sx.mb = 5;
         sx.pb = 2;
         sx.borderBottom = 'solid 1px #aaa';
     }
     return (react_1.default.createElement(Box_1.default, { sx: Object.assign(Object.assign({}, styles_1.Layout.flexRowGrow), sx) },
         bottom
-            ? react_1.default.createElement(Button_1.default, { variant: "contained", type: "button", color: "error", size: "small", disabled: (0, utils_1.isTmpId)(objId) || !onDeleteModel, onClick: onDeleteModel }, "Apagar")
+            ? react_1.default.createElement(Button_1.default, { variant: "contained", type: "button", color: "error", size: "small", disabled: (0, utils_1.isTmpId)(objId) || !onDeleteModel, onClick: () => {
+                    onDeleteModel(model, objId, onSuccess);
+                } }, deleteBtnLabel)
             : title
                 ? react_1.default.createElement(Typography_1.default, { variant: "h5" }, title)
                 : react_1.default.createElement(Box_1.default, null),
         react_1.default.createElement(Box_1.default, { sx: styles_1.Layout.flexRow },
-            cancelBtn
-                ? react_1.default.createElement(Button_1.default, { variant: "contained", color: "primary", size: "small", sx: { ml: 1 }, onClick: cancelBtn }, "Cancelar")
-                : react_1.default.createElement(Button_1.default, { variant: "contained", color: "primary", size: "small", sx: { ml: 1 }, onClick: () => {
-                        navigate(-1);
-                    } }, "Voltar"),
+            cancelBtn &&
+                react_1.default.createElement(Button_1.default, { variant: "contained", color: "primary", size: "small", sx: { ml: 1 }, onClick: cancelBtn }, cancelBtnLabel),
             saveAndContinue &&
                 react_1.default.createElement(react_1.default.Fragment, null,
-                    react_1.default.createElement(Button_1.default, { variant: "contained", name: "createNewOnSave", type: "submit", color: "secondary", size: "small", sx: { ml: 1 }, disabled: formDisabled }, "Salvar e criar novo"),
-                    react_1.default.createElement(Button_1.default, { variant: "contained", name: "stayOnSave", type: "submit", color: "secondary", size: "small", sx: { ml: 1 }, disabled: formDisabled }, "Salvar e continuar")),
-            react_1.default.createElement(Button_1.default, { variant: "contained", name: "exitOnSave", type: "submit", color: "primary", size: "small", sx: { ml: 1 }, disabled: formDisabled }, "Salvar"))));
+                    react_1.default.createElement(Button_1.default, { variant: "contained", name: "createNewOnSave", type: "submit", color: "secondary", size: "small", sx: { ml: 1 }, disabled: formDisabled }, saveAndCreateNewBtnLabel),
+                    react_1.default.createElement(Button_1.default, { variant: "contained", name: "stayOnSave", type: "submit", color: "secondary", size: "small", sx: { ml: 1 }, disabled: formDisabled }, saveAndContinueBtnLabel)),
+            react_1.default.createElement(Button_1.default, { variant: "contained", name: "exitOnSave", type: "submit", color: "primary", size: "small", sx: { ml: 1 }, disabled: formDisabled }, saveBtnLabel))));
 }
 exports.default = FormButtons;

package/dist/components/GenericModelList.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+/// <reference types="react" />
 import { SumRowsType } from './DataTotals';
 import { GridEnrichedBySchemaColDef } from '../utils';
 interface GenericModelListProps {
@@ -13,7 +13,8 @@ interface GenericModelListProps {
     isAutoHeight?: boolean;
     model: string;
     forceReload: boolean;
-    LinkComponent?: React.ReactNode;
+    LinkComponent?: JSX.Element | null;
+    hasHeader: boolean;
 }
-declare const GenericModelList: ({ columnFields, hiddenFields, minWidthFields, indexFieldBasePath, indexField, customColumnOperations, customLinkDestination, sumRows, isAutoHeight, model, forceReload, LinkComponent }: GenericModelListProps) => JSX.Element;
+declare const GenericModelList: ({ columnFields, hiddenFields, minWidthFields, indexFieldBasePath, indexField, customColumnOperations, customLinkDestination, sumRows, isAutoHeight, model, forceReload, LinkComponent, hasHeader, }: GenericModelListProps) => JSX.Element;
 export default GenericModelList;

package/dist/components/GenericModelList.js

@@ -37,13 +37,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = __importStar(require("react"));
 const Box_1 = __importDefault(require("@mui/material/Box"));
+const Typography_1 = __importDefault(require("@mui/material/Typography"));
+const Button_1 = __importDefault(require("@mui/material/Button"));
+const AddCircleOutline_1 = __importDefault(require("@mui/icons-material/AddCircleOutline"));
 const DataGridBySchemaEditable_1 = __importDefault(require("./DataGridBySchemaEditable"));
 const DataTotals_1 = __importDefault(require("./DataTotals"));
 const styles_1 = require("../styles");
 const api_1 = require("../api");
 const DRFReactBySchemaContext_1 = require("../context/DRFReactBySchemaContext");
 const APIWrapperContext_1 = require("../context/APIWrapperContext");
-const GenericModelList = ({ columnFields, hiddenFields = [], minWidthFields, indexFieldBasePath, indexField, customColumnOperations, customLinkDestination, sumRows, isAutoHeight = true, model, forceReload = false, LinkComponent = null }) => {
+const GenericModelList = ({ columnFields, hiddenFields = [], minWidthFields, indexFieldBasePath, indexField, customColumnOperations, customLinkDestination, sumRows, isAutoHeight = true, model, forceReload = false, LinkComponent = null, hasHeader = false, }) => {
     const context = react_1.default.useContext(DRFReactBySchemaContext_1.DRFReactBySchemaContext);
     const apiContext = react_1.default.useContext(APIWrapperContext_1.APIWrapperContext);
     if (!context.serverEndPoint || !apiContext) {
@@ -82,7 +85,7 @@ const GenericModelList = ({ columnFields, hiddenFields = [], minWidthFields, ind
             handleLoading(false);
             if (isInBatches && loadedData.data.length === firstBatchLength) {
                 setHideFooterPagination(true);
-                (0, api_1.getGenericModelList)(Object.assign(Object.assign({}, loadParams), { loadedSchema: loadedData.schema })).then(lastBatchData => {
+                (0, api_1.getGenericModelList)(Object.assign(Object.assign({}, loadParams), { loadedSchema: loadedData.schema, loadedModelOptions: loadedData.modelOptions })).then(lastBatchData => {
                     if (lastBatchData && typeof lastBatchData !== 'boolean') {
                         setData(Object.assign(Object.assign({}, loadedData), { data: [
                                 ...loadedData.data,
@@ -101,9 +104,16 @@ const GenericModelList = ({ columnFields, hiddenFields = [], minWidthFields, ind
     }
     (0, react_1.useEffect)(() => {
         loadObjectList();
-    }, []);
+    }, [model]);
     return (react_1.default.createElement(react_1.default.Fragment, null, typeof data !== 'boolean' && data.columns &&
         react_1.default.createElement(react_1.default.Fragment, null,
+            hasHeader &&
+                react_1.default.createElement(Box_1.default, { sx: Object.assign(Object.assign({}, styles_1.Layout.flexRowGrow), { mb: 2 }) },
+                    react_1.default.createElement(Typography_1.default, { variant: "h5" }, data.modelOptions.verbose_name_plural || data.modelOptions.name),
+                    LinkComponent &&
+                        react_1.default.createElement(Box_1.default, { sx: styles_1.Layout.flexRow },
+                            react_1.default.createElement(LinkComponent, { to: `novo` },
+                                react_1.default.createElement(Button_1.default, { variant: "contained", size: "medium", sx: { alignSelf: 'stretch' }, startIcon: react_1.default.createElement(AddCircleOutline_1.default, null) }, "Adicionar")))),
             react_1.default.createElement(Box_1.default, { sx: styles_1.Layout.dataGridWithTabs },
                 react_1.default.createElement(DataGridBySchemaEditable_1.default, { data: data.data, columns: data.columns, schema: data.schema || {}, model: model, indexField: indexField, indexFieldBasePath: indexFieldBasePath, isEditable: false, isAutoHeight: isAutoHeight, hideFooterPagination: hideFooterPagination, customColumnOperations: finalCustomColumnOperations, customLinkDestination: customLinkDestination, setVisibleRows: setVisibleRows, onDataChange: newData => {
                         setData(Object.assign(Object.assign({}, data), { data: newData }));

package/dist/context/APIWrapper.js

@@ -108,7 +108,7 @@ function APIWrapper({ setLoading, handleLoading, setSnackBar, setDialog, childre
         const values = populateInitialValues(Object.assign({ model, id: objId, extraValidators }, object));
         return values;
     });
-    const onSubmit = (model, id, data, event) => __awaiter(this, void 0, void 0, function* () {
+    const onSubmit = (model, id, data) => __awaiter(this, void 0, void 0, function* () {
         setLoading(true);
         const response = yield (0, api_1.updateDataBySchema)({
             model,
@@ -153,6 +153,7 @@ function APIWrapper({ setLoading, handleLoading, setSnackBar, setDialog, childre
             model,
             id,
             schema: object.schema,
+            modelOptions: object.modelOptions,
             initialValues: values,
             validationSchema: yupSchema
         });
@@ -235,8 +236,8 @@ function APIWrapper({ setLoading, handleLoading, setSnackBar, setDialog, childre
                 msg: 'Apagado com com sucesso!',
                 severity: 'info'
             });
-            if (onSuccess !== null) {
-                onSuccess();
+            if (onSuccess) {
+                onSuccess({});
             }
             return true;
         }
@@ -335,7 +336,11 @@ function APIWrapper({ setLoading, handleLoading, setSnackBar, setDialog, childre
             onEditRelatedModelSave,
             onDeleteRelatedModel,
             onTriggerSnackBar,
-            setDialog
+            setDialog,
+            // Remove after integrating new "onEditModel" to package:
+            serverEndPoint,
+            editModel,
+            populateOptionsAC,
         } }, children));
 }
 exports.default = react_1.default.memo(APIWrapper);

package/dist/context/APIWrapperContext.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 import { FieldValues, SubmitHandler } from 'react-hook-form';
 import { ItemSchemaColumnsType, Id, Item, SchemaType } from '../utils';
+import { serverEndPointType } from './DRFReactBySchemaContext';
 export interface LoadSinglePageDataProps {
     model: string;
     objId?: Id;
@@ -66,10 +67,13 @@ export interface APIWrapperContextType {
         [x: string]: any;
     }, React.Dispatch<PageFormType>];
     onEditModel: (p: OnEditModelType) => void;
-    onDeleteModel: (model: string, id: Id, onSuccess: () => void | null) => void;
+    onDeleteModel: (model: string, id: Id, onSuccess?: (e: React.BaseSyntheticEvent) => any) => void;
     onEditRelatedModelSave: (p: OnEditRelatedModelType) => Promise<boolean | Id | ItemSchemaColumnsType>;
     onDeleteRelatedModel: (p: OnDeleteRelatedModelType) => Promise<boolean>;
     onTriggerSnackBar: (p: SnackBarType) => void;
     setDialog: React.Dispatch<React.SetStateAction<DialogType>>;
+    serverEndPoint: serverEndPointType;
+    editModel: React.MutableRefObject<Item>;
+    populateOptionsAC: (optionsACModels: string[]) => void;
 }
 export declare const APIWrapperContext: React.Context<APIWrapperContextType | null>;

package/dist/context/Form.d.ts

@@ -5,7 +5,17 @@ interface FormProps {
     id: Id;
     objTitleField?: string;
     optionsACModels: string[];
+    cancelBtn?: (e: React.BaseSyntheticEvent) => any;
+    cancelBtnLabel?: string;
+    deleteBtnLabel?: string;
+    saveAndCreateNewBtnLabel?: string;
+    saveAndContinueBtnLabel?: string;
+    saveBtnLabel?: string;
+    onSuccess?: (e: React.BaseSyntheticEvent) => any;
+    borderBottom?: boolean;
+    saveAndContinue?: boolean;
+    formButtonsSx?: any;
     children: React.ReactNode;
 }
-export default function Form({ model, id, objTitleField, optionsACModels, children }: FormProps): JSX.Element;
+export default function Form({ model, id, objTitleField, optionsACModels, cancelBtn, cancelBtnLabel, deleteBtnLabel, saveAndCreateNewBtnLabel, saveAndContinueBtnLabel, saveBtnLabel, onSuccess, borderBottom, saveAndContinue, formButtonsSx, children }: FormProps): JSX.Element;
 export {};

package/dist/context/Form.js

@@ -36,7 +36,8 @@ const FormButtons_1 = __importDefault(require("../components/FormButtons"));
 const APIWrapperContext_1 = require("./APIWrapperContext");
 const utils_1 = require("../utils");
 const DRFReactBySchemaContext_1 = require("./DRFReactBySchemaContext");
-function Form({ model, id, objTitleField = 'name', optionsACModels = [], children }) {
+const FormContext_1 = require("./FormContext");
+function Form({ model, id, objTitleField = 'name', optionsACModels = [], cancelBtn, cancelBtnLabel, deleteBtnLabel, saveAndCreateNewBtnLabel, saveAndContinueBtnLabel, saveBtnLabel, onSuccess, borderBottom, saveAndContinue, formButtonsSx, children }) {
     const apiContext = react_1.default.useContext(APIWrapperContext_1.APIWrapperContext);
     const context = react_1.default.useContext(DRFReactBySchemaContext_1.DRFReactBySchemaContext);
     if (!context.serverEndPoint || !apiContext) {
@@ -66,14 +67,30 @@ function Form({ model, id, objTitleField = 'name', optionsACModels = [], childre
         loadAllData();
     }, [id]);
     const formButtonProps = {
+        model,
         objId: id,
+        title: (0, utils_1.isTmpId)(id) ? 'Novo' : 'Editar',
         formDisabled: !isDirty,
-        title: (0, utils_1.isTmpId)(id) ? 'Novo' : 'Editar'
+        cancelBtn,
+        cancelBtnLabel,
+        deleteBtnLabel,
+        saveAndCreateNewBtnLabel,
+        saveAndContinueBtnLabel,
+        saveBtnLabel,
+        onSuccess,
+        borderBottom,
+        saveAndContinue,
+        sx: formButtonsSx
     };
+    // onSubmit={handleSubmit((data, event) => {
+    //     onSubmit(
+    //         model,
+    //         id,
+    //         data,
+    //         event
+    //     );
     return (react_1.default.createElement(react_1.default.Fragment, null, pageForm.initialValues && pageForm.schema && control &&
-        react_1.default.createElement("form", { onSubmit: handleSubmit((data, event) => {
-                onSubmit(model, id, data, event);
-            }) },
+        react_1.default.createElement(FormContext_1.FormContext.Provider, { value: null },
             react_1.default.createElement(LocalizationProvider_1.LocalizationProvider, { dateAdapter: AdapterMoment_1.AdapterMoment },
                 react_1.default.createElement(FormButtons_1.default, Object.assign({}, formButtonProps)),
                 react_1.default.createElement(Box_1.default, null, children),

package/dist/context/FormContext.d.ts

@@ -0,0 +1,72 @@
+import React from 'react';
+import { Id, Item, SchemaType } from '../utils';
+export interface LoadSinglePageDataProps {
+    model: string;
+    objId?: Id;
+    objTitleField?: string;
+    optionsACModels: string[];
+    basePath?: string;
+    formPath?: string | null;
+    extraValidators?: Item;
+}
+export type OptionsACType = Record<string, Item[]>;
+export interface PageFormType {
+    id: Id;
+    schema: SchemaType | null;
+    initialValues: Item | null;
+    validationSchema: Item | null;
+}
+export interface OnEditModelType {
+    fieldKey: string;
+    index: string;
+    model: string;
+    id: Id;
+    labelKey: string;
+    setValue: (p: any) => void;
+    getValues: (p: any) => any;
+}
+export interface OnEditRelatedModelType {
+    model: string;
+    id: Id;
+    relatedModel: string;
+    relatedModelId: Id;
+    newRow: Item;
+    schema: SchemaType;
+    onlyAddExisting: boolean;
+}
+export interface OnDeleteRelatedModelType {
+    model: string;
+    id: Id;
+    relatedModel: string;
+    relatedModelId: Id;
+}
+export interface SnackBarType {
+    open?: boolean;
+    msg?: string;
+    severity?: string;
+}
+export interface DialogType {
+    open: boolean;
+    loading?: boolean;
+    title?: string;
+    Body?: React.ReactNode;
+    Actions?: React.ReactNode;
+}
+export interface FormContextType {
+    model: string;
+    id: Id;
+    objTitleField: string;
+    optionsACModels: string[];
+    cancelBtn?: (e: React.BaseSyntheticEvent) => any;
+    cancelBtnLabel: any;
+    deleteBtnLabel: any;
+    saveAndCreateNewBtnLabel: any;
+    saveAndContinueBtnLabel: any;
+    saveBtnLabel: any;
+    onSuccess: any;
+    borderBottom: any;
+    saveAndContinue: any;
+    formButtonsSx: any;
+    children: any;
+}
+export declare const FormContext: React.Context<FormContextType | null>;

package/dist/context/FormContext.js

@@ -0,0 +1,15 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FormContext = void 0;
+const react_1 = __importDefault(require("react"));
+;
+;
+;
+;
+;
+;
+;
+exports.FormContext = react_1.default.createContext(null);

package/dist/index.d.ts

@@ -8,4 +8,5 @@ import GenericModelList from './components/GenericModelList';
 import GenericRelatedModelList from './components/GenericRelatedModelList';
 import DataTotals from './components/DataTotals';
 import DialogActions from './components/DialogActions';
-export { DRFReactBySchemaProvider, DRFReactBySchemaContext, APIWrapperContext, useTheme, DataGridBySchemaEditable, GenericModelList, GenericRelatedModelList, DataTotals, DialogActions, updateData, partialUpdateData, createData, deleteData, createOrUpdateData, updateDataBySchema, addExistingRelatedModel, getAutoComplete, getJSONSchema, createOrUpdateJSONSchema, loginByPayload, setAuthToken, isLoggedIn, getGenericModelList, getGenericModel, emptyByType, getChoiceByValue, populateValues, buildGenericYupValidationSchema, errorProps, getTmpId, isTmpId, getPatternFormat };
+import Form from './context/Form';
+export { DRFReactBySchemaProvider, DRFReactBySchemaContext, APIWrapperContext, useTheme, Form, FormContext, DataGridBySchemaEditable, GenericModelList, GenericRelatedModelList, DataTotals, DialogActions, updateData, partialUpdateData, createData, deleteData, createOrUpdateData, updateDataBySchema, addExistingRelatedModel, getAutoComplete, getJSONSchema, createOrUpdateJSONSchema, loginByPayload, setAuthToken, isLoggedIn, getGenericModelList, getGenericModel, emptyByType, getChoiceByValue, populateValues, buildGenericYupValidationSchema, errorProps, getTmpId, isTmpId, getPatternFormat };

package/dist/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPatternFormat = exports.isTmpId = exports.getTmpId = exports.errorProps = exports.buildGenericYupValidationSchema = exports.populateValues = exports.getChoiceByValue = exports.emptyByType = exports.getGenericModel = exports.getGenericModelList = exports.isLoggedIn = exports.setAuthToken = exports.loginByPayload = exports.createOrUpdateJSONSchema = exports.getJSONSchema = exports.getAutoComplete = exports.addExistingRelatedModel = exports.updateDataBySchema = exports.createOrUpdateData = exports.deleteData = exports.createData = exports.partialUpdateData = exports.updateData = exports.DialogActions = exports.DataTotals = exports.GenericRelatedModelList = exports.GenericModelList = exports.DataGridBySchemaEditable = exports.useTheme = exports.APIWrapperContext = exports.DRFReactBySchemaContext = exports.DRFReactBySchemaProvider = void 0;
+exports.getPatternFormat = exports.isTmpId = exports.getTmpId = exports.errorProps = exports.buildGenericYupValidationSchema = exports.populateValues = exports.getChoiceByValue = exports.emptyByType = exports.getGenericModel = exports.getGenericModelList = exports.isLoggedIn = exports.setAuthToken = exports.loginByPayload = exports.createOrUpdateJSONSchema = exports.getJSONSchema = exports.getAutoComplete = exports.addExistingRelatedModel = exports.updateDataBySchema = exports.createOrUpdateData = exports.deleteData = exports.createData = exports.partialUpdateData = exports.updateData = exports.DialogActions = exports.DataTotals = exports.GenericRelatedModelList = exports.GenericModelList = exports.DataGridBySchemaEditable = exports.FormContext = exports.Form = exports.useTheme = exports.APIWrapperContext = exports.DRFReactBySchemaContext = exports.DRFReactBySchemaProvider = void 0;
 // Methods:
 const api_1 = require("./api");
 Object.defineProperty(exports, "updateData", { enumerable: true, get: function () { return api_1.updateData; } });
@@ -49,3 +49,5 @@ const DataTotals_1 = __importDefault(require("./components/DataTotals"));
 exports.DataTotals = DataTotals_1.default;
 const DialogActions_1 = __importDefault(require("./components/DialogActions"));
 exports.DialogActions = DialogActions_1.default;
+const Form_1 = __importDefault(require("./context/Form"));
+exports.Form = Form_1.default;

package/dist/styles/layout.d.ts

@@ -89,7 +89,7 @@ export declare const fullWidthButton: {
 };
 export declare const formCard: {
     width: string;
-    backgroundColor: string;
+    backgroundColor: any;
     mt: number;
     mb: number;
 };

package/dist/styles/theme.d.ts

@@ -17,5 +17,5 @@ declare module '@mui/material/styles' {
         semaphoric?: string;
     }
 }
-declare const defaultTheme: import("@mui/material/styles").Theme;
+declare const defaultTheme: any;
 export default defaultTheme;

package/dist/utils.d.ts

@@ -1,8 +1,8 @@
-import * as Yup from 'yup';
 import { GridActionsColDef, GridColDef } from '@mui/x-data-grid';
 export type Id = string | number;
 export type Item = Record<string, any>;
 export type SchemaType = Record<string, Field>;
+export type modelOptionsType = Record<string, string>;
 export interface Choice {
     value: string | number;
     display_name: string;
@@ -35,11 +35,13 @@ export type GridEnrichedBySchemaColDef = GridBySchemaColDef | GridActionsBySchem
 export interface DataSchemaColumnsType {
     data: Item[];
     schema: SchemaType;
+    modelOptions: modelOptionsType;
     columns?: GridEnrichedBySchemaColDef[];
 }
 export interface ItemSchemaColumnsType {
     data: Item;
     schema: SchemaType;
+    modelOptions: modelOptionsType;
     columns?: GridEnrichedBySchemaColDef[];
 }
 export declare const emptyByType: any;
@@ -54,7 +56,7 @@ export declare const buildGenericYupValidationSchema: ({ data, schema, many, ski
     many?: boolean | undefined;
     skipFields?: string[] | undefined;
     extraValidators?: Item | undefined;
-}) => Yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, Record<string, any>>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, Record<string, any>>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, Record<string, any>>>> | Yup.ArraySchema<Yup.ObjectSchema<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, Record<string, any>>, import("yup/lib/object").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, Record<string, any>>>, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, Record<string, any>>>>, import("yup/lib/types").AnyObject, import("yup/lib/object").TypeOfShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, Record<string, any>>>[] | undefined, import("yup/lib/object").AssertsShape<import("yup/lib/object").Assign<import("yup/lib/object").ObjectShape, Record<string, any>>>[] | undefined>;
+}) => any;
 export declare const errorProps: ({ type, errors, fieldKey, fieldKeyProp, index }: {
     type: string;
     errors: Item;

package/dist/utils.js

@@ -144,7 +144,7 @@ const getYupValidator = (type) => {
                 yupFunc = Yup.number();
                 break;
             case 'boolean':
-                yupFunc = Yup.boolean();
+                yupFunc = Yup.bool();
                 break;
             case 'array':
                 yupFunc = Yup.array();
@@ -236,7 +236,7 @@ const isTmpId = (id) => {
     if (!id) {
         return true;
     }
-    return id.toString().substr(0, 3) === 'tmp';
+    return id.toString().slice(0, 3) === 'tmp';
 };
 exports.isTmpId = isTmpId;
 const reducer = (state, newState) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drf-react-by-schema",
-  "version": "0.3.1",
+  "version": "0.5.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",
@@ -10,9 +10,9 @@
     "prepare": "install-peers",
     "styleguide": "styleguidist server",
     "styleguide:build": "styleguidist build",
-    "release:major": "npm version $(semver $npm_package_version -i major) && npm publish --tag latest",
-    "release:minor": "npm version $(semver $npm_package_version -i minor) && npm publish --tag latest",
-    "release:patch": "npm version $(semver $npm_package_version -i patch) && npm publish --tag latest"
+    "release:major": "yarn version --version $(semver $npm_package_version -i major) && yarn publish --tag latest",
+    "release:minor": "yarn version --new-version $(semver $npm_package_version -i minor) && yarn publish --tag latest",
+    "release:patch": "yarn version --new-version $(semver $npm_package_version -i patch) && yarn publish --tag latest"
   },
   "repository": {
     "type": "git",