drf-react-by-schema 0.24.4 → 0.24.6

package/dist/components/DataGridBySchemaEditable/hooks/useProcessRowUpdate.js

@@ -24,89 +24,149 @@ const useProcessRowUpdate = ({ preparedColumns, yupValidationSchema, setDataGrid
 // extraValidators, // TODO: Check why this is missing
 onEditModel, }) => {
     const { onEditRelatedModelSave, onEditModelDataGridSave } = (0, APIWrapperContext_1.useAPIWrapper)();
-    const processRowUpdate = (editedRow) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b;
-        const originalRow = dataGrid.data.find((r) => r.id === editedRow.id);
-        if (originalRow && JSON.stringify(originalRow) === JSON.stringify(editedRow)) {
-            console.log('No changes detected, skipping save.');
-            handleStopEditing();
-            if ((0, utils_1.isTmpId)(editedRow.id)) {
-                const newData = dataGrid.data.filter(({ id: rowId }) => editedRow.id !== rowId);
-                setDataGrid({ data: newData });
-                throw new Error('CANCEL_TMP_ROW');
+    function processRowUpdate(editedRow, originalRow) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            // const originalRow = dataGrid.data.find((r) => r.id === editedRow.id);
+            if (originalRow && JSON.stringify(originalRow) === JSON.stringify(editedRow)) {
+                console.log('No changes detected, skipping save.');
+                handleStopEditing();
+                if ((0, utils_1.isTmpId)(editedRow.id)) {
+                    const newData = dataGrid.data.filter(({ id: rowId }) => editedRow.id !== rowId);
+                    setDataGrid({ data: newData });
+                    throw new Error('CANCEL_TMP_ROW');
+                }
+                return editedRow;
             }
-            return editedRow;
-        }
-        if (!preparedColumns || !yupValidationSchema) {
-            return false;
-        }
-        setDataGridLoading(true);
-        const indexCol = preparedColumns.find((col) => col.field === indexField);
-        processingRow.current = editedRow.id;
-        try {
-            yield yupValidationSchema.validate(editedRow, { abortEarly: false });
-        }
-        catch (err) {
-            if (isYupValidationError(err)) {
-                const rowErrors = {};
-                err.inner.forEach((e) => {
-                    if (e.path) {
-                        rowErrors[e.path] = e.message;
-                    }
-                    else {
-                        rowErrors['campo desconhecido'] = e.message;
-                    }
-                });
-                setValidationErrors((prev) => (Object.assign(Object.assign({}, prev), { [editedRow.id]: rowErrors })));
-                err.message = Object.entries(rowErrors)
-                    .map(([field, message]) => `${field}: ${message}`)
-                    .join('; ');
+            if (!preparedColumns || !yupValidationSchema) {
+                return originalRow;
             }
-            setDataGridLoading(false);
-            throw err;
-        }
-        const onlyAddExisting = indexField &&
-            (0, utils_1.isTmpId)(editedRow.id) &&
-            editedRow[indexField] &&
-            !(0, utils_1.isTmpId)(editedRow[indexField].id) &&
-            (!indexCol || !indexCol.valueFormatter);
-        const createNewItem = indexField &&
-            (0, utils_1.isTmpId)(editedRow.id) &&
-            editedRow[indexField] &&
-            (0, utils_1.isTmpId)(editedRow[indexField].id);
-        if (onlyAddExisting) {
-            const row = {};
-            row.id_to_add = editedRow[indexField].id;
-            for (const [key, value] of Object.entries(editedRow[indexField])) {
-                if (key === 'id') {
-                    row[key] = editedRow.id;
-                    continue;
+            setDataGridLoading(true);
+            const indexCol = preparedColumns.find((col) => col.field === indexField);
+            processingRow.current = editedRow.id;
+            try {
+                yield yupValidationSchema.validate(editedRow, { abortEarly: false });
+            }
+            catch (err) {
+                if (isYupValidationError(err)) {
+                    const rowErrors = {};
+                    err.inner.forEach((e) => {
+                        if (e.path) {
+                            rowErrors[e.path] = e.message;
+                        }
+                        else {
+                            rowErrors['campo desconhecido'] = e.message;
+                        }
+                    });
+                    setValidationErrors((prev) => (Object.assign(Object.assign({}, prev), { [editedRow.id]: rowErrors })));
+                    err.message = Object.entries(rowErrors)
+                        .map(([field, message]) => `${field}: ${message}`)
+                        .join('; ');
                 }
-                row[key] = value;
+                setDataGridLoading(false);
+                throw err;
             }
-            editedRow = Object.assign({}, row);
-        }
-        if (createNewItem && editedRow[indexField]) {
-            if (editedRow[indexField].inputValue) {
-                editedRow[indexField] = editedRow[indexField].inputValue;
+            const onlyAddExisting = indexField &&
+                (0, utils_1.isTmpId)(editedRow.id) &&
+                editedRow[indexField] &&
+                !(0, utils_1.isTmpId)(editedRow[indexField].id) &&
+                (!indexCol || !indexCol.valueFormatter);
+            const createNewItem = indexField &&
+                (0, utils_1.isTmpId)(editedRow.id) &&
+                editedRow[indexField] &&
+                (0, utils_1.isTmpId)(editedRow[indexField].id);
+            if (onlyAddExisting) {
+                const row = {};
+                row.id_to_add = editedRow[indexField].id;
+                for (const [key, value] of Object.entries(editedRow[indexField])) {
+                    if (key === 'id') {
+                        row[key] = editedRow.id;
+                        continue;
+                    }
+                    row[key] = value;
+                }
+                editedRow = Object.assign({}, row);
             }
-            if (addExistingModel) {
-                editedRow[indexField] = editedRow[indexField].label;
+            if (createNewItem && editedRow[indexField]) {
+                if (editedRow[indexField].inputValue) {
+                    editedRow[indexField] = editedRow[indexField].inputValue;
+                }
+                if (addExistingModel) {
+                    editedRow[indexField] = editedRow[indexField].label;
+                }
             }
-        }
-        if (modelParent && modelParentId && onEditRelatedModelSave) {
-            const response = yield onEditRelatedModelSave({
-                model: modelParent,
-                id: modelParentId,
-                relatedModel: model,
-                relatedModelId: editedRow.id,
+            if (modelParent && modelParentId && onEditRelatedModelSave) {
+                const response = yield onEditRelatedModelSave({
+                    model: modelParent,
+                    id: modelParentId,
+                    relatedModel: model,
+                    relatedModelId: editedRow.id,
+                    newRow: editedRow,
+                    schema,
+                    onlyAddExisting,
+                });
+                if (axios_1.default.isAxiosError(response)) {
+                    let errorMessage = 'Erro desconhecido no servidor';
+                    if (((_a = response.response) === null || _a === void 0 ? void 0 : _a.data) &&
+                        typeof response.response.data === 'object' &&
+                        !Array.isArray(response.response.data)) {
+                        const backendErrors = response.response.data;
+                        const rowErrors = {};
+                        Object.keys(backendErrors).forEach((field) => {
+                            const msgs = backendErrors[field];
+                            if (Array.isArray(msgs)) {
+                                rowErrors[field] = msgs.join(', ');
+                            }
+                            else if (typeof msgs === 'string') {
+                                rowErrors[field] = msgs;
+                            }
+                        });
+                        setValidationErrors((prev) => (Object.assign(Object.assign({}, prev), { [editedRow.id]: rowErrors })));
+                        errorMessage = Object.entries(rowErrors)
+                            .map(([field, message]) => `${field}: ${message}`)
+                            .join('; ');
+                    }
+                    setDataGridLoading(false);
+                    throw new Error(errorMessage);
+                }
+                if (onlyAddExisting || createNewItem || !onlyAddExisting) {
+                    setValidationErrors((prev) => {
+                        const newState = Object.assign({}, prev);
+                        delete newState[editedRow.id];
+                        return newState;
+                    });
+                    updateOptionsAC();
+                    const data = [...dataGrid.data];
+                    const newRow = 'data' in response && 'schema' in response ? response.data : response;
+                    for (const i in data) {
+                        if (data[i].id === editedRow.id) {
+                            data[i] = newRow;
+                            break;
+                        }
+                    }
+                    if (onDataChange) {
+                        onDataChange(data);
+                    }
+                    if (onProcessRow) {
+                        onProcessRow(newRow);
+                    }
+                    setDataGrid({
+                        data,
+                    });
+                    setDataGridLoading(false);
+                    handleStopEditing();
+                    return newRow;
+                }
+            }
+            const response = yield onEditModelDataGridSave({
+                model,
+                id: editedRow.id,
                 newRow: editedRow,
                 schema,
-                onlyAddExisting,
             });
             if (axios_1.default.isAxiosError(response)) {
                 let errorMessage = 'Erro desconhecido no servidor';
-                if (((_a = response.response) === null || _a === void 0 ? void 0 : _a.data) &&
+                if (((_b = response.response) === null || _b === void 0 ? void 0 : _b.data) &&
                     typeof response.response.data === 'object' &&
                     !Array.isArray(response.response.data)) {
                     const backendErrors = response.response.data;
@@ -128,92 +188,35 @@ onEditModel, }) => {
                 setDataGridLoading(false);
                 throw new Error(errorMessage);
             }
-            if (onlyAddExisting || createNewItem || !onlyAddExisting) {
-                setValidationErrors((prev) => {
-                    const newState = Object.assign({}, prev);
-                    delete newState[editedRow.id];
-                    return newState;
-                });
-                updateOptionsAC();
-                const data = [...dataGrid.data];
-                const newRow = 'data' in response && 'schema' in response ? response.data : response;
-                for (const i in data) {
-                    if (data[i].id === editedRow.id) {
-                        data[i] = newRow;
-                        break;
-                    }
-                }
-                if (onDataChange) {
-                    onDataChange(data);
-                }
-                if (onProcessRow) {
-                    onProcessRow(newRow);
+            setValidationErrors((prev) => {
+                const newState = Object.assign({}, prev);
+                delete newState[editedRow.id];
+                return newState;
+            });
+            updateOptionsAC();
+            const data = [...dataGrid.data];
+            const newRow = 'data' in response && 'schema' in response ? response.data : response;
+            for (const i in data) {
+                if (data[i].id === editedRow.id) {
+                    data[i] = newRow;
+                    break;
                 }
-                setDataGrid({
-                    data,
-                });
-                setDataGridLoading(false);
-                handleStopEditing();
-                return newRow;
             }
-        }
-        const response = yield onEditModelDataGridSave({
-            model,
-            id: editedRow.id,
-            newRow: editedRow,
-            schema,
-        });
-        if (axios_1.default.isAxiosError(response)) {
-            let errorMessage = 'Erro desconhecido no servidor';
-            if (((_b = response.response) === null || _b === void 0 ? void 0 : _b.data) &&
-                typeof response.response.data === 'object' &&
-                !Array.isArray(response.response.data)) {
-                const backendErrors = response.response.data;
-                const rowErrors = {};
-                Object.keys(backendErrors).forEach((field) => {
-                    const msgs = backendErrors[field];
-                    if (Array.isArray(msgs)) {
-                        rowErrors[field] = msgs.join(', ');
-                    }
-                    else if (typeof msgs === 'string') {
-                        rowErrors[field] = msgs;
-                    }
-                });
-                setValidationErrors((prev) => (Object.assign(Object.assign({}, prev), { [editedRow.id]: rowErrors })));
-                errorMessage = Object.entries(rowErrors)
-                    .map(([field, message]) => `${field}: ${message}`)
-                    .join('; ');
+            if (onDataChange) {
+                onDataChange(data);
             }
-            setDataGridLoading(false);
-            throw new Error(errorMessage);
-        }
-        setValidationErrors((prev) => {
-            const newState = Object.assign({}, prev);
-            delete newState[editedRow.id];
-            return newState;
-        });
-        updateOptionsAC();
-        const data = [...dataGrid.data];
-        const newRow = 'data' in response && 'schema' in response ? response.data : response;
-        for (const i in data) {
-            if (data[i].id === editedRow.id) {
-                data[i] = newRow;
-                break;
+            if (onProcessRow) {
+                onProcessRow(newRow);
             }
-        }
-        if (onDataChange) {
-            onDataChange(data);
-        }
-        if (onProcessRow) {
-            onProcessRow(newRow);
-        }
-        setDataGrid({
-            data,
+            setDataGrid({
+                data,
+            });
+            setDataGridLoading(false);
+            handleStopEditing();
+            return newRow;
         });
-        setDataGridLoading(false);
-        handleStopEditing();
-        return newRow;
-    });
+    }
+    ;
     return { processRowUpdate };
 };
 exports.useProcessRowUpdate = useProcessRowUpdate;

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

@@ -1,11 +1,10 @@
-import React from 'react';
 import { GridRowId, GridRenderCellParams } from '@mui/x-data-grid';
-import { SchemaType, GridEnrichedBySchemaColDef, OptionsAC, OnEditModelType, ActionType, CustomAction, LinkComponentType, FormFieldLayout } from '../../../@types';
+import { SchemaType, GridEnrichedBySchemaColDef, OptionsAC, OnEditModelType, ActionType, CustomAction, LinkComponentType, CustomFormFieldLayouts, FieldKey, CustomColumnOperations } from '../../../@types';
 import { ServerEndPoint } from '../../../context/DRFReactBySchemaContext';
 import { DialogType } from '../../../context/APIWrapperContext';
-export interface BuildPreparedColumnsProps {
-    schema: SchemaType;
-    columns: GridEnrichedBySchemaColDef[];
+export interface BuildPreparedColumnsProps<T = void> {
+    schema: SchemaType<T>;
+    columns: GridEnrichedBySchemaColDef<T>[];
     isEditable: boolean;
     actions: Partial<ActionType>[];
     customActions?: CustomAction[];
@@ -14,17 +13,17 @@ export interface BuildPreparedColumnsProps {
     indexFieldViewBasePath?: string;
     stateToLink: object;
     validationErrors: Record<GridRowId, Record<string, string>>;
-    optionsAC: OptionsAC;
-    onEditModel?: (p: OnEditModelType) => void;
-    customFieldFormLayouts?: Record<string, FormFieldLayout[]>;
-    setDialog: React.ActionDispatch<[newState: Partial<DialogType> | null]>;
-    indexField: string;
+    optionsAC: OptionsAC<T>;
+    onEditModel?: (p: OnEditModelType<T>) => void;
+    customFieldFormLayouts?: CustomFormFieldLayouts<T>;
+    setDialog: (newState: Partial<DialogType> | null) => void;
+    indexField: FieldKey<T>;
     addExistingModel?: string;
     serverEndPoint: ServerEndPoint;
     indexFieldMinWidth: number;
     minWidth: number;
-    customColumnOperations?: (p: GridEnrichedBySchemaColDef) => GridEnrichedBySchemaColDef | Promise<GridEnrichedBySchemaColDef>;
+    customColumnOperations?: CustomColumnOperations<T>;
     customLinkDestination?: (p: GridRenderCellParams) => string;
 }
-export declare const buildPreparedColumns: ({ schema, columns, isEditable, actions, LinkComponent, stateToLink, validationErrors, optionsAC, onEditModel, customFieldFormLayouts, setDialog, indexField, serverEndPoint, indexFieldMinWidth, minWidth, customColumnOperations, customLinkDestination, indexFieldBasePath, }: BuildPreparedColumnsProps) => Promise<GridEnrichedBySchemaColDef[]>;
+export declare function buildPreparedColumns<T = void>({ schema, columns, isEditable, actions, LinkComponent, stateToLink, validationErrors, optionsAC, onEditModel, customFieldFormLayouts, setDialog, indexField, serverEndPoint, indexFieldMinWidth, minWidth, customColumnOperations, customLinkDestination, indexFieldBasePath, }: BuildPreparedColumnsProps<T>): Promise<GridEnrichedBySchemaColDef<T>[]>;
 //# sourceMappingURL=columnFactory.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"columnFactory.d.ts","sourceRoot":"","sources":["../../../../src/components/DataGridBySchemaEditable/utils/columnFactory.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAG1B,OAAO,EACL,SAAS,EACT,oBAAoB,EAGrB,MAAM,kBAAkB,CAAC;AAM1B,OAAO,EACL,UAAU,EACV,0BAA0B,EAC1B,SAAS,EACT,eAAe,EACf,UAAU,EAEV,YAAY,EACZ,iBAAiB,EACjB,eAAe,EAChB,MAAM,iBAAiB,CAAC;AAUzB,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAEhE,MAAM,WAAW,yBAAyB;IACxC,MAAM,EAAE,UAAU,CAAC;IACnB,OAAO,EAAE,0BAA0B,EAAE,CAAC;IACtC,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;IAC/B,aAAa,CAAC,EAAE,YAAY,EAAE,CAAC;IAC/B,aAAa,CAAC,EAAE,iBAAiB,CAAC;IAClC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC5D,SAAS,EAAE,SAAS,CAAC;IACrB,WAAW,CAAC,EAAE,CAAC,CAAC,EAAE,eAAe,KAAK,IAAI,CAAC;IAC3C,sBAAsB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,EAAE,CAAC,CAAC;IAC3D,SAAS,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;IACxE,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,EAAE,cAAc,CAAC;IAC/B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,sBAAsB,CAAC,EAAE,CACvB,CAAC,EAAE,0BAA0B,KAC1B,0BAA0B,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;IACtE,qBAAqB,CAAC,EAAE,CAAC,CAAC,EAAE,oBAAoB,KAAK,MAAM,CAAC;CAC7D;AAED,eAAO,MAAM,oBAAoB,GAAU,iRAmBxC,yBAAyB,KAAG,OAAO,CAAC,0BAA0B,EAAE,CAuNlE,CAAC"}
+{"version":3,"file":"columnFactory.d.ts","sourceRoot":"","sources":["../../../../src/components/DataGridBySchemaEditable/utils/columnFactory.tsx"],"names":[],"mappings":"AAGA,OAAO,EACL,SAAS,EACT,oBAAoB,EAErB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,UAAU,EACV,0BAA0B,EAC1B,SAAS,EACT,eAAe,EACf,UAAU,EAEV,YAAY,EACZ,iBAAiB,EACjB,sBAAsB,EACtB,QAAQ,EACR,sBAAsB,EACvB,MAAM,iBAAiB,CAAC;AAUzB,OAAO,EAAE,cAAc,EAAE,MAAM,0CAA0C,CAAC;AAC1E,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAEhE,MAAM,WAAW,yBAAyB,CAAC,CAAC,GAAG,IAAI;IACjD,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IACtB,OAAO,EAAE,0BAA0B,CAAC,CAAC,CAAC,EAAE,CAAC;IACzC,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;IAC/B,aAAa,CAAC,EAAE,YAAY,EAAE,CAAC;IAC/B,aAAa,CAAC,EAAE,iBAAiB,CAAC;IAClC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC5D,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;IACxB,WAAW,CAAC,EAAE,CAAC,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC;IAC9C,sBAAsB,CAAC,EAAE,sBAAsB,CAAC,CAAC,CAAC,CAAC;IACnD,SAAS,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,IAAI,KAAK,IAAI,CAAC;IAC1D,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,EAAE,cAAc,CAAC;IAC/B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,sBAAsB,CAAC,EAAE,sBAAsB,CAAC,CAAC,CAAC,CAAC;IACnD,qBAAqB,CAAC,EAAE,CAAC,CAAC,EAAE,oBAAoB,KAAK,MAAM,CAAC;CAC7D;AAED,wBAAsB,oBAAoB,CAAC,CAAC,GAAG,IAAI,EAAE,EACnD,MAAM,EACN,OAAO,EACP,UAAU,EACV,OAAO,EACP,aAAa,EACb,WAAW,EACX,gBAAgB,EAChB,SAAS,EACT,WAAW,EACX,sBAAsB,EACtB,SAAS,EACT,UAAU,EACV,cAAc,EACd,kBAAkB,EAClB,QAAQ,EACR,sBAAsB,EACtB,qBAAqB,EACrB,kBAAkB,GACnB,EAAE,yBAAyB,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC,CAAC,EAAE,CAAC,CAuNzE"}