drf-react-by-schema 0.12.5 → 0.13.0

package/dist/api.js

@@ -567,6 +567,7 @@ const signUp = (data, serverEndPoint) => __awaiter(void 0, void 0, void 0, funct
 });
 exports.signUp = signUp;
 const getGenericModelList = ({ model, serverEndPoint, id = '', relatedModel = '', relatedModelId = '', columnFields, hiddenFields = ['id'], creatableFields = [], disabledFields = [], isInBatches = false, loadedSchema, loadedModelOptions, page, filter, queryParams = [], sort, sumRows, }) => __awaiter(void 0, void 0, void 0, function* () {
+    const newQueryParams = [...queryParams];
     let path = `${model}/${id}`;
     let schemaPath = `${model}/`;
     let schema = loadedSchema;
@@ -582,14 +583,14 @@ const getGenericModelList = ({ model, serverEndPoint, id = '', relatedModel = ''
     // SERVER-SIDE TOTALS (sumRows):
     if (sumRows) {
         const sumRowsParams = sumRows.rows.map((row) => row.field).join(',');
-        queryParams.push(`sum_rows=${sumRowsParams}`);
+        newQueryParams.push(`sum_rows=${sumRowsParams}`);
     }
     // SERVER-SIDE FILTERING:
     if (filter) {
         if (filter.quickFilterValues &&
             filter.quickFilterValues.length > 0 &&
             filter.quickFilterValues[0]) {
-            queryParams.push(`search=${filter.quickFilterValues[0]}`);
+            newQueryParams.push(`search=${filter.quickFilterValues[0]}`);
         }
         for (const item of filter.items) {
             if (!item.operatorValue) {
@@ -598,7 +599,7 @@ const getGenericModelList = ({ model, serverEndPoint, id = '', relatedModel = ''
             const queryParam = item.value
                 ? `columnField=${item.columnField}&operatorValue=${item.operatorValue}&value=${item.value}`
                 : `columnField=${item.columnField}&operatorValue=${item.operatorValue}`;
-            queryParams.push(queryParam);
+            newQueryParams.push(queryParam);
         }
     }
     // SERVER-SIDE SORTING:
@@ -607,14 +608,14 @@ const getGenericModelList = ({ model, serverEndPoint, id = '', relatedModel = ''
         for (const item of sort) {
             sortParams.push(item.sort === 'desc' ? `-${item.field}` : item.field);
         }
-        queryParams.push(`ordering=${sortParams.join(',')}`);
+        newQueryParams.push(`ordering=${sortParams.join(',')}`);
     }
     // SERVER-SIDE PAGINATION:
     if (page) {
-        queryParams.push(`page=${page + 1}`);
+        newQueryParams.push(`page=${page + 1}`);
     }
-    if (queryParams.length > 0) {
-        path += `?${queryParams.join('&')}`;
+    if (newQueryParams.length > 0) {
+        path += `?${newQueryParams.join('&')}`;
     }
     // Only get schema and columns if not in batches or in first batch:
     if (!schema) {

package/dist/components/DataGridBySchemaEditable.d.ts

@@ -19,6 +19,7 @@ interface DataGridBySchemaEditableProps {
     indexFieldViewBasePath?: string;
     stateToLink?: object;
     minWidth?: number;
+    loading?: boolean;
     modelParentId?: Id;
     modelParent?: string;
     customColumnOperations?: (p: any) => GridEnrichedBySchemaColDef;

package/dist/components/DataGridBySchemaEditable.js

@@ -75,7 +75,7 @@ const ConfirmDialog_1 = require("./DataGridBySchemaEditable/ConfirmDialog");
 const APIWrapperContext_1 = require("../context/APIWrapperContext");
 const stringMask = require('string-mask');
 const DataGridBySchemaEditable = (0, react_1.forwardRef)((_a, ref) => {
-    var { schema, data, rowCount = 0, columns, model, fieldKey, labelKey = 'nome', index, name = Math.floor(Math.random() * 1000000).toString(), indexField = 'nome', addExistingModel, indexFieldMinWidth = 350, indexFieldBasePath = '', indexFieldViewBasePath, stateToLink = {}, minWidth = 80, modelParent, modelParentId, customColumnOperations, customLinkDestination, LinkComponent, onProcessRow, onDataChange, onEditModel, isEditable = false, hasBulkSelect = false, sx = { mr: 2 }, isAutoHeight = false, defaultValues = {}, hideFooterPagination = false, setVisibleRows, paginationModel = undefined, setPaginationModel = undefined, hideFooterComponent, hideToolbarComponent, tableAutoHeight, actions = ['editInline', 'remove'], optionsAC: optionsACExternal } = _a, other = __rest(_a, ["schema", "data", "rowCount", "columns", "model", "fieldKey", "labelKey", "index", "name", "indexField", "addExistingModel", "indexFieldMinWidth", "indexFieldBasePath", "indexFieldViewBasePath", "stateToLink", "minWidth", "modelParent", "modelParentId", "customColumnOperations", "customLinkDestination", "LinkComponent", "onProcessRow", "onDataChange", "onEditModel", "isEditable", "hasBulkSelect", "sx", "isAutoHeight", "defaultValues", "hideFooterPagination", "setVisibleRows", "paginationModel", "setPaginationModel", "hideFooterComponent", "hideToolbarComponent", "tableAutoHeight", "actions", "optionsAC"]);
+    var { schema, data, rowCount = 0, columns, model, fieldKey, labelKey = 'nome', index, name = Math.floor(Math.random() * 1000000).toString(), indexField = 'nome', addExistingModel, indexFieldMinWidth = 350, indexFieldBasePath = '', indexFieldViewBasePath, stateToLink = {}, minWidth = 80, loading, modelParent, modelParentId, customColumnOperations, customLinkDestination, LinkComponent, onProcessRow, onDataChange, onEditModel, isEditable = false, hasBulkSelect = false, sx = { mr: 2 }, isAutoHeight = false, defaultValues = {}, hideFooterPagination = false, setVisibleRows, paginationModel = undefined, setPaginationModel = undefined, hideFooterComponent, hideToolbarComponent, tableAutoHeight, actions = ['editInline', 'remove'], optionsAC: optionsACExternal } = _a, other = __rest(_a, ["schema", "data", "rowCount", "columns", "model", "fieldKey", "labelKey", "index", "name", "indexField", "addExistingModel", "indexFieldMinWidth", "indexFieldBasePath", "indexFieldViewBasePath", "stateToLink", "minWidth", "loading", "modelParent", "modelParentId", "customColumnOperations", "customLinkDestination", "LinkComponent", "onProcessRow", "onDataChange", "onEditModel", "isEditable", "hasBulkSelect", "sx", "isAutoHeight", "defaultValues", "hideFooterPagination", "setVisibleRows", "paginationModel", "setPaginationModel", "hideFooterComponent", "hideToolbarComponent", "tableAutoHeight", "actions", "optionsAC"]);
     const { serverEndPoint } = (0, DRFReactBySchemaContext_1.useDRFReactBySchema)();
     const apiContext = (0, APIWrapperContext_1.useAPIWrapper)();
     const initialSnackBar = {
@@ -600,7 +600,7 @@ const DataGridBySchemaEditable = (0, react_1.forwardRef)((_a, ref) => {
                         visibleRows.current = newVisibleRowsJSON;
                     }
                 }
-            }, editMode: "row", loading: dataGridLoading, hideFooterPagination: hideFooterPagination, getRowHeight: () => {
+            }, editMode: "row", loading: dataGridLoading || loading, hideFooterPagination: hideFooterPagination, getRowHeight: () => {
                 if (isAutoHeight) {
                     return 'auto';
                 }

package/dist/components/GenericModelList.js

@@ -40,6 +40,8 @@ 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 Backdrop_1 = __importDefault(require("@mui/material/Backdrop"));
+const CircularProgress_1 = __importDefault(require("@mui/material/CircularProgress"));
 const DataGridBySchemaEditable_1 = __importDefault(require("./DataGridBySchemaEditable"));
 const DataTotals_1 = __importDefault(require("./DataTotals"));
 const DataTotalsServer_1 = __importDefault(require("./DataTotalsServer"));
@@ -50,8 +52,9 @@ const DRFReactBySchemaContext_1 = require("../context/DRFReactBySchemaContext");
 const APIWrapperContext_1 = require("../context/APIWrapperContext");
 const GenericModelList = ({ model, columnFields, hiddenFields = [], creatableFields, disabledFields, minWidthFields, indexField, indexFieldBasePath, indexFieldViewBasePath, addExistingModel, onProcessRow, customColumnOperations, customLinkDestination, isEditable, hasBulkSelect = false, sumRows, isAutoHeight = true, forceReload = false, LinkComponent = null, hasHeader = false, paginationMode = 'client', defaultFilter, queryParams, hideFooterComponent, hideToolbarComponent, tableAutoHeight, actions, optionsAC, disableScreenLoading, }) => {
     const { serverEndPoint, isInBatches, firstBatchLength } = (0, DRFReactBySchemaContext_1.useDRFReactBySchema)();
-    const { onEditModel, handleLoading } = (0, APIWrapperContext_1.useAPIWrapper)();
+    const { onEditModel } = (0, APIWrapperContext_1.useAPIWrapper)();
     const [data, setData] = (0, react_1.useState)(false);
+    const [loading, setLoading] = (0, react_1.useState)(false);
     const [visibleRows, setVisibleRows] = (0, react_1.useState)([]);
     const [hideFooterPagination, setHideFooterPagination] = (0, react_1.useState)(false);
     const [paginationModel, setPaginationModel] = (0, react_1.useState)(paginationMode === 'server' ? { page: 0, pageSize: 100 } : undefined);
@@ -68,7 +71,7 @@ const GenericModelList = ({ model, columnFields, hiddenFields = [], creatableFie
     };
     const loadObjectList = () => __awaiter(void 0, void 0, void 0, function* () {
         if (!disableScreenLoading) {
-            handleLoading(true);
+            setLoading(true);
         }
         switch (paginationMode) {
             case 'client':
@@ -85,7 +88,7 @@ const GenericModelList = ({ model, columnFields, hiddenFields = [], creatableFie
                 const loadedData = yield (0, api_1.getGenericModelList)(loadParams);
                 if (loadedData && typeof loadedData !== 'boolean') {
                     setData(loadedData);
-                    handleLoading(false);
+                    setLoading(false);
                     if (isInBatches && loadedData.data.length === firstBatchLength) {
                         setHideFooterPagination(true);
                         (0, api_1.getGenericModelList)(Object.assign(Object.assign({}, loadParams), { loadedSchema: loadedData.schema, loadedModelOptions: loadedData.modelOptions })).then((lastBatchData) => {
@@ -119,7 +122,7 @@ const GenericModelList = ({ model, columnFields, hiddenFields = [], creatableFie
                 const paginatedData = yield (0, api_1.getGenericModelList)(loadPaginatedParams);
                 if (paginatedData && typeof paginatedData !== 'boolean') {
                     setData(paginatedData);
-                    handleLoading(false);
+                    setLoading(false);
                     return;
                 }
                 console.log('error retrieving data!');
@@ -141,20 +144,21 @@ const GenericModelList = ({ model, columnFields, hiddenFields = [], creatableFie
         console.error('Error: There is no endpoint defined in DRFReactBySchemaProvider!');
         return react_1.default.createElement(react_1.default.Fragment, null);
     }
-    return (react_1.default.createElement(react_1.default.Fragment, null, typeof data !== 'boolean' && data.columns && (react_1.default.createElement(react_1.default.Fragment, null,
+    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: tableAutoHeight ? {} : 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, indexFieldViewBasePath: indexFieldViewBasePath, addExistingModel: addExistingModel, isEditable: isEditable, hasBulkSelect: hasBulkSelect, onEditModel: onEditModel, isAutoHeight: isAutoHeight, tableAutoHeight: tableAutoHeight, customColumnOperations: finalCustomColumnOperations, setVisibleRows: setVisibleRows, hideFooterPagination: hideFooterPagination, hideFooterComponent: hideFooterComponent, hideToolbarComponent: hideToolbarComponent, customLinkDestination: customLinkDestination, actions: actions, optionsAC: optionsAC, onProcessRow: onProcessRow, onDataChange: (newData) => {
+            react_1.default.createElement(DataGridBySchemaEditable_1.default, { data: data.data, columns: data.columns, schema: data.schema || {}, model: model, loading: loading, indexField: indexField, indexFieldBasePath: indexFieldBasePath, indexFieldViewBasePath: indexFieldViewBasePath, addExistingModel: addExistingModel, isEditable: isEditable, hasBulkSelect: hasBulkSelect, onEditModel: onEditModel, isAutoHeight: isAutoHeight, tableAutoHeight: tableAutoHeight, customColumnOperations: finalCustomColumnOperations, setVisibleRows: setVisibleRows, hideFooterPagination: hideFooterPagination, hideFooterComponent: hideFooterComponent, hideToolbarComponent: hideToolbarComponent, customLinkDestination: customLinkDestination, actions: actions, optionsAC: optionsAC, onProcessRow: onProcessRow, onDataChange: (newData) => {
                     setData(Object.assign(Object.assign({}, data), { data: newData }));
                 }, LinkComponent: LinkComponent, paginationModel: paginationMode === 'server' ? paginationModel : undefined, setPaginationModel: paginationMode === 'server' ? setPaginationModel : undefined, rowCount: paginationMode === 'client'
                     ? undefined
                     : typeof data.rowCount !== undefined
                         ? data.rowCount
                         : 0 })),
-        paginationMode === 'client' ? (react_1.default.createElement(DataTotals_1.default, { data: data.data, sumRows: sumRows, visibleRows: visibleRows })) : (react_1.default.createElement(DataTotalsServer_1.default, { sumRows: sumRows, totals: data.sumRowsTotals }))))));
+        paginationMode === 'client' ? (react_1.default.createElement(DataTotals_1.default, { data: data.data, sumRows: sumRows, visibleRows: visibleRows })) : (react_1.default.createElement(DataTotalsServer_1.default, { sumRows: sumRows, totals: data.sumRowsTotals })))) : (react_1.default.createElement(Backdrop_1.default, { invisible: true, sx: { color: '#fff', zIndex: (theme) => theme.zIndex.drawer + 1 }, open: loading },
+        react_1.default.createElement(CircularProgress_1.default, null)))));
 };
 exports.default = GenericModelList;

package/dist/components/GenericRelatedModelList.js

@@ -40,6 +40,8 @@ const Box_1 = __importDefault(require("@mui/material/Box"));
 const Card_1 = __importDefault(require("@mui/material/Card"));
 const CardHeader_1 = __importDefault(require("@mui/material/CardHeader"));
 const CardContent_1 = __importDefault(require("@mui/material/CardContent"));
+const Backdrop_1 = __importDefault(require("@mui/material/Backdrop"));
+const CircularProgress_1 = __importDefault(require("@mui/material/CircularProgress"));
 const DataGridBySchemaEditable_1 = __importDefault(require("./DataGridBySchemaEditable"));
 const DataTotals_1 = __importDefault(require("./DataTotals"));
 const DataTotalsServer_1 = __importDefault(require("./DataTotalsServer"));
@@ -47,19 +49,21 @@ const APIWrapperContext_1 = require("../context/APIWrapperContext");
 const utils_1 = require("../utils");
 const api_1 = require("../api");
 const styles_1 = require("../styles");
-const ContentTable = ({ data, relatedModel, model, id, indexField, indexFieldBasePath, indexFieldViewBasePath, addExistingModel, isEditable, onEditModel, finalCustomColumnOperations, setVisibleRows, isAutoHeight, hideFooterPagination, hideFooterComponent, hideToolbarComponent, onProcessRow, setData, sumRows, visibleRows, paginationMode = 'client', paginationModel, setPaginationModel, hasBulkSelect, tableAutoHeight, actions, optionsAC, }) => (react_1.default.createElement(react_1.default.Fragment, null,
-    data.columns && (react_1.default.createElement(Box_1.default, { sx: tableAutoHeight ? {} : styles_1.Layout.dataGridFixedHeight },
-        react_1.default.createElement(DataGridBySchemaEditable_1.default, { data: data.data, columns: data.columns, schema: data.schema, model: relatedModel, modelParent: model, modelParentId: id, indexField: indexField, indexFieldBasePath: indexFieldBasePath, indexFieldViewBasePath: indexFieldViewBasePath, addExistingModel: addExistingModel, isEditable: isEditable, hasBulkSelect: hasBulkSelect, onEditModel: onEditModel, isAutoHeight: isAutoHeight, tableAutoHeight: tableAutoHeight, customColumnOperations: finalCustomColumnOperations, setVisibleRows: setVisibleRows, hideFooterPagination: hideFooterPagination, hideFooterComponent: hideFooterComponent, hideToolbarComponent: hideToolbarComponent, actions: actions, optionsAC: optionsAC, onProcessRow: onProcessRow, onDataChange: (newData) => {
+const ContentTable = ({ data, relatedModel, model, loading, id, indexField, indexFieldBasePath, indexFieldViewBasePath, addExistingModel, isEditable, onEditModel, finalCustomColumnOperations, setVisibleRows, isAutoHeight, hideFooterPagination, hideFooterComponent, hideToolbarComponent, onProcessRow, setData, sumRows, visibleRows, paginationMode = 'client', paginationModel, setPaginationModel, hasBulkSelect, tableAutoHeight, actions, optionsAC, }) => (react_1.default.createElement(react_1.default.Fragment, null,
+    data.columns ? (react_1.default.createElement(Box_1.default, { sx: tableAutoHeight ? {} : styles_1.Layout.dataGridFixedHeight },
+        react_1.default.createElement(DataGridBySchemaEditable_1.default, { data: data.data, columns: data.columns, schema: data.schema, model: relatedModel, modelParent: model, modelParentId: id, loading: loading, indexField: indexField, indexFieldBasePath: indexFieldBasePath, indexFieldViewBasePath: indexFieldViewBasePath, addExistingModel: addExistingModel, isEditable: isEditable, hasBulkSelect: hasBulkSelect, onEditModel: onEditModel, isAutoHeight: isAutoHeight, tableAutoHeight: tableAutoHeight, customColumnOperations: finalCustomColumnOperations, setVisibleRows: setVisibleRows, hideFooterPagination: hideFooterPagination, hideFooterComponent: hideFooterComponent, hideToolbarComponent: hideToolbarComponent, actions: actions, optionsAC: optionsAC, onProcessRow: onProcessRow, onDataChange: (newData) => {
                 setData(Object.assign(Object.assign({}, data), { data: newData }));
             }, paginationModel: paginationMode === 'server' ? paginationModel : undefined, setPaginationModel: paginationMode === 'server' ? setPaginationModel : undefined, rowCount: paginationMode === 'client'
                 ? undefined
                 : typeof data.rowCount !== undefined
                     ? data.rowCount
-                    : 0 }))),
+                    : 0 }))) : (react_1.default.createElement(Backdrop_1.default, { invisible: true, sx: { color: '#fff', zIndex: (theme) => theme.zIndex.drawer + 1 }, open: loading },
+        react_1.default.createElement(CircularProgress_1.default, null))),
     paginationMode === 'client' ? (react_1.default.createElement(DataTotals_1.default, { data: data.data, sumRows: sumRows, visibleRows: visibleRows })) : (react_1.default.createElement(DataTotalsServer_1.default, { sumRows: sumRows, totals: data.sumRowsTotals }))));
 function GenericRelatedModelList({ model, id, relatedModel, columnFields, hiddenFields, creatableFields, disabledFields, usuaria = null, minWidthFields, indexField, indexFieldBasePath, indexFieldViewBasePath, addExistingModel, label, onProcessRow, customColumnOperations, isEditable = true, hasBulkSelect = false, sumRows, isAutoHeight = false, isInBatches = true, noCardWrapper = false, paginationMode = 'client', defaultFilter, queryParams, hideFooterComponent, hideToolbarComponent, tableAutoHeight, actions, optionsAC, }) {
     const [data, setData] = (0, react_1.useState)(false);
     const [visibleRows, setVisibleRows] = (0, react_1.useState)([]);
+    const [loading, setLoading] = (0, react_1.useState)(false);
     const [hideFooterPagination, setHideFooterPagination] = (0, react_1.useState)(false);
     const [paginationModel, setPaginationModel] = (0, react_1.useState)(paginationMode === 'server' ? { page: 0, pageSize: 100 } : undefined);
     const { onEditModel, onDeleteRelatedModel, serverEndPoint } = (0, APIWrapperContext_1.useAPIWrapper)();
@@ -75,6 +79,7 @@ function GenericRelatedModelList({ model, id, relatedModel, columnFields, hidden
         return column;
     };
     const loadObjectList = () => __awaiter(this, void 0, void 0, function* () {
+        setLoading(true);
         switch (paginationMode) {
             case 'client':
                 const loadParams = {
@@ -94,6 +99,7 @@ function GenericRelatedModelList({ model, id, relatedModel, columnFields, hidden
                 const loadedData = yield (0, api_1.getGenericModelList)(loadParams);
                 if (loadedData && typeof loadedData !== 'boolean') {
                     setData(loadedData);
+                    setLoading(false);
                     if (isInBatches && loadedData.data.length === 100) {
                         setHideFooterPagination(true);
                         (0, api_1.getGenericModelList)(Object.assign(Object.assign({}, loadParams), { loadedSchema: loadedData.schema })).then((lastBatchData) => {
@@ -129,6 +135,7 @@ function GenericRelatedModelList({ model, id, relatedModel, columnFields, hidden
                 const paginatedData = yield (0, api_1.getGenericModelList)(loadPaginatedParams);
                 if (paginatedData && typeof paginatedData !== 'boolean') {
                     setData(paginatedData);
+                    setLoading(false);
                     return;
                 }
                 console.log('error retrieving data!');
@@ -143,9 +150,9 @@ function GenericRelatedModelList({ model, id, relatedModel, columnFields, hidden
             loadObjectList();
         }
     }, [paginationModel]);
-    return (react_1.default.createElement(react_1.default.Fragment, null, typeof data !== 'boolean' && data.columns && (react_1.default.createElement(react_1.default.Fragment, null, noCardWrapper ? (react_1.default.createElement(ContentTable, { data: data, model: model, relatedModel: relatedModel, id: id, indexField: indexField || '', indexFieldBasePath: indexFieldBasePath, indexFieldViewBasePath: indexFieldViewBasePath, addExistingModel: addExistingModel, isEditable: isEditable, hasBulkSelect: hasBulkSelect, onEditModel: onEditModel, onDeleteRelatedModel: onDeleteRelatedModel, finalCustomColumnOperations: finalCustomColumnOperations, setVisibleRows: setVisibleRows, isAutoHeight: isAutoHeight, tableAutoHeight: tableAutoHeight, hideFooterPagination: hideFooterPagination, hideFooterComponent: hideFooterComponent, hideToolbarComponent: hideToolbarComponent, onProcessRow: onProcessRow, setData: setData, sumRows: sumRows, visibleRows: visibleRows, paginationMode: paginationMode, paginationModel: paginationModel, setPaginationModel: setPaginationModel, actions: actions, optionsAC: optionsAC })) : (react_1.default.createElement(Card_1.default, { sx: styles_1.Layout.formCard },
+    return (react_1.default.createElement(react_1.default.Fragment, null, typeof data !== 'boolean' && data.columns && (react_1.default.createElement(react_1.default.Fragment, null, noCardWrapper ? (react_1.default.createElement(ContentTable, { data: data, relatedModel: relatedModel, model: model, loading: loading, id: id, indexField: indexField || '', indexFieldBasePath: indexFieldBasePath, indexFieldViewBasePath: indexFieldViewBasePath, addExistingModel: addExistingModel, isEditable: isEditable, hasBulkSelect: hasBulkSelect, onEditModel: onEditModel, onDeleteRelatedModel: onDeleteRelatedModel, finalCustomColumnOperations: finalCustomColumnOperations, setVisibleRows: setVisibleRows, isAutoHeight: isAutoHeight, tableAutoHeight: tableAutoHeight, hideFooterPagination: hideFooterPagination, hideFooterComponent: hideFooterComponent, hideToolbarComponent: hideToolbarComponent, onProcessRow: onProcessRow, setData: setData, sumRows: sumRows, visibleRows: visibleRows, paginationMode: paginationMode, paginationModel: paginationModel, setPaginationModel: setPaginationModel, actions: actions, optionsAC: optionsAC })) : (react_1.default.createElement(Card_1.default, { sx: styles_1.Layout.formCard },
         react_1.default.createElement(CardHeader_1.default, { title: label }),
         react_1.default.createElement(CardContent_1.default, null,
-            react_1.default.createElement(ContentTable, { data: data, model: model, relatedModel: relatedModel, id: id, indexField: indexField || '', indexFieldBasePath: indexFieldBasePath, indexFieldViewBasePath: indexFieldViewBasePath, addExistingModel: addExistingModel, isEditable: isEditable, hasBulkSelect: hasBulkSelect, onEditModel: onEditModel, onDeleteRelatedModel: onDeleteRelatedModel, finalCustomColumnOperations: finalCustomColumnOperations, setVisibleRows: setVisibleRows, isAutoHeight: isAutoHeight, tableAutoHeight: tableAutoHeight, hideFooterPagination: hideFooterPagination, hideFooterComponent: hideFooterComponent, hideToolbarComponent: hideToolbarComponent, onProcessRow: onProcessRow, setData: setData, sumRows: sumRows, visibleRows: visibleRows, paginationMode: paginationMode, paginationModel: paginationModel, setPaginationModel: setPaginationModel, actions: actions, optionsAC: optionsAC }))))))));
+            react_1.default.createElement(ContentTable, { data: data, relatedModel: relatedModel, model: model, loading: loading, id: id, indexField: indexField || '', indexFieldBasePath: indexFieldBasePath, indexFieldViewBasePath: indexFieldViewBasePath, addExistingModel: addExistingModel, isEditable: isEditable, hasBulkSelect: hasBulkSelect, onEditModel: onEditModel, onDeleteRelatedModel: onDeleteRelatedModel, finalCustomColumnOperations: finalCustomColumnOperations, setVisibleRows: setVisibleRows, isAutoHeight: isAutoHeight, tableAutoHeight: tableAutoHeight, hideFooterPagination: hideFooterPagination, hideFooterComponent: hideFooterComponent, hideToolbarComponent: hideToolbarComponent, onProcessRow: onProcessRow, setData: setData, sumRows: sumRows, visibleRows: visibleRows, paginationMode: paginationMode, paginationModel: paginationModel, setPaginationModel: setPaginationModel, actions: actions, optionsAC: optionsAC }))))))));
 }
 exports.default = GenericRelatedModelList;

package/dist/components/forms/FormBySchema.js

@@ -104,11 +104,13 @@ function FormBySchema(_a) {
     const populateOptionsAC = (optionsACModels) => __awaiter(this, void 0, void 0, function* () {
         const newOptionsAC = {};
         for (const model of optionsACModels) {
-            const ret = isolatedGetAutoComplete
-                ? yield isolatedGetAutoComplete(model)
-                : yield getAutoComplete(model);
-            if (ret !== false) {
-                newOptionsAC[model] = ret;
+            if (!optionsAC || !optionsAC[model]) {
+                const ret = isolatedGetAutoComplete
+                    ? yield isolatedGetAutoComplete(model)
+                    : yield getAutoComplete(model);
+                if (ret !== false) {
+                    newOptionsAC[model] = ret;
+                }
             }
         }
         if (setOptionsAC) {

package/dist/context/APIWrapper.d.ts

@@ -1,12 +1,11 @@
 import React from 'react';
 import { DialogType, SnackBarType } from './APIWrapperContext';
 interface APIWrapperProps {
-    setLoading: (x: boolean) => void;
     handleLoading: (x: boolean) => void;
     setSnackBar: (x: Partial<SnackBarType>) => void;
     setDialog: (x: Partial<DialogType>) => void;
     children: React.ReactNode;
 }
-declare function APIWrapper({ setLoading, handleLoading, setSnackBar, setDialog, children, }: APIWrapperProps): JSX.Element;
+declare function APIWrapper({ handleLoading, setSnackBar, setDialog, children }: APIWrapperProps): JSX.Element;
 declare const _default: React.MemoExoticComponent<typeof APIWrapper>;
 export default _default;

package/dist/context/APIWrapper.js

@@ -53,7 +53,7 @@ const DRFReactBySchemaContext_1 = require("./DRFReactBySchemaContext");
 const api_1 = require("../api");
 const APIWrapperContext_1 = require("./APIWrapperContext");
 const DialogFormBySchema_1 = __importDefault(require("../components/forms/DialogFormBySchema"));
-function APIWrapper({ setLoading, handleLoading, setSnackBar, setDialog, children, }) {
+function APIWrapper({ handleLoading, setSnackBar, setDialog, children }) {
     const { serverEndPoint } = (0, DRFReactBySchemaContext_1.useDRFReactBySchema)();
     const [usuaria, setUsuaria] = (0, react_1.useState)(null);
     const [optionsAC, setOptionsAC] = (0, react_1.useReducer)((utils_1.reducer), null);
@@ -85,7 +85,7 @@ function APIWrapper({ setLoading, handleLoading, setSnackBar, setDialog, childre
         });
     };
     const loadSinglePageData = ({ model, objId, optionsACModels = null, defaults = {}, extraValidators = {}, }) => __awaiter(this, void 0, void 0, function* () {
-        setLoading(true);
+        handleLoading(true);
         if (!objId || objId === 'novo') {
             objId = (0, utils_1.getTmpId)();
         }
@@ -99,7 +99,7 @@ function APIWrapper({ setLoading, handleLoading, setSnackBar, setDialog, childre
             console.log('Houve um erro ao tentar carregar os dados!');
             return false;
         }
-        setLoading(false);
+        handleLoading(false);
         if (optionsACModels) {
             populateOptionsAC(optionsACModels);
         }
@@ -116,7 +116,7 @@ function APIWrapper({ setLoading, handleLoading, setSnackBar, setDialog, childre
             console.log('there must be a pageForm!');
             return false;
         }
-        setLoading(true);
+        handleLoading(true);
         const response = yield (0, api_1.updateDataBySchema)({
             model,
             modelObjectId: id,
@@ -124,7 +124,7 @@ function APIWrapper({ setLoading, handleLoading, setSnackBar, setDialog, childre
             data,
             schema: pageForm.schema,
         });
-        setLoading(false);
+        handleLoading(false);
         if (!['number', 'string'].includes(typeof response)) {
             onTriggerSnackBar({
                 msg: 'Houve um problema ao salvar seus dados! Por favor, entre em contato',
@@ -275,7 +275,7 @@ function APIWrapper({ setLoading, handleLoading, setSnackBar, setDialog, childre
     };
     const onDeleteModelSave = (model, id, onSuccess) => __awaiter(this, void 0, void 0, function* () {
         setDialog({ open: false });
-        setLoading(true);
+        handleLoading(true);
         const ret = yield (0, api_1.deleteData)(model, serverEndPoint, id);
         if (ret !== false) {
             onTriggerSnackBar({
@@ -287,7 +287,7 @@ function APIWrapper({ setLoading, handleLoading, setSnackBar, setDialog, childre
             }
             return true;
         }
-        setLoading(false);
+        handleLoading(false);
         onTriggerSnackBar({
             msg: 'Houve um problema ao remover o item! Por favor, entre em contato.',
             severity: 'error',

package/dist/context/Overlays.js

@@ -53,7 +53,7 @@ function Overlays({ children }) {
     };
     const [snackBar, setSnackBar] = (0, react_1.useReducer)((utils_1.reducer), initialSnackBar);
     const [dialog, setDialog] = (0, react_1.useReducer)((utils_1.reducer), initialDialog);
-    const [loading, setLoading] = (0, react_1.useState)(true);
+    const [loading, setLoading] = (0, react_1.useState)(false);
     // give some time to stop loading when data is retrieved and must render before loading rendering:
     const handleLoading = (loadingState) => {
         if (loadingState) {
@@ -70,8 +70,8 @@ function Overlays({ children }) {
         });
     };
     return (react_1.default.createElement(react_1.default.Fragment, null,
-        react_1.default.createElement(APIWrapper_1.default, { setLoading: setLoading, handleLoading: handleLoading, setSnackBar: setSnackBar, setDialog: setDialog, children: children }),
-        react_1.default.createElement(Backdrop_1.default, { sx: { color: '#fff', zIndex: (theme) => theme.zIndex.drawer + 1 }, open: loading },
+        react_1.default.createElement(APIWrapper_1.default, { handleLoading: handleLoading, setSnackBar: setSnackBar, setDialog: setDialog, children: children }),
+        react_1.default.createElement(Backdrop_1.default, { invisible: false, sx: { color: '#fff', zIndex: (theme) => theme.zIndex.drawer + 1 }, open: loading },
             react_1.default.createElement(CircularProgress_1.default, null)),
         snackBar && (react_1.default.createElement(Snackbar_1.default, { open: snackBar.open, autoHideDuration: 3000, onClose: () => {
                 setSnackBar({ open: false });

package/package.json

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