From c7bd5a332732c5e2db1f60274a98cb3ab8978d22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adri=C3=A1na=20Kohanov=C3=A1?= <adriana.kohanova@m2ms.sk>
Date: Fri, 29 Jan 2021 10:42:18 +0100
Subject: [PATCH] #511 Create new project hangs indefinetely

---
 js/components/preview/redux/dispatchActions.js  | 4 ++--
 js/components/projects/redux/dispatchActions.js | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/js/components/preview/redux/dispatchActions.js b/js/components/preview/redux/dispatchActions.js
index 5f0aadde9..fee6aafbc 100644
--- a/js/components/preview/redux/dispatchActions.js
+++ b/js/components/preview/redux/dispatchActions.js
@@ -121,13 +121,13 @@ export const unmountPreviewComponent = (stages = []) => dispatch => {
     }
   });
 
+  dispatch(resetTrackingState());
+
   dispatch(resetCurrentCompoundsSettings(true));
   dispatch(resetProjectsReducer());
 
   dispatch(resetSelectionState());
   dispatch(resetDatasetsState());
-
-  dispatch(resetTrackingState());
 };
 
 export const resetReducersForRestoringActions = () => dispatch => {
diff --git a/js/components/projects/redux/dispatchActions.js b/js/components/projects/redux/dispatchActions.js
index 34ed6b19d..1556023be 100644
--- a/js/components/projects/redux/dispatchActions.js
+++ b/js/components/projects/redux/dispatchActions.js
@@ -20,6 +20,8 @@ import { createInitSnapshotFromCopy, getListOfSnapshots } from '../../snapshot/r
 import { SnapshotType } from './constants';
 import { DJANGO_CONTEXT } from '../../../utils/djangoContext';
 import { sendInitTrackingActionByProjectId } from '../../../reducers/tracking/dispatchActions';
+import { resetTrackingState } from '../../../reducers/tracking/actions';
+
 import moment from 'moment';
 
 export const assignSnapshotToProject = ({ projectID, snapshotID, ...rest }) => (dispatch, getState) => {
@@ -320,6 +322,7 @@ export const createProjectFromSnapshot = ({ title, description, author, tags, hi
   const snapshotData = JSON.parse(selectedSnapshot && selectedSnapshot.data);
 
   dispatch(setProjectModalIsLoading(true));
+  dispatch(resetTrackingState());
   return dispatch(
     createProject({
       title,
@@ -365,6 +368,7 @@ export const createProjectFromScratch = ({ title, description, target, author, t
   getState
 ) => {
   dispatch(setProjectModalIsLoading(true));
+  dispatch(resetTrackingState());
   return api({
     url: `${base_url}/api/session-projects/`,
     method: METHOD.POST,