Skip to content

Commit 1c93b58

Browse files
bsekachevChris Lee-Messer
authored and
Chris Lee-Messer
committed
React & Antd UI: Model manager (cvat-ai#856)
* Supported git to create and sync * Updated antd * Updated icons * Improved header * Top bar for models & empty models list * Removed one extra reducer and actions * Removed one extra reducer and actions * Crossplatform css * Models reducers, some models actions, base for model list, imrovements * Models list, ability to delete models * Added ability to upload models * Improved form, reinit models after create * Removed some importants in css * Model running dialog window, a lot of fixes
1 parent 31232b8 commit 1c93b58

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+3051
-766
lines changed

cvat-core/src/api-implementation.js

+5
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,11 @@
8989
return result;
9090
};
9191

92+
cvat.server.request.implementation = async (url, data) => {
93+
const result = await serverProxy.server.request(url, data);
94+
return result;
95+
};
96+
9297
cvat.users.get.implementation = async (filter) => {
9398
checkFilter(filter, {
9499
self: isBoolean,

cvat-core/src/api.js

+16
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,22 @@ function build() {
177177
.apiWrapper(cvat.server.authorized);
178178
return result;
179179
},
180+
/**
181+
* Method allows to do requests via cvat-core with authorization headers
182+
* @method request
183+
* @async
184+
* @memberof module:API.cvat.server
185+
* @param {string} url
186+
* @param {Object} data request parameters: method, headers, data, etc.
187+
* @returns {Object | undefined} response data if exist
188+
* @throws {module:API.cvat.exceptions.PluginError}
189+
* @throws {module:API.cvat.exceptions.ServerError}
190+
*/
191+
async request(url, data) {
192+
const result = await PluginRegistry
193+
.apiWrapper(cvat.server.request, url, data);
194+
return result;
195+
},
180196
},
181197
/**
182198
* Namespace is used for getting tasks

cvat-core/src/server-proxy.js

+12
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,17 @@
182182
return true;
183183
}
184184

185+
async function serverRequest(url, data) {
186+
try {
187+
return (await Axios({
188+
url,
189+
...data,
190+
})).data;
191+
} catch (errorData) {
192+
throw generateError(errorData, 'Could not have done the request');
193+
}
194+
}
195+
185196
async function getTasks(filter = '') {
186197
const { backendAPI } = config;
187198

@@ -560,6 +571,7 @@
560571
logout,
561572
authorized,
562573
register,
574+
request: serverRequest,
563575
}),
564576
writable: false,
565577
},

cvat-ui/package-lock.json

+30-64
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cvat-ui/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"@types/react-router": "^5.0.5",
4040
"@types/react-router-dom": "^5.1.0",
4141
"@types/react-share": "^3.0.1",
42-
"antd": "^3.24.2",
42+
"antd": "^3.25.2",
4343
"dotenv-webpack": "^1.7.0",
4444
"moment": "^2.24.0",
4545
"prop-types": "^15.7.2",

0 commit comments

Comments
 (0)