fix: reload NMRium with the last selected workspace

close #1453
cheminfo · Mar 31, 2022 · cb52cdc · cb52cdc
1 parent 46c4aa2
commit cb52cdc
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/src/component/reducer/preferencesReducer.ts b/src/component/reducer/preferencesReducer.ts
@@ -221,20 +221,28 @@ function handleInit(draft: Draft<PreferencesState>, action) {
           ))) ||
       !localData
     ) {
-      const { workspaces, version } = draft || {};
+      const {
+        workspaces,
+        version,
+        workspace: { current },
+      } = draft || {};
       const display = filterObject(workspacePreferences.display);
 
       const data = {
         version,
+        ...(localData?.currentWorkspace && {
+          currentWorkspace: localData?.currentWorkspace,
+        }),
         workspaces: {
           ...workspaces,
-          [draft.workspace.current]: {
+          [current]: {
             ...workspacePreferences,
             display,
           },
         },
       };
-      draft.workspaces[draft.workspace.current] = lodashMerge(
+
+      draft.workspaces[current] = lodashMerge(
         {},
         currentWorkspacePreferences,
         workspacePreferences,