Skip to content

React & Antd: Dashboard migration #892

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Dec 4, 2019
Merged

React & Antd: Dashboard migration #892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
bd0473d
Removed old dashboard
bsekachev Dec 3, 2019
f61b709
Fixed condition
bsekachev Dec 3, 2019
870002c
Getting all users
bsekachev Dec 3, 2019
13ca700
Updated changelog
bsekachev Dec 3, 2019
733c189
Reimplemented login decorator
bsekachev Dec 3, 2019
e03e694
Minor fixes
bsekachev Dec 3, 2019
910dd0a
Typos
bsekachev Dec 3, 2019
594790d
Implicit host, scheme in docker-compose
bsekachev Dec 3, 2019
b83dd9d
Merge branch 'develop' of github.com:opencv/cvat into develop
bsekachev Dec 4, 2019
9a8e0c7
Merge branch 'develop' into bs/replace_dashboard
bsekachev Dec 4, 2019
9a7f444
Fixed issue with pagination
bsekachev Dec 4, 2019
95dbd98
link to exact readme md
bsekachev Dec 4, 2019
c32aa7a
Implicit page size parameter for tasks
bsekachev Dec 4, 2019
7767134
Fixed redirect to task
bsekachev Dec 4, 2019
d5fc29c
Fixed 400 codes
bsekachev Dec 4, 2019
1267255
Fixed linkedin icon, added links to tasks in notifications
bsekachev Dec 4, 2019
ee0e889
Configurable method for check plugin
bsekachev Dec 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ https://github.com/opencv/cvat/issues/750).

### Changed
- page_size parameter for all REST API methods
- React & Redux & Antd based dashboard

### Deprecated
-
Expand Down
85 changes: 31 additions & 54 deletions cvat-core/src/server-proxy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,14 @@
const store = require('store');
const config = require('./config');

function generateError(errorData, baseMessage) {
function generateError(errorData) {
if (errorData.response) {
const message = `${baseMessage}. `
+ `${errorData.message}. ${JSON.stringify(errorData.response.data) || ''}.`;
const message = `${errorData.message}. ${JSON.stringify(errorData.response.data) || ''}.`;
return new ServerError(message, errorData.response.status);
}

// Server is unavailable (no any response)
const message = `${baseMessage}. `
+ `${errorData.message}.`; // usually is "Error Network"
const message = `${errorData.message}.`; // usually is "Error Network"
return new ServerError(message, 0);
}

Expand All @@ -49,7 +47,7 @@
proxy: config.proxy,
});
} catch (errorData) {
throw generateError(errorData, 'Could not get "about" information from the server');
throw generateError(errorData);
}

return response.data;
Expand All @@ -65,7 +63,7 @@
proxy: config.proxy,
});
} catch (errorData) {
throw generateError(errorData, 'Could not get "share" information from the server');
throw generateError(errorData);
}

return response.data;
Expand All @@ -82,7 +80,7 @@
},
});
} catch (errorData) {
throw generateError(errorData, 'Could not send an exception to the server');
throw generateError(errorData);
}
}

Expand All @@ -95,7 +93,7 @@
proxy: config.proxy,
});
} catch (errorData) {
throw generateError(errorData, 'Could not get annotation formats from the server');
throw generateError(errorData);
}

return response.data;
Expand All @@ -111,7 +109,7 @@
});
response = JSON.parse(response.data);
} catch (errorData) {
throw generateError(errorData, 'Could not get export formats from the server');
throw generateError(errorData);
}

return response;
Expand All @@ -135,7 +133,7 @@
},
});
} catch (errorData) {
throw generateError(errorData, `Could not register '${username}' user on the server`);
throw generateError(errorData);
}

return response.data;
Expand All @@ -157,7 +155,7 @@
},
);
} catch (errorData) {
throw generateError(errorData, 'Could not login on a server');
throw generateError(errorData);
}

if (authenticationResponse.headers['set-cookie']) {
Expand All @@ -178,7 +176,7 @@
proxy: config.proxy,
});
} catch (errorData) {
throw generateError(errorData, 'Could not logout from the server');
throw generateError(errorData);
}

store.remove('token');
Expand Down Expand Up @@ -206,7 +204,7 @@
...data,
})).data;
} catch (errorData) {
throw generateError(errorData, 'Could not have done the request');
throw generateError(errorData);
}
}

Expand All @@ -215,11 +213,11 @@

let response = null;
try {
response = await Axios.get(`${backendAPI}/tasks?${filter}`, {
response = await Axios.get(`${backendAPI}/tasks?page_size=10&${filter}`, {
proxy: config.proxy,
});
} catch (errorData) {
throw generateError(errorData, 'Could not get tasks from a server');
throw generateError(errorData);
}

response.data.results.count = response.data.count;
Expand All @@ -237,7 +235,7 @@
},
});
} catch (errorData) {
throw generateError(errorData, 'Could not save the task on the server');
throw generateError(errorData);
}
}

Expand All @@ -247,7 +245,7 @@
try {
await Axios.delete(`${backendAPI}/tasks/${id}`);
} catch (errorData) {
throw generateError(errorData, `Could not delete the task ${id} from the server`);
throw generateError(errorData);
}
}

Expand All @@ -269,10 +267,7 @@
resolve(url);
}
} catch (errorData) {
reject(generateError(
errorData,
`Failed to export the task ${id} as a dataset`,
));
reject(generateError(errorData));
}
}

Expand Down Expand Up @@ -311,7 +306,7 @@
}
} catch (errorData) {
reject(
generateError(errorData, 'Could not put task to the server'),
generateError(errorData),
);
}
}
Expand Down Expand Up @@ -340,7 +335,7 @@
},
});
} catch (errorData) {
throw generateError(errorData, 'Could not put task to the server');
throw generateError(errorData);
}

onUpdate('The data is being uploaded to the server..');
Expand All @@ -355,7 +350,7 @@
// ignore
}

throw generateError(errorData, 'Could not put data to the server');
throw generateError(errorData);
}

try {
Expand All @@ -378,7 +373,7 @@
proxy: config.proxy,
});
} catch (errorData) {
throw generateError(errorData, 'Could not get jobs from a server');
throw generateError(errorData);
}

return response.data;
Expand All @@ -395,7 +390,7 @@
},
});
} catch (errorData) {
throw generateError(errorData, 'Could not save the job on the server');
throw generateError(errorData);
}
}

Expand All @@ -405,7 +400,7 @@
let response = null;
try {
if (id === null) {
response = await Axios.get(`${backendAPI}/users`, {
response = await Axios.get(`${backendAPI}/users?page_size=all`, {
proxy: config.proxy,
});
} else {
Expand All @@ -414,7 +409,7 @@
});
}
} catch (errorData) {
throw generateError(errorData, 'Could not get users from the server');
throw generateError(errorData);
}

return response.data.results;
Expand All @@ -429,7 +424,7 @@
proxy: config.proxy,
});
} catch (errorData) {
throw generateError(errorData, 'Could not get user data from the server');
throw generateError(errorData);
}

return response.data;
Expand Down Expand Up @@ -466,10 +461,7 @@
responseType: 'blob',
});
} catch (errorData) {
throw generateError(
errorData,
`Could not get frame ${frame} for the task ${tid} from the server`,
);
throw generateError(errorData);
}

return response.data;
Expand All @@ -484,10 +476,7 @@
proxy: config.proxy,
});
} catch (errorData) {
throw generateError(
errorData,
`Could not get frame meta info for the task ${tid} from the server`,
);
throw generateError(errorData);
}

return response.data;
Expand All @@ -503,10 +492,7 @@
proxy: config.proxy,
});
} catch (errorData) {
throw generateError(
errorData,
`Could not get annotations for the ${session} ${id} from the server`,
);
throw generateError(errorData);
}

return response.data;
Expand Down Expand Up @@ -534,10 +520,7 @@
},
});
} catch (errorData) {
throw generateError(
errorData,
`Could not ${action} annotations for the ${session} ${id} on the server`,
);
throw generateError(errorData);
}

return response.data;
Expand All @@ -564,10 +547,7 @@
resolve();
}
} catch (errorData) {
reject(generateError(
errorData,
`Could not upload annotations for the ${session} ${id}`,
));
reject(generateError(errorData));
}
}

Expand Down Expand Up @@ -595,10 +575,7 @@
resolve(url);
}
} catch (errorData) {
reject(generateError(
errorData,
`Could not dump annotations for the task ${id} from the server`,
));
reject(generateError(errorData));
}
}

Expand Down
5 changes: 3 additions & 2 deletions cvat-ui/src/actions/models-actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,10 +551,11 @@ function inferModelSuccess(): AnyAction {
return action;
}

function inferModelFailed(error: any): AnyAction {
function inferModelFailed(error: any, taskID: number): AnyAction {
const action = {
type: ModelsActionTypes.INFER_MODEL_FAILED,
payload: {
taskID,
error,
},
};
Expand Down Expand Up @@ -599,7 +600,7 @@ export function inferModelAsync(

dispatch(getInferenceStatusAsync([taskInstance.id]));
} catch (error) {
dispatch(inferModelFailed(error));
dispatch(inferModelFailed(error, taskInstance.id));
return;
}

Expand Down
12 changes: 7 additions & 5 deletions cvat-ui/src/actions/tasks-actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,12 @@ ThunkAction<Promise<void>, {}, {}, AnyAction> {
return;
}

const array = Array.from(result);
const array = Array.from(result)
.filter((task: any) => task.jobs.length > 0);
const previews = [];
const promises = array
.map((task): string => (task as any).frames.preview());

dispatch(
getInferenceStatusAsync(
array.map(
Expand Down Expand Up @@ -441,23 +443,23 @@ function updateTask(): AnyAction {
return action;
}

function updateTaskSuccess(taskInstance: any): AnyAction {
function updateTaskSuccess(task: any): AnyAction {
const action = {
type: TasksActionTypes.UPDATE_TASK_SUCCESS,
payload: {
taskInstance,
task,
},
};

return action;
}

function updateTaskFailed(error: any, taskInstance: any): AnyAction {
function updateTaskFailed(error: any, task: any): AnyAction {
const action = {
type: TasksActionTypes.UPDATE_TASK_FAILED,
payload: {
error,
taskInstance,
task,
},
};

Expand Down
3 changes: 1 addition & 2 deletions cvat-ui/src/components/create-model-page/create-model-content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import {
Alert,
Button,
Tooltip,
Modal,
message,
notification,
} from 'antd';
Expand Down Expand Up @@ -96,7 +95,7 @@ export default class CreateModelContent extends React.PureComponent<Props> {
const status = this.props.modelCreatingStatus
&& this.props.modelCreatingStatus !== 'CREATED' ? this.props.modelCreatingStatus : '';

const guideLink = 'https://github.com/opencv/cvat/tree/develop/cvat/apps/auto_annotation';
const guideLink = 'https://github.com/opencv/cvat/blob/develop/cvat/apps/auto_annotation/README.md';
return (
<Row type='flex' justify='start' align='middle' className='cvat-create-model-content'>
<Col span={24}>
Expand Down
Loading