menu: add getTabByOrder.

Author: shubham-padia

app/main/menu.ts

@@ -701,24 +701,28 @@ async function checkForUpdate(): Promise<void> {
   await appUpdater(true);
 }
 
+function getTabByOrder(tabs: TabData[], order: number): TabData | undefined {
+  return tabs.find((tab) => tab.index === order);
+}
+
 function getNextServer(tabs: TabData[], activeTabId: string): string {
   const activeTab = tabs.find((tab) => tab.id === activeTabId)!;
   let {index} = activeTab;
   do {
     index = (index + 1) % tabs.length;
-  } while (tabs[index]?.role !== "server");
+  } while (getTabByOrder(tabs, index)?.role !== "server");
 
-  return tabs[index].id;
+  return getTabByOrder(tabs, index)!.id;
 }
 
 function getPreviousServer(tabs: TabData[], activeTabId: string): string {
   const activeTab = tabs.find((tab) => tab.id === activeTabId)!;
   let {index} = activeTab;
   do {
-    index = (index - 1 + tabs.length) % tabs.length;
-  } while (tabs[index]?.role !== "server");
+    index = (index - 1) % tabs.length;
+  } while (getTabByOrder(tabs, index)?.role !== "server");
 
-  return tabs[index].id;
+  return getTabByOrder(tabs, index)!.id;
 }
 
 export function setMenu(properties: MenuProperties): void {

app/renderer/js/main.ts

@@ -333,7 +333,7 @@ export class ServerManagerView {
       }
 
       // Open last active tab
-      const firstTab = this.tabs[0];
+      const firstTab = this.getTabByOrder(this.tabs, 0)!;
       const lastActiveTabId = ConfigUtil.getConfigItem(
         "lastActiveTabId",
         firstTab.properties.tabId,
@@ -346,14 +346,14 @@ export class ServerManagerView {
       // `webview.load()` for lastActiveTabId before the others
       await this.activateTab(lastActiveTabId);
       await Promise.all(
-        servers.map(async (server, i) => {
+        servers.map(async (server) => {
           // After the lastActiveTabId is activated, we load the others in the background
           // without activating them, to prevent flashing of server icons
           if (server.id === lastActiveTabId) {
             return;
           }
 
-          const tab = this.tabs[i];
+          const tab = this.getTabById(server.id);
           if (tab instanceof ServerTab) (await tab.webview).load();
         }),
       );
@@ -657,6 +657,13 @@ export class ServerManagerView {
     }));
   }
 
+  getTabByOrder(
+    tabs: ServerOrFunctionalTab[],
+    order: number,
+  ): ServerOrFunctionalTab | undefined {
+    return tabs.find((tab) => tab.properties.index === order);
+  }
+
   async activateTab(id: string, hideOldTab = true): Promise<void> {
     const tab = this.getTabById(id);
     if (!tab) {
@@ -729,7 +736,10 @@ export class ServerManagerView {
 
     // Issue #188: If the functional tab was not focused, do not activate another tab.
     if (this.activeTabId === tabId) {
-      await this.activateTab(this.tabs[0].properties.tabId, false);
+      await this.activateTab(
+        this.getTabByOrder(this.tabs, 0)!.properties.tabId,
+        false,
+      );
     }
   }