drf-react-by-schema 0.4.0 → 0.5.0

package/dist/api.d.ts

@@ -1,5 +1,5 @@
 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
@@ -71,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.js

@@ -415,9 +415,7 @@ const DataGridBySchemaEditable = (0, react_1.forwardRef)((_a, ref) => {
         setDataGridLoading(true);
         const indexCol = preparedColumns.find(col => col.field === indexField);
         processingRow.current = newRow.id;
-        console.log('antes');
         yield yupValidationSchema.current.validate(newRow);
-        console.log('depois');
         const onlyAddExisting = (indexField &&
             (0, utils_1.isTmpId)(newRow.id) &&
             (newRow[indexField] && !(0, utils_1.isTmpId)(newRow[indexField].id)) &&
@@ -443,7 +441,6 @@ const DataGridBySchemaEditable = (0, react_1.forwardRef)((_a, ref) => {
                 newRow[indexField] = newRow[indexField].label;
             }
         }
-        console.log({ modelParent, modelParentId, apiContext });
         if (modelParent && modelParentId && apiContext) {
             const response = yield apiContext.onEditRelatedModelSave({
                 model: modelParent,

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
         });
@@ -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;
@@ -71,5 +72,8 @@ export interface APIWrapperContextType {
     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/utils.d.ts

@@ -2,6 +2,7 @@ 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;
@@ -34,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;

package/dist/utils.js

@@ -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.4.0",
+  "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",