Merge remote-tracking branch 'origin/develop' into dk/login-redirect

cvat-ai · Dec 3, 2020 · 16a0293 · 16a0293
2 parents b593f08 + e5356cd
commit 16a0293
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -44,6 +44,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Disabled position editing in AAM (<https://github.com/openvinotoolkit/cvat/pull/2506>)
 - TypeError: Cannot read property 'toString' of undefined (<https://github.com/openvinotoolkit/cvat/pull/2517>)
 - Extra shapes are drawn after Esc, or G pressed while drawing a region in grouping (<https://github.com/openvinotoolkit/cvat/pull/2507>)
+- Reset state (reviews, issues) after logout or changing a job (<https://github.com/openvinotoolkit/cvat/pull/2525>)
 
 ### Security
 

diff --git a/cvat-ui/src/reducers/review-reducer.ts b/cvat-ui/src/reducers/review-reducer.ts
@@ -5,6 +5,7 @@
 import consts from 'consts';
 import { AnnotationActionTypes } from 'actions/annotation-actions';
 import { ReviewActionTypes } from 'actions/review-actions';
+import { AuthActionTypes } from 'actions/auth-actions';
 import { ReviewState } from './interfaces';
 
 const defaultState: ReviewState = {
@@ -184,6 +185,10 @@ export default function (state: ReviewState = defaultState, action: any): Review
                 issuesHidden: hidden,
             };
         }
+        case AnnotationActionTypes.CLOSE_JOB:
+        case AuthActionTypes.LOGOUT_SUCCESS: {
+            return { ...defaultState };
+        }
         default:
             return state;
     }