Merge pull request #1045 from abdelrhman-arnos/feature/reopen-closed-…

…tabs-999

Feature/reopen closed tabs 999

src/app/components/window-switcher/window-switcher.component.html

@@ -76,4 +76,12 @@
       {{ 'CLOSE_OTHER_WINDOWS_TEXT' | translate }}
     </span>
   </ng-template>
+  <ng-template *ngIf="(closedWindows?.length)" contextMenuItem (execute)="reopenClosedTab()">
+    <span class="menu-icon">
+      <clr-icon shape="circle" class="is-solid"></clr-icon>
+    </span>
+    <span class="menu-text">
+      {{ 'REOPEN_CLOSED_WINDOW_TEXT' | translate }}
+    </span>
+  </ng-template>
 </context-menu>

src/app/components/window-switcher/window-switcher.component.ts

@@ -21,6 +21,7 @@ export class WindowSwitcherComponent implements OnInit {
 
   @Input() windows = {};
   @Input() windowIds = [];
+  @Input() closedWindows = [];
   @Input() activeWindowId = '';
   @Input() isElectron = false;
   @Output() activeWindowChange = new EventEmitter();
@@ -87,6 +88,10 @@ export class WindowSwitcherComponent implements OnInit {
     this.duplicateWindowChange.next(windowId);
   }
 
+  reopenClosedTab() {
+    this.reopenClosedWindowChange.emit();
+  }
+
   log(str) {
     debug.log(str);
   }

src/app/containers/app/app.component.html

@@ -37,6 +37,7 @@
         [windows]="windows"
         [windowIds] = "windowIds"
         [activeWindowId]="activeWindowId"
+        [closedWindows]="closedWindows"
         [isElectron]="isElectron"
         (newWindowChange)="newWindow()"
         (activeWindowChange)="setActiveWindow($event)"

src/app/containers/app/app.component.ts

@@ -58,6 +58,7 @@ export class AppComponent implements OnDestroy {
 
   windowIds = [];
   windows = {};
+  closedWindows = [];
   activeWindowId = '';
   isElectron = isElectron;
   isWebApp = config.isWebApp;
@@ -129,6 +130,7 @@ export class AppComponent implements OnDestroy {
       .subscribe(data => {
         this.windows = data.windows;
         this.windowIds = Object.keys(data.windows);
+        this.closedWindows = data.local.closedWindows;
         this.showDonationAlert = data.donation.showAlert;
 
         this.showImportCurlDialog = data.windowsMeta.showImportCurlDialog;

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();
         }
@@ -74,8 +74,10 @@ export class WindowsEffects {
 
         windows[lastClosedWindowId] = lastClosedWindow;
         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 }));
+        this.store.dispatch(new windowsMetaActions.SetWindowIdsAction({ ids: newWindowIds }));
+        return observableOf(new windowsMetaActions.SetActiveWindowIdAction({ windowId: lastClosedWindowId }));
       }),
       tap(() => {
         this.store.dispatch(new localActions.PopFromClosedWindowsAction());

src/app/reducers/local/local.ts

@@ -2,6 +2,8 @@
 
 import * as local from '../../actions/local/local';
 
+const MAX_CLOSED_WINDOWS_LENGTH = 50;
+
 export interface State {
   closedWindows: any[];
 }
@@ -11,14 +13,17 @@ const initialState: State = {
 };
 
 export function localReducer(state = initialState, action: local.Action): State {
+  const len = state.closedWindows.length;
   switch (action.type) {
     case local.PUSH_CLOSED_WINDOW_TO_LOCAL:
       return {
         ...state,
-        closedWindows: [ ...state.closedWindows, action.payload.window ],
+        closedWindows: len === MAX_CLOSED_WINDOWS_LENGTH ?
+          [ ...state.closedWindows.slice(1), action.payload.window ] :
+          [ ...state.closedWindows, action.payload.window ],
+
       };
     case local.POP_FROM_CLOSED_WINDOWS:
-      const len = state.closedWindows.length;
       return {
         ...state,
         closedWindows: state.closedWindows.filter((_, i) => i < len - 1),

src/app/reducers/windows.ts

@@ -45,7 +45,7 @@ export function windows(reducer: ActionReducer<any>) {
     return function(state = initialState, action: any) {
 
         const _state = Object.assign({}, state);
-        let _windowState = _state[action.windowId];
+        const _windowState = _state[action.windowId];
 
         switch (action.type) {
             case windowsActions.ADD_WINDOW:
@@ -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;

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));