Merge pull request #989 from geoadmin/bug-PB-747-app-not-ready

PB-747: Fix race condition in startup - #patch
geoadmin · Jul 4, 2024 · 3e95337 · 3e95337
2 parents 7c2c05e + 9afd766
commit 3e95337
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/store/plugins/app-readiness.plugin.js b/src/store/plugins/app-readiness.plugin.js
@@ -38,13 +38,14 @@ const appReadinessPlugin = (store) => {
 
         if (mutation.type === 'mapModuleReady') {
             store.dispatch('clearLoadingBar4MapLoading', { dispatcher })
+        }
 
-            // In production build we are not interested anymore in the mutation logs
-            // therefore unsubscribe here
-            if (ENVIRONMENT === 'production') {
-                unsubscribe()
-            }
+        // In production build we are not interested anymore in the mutation logs
+        // therefore unsubscribe when the app is ready and map is ready
+        if (state.app.isReady && state.app.isMapReady && ENVIRONMENT === 'production') {
+            unsubscribe()
         }
+
         // otherwise we ignore all mutations, our job is already done
     })