Fixed SetWindowAction.

Fixed reopen closed window implementation.
altair-graphql · Nov 2, 2019 · 0fd4b94 · 0fd4b94
1 parent 60eb7e8
commit 0fd4b94
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/src/app/components/window-switcher/window-switcher.component.html b/src/app/components/window-switcher/window-switcher.component.html
@@ -81,7 +81,7 @@
       <clr-icon shape="circle" class="is-solid"></clr-icon>
     </span>
     <span class="menu-text">
-      Reopen Closed Tab
+      {{ 'REOPEN_CLOSED_WINDOW_TEXT' | translate }}
     </span>
   </ng-template>
 </context-menu>
diff --git a/src/app/effects/windows.ts b/src/app/effects/windows.ts
@@ -61,7 +61,7 @@ export class WindowsEffects {
         return { closedWindows: state.local.closedWindows, windows: state.windows, windowIds: state.windowsMeta.windowIds, action };
       }),
       switchMap(data => {
-        const lastClosedWindow = data.closedWindows.pop();
+        const lastClosedWindow = data.closedWindows[data.closedWindows.length - 1];
         if (!lastClosedWindow || !lastClosedWindow.windowId) {
           return observableEmpty();
         }
@@ -73,7 +73,8 @@ export class WindowsEffects {
         }
 
         windows[lastClosedWindowId] = lastClosedWindow;
-        // this.store.dispatch(new windowActions.SetWindowsAction(Object.values(windows)));
+        this.store.dispatch(new windowActions.SetWindowsAction(Object.values(windows)));
+        this.windowService.setupWindow(lastClosedWindowId);
         const newWindowIds = [ ...data.windowIds, lastClosedWindowId ];
         return observableOf(new windowsMetaActions.SetWindowIdsAction({ ids: newWindowIds }));
       }),

diff --git a/src/app/reducers/windows.ts b/src/app/reducers/windows.ts
@@ -72,16 +72,15 @@ export function windows(reducer: ActionReducer<any>) {
                 const _windows = action.payload;
 
                 const newWindowsState = {};
-                _windows.forEach(window => {
+                _windows.forEach((window: fromRoot.PerWindowState) => {
                     const windowKey = window.windowId;
-                    const windowTitle = window.title;
+                    // const windowTitle = window.layout.title;
 
                     // Using JSON.parse and JSON.stringify instead of Object.assign for deep cloning
-                    _windowState = JSON.parse(JSON.stringify(initWindowState));
-                    _windowState.windowId = windowKey;
-                    _windowState.layout.title = _windowState.layout.title || windowTitle;
+                    // _windowState = JSON.parse(JSON.stringify(initWindowState));
+                    // _windowState.windowId = windowKey;
 
-                    newWindowsState[windowKey] = { ..._windowState };
+                    newWindowsState[windowKey] = { ...window };
                 });
 
                 return newWindowsState;

diff --git a/src/app/services/window.service.ts b/src/app/services/window.service.ts
@@ -260,7 +260,7 @@ export class WindowService {
   /**
    * Carry out any necessary house cleaning tasks.
    */
-  private setupWindow(windowId) {
+  setupWindow(windowId) {
     this.store.dispatch(new queryActions.SetSubscriptionResponseListAction(windowId, { list: [] }));
     this.store.dispatch(new queryActions.StopSubscriptionAction(windowId));
     this.store.dispatch(new streamActions.StopStreamClientAction(windowId));