From e8024a9fa80171e6992328d8f60370590191bed6 Mon Sep 17 00:00:00 2001 From: Kirill Lakhov Date: Mon, 20 Feb 2023 17:16:23 +0300 Subject: [PATCH] Fix excessive notifications (#5737) ### Motivation and context This PR fixes two annoying notifications: 1. On models page if there is no models (Resolves #5728) 2. On login page if token sesssion is expired ### How has this been tested? ### Checklist - [ ] I submit my changes into the `develop` branch - [ ] 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)) - [ ] 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 - [ ] 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. --- cvat-core/src/server-proxy.ts | 2 +- cvat-ui/src/components/models-page/models-page.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cvat-core/src/server-proxy.ts b/cvat-core/src/server-proxy.ts index d994a08624b3..bde9a3ae5ef4 100644 --- a/cvat-core/src/server-proxy.ts +++ b/cvat-core/src/server-proxy.ts @@ -482,7 +482,7 @@ async function authorized() { await getSelf(); } catch (serverError) { if (serverError.code === 401) { - await logout(); + removeAuthData(); return false; } diff --git a/cvat-ui/src/components/models-page/models-page.tsx b/cvat-ui/src/components/models-page/models-page.tsx index 0b08b06abb74..8f9d0d9bbcaa 100644 --- a/cvat-ui/src/components/models-page/models-page.tsx +++ b/cvat-ui/src/components/models-page/models-page.tsx @@ -43,7 +43,7 @@ function ModelsPageComponent(): JSX.Element { }); }, [query]); - const pageOutOfBounds = updatedQuery.page > Math.ceil(totalCount / PAGE_SIZE); + const pageOutOfBounds = totalCount && updatedQuery.page > Math.ceil(totalCount / PAGE_SIZE); useEffect(() => { dispatch(getModelProvidersAsync()); dispatch(getModelsAsync(updatedQuery));