drf-react-by-schema 0.15.2 → 0.15.3

package/dist/api.js

@@ -16,11 +16,16 @@ exports.getAllModels = exports.getGenericModel = exports.getGenericModelList = e
 const axios_1 = __importDefault(require("axios"));
 const moment_1 = __importDefault(require("moment"));
 const utils_1 = require("./utils");
+const expiredTokenMessage = 'Token expired! System must login again';
+const noServerEndPointMessage = 'There is not API definition (serverEndPoint)!';
+const unknownError = 'Unknown error!';
 const getOptions = (path, serverEndPoint) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
     if (!serverEndPoint) {
-        console.log('Não há definição de API (serverEndPoint!');
-        return false;
+        return {
+            message: noServerEndPointMessage,
+            isAxiosError: true,
+        };
     }
     const url = `${serverEndPoint.api}/${path}`;
     try {
@@ -30,29 +35,43 @@ const getOptions = (path, serverEndPoint) => __awaiter(void 0, void 0, void 0, f
     catch (e) {
         if (axios_1.default.isAxiosError(e)) {
             const err = e;
+            const message = `Error fetching options from ${url}`;
             if (((_a = err.response) === null || _a === void 0 ? void 0 : _a.status) === 401) {
                 const isRefreshed = yield refreshToken(serverEndPoint);
                 if (!isRefreshed) {
-                    console.log('Token expirou! Deve-se fazer login de novo');
-                    return false;
+                    console.log(expiredTokenMessage);
+                    return {
+                        message: expiredTokenMessage,
+                        isAxiosError: true,
+                    };
                 }
                 try {
                     const { data } = yield axios_1.default.options(url);
                     return data;
                 }
                 catch (e) {
-                    console.log(`Error fetching options from ${url}`, e);
-                    return false;
+                    console.log(message, e);
+                    return {
+                        message,
+                        isAxiosError: true,
+                    };
                 }
             }
-            console.log(`Error fetching options from ${url}`, e);
-            return false;
+            console.log(message, e);
+            return {
+                message,
+                isAxiosError: true,
+            };
         }
+        return {
+            message: unknownError,
+            isAxiosError: true,
+        };
     }
 });
 const getSchema = (path, serverEndPoint) => __awaiter(void 0, void 0, void 0, function* () {
     const options = yield getOptions(path, serverEndPoint);
-    if (!options || !options.actions || !options.actions.POST) {
+    if ('isAxiosError' in options) {
         return false;
     }
     // Special default value of "currentUser":
@@ -71,16 +90,21 @@ const getSchema = (path, serverEndPoint) => __awaiter(void 0, void 0, void 0, fu
             }
         }
     }
-    const modelOptions = Object.assign({}, options);
-    delete modelOptions.renders;
-    delete modelOptions.parses;
-    delete modelOptions.actions;
+    const modelOptions = {
+        name: options.name,
+        description: options.description,
+        verbose_name: options.verbose_name,
+        verbose_name_plural: options.verbose_name_plural,
+    };
     return { schema: options.actions.POST, modelOptions };
 });
 const getRawData = ({ path, serverEndPoint, }) => __awaiter(void 0, void 0, void 0, function* () {
     var _b;
     if (!serverEndPoint) {
-        return false;
+        return {
+            message: noServerEndPointMessage,
+            isAxiosError: true,
+        };
     }
     const url = `${serverEndPoint.api}/${path}`;
     try {
@@ -88,38 +112,52 @@ const getRawData = ({ path, serverEndPoint, }) => __awaiter(void 0, void 0, void
         return data;
     }
     catch (e) {
+        const message = `Error fetching data from ${url}`;
         if (axios_1.default.isAxiosError(e)) {
             const err = e;
             if (((_b = err.response) === null || _b === void 0 ? void 0 : _b.status) === 401) {
                 const isRefreshed = yield refreshToken(serverEndPoint);
                 if (!isRefreshed) {
-                    console.log('Token expirou! Deve-se fazer login de novo');
-                    return false;
+                    console.log(expiredTokenMessage);
+                    return {
+                        message: expiredTokenMessage,
+                        isAxiosError: true,
+                    };
                 }
                 try {
                     const { data } = yield axios_1.default.get(url);
                     return data;
                 }
                 catch (e) {
-                    console.log(`Error fetching data from ${url} after token refresh`, e);
-                    return false;
+                    const message = `Error fetching data from ${url}`;
+                    console.log(message, e);
+                    return {
+                        message,
+                        isAxiosError: true,
+                    };
                 }
             }
         }
-        console.log(`Error fetching data from ${url}`, e);
-        return false;
+        console.log(message, e);
+        return {
+            message,
+            isAxiosError: true,
+        };
     }
 });
 exports.getRawData = getRawData;
-const getData = ({ path, serverEndPoint, route = 'api', page, }) => __awaiter(void 0, void 0, void 0, function* () {
+const getData = ({ path, serverEndPoint, route = 'api', }) => __awaiter(void 0, void 0, void 0, function* () {
     var _c;
     if (!serverEndPoint) {
-        return false;
+        return {
+            message: noServerEndPointMessage,
+            isAxiosError: true,
+        };
     }
     const url = `${serverEndPoint[route]}/${path}`;
     try {
         const { data } = yield axios_1.default.get(url);
-        return typeof page === 'undefined' ? data : data;
+        return data;
     }
     catch (e) {
         if (axios_1.default.isAxiosError(e)) {
@@ -127,187 +165,237 @@ const getData = ({ path, serverEndPoint, route = 'api', page, }) => __awaiter(vo
             if (((_c = err.response) === null || _c === void 0 ? void 0 : _c.status) === 401) {
                 const isRefreshed = yield refreshToken(serverEndPoint);
                 if (!isRefreshed) {
-                    console.log('Token expirou! Deve-se fazer login de novo');
-                    return false;
+                    console.log(expiredTokenMessage);
+                    return {
+                        message: expiredTokenMessage,
+                        isAxiosError: true,
+                    };
                 }
                 try {
                     const { data } = yield axios_1.default.get(url);
                     return data;
                 }
                 catch (e) {
-                    console.log(`Error fetching data from ${url} after token refresh`, e);
-                    return false;
+                    console.log(expiredTokenMessage);
+                    return {
+                        message: expiredTokenMessage,
+                        isAxiosError: true,
+                    };
                 }
             }
         }
-        console.log(`Error fetching data from ${url}`, e);
-        return false;
+        const message = `Error fetching data from ${url}`;
+        console.log(message, e);
+        return {
+            message,
+            isAxiosError: true,
+        };
     }
 });
 /**
  *
  * @param options - params
- * @returns Id when succesfully updated, false otherwise
+ * @returns updatedData when succesfully updated, axiosError otherwise
  */
 const updateData = ({ path, serverEndPoint, data, id }) => __awaiter(void 0, void 0, void 0, function* () {
     var _d, _e, _f;
     if (!serverEndPoint) {
-        return { errors: 'Não há definição de API (serverEndPoint!' };
+        return {
+            message: noServerEndPointMessage,
+            isAxiosError: true,
+        };
     }
     const url = `${serverEndPoint.api}/${path}/${id}/`;
     try {
-        yield axios_1.default.put(url, data);
+        const { data: updatedData } = yield axios_1.default.put(url, data);
+        return updatedData;
     }
     catch (e) {
         if (axios_1.default.isAxiosError(e)) {
             const err = e;
+            const message = `Error updating data at ${url}`;
             if (((_d = err.response) === null || _d === void 0 ? void 0 : _d.status) === 401) {
                 const isRefreshed = yield refreshToken(serverEndPoint);
                 if (!isRefreshed) {
-                    console.log('Token expirou! Deve-se fazer login de novo');
-                    return false;
+                    console.log(expiredTokenMessage);
+                    return {
+                        message: expiredTokenMessage,
+                        isAxiosError: true,
+                    };
                 }
                 try {
-                    yield axios_1.default.put(url, data);
+                    const { data: updatedData } = yield axios_1.default.put(url, data);
+                    return updatedData;
                 }
                 catch (e) {
-                    console.log(`Error updating data at ${url}`, data, e);
-                    return false;
+                    console.log(message, data, (_e = err.response) === null || _e === void 0 ? void 0 : _e.data);
+                    return { message, isAxiosError: true };
                 }
-                return id;
             }
-            console.log(`Error updating data at ${url}`, data, (_e = err.response) === null || _e === void 0 ? void 0 : _e.data);
-            return { errors: (_f = err.response) === null || _f === void 0 ? void 0 : _f.data };
+            console.log(message, data, (_f = err.response) === null || _f === void 0 ? void 0 : _f.data);
+            return { message, isAxiosError: true };
         }
     }
-    return id;
+    return { message: unknownError, isAxiosError: true };
 });
 exports.updateData = updateData;
 const partialUpdateData = ({ path, serverEndPoint, data, id }) => __awaiter(void 0, void 0, void 0, function* () {
-    var _g, _h, _j, _k, _l;
+    var _g, _h;
     if (!serverEndPoint) {
-        return { errors: 'Não há definição de API (serverEndPoint!' };
+        return {
+            message: noServerEndPointMessage,
+            isAxiosError: true,
+        };
     }
     const url = `${serverEndPoint.api}/${path}/${id}/`;
     try {
-        yield axios_1.default.patch(url, data);
-        // DEBUG console.log({ path, data, id });
+        const { data: updatedData } = yield axios_1.default.patch(url, data);
+        return updatedData;
     }
     catch (e) {
         if (axios_1.default.isAxiosError(e)) {
             const err = e;
+            const message = `Error partial updating data at ${url}`;
             if (((_g = err.response) === null || _g === void 0 ? void 0 : _g.status) === 401) {
                 const isRefreshed = yield refreshToken(serverEndPoint);
                 if (!isRefreshed) {
-                    console.log('Token expirou! Deve-se fazer login de novo');
-                    return { errors: (_h = err.response) === null || _h === void 0 ? void 0 : _h.data };
+                    console.log(expiredTokenMessage);
+                    return {
+                        message: expiredTokenMessage,
+                        isAxiosError: true,
+                    };
                 }
                 try {
-                    yield axios_1.default.patch(url, data);
+                    const { data: updatedData } = yield axios_1.default.patch(url, data);
+                    return updatedData;
                 }
                 catch (e) {
-                    console.log(`Error partial updating data at ${url}`, data, e);
-                    return { errors: (_j = err.response) === null || _j === void 0 ? void 0 : _j.data };
+                    console.log(message, data, e);
+                    return {
+                        message: err.response ? err.response.data : message,
+                        isAxiosError: true,
+                    };
                 }
-                return id;
             }
-            console.log(`Error partial updating data at ${url}`, data, (_k = err.response) === null || _k === void 0 ? void 0 : _k.data);
-            return { errors: (_l = err.response) === null || _l === void 0 ? void 0 : _l.data };
+            console.log(message, data, (_h = err.response) === null || _h === void 0 ? void 0 : _h.data);
+            return {
+                message: err.response ? err.response.data : message,
+                isAxiosError: true,
+            };
         }
     }
-    return id;
+    return { message: unknownError, isAxiosError: true };
 });
 exports.partialUpdateData = partialUpdateData;
 const createData = ({ path, serverEndPoint, data }) => __awaiter(void 0, void 0, void 0, function* () {
-    var _m, _o, _p;
+    var _j, _k;
     if (!serverEndPoint) {
-        return { errors: 'Não há definição de API (serverEndPoint!' };
+        return {
+            message: noServerEndPointMessage,
+            isAxiosError: true,
+        };
     }
     const url = `${serverEndPoint.api}/${path}/`;
-    let ret = {};
     try {
-        ret = yield axios_1.default.post(url, data);
+        const { data: createdData } = yield axios_1.default.post(url, data);
+        return createdData;
     }
     catch (e) {
         if (axios_1.default.isAxiosError(e)) {
             const err = e;
-            if (((_m = err.response) === null || _m === void 0 ? void 0 : _m.status) === 401) {
+            const message = `Error creating data at ${url}`;
+            if (((_j = err.response) === null || _j === void 0 ? void 0 : _j.status) === 401) {
                 const isRefreshed = yield refreshToken(serverEndPoint);
                 if (!isRefreshed) {
-                    console.log('Token expirou! Deve-se fazer login de novo');
-                    return false;
+                    console.log(expiredTokenMessage);
+                    return {
+                        message: expiredTokenMessage,
+                        isAxiosError: true,
+                    };
                 }
                 try {
-                    ret = yield axios_1.default.post(url, data);
+                    const { data: createdData } = yield axios_1.default.post(url, data);
+                    return createdData;
                 }
                 catch (e) {
-                    console.log(`Error creating data at ${url}`, data, e);
-                    return false;
+                    console.log(message, data, e);
+                    return {
+                        message: err.response ? err.response.data : message,
+                        isAxiosError: true,
+                    };
                 }
-                return ret;
             }
-            console.log(`Error creating data at ${url}`, data, (_o = err.response) === null || _o === void 0 ? void 0 : _o.data);
-            return { errors: (_p = err.response) === null || _p === void 0 ? void 0 : _p.data };
+            console.log(message, data, (_k = err.response) === null || _k === void 0 ? void 0 : _k.data);
+            return {
+                message: err.response ? err.response.data : message,
+                isAxiosError: true,
+            };
         }
     }
-    return ret;
+    return {
+        message: unknownError,
+        isAxiosError: true,
+    };
 });
 exports.createData = createData;
 const deleteData = (path, serverEndPoint, id) => __awaiter(void 0, void 0, void 0, function* () {
-    var _q;
+    var _l;
     if (!serverEndPoint) {
-        console.log('Não há definição de API (serverEndPoint!');
-        return false;
+        return {
+            message: noServerEndPointMessage,
+            isAxiosError: true,
+        };
     }
     const url = `${serverEndPoint.api}/${path}/${id}`;
     try {
         yield axios_1.default.delete(url);
+        return true;
     }
     catch (e) {
         if (axios_1.default.isAxiosError(e)) {
             const err = e;
-            if (((_q = err.response) === null || _q === void 0 ? void 0 : _q.status) === 401) {
+            const message = `Error deleting data from ${url}`;
+            if (((_l = err.response) === null || _l === void 0 ? void 0 : _l.status) === 401) {
                 const isRefreshed = yield refreshToken(serverEndPoint);
                 if (!isRefreshed) {
-                    console.log('Token expirou! Deve-se fazer login de novo');
-                    return false;
+                    console.log(expiredTokenMessage);
+                    return {
+                        message: expiredTokenMessage,
+                        isAxiosError: true,
+                    };
                 }
                 try {
                     yield axios_1.default.delete(url);
+                    return true;
                 }
                 catch (e) {
-                    console.log(`Error deleting data from ${url}`, e);
-                    return false;
+                    console.log(message, e);
+                    return {
+                        message: err.response ? err.response.data : message,
+                        isAxiosError: true,
+                    };
                 }
-                return true;
             }
-            console.log(`Error deleting data from ${url}`, e);
-            return false;
+            console.log(message, e);
+            return {
+                message: err.response ? err.response.data : message,
+                isAxiosError: true,
+            };
         }
     }
-    return true;
+    return {
+        message: unknownError,
+        isAxiosError: true,
+    };
 });
 exports.deleteData = deleteData;
 const createOrUpdateData = ({ path, serverEndPoint, data, id, }) => __awaiter(void 0, void 0, void 0, function* () {
-    if ((0, utils_1.isTmpId)(id)) {
-        id = null;
-    }
-    if (id) {
-        const responseUpdate = yield (0, exports.updateData)({ path, serverEndPoint, data, id });
-        return responseUpdate;
-    }
-    const responseCreate = yield (0, exports.createData)({ path, serverEndPoint, data });
-    if (!responseCreate || Object.prototype.hasOwnProperty.call(responseCreate, 'errors')) {
+    if ((0, utils_1.isTmpId)(id) || !id) {
+        const responseCreate = yield (0, exports.createData)({ path, serverEndPoint, data });
         return responseCreate;
     }
-    return responseCreate.data.id;
-    // const responseUpdate = await updateData({
-    //     path,
-    //     serverEndPoint,
-    //     data,
-    //     id: responseCreate.data.id,
-    // });
-    // return responseUpdate;
+    const responseUpdate = yield (0, exports.updateData)({ path, serverEndPoint, data, id });
+    return responseUpdate;
 });
 exports.createOrUpdateData = createOrUpdateData;
 const prepareDataBySchema = ({ data, schema }) => {
@@ -382,24 +470,11 @@ const updateDataBySchema = ({ model, modelObjectId, serverEndPoint, data, schema
         data: dbData,
         id: modelObjectId,
     });
-    /*console.log({
-        model,
-        modelObjectId,
-        data,
-        schema,
-        dbData,
-        response,
-    });*/
-    if (typeof response !== 'object' && parseInt(response)) {
-        return response;
-    }
-    console.log('ERRO MAIN', response);
     return response;
 });
 exports.updateDataBySchema = updateDataBySchema;
 const addExistingRelatedModel = ({ model, serverEndPoint, id, data, }) => __awaiter(void 0, void 0, void 0, function* () {
     const response = yield (0, exports.partialUpdateData)({ path: model, serverEndPoint, data, id });
-    // DEBUG console.log({ model, id, data, response });
     return response;
 });
 exports.addExistingRelatedModel = addExistingRelatedModel;
@@ -408,7 +483,7 @@ const getDataGridColumns = (schema, columnFields = [], hiddenFields = [], creata
         return false;
     }
     columnFields =
-        !columnFields || columnFields.length === 0
+        columnFields.length === 0
             ? Object.keys(schema)
             : columnFields.filter((field) => {
                 return Object.prototype.hasOwnProperty.call(schema, field);
@@ -427,7 +502,7 @@ const getDataGridColumns = (schema, columnFields = [], hiddenFields = [], creata
 };
 const getAutoComplete = ({ model, serverEndPoint, }) => __awaiter(void 0, void 0, void 0, function* () {
     const data = yield getData({ path: `${model}/`, serverEndPoint, route: 'autocomplete' });
-    if (data === false) {
+    if ('isAxiosError' in data) {
         return false;
     }
     return data;
@@ -435,8 +510,10 @@ const getAutoComplete = ({ model, serverEndPoint, }) => __awaiter(void 0, void 0
 exports.getAutoComplete = getAutoComplete;
 const loginByPayload = (payload, serverEndPoint) => __awaiter(void 0, void 0, void 0, function* () {
     if (!serverEndPoint) {
-        console.log('Não há definição de API (serverEndPoint!');
-        return false;
+        return {
+            message: noServerEndPointMessage,
+            isAxiosError: true,
+        };
     }
     const url = serverEndPoint.getToken;
     if (!url) {
@@ -482,8 +559,10 @@ const setAuthToken = (token) => {
 exports.setAuthToken = setAuthToken;
 const refreshToken = (serverEndPoint) => __awaiter(void 0, void 0, void 0, function* () {
     if (!serverEndPoint) {
-        console.log('Não há definição de API (serverEndPoint!');
-        return false;
+        return {
+            message: noServerEndPointMessage,
+            isAxiosError: true,
+        };
     }
     const refreshToken = localStorage.getItem('refreshToken');
     // console.log('entrou refreshToken', refreshToken);
@@ -510,7 +589,7 @@ const isLoggedIn = (serverEndPoint) => __awaiter(void 0, void 0, void 0, functio
         return false;
     }
     const usuaria = yield getData({ path: 'minhaconta/', serverEndPoint });
-    if (!usuaria) {
+    if ('isAxiosError' in usuaria) {
         console.log('Erro ao recuperar dados de usuária!');
         return false;
     }
@@ -519,52 +598,76 @@ const isLoggedIn = (serverEndPoint) => __awaiter(void 0, void 0, void 0, functio
 exports.isLoggedIn = isLoggedIn;
 const getSignUpOptions = (serverEndPoint) => __awaiter(void 0, void 0, void 0, function* () {
     if (!serverEndPoint || !serverEndPoint.signUp) {
-        return false;
+        return {
+            message: noServerEndPointMessage,
+            isAxiosError: true,
+        };
     }
     const url = serverEndPoint.signUp;
     try {
         const { data } = yield axios_1.default.options(url);
-        return data.action.POST;
+        return data.actions.POST;
     }
     catch (e) {
-        console.log(`Error fetching options from ${url}`, e);
-        return false;
+        const message = `Error fetching options from ${url}`;
+        console.log(message, e);
+        return {
+            message,
+            isAxiosError: true,
+        };
     }
 });
 exports.getSignUpOptions = getSignUpOptions;
 const signUp = (data, serverEndPoint) => __awaiter(void 0, void 0, void 0, function* () {
-    var _r;
+    var _m;
     if (!serverEndPoint || !serverEndPoint.signUp) {
-        return false;
+        return {
+            message: noServerEndPointMessage,
+            isAxiosError: true,
+        };
     }
     const url = serverEndPoint.signUp;
     try {
-        const response = yield axios_1.default.post(url, data);
-        // console.log(response);
-        return response;
+        const { data: responseData } = yield axios_1.default.post(url, data);
+        return responseData;
     }
     catch (e) {
         if (axios_1.default.isAxiosError(e)) {
             const err = e;
-            if (((_r = err.response) === null || _r === void 0 ? void 0 : _r.status) === 401) {
+            const message = `Error trying signUp at ${url}`;
+            if (((_m = err.response) === null || _m === void 0 ? void 0 : _m.status) === 401) {
                 const isRefreshed = yield refreshToken(serverEndPoint);
                 if (!isRefreshed) {
-                    console.log('Token expirou! Deve-se fazer login de novo');
-                    return false;
+                    console.log(expiredTokenMessage);
+                    return {
+                        message: expiredTokenMessage,
+                        isAxiosError: true,
+                    };
                 }
                 try {
-                    const response = yield axios_1.default.post(url, data);
-                    return response;
+                    const { data: responseData } = yield axios_1.default.post(url, data);
+                    return responseData;
                 }
                 catch (e) {
-                    console.log(`Error updating data at ${url}`, data, e);
-                    return false;
+                    console.log(message, data, e);
+                    return {
+                        message,
+                        isAxiosError: true,
+                    };
                 }
             }
-            console.log(`Error updating data at ${url}`, data, err.response);
-            return { errors: err.response ? err.response.data : `Error updating data at ${url}` };
+            console.log(message, data, e);
+            return {
+                message,
+                isAxiosError: true,
+            };
         }
     }
+    console.log(unknownError, data);
+    return {
+        message: unknownError,
+        isAxiosError: true,
+    };
 });
 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* () {
@@ -573,7 +676,7 @@ const getGenericModelList = ({ model, serverEndPoint, id = '', relatedModel = ''
     let schemaPath = `${model}/`;
     let schema = loadedSchema;
     let modelOptions = loadedModelOptions;
-    let columns;
+    let columns = [];
     if (!(0, utils_1.isTmpId)(id) && relatedModel) {
         path += `/${relatedModel}/`;
         if (relatedModelId) {
@@ -638,8 +741,8 @@ const getGenericModelList = ({ model, serverEndPoint, id = '', relatedModel = ''
         if (isInBatches) {
             path += loadedSchema ? '?is_last_batch=1' : '?is_first_batch=1';
         }
-        const ret = yield getData({ path, serverEndPoint, page });
-        if (ret === false) {
+        const ret = yield getData({ path, serverEndPoint });
+        if ('isAxiosError' in ret) {
             return false;
         }
         const dataRaw = 'results' in ret ? ret.results : ret;
@@ -695,18 +798,24 @@ const getGenericModel = ({ model, serverEndPoint, id = '', relatedModel = '', re
         return false;
     }
     const { schema, modelOptions } = options;
-    const data = !id || (id && relatedModel && !relatedModelId)
-        ? {}
-        : yield getData({ path, serverEndPoint });
-    // console.log({ schema, data }); // DEBUG
+    let data = {};
+    if (id && (!relatedModel || (relatedModel && relatedModelId))) {
+        const response = yield getData({ path, serverEndPoint });
+        if (!('isAxiosError' in response)) {
+            data = response;
+        }
+    }
     return { schema, modelOptions, data };
 });
 exports.getGenericModel = getGenericModel;
 const getAllModels = (serverEndPoint) => __awaiter(void 0, void 0, void 0, function* () {
     if (!serverEndPoint) {
-        return [];
+        return {
+            message: noServerEndPointMessage,
+            isAxiosError: true,
+        };
     }
     const data = yield getData({ path: 'endpoints/', serverEndPoint });
-    return data || [];
+    return 'isAxiosError' in data ? [] : data;
 });
 exports.getAllModels = getAllModels;