From c6cc870e1976dce8ec1a2064591a0970b0f8c1a0 Mon Sep 17 00:00:00 2001
From: Devin Binnie <52460000+devinbinnie@users.noreply.github.com>
Date: Tue, 28 Jun 2022 08:00:25 -0400
Subject: [PATCH] [MM-44932] Fixed issue where deleting a server doesn't switch
 to another server (or show the new server modal) (#2174)

---
 src/main/views/viewManager.test.js | 23 +++++++++++++++++------
 src/main/views/viewManager.ts      | 17 ++++++++++-------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/src/main/views/viewManager.test.js b/src/main/views/viewManager.test.js
index ce3c5dbf..e642b95b 100644
--- a/src/main/views/viewManager.test.js
+++ b/src/main/views/viewManager.test.js
@@ -4,10 +4,10 @@
 /* eslint-disable max-lines */
 'use strict';
 
-import {dialog} from 'electron';
+import {dialog, ipcMain} from 'electron';
 import {Tuple as tuple} from '@bloomberg/record-tuple-polyfill';
 
-import {BROWSER_HISTORY_PUSH, LOAD_SUCCESS} from 'common/communication';
+import {BROWSER_HISTORY_PUSH, LOAD_SUCCESS, SHOW_NEW_SERVER_MODAL} from 'common/communication';
 import {MattermostServer} from 'common/servers/MattermostServer';
 import {getServerView, getTabViewName} from 'common/tabs/TabView';
 import urlUtils from 'common/utils/url';
@@ -417,7 +417,7 @@ describe('main/views/viewManager', () => {
             ],
         }];
         const viewManager = new ViewManager({});
-        viewManager.configServers = teams.concat();
+        viewManager.getServers = () => teams.concat();
 
         beforeEach(() => {
             viewManager.showByName = jest.fn();
@@ -426,7 +426,7 @@ describe('main/views/viewManager', () => {
 
         afterEach(() => {
             jest.resetAllMocks();
-            viewManager.configServers = teams;
+            viewManager.getServers = () => teams;
             delete viewManager.lastActiveServer;
         });
 
@@ -442,7 +442,7 @@ describe('main/views/viewManager', () => {
         });
 
         it('should show last active tab of first server', () => {
-            viewManager.configServers = [{
+            viewManager.getServers = () => [{
                 name: 'server-1',
                 order: 1,
                 tabs: [
@@ -489,7 +489,7 @@ describe('main/views/viewManager', () => {
         });
 
         it('should show next tab when last active tab is closed', () => {
-            viewManager.configServers = [{
+            viewManager.getServers = () => [{
                 name: 'server-1',
                 order: 1,
                 tabs: [
@@ -534,6 +534,17 @@ describe('main/views/viewManager', () => {
             viewManager.showInitial();
             expect(viewManager.showByName).toHaveBeenCalledWith('server-2_tab-1');
         });
+
+        it('should open new server modal when no servers exist', () => {
+            viewManager.mainWindow = {
+                webContents: {
+                    send: jest.fn(),
+                },
+            };
+            viewManager.getServers = () => [];
+            viewManager.showInitial();
+            expect(ipcMain.emit).toHaveBeenCalledWith(SHOW_NEW_SERVER_MODAL);
+        });
     });
 
     describe('showByName', () => {
diff --git a/src/main/views/viewManager.ts b/src/main/views/viewManager.ts
index 630935f0..a43624ee 100644
--- a/src/main/views/viewManager.ts
+++ b/src/main/views/viewManager.ts
@@ -20,6 +20,7 @@ import {
     BROWSER_HISTORY_PUSH,
     UPDATE_LAST_ACTIVE,
     UPDATE_URL_VIEW_WIDTH,
+    SHOW_NEW_SERVER_MODAL,
 } from 'common/communication';
 import Config from 'common/config';
 import urlUtils from 'common/utils/url';
@@ -45,7 +46,6 @@ enum LoadingScreenState {
 }
 
 export class ViewManager {
-    configServers: TeamWithTabs[];
     lastActiveServer?: number;
     viewOptions: BrowserViewConstructorOptions;
     closedViews: Map<string, {srv: MattermostServer; tab: Tab}>;
@@ -58,7 +58,6 @@ export class ViewManager {
     loadingScreenState: LoadingScreenState;
 
     constructor(mainWindow: BrowserWindow) {
-        this.configServers = Config.teams.concat();
         this.lastActiveServer = Config.lastActiveTeam;
         this.viewOptions = {webPreferences: {spellcheck: Config.useSpellChecker}};
         this.views = new Map(); // keep in mind that this doesn't need to hold server order, only tabs on the renderer need that.
@@ -72,7 +71,7 @@ export class ViewManager {
     }
 
     getServers = () => {
-        return this.configServers;
+        return Config.teams.concat();
     }
 
     loadServer = (server: TeamWithTabs) => {
@@ -119,7 +118,7 @@ export class ViewManager {
     }
 
     load = () => {
-        this.configServers.forEach((server) => this.loadServer(server));
+        this.getServers().forEach((server) => this.loadServer(server));
     }
 
     /** Called when a new configuration is received
@@ -199,8 +198,9 @@ export class ViewManager {
     }
 
     showInitial = () => {
-        if (this.configServers.length) {
-            const element = this.configServers.find((e) => e.order === this.lastActiveServer) || this.configServers.find((e) => e.order === 0);
+        const servers = this.getServers();
+        if (servers.length) {
+            const element = servers.find((e) => e.order === this.lastActiveServer) || servers.find((e) => e.order === 0);
             if (element && element.tabs.length) {
                 let tab = element.tabs.find((tab) => tab.order === element.lastActiveTab) || element.tabs.find((tab) => tab.order === 0);
                 if (!tab?.isOpen) {
@@ -212,6 +212,9 @@ export class ViewManager {
                     this.showByName(tabView);
                 }
             }
+        } else {
+            this.mainWindow.webContents.send(SET_ACTIVE_VIEW, null, null);
+            ipcMain.emit(SHOW_NEW_SERVER_MODAL);
         }
     }
 
@@ -503,7 +506,7 @@ export class ViewManager {
         // TODO: fix for new tabs
         if (url) {
             const parsedURL = urlUtils.parseURL(url)!;
-            const tabView = urlUtils.getView(parsedURL, this.configServers, true);
+            const tabView = urlUtils.getView(parsedURL, this.getServers(), true);
             if (tabView) {
                 const urlWithSchema = `${urlUtils.parseURL(tabView.url)?.origin}${parsedURL.pathname}${parsedURL.search}`;
                 if (this.closedViews.has(tabView.name)) {