未验证 提交 822f87b4 编写于 作者: K Kirill Lakhov 提交者: GitHub

Reset notifications on login/logout/register (#5788)

<!-- Raise an issue to propose your change
(https://github.com/opencv/cvat/issues).
It helps to avoid duplication of efforts from multiple independent
contributors.
Discuss your ideas with maintainers to be sure that changes will be
approved and merged.
Read the [Contribution
guide](https://opencv.github.io/cvat/docs/contributing/). -->

<!-- Provide a general summary of your changes in the Title above -->

### Motivation and context
<!-- Why is this change required? What problem does it solve? If it
fixes an open
issue, please link to the issue here. Describe your changes in detail,
add
screenshots. -->
Just simple UX improvement that allows to hide notifications on
login/logout. For example if we entered wrong credentials, and then
logined successfully, notification is still on the screen.

### How has this been tested?
<!-- Please describe in detail how you tested your changes.
Include details of your testing environment, and the tests you ran to
see how your change affects other areas of the code, etc. -->

### Checklist
<!-- Go over all the following points, and put an `x` in all the boxes
that apply.
If an item isn't applicable for some reason, then ~~explicitly
strikethrough~~ the whole
line. If you don't do that, GitHub will show incorrect progress for the
pull request.
If you're unsure about any of these, don't hesitate to ask. We're here
to help! -->
- [x] I submit my changes into the `develop` branch
- [x] I have added a description of my changes into the
[CHANGELOG](https://github.com/opencv/cvat/blob/develop/CHANGELOG.md)
file
- ~~[ ] I have updated the documentation accordingly~~
- ~~[ ] I have added tests to cover my changes~~
- ~~[ ] I have linked related issues (see [GitHub docs](

https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword))~~
- [x] I have increased versions of npm packages if it is necessary

([cvat-canvas](https://github.com/opencv/cvat/tree/develop/cvat-canvas#versioning),

[cvat-core](https://github.com/opencv/cvat/tree/develop/cvat-core#versioning),

[cvat-data](https://github.com/opencv/cvat/tree/develop/cvat-data#versioning)
and

[cvat-ui](https://github.com/opencv/cvat/tree/develop/cvat-ui#versioning))

### License

- [x] I submit _my code changes_ under the same [MIT License](
https://github.com/opencv/cvat/blob/develop/LICENSE) that covers the
project.
  Feel free to contact the maintainers if that's a concern.
上级 7ecda9f1
......@@ -49,6 +49,7 @@ Tracks can be exported/imported to/from Datumaro and Sly Pointcloud formats (<ht
`/api/issues/{id}.comments`, `/api/projects | tasks | jobs/{id}.labels`
(<https://github.com/opencv/cvat/pull/5662>)
- Hide analytics link from non-admin users (<https://github.com/opencv/cvat/pull/5789>)
- Hide notifications on login/logout/register (<https://github.com/opencv/cvat/pull/5788>)
### Deprecated
- TBD
......
{
"name": "cvat-ui",
"version": "1.49.2",
"version": "1.49.3",
"description": "CVAT single-page application",
"main": "src/index.tsx",
"scripts": {
......
......@@ -128,6 +128,10 @@ class CVATApplication extends React.PureComponent<CVATAppProps & RouteComponentP
public componentDidMount(): void {
const core = getCore();
const { history, location } = this.props;
const {
HEALTH_CHECK_RETRIES, HEALTH_CHECK_PERIOD, HEALTH_CHECK_REQUEST_TIMEOUT, SERVER_UNAVAILABLE_COMPONENT,
RESET_NOTIFICATIONS_PATHS,
} = appConfig;
// configure({ ignoreRepeatedEventsWhenKeyHeldDown: false });
// Logger configuration
......@@ -140,13 +144,20 @@ class CVATApplication extends React.PureComponent<CVATAppProps & RouteComponentP
EventRecorder.initSave();
customWaViewHit(location.pathname, location.search, location.hash);
history.listen((_location) => {
customWaViewHit(_location.pathname, _location.search, _location.hash);
history.listen((newLocation) => {
customWaViewHit(newLocation.pathname, newLocation.search, newLocation.hash);
const { location: prevLocation } = this.props;
const shouldResetNotifications = RESET_NOTIFICATIONS_PATHS.from.some(
(pathname) => prevLocation.pathname === pathname,
);
const pathExcluded = shouldResetNotifications && RESET_NOTIFICATIONS_PATHS.exclude.some(
(pathname) => newLocation.pathname.includes(pathname),
);
if (shouldResetNotifications && !pathExcluded) {
this.resetNotifications();
}
});
const {
HEALTH_CHECK_RETRIES, HEALTH_CHECK_PERIOD, HEALTH_CHECK_REQUEST_TIMEOUT, SERVER_UNAVAILABLE_COMPONENT,
} = appConfig;
core.server.healthCheck(
HEALTH_CHECK_RETRIES,
HEALTH_CHECK_PERIOD,
......@@ -360,6 +371,14 @@ class CVATApplication extends React.PureComponent<CVATAppProps & RouteComponentP
}
}
private resetNotifications(): void {
const { resetErrors, resetMessages } = this.props;
notification.destroy();
resetErrors();
resetMessages();
}
// Where you go depends on your URL
public render(): JSX.Element {
const {
......
......@@ -116,6 +116,17 @@ const SSO_PROVIDER_KEY = 'sso';
const CONTROLS_LOGS_INTERVAL = 90000; // 1.5 min in ms
const RESET_NOTIFICATIONS_PATHS = {
from: [
'/auth/login',
'/auth/register',
'/auth/logout',
],
exclude: [
'/auth',
],
};
export default {
UNDEFINED_ATTRIBUTE_VALUE,
NO_BREAK_SPACE,
......@@ -151,4 +162,5 @@ export default {
CANVAS_WORKSPACE_DEFAULT_CONTEXT_HEIGHT,
CONTROLS_LOGS_INTERVAL,
SSO_PROVIDER_KEY,
RESET_NOTIFICATIONS_PATHS,
};
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册