drf-react-by-schema 0.7.6 → 0.7.7

package/dist/api.js

@@ -388,7 +388,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' });
+    const data = yield getData({ path: `${model}/`, serverEndPoint, route: 'autocomplete' });
     if (data === false) {
         return false;
     }
@@ -471,7 +471,7 @@ const isLoggedIn = (serverEndPoint) => __awaiter(void 0, void 0, void 0, functio
     if (!token) {
         return false;
     }
-    const usuaria = yield getData({ path: 'minhaconta', serverEndPoint });
+    const usuaria = yield getData({ path: 'minhaconta/', serverEndPoint });
     if (!usuaria) {
         console.log('Erro ao recuperar dados de usuária!');
         return false;
@@ -531,13 +531,13 @@ 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 = [], isInBatches = false, loadedSchema, loadedModelOptions, page, filter, sort, sumRows, }) => __awaiter(void 0, void 0, void 0, function* () {
     let path = `${model}/${id}`;
-    let schemaPath = model;
+    let schemaPath = `${model}/`;
     let schema = loadedSchema;
     let modelOptions = loadedModelOptions;
     let columns;
     if (!(0, utils_1.isTmpId)(id) && relatedModel) {
-        path += `/${relatedModel}/${relatedModelId}`;
-        schemaPath += `/${id}/${relatedModel}`;
+        path += `/${relatedModel}/${relatedModelId}/`;
+        schemaPath += `${id}/${relatedModel}/`;
     }
     const queryParams = [];
     // SERVER-SIDE TOTALS (sumRows):
@@ -638,10 +638,13 @@ const getGenericModelList = ({ model, serverEndPoint, id = '', relatedModel = ''
 exports.getGenericModelList = getGenericModelList;
 const getGenericModel = ({ model, serverEndPoint, id = '', relatedModel = '', relatedModelId = '', }) => __awaiter(void 0, void 0, void 0, function* () {
     let path = `${model}/${id}`;
-    let schemaPath = model;
+    let schemaPath = `${model}/`;
     if (id && relatedModel) {
-        path += `/${relatedModel}/${relatedModelId}`;
-        schemaPath += `/${id}/${relatedModel}`;
+        path += `/${relatedModel}/${relatedModelId}/`;
+        schemaPath += `${id}/${relatedModel}/`;
+    }
+    else if (id) {
+        path += '/';
     }
     const options = yield getSchema(schemaPath, serverEndPoint);
     if (!options) {
@@ -659,8 +662,7 @@ const getAllModels = (serverEndPoint) => __awaiter(void 0, void 0, void 0, funct
     if (!serverEndPoint) {
         return [];
     }
-    const path = 'endpoints';
-    const data = yield getData({ path, serverEndPoint });
+    const data = yield getData({ path: 'endpoints/', serverEndPoint });
     return data || [];
 });
 exports.getAllModels = getAllModels;

package/dist/components/forms/inputs/EditableAutocompleteFieldBySchema.js

@@ -96,7 +96,7 @@ const EditableAutocompleteFieldBySchema = react_1.default.forwardRef((_a, ref) =
                 : schema[name].help_text || '',
         };
     if (!schema[model].disabled && onEditModel && optionsModel) {
-        return (react_1.default.createElement(react_hook_form_1.Controller, { control: control, name: name, render: ({ field }) => (react_1.default.createElement(Autocomplete_1.default, Object.assign({ key: name }, field, { id: name, options: options, disabled: options.length === 0 || schema[model].disabled === true, autoHighlight: true, isOptionEqualToValue: (option, value) => option.id === value.id, fullWidth: true, multiple: multiple, sx: sx, onChange: (e, value) => {
+        return (react_1.default.createElement(react_hook_form_1.Controller, { control: control, name: name, render: ({ field }) => (react_1.default.createElement(Autocomplete_1.default, Object.assign({ key: name }, field, { id: name, options: options, disabled: schema[model].disabled === true, autoHighlight: true, isOptionEqualToValue: (option, value) => option.id === value.id, fullWidth: true, multiple: multiple, sx: sx, onChange: (e, value) => {
                     let valueAr = value;
                     if (!multiple) {
                         valueAr = [value];
@@ -196,7 +196,7 @@ const EditableAutocompleteFieldBySchema = react_1.default.forwardRef((_a, ref) =
                     }
                     : undefined }))) }));
     }
-    return (react_1.default.createElement(react_hook_form_1.Controller, { control: control, name: name, render: ({ field }) => (react_1.default.createElement(Autocomplete_1.default, Object.assign({ key: name }, field, { id: name, options: options, disabled: options.length === 0 || schema[model].disabled === true, autoHighlight: true, isOptionEqualToValue: (option, value) => option.id === value.id, fullWidth: true, multiple: multiple, sx: sx, onChange: (e, value) => {
+    return (react_1.default.createElement(react_hook_form_1.Controller, { control: control, name: name, render: ({ field }) => (react_1.default.createElement(Autocomplete_1.default, Object.assign({ key: name }, field, { id: name, options: options, disabled: schema[model].disabled === true, autoHighlight: true, isOptionEqualToValue: (option, value) => option.id === value.id, fullWidth: true, multiple: multiple, sx: sx, onChange: (e, value) => {
                 field.onChange(value);
             }, renderInput: (params) => (react_1.default.createElement(TextField_1.default, Object.assign({}, params, { label: label, required: schema[model].required, margin: "normal", error: error, helperText: helperText }, other))), getOptionLabel: getOptionLabel, renderOption: renderOption }))) }));
 });

package/dist/context/DRFReactBySchemaProvider.js

@@ -37,7 +37,9 @@ const DRFReactBySchemaProvider = ({ serverEndPoint, theme, isInBatches, firstBat
             if (serverEndPoint[hybridKey]) {
                 continue;
             }
-            serverEndPoint[hybridKey] = `${serverEndPoint.url}/${hybridUrl}`;
+            serverEndPoint[hybridKey] = ['refreshToken', 'verifyToken'].includes(hybridKey)
+                ? `${serverEndPoint.apiTokenUrl}${hybridUrl}/`
+                : `${serverEndPoint.url}/${hybridUrl}`;
         }
     }
     const mergedTheme = theme ? Object.assign(Object.assign({}, theme_1.default), theme) : theme_1.default;

package/package.json

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