tab: Use activeTabId instead of activeTabIndex.

We also use lastActiveTabId instead of lastActiveTabIndex now.
`save-last-tab` uses id instead of index to commmunicate the identity of
a server. getNextServer and getPreviousServer also start using id with
this commit, the index mentioned in those functions is actually the
order in which the servers should be displayed and we will fix that
problem in upcoming commits.

Author: shubham-padia

app/common/config-schemata.ts

@@ -21,7 +21,7 @@ export const configSchemata = {
   downloadsPath: z.string(),
   enableSpellchecker: z.boolean(),
   errorReporting: z.boolean(),
-  lastActiveTab: z.number(),
+  lastActiveTabId: z.string().optional(),
   promptDownload: z.boolean(),
   proxyBypass: z.string(),
   // eslint-disable-next-line @typescript-eslint/naming-convention

app/common/typed-ipc.ts

@@ -13,7 +13,7 @@ export type MainMessage = {
   "realm-icon-changed": (serverURL: string, iconURL: string) => void;
   "realm-name-changed": (serverURL: string, realmName: string) => void;
   "reload-full-app": () => void;
-  "save-last-tab": (index: number) => void;
+  "save-last-tab": (tabId: string) => void;
   "switch-server-tab": (serverId: string) => void;
   "toggle-app": () => void;
   "toggle-badge-option": (newValue: boolean) => void;

app/common/types.ts

@@ -1,6 +1,6 @@
 export type MenuProperties = {
   tabs: TabData[];
-  activeTabIndex?: number;
+  activeTabId?: string;
   enableMenu?: boolean;
 };
 

app/main/index.ts

@@ -428,9 +428,11 @@ function createMainWindow(): BrowserWindow {
 
   ipcMain.on("update-menu", (_event, properties: MenuProperties) => {
     AppMenu.setMenu(properties);
-    if (properties.activeTabIndex !== undefined) {
-      const activeTab = properties.tabs[properties.activeTabIndex];
-      mainWindow.setTitle(`Zulip - ${activeTab.label}`);
+    if (properties.activeTabId !== undefined) {
+      const activeTab = properties.tabs.find(
+        (tab) => tab.id === properties.activeTabId,
+      );
+      mainWindow.setTitle(`Zulip - ${activeTab!.label}`);
     }
   });
 
@@ -452,8 +454,8 @@ function createMainWindow(): BrowserWindow {
     },
   );
 
-  ipcMain.on("save-last-tab", (_event, index: number) => {
-    ConfigUtil.setConfigItem("lastActiveTab", index);
+  ipcMain.on("save-last-tab", (_event, tabId: string) => {
+    ConfigUtil.setConfigItem("lastActiveTabId", tabId);
   });
 
   ipcMain.on("focus-this-webview", (event) => {

app/main/menu.ts

@@ -294,7 +294,7 @@ function getHelpSubmenu(): MenuItemConstructorOptions[] {
 
 function getWindowSubmenu(
   tabs: TabData[],
-  activeTabIndex?: number,
+  activeTabId?: string,
 ): MenuItemConstructorOptions[] {
   const initialSubmenu: MenuItemConstructorOptions[] = [
     {
@@ -326,7 +326,7 @@ function getWindowSubmenu(
         label: tab.label,
         accelerator:
           tab.role === "function" ? "" : `${shortcutKey} + ${tab.index + 1}`,
-        checked: tab.index === activeTabIndex,
+        checked: tab.id === activeTabId,
         click(_item, focusedWindow) {
           if (focusedWindow) {
             sendAction("switch-server-tab", tab.serverId!);
@@ -346,10 +346,7 @@ function getWindowSubmenu(
         enabled: tabs.length > 1,
         click(_item, focusedWindow) {
           if (focusedWindow) {
-            sendAction(
-              "switch-server-tab",
-              getNextServer(tabs, tabs[activeTabIndex!]),
-            );
+            sendAction("switch-server-tab", getNextServer(tabs, activeTabId!));
           }
         },
       },
@@ -361,7 +358,7 @@ function getWindowSubmenu(
           if (focusedWindow) {
             sendAction(
               "switch-server-tab",
-              getPreviousServer(tabs, tabs[activeTabIndex!]),
+              getPreviousServer(tabs, activeTabId!),
             );
           }
         },
@@ -375,7 +372,7 @@ function getWindowSubmenu(
 function getDarwinTpl(
   properties: MenuProperties,
 ): MenuItemConstructorOptions[] {
-  const {tabs, activeTabIndex, enableMenu = false} = properties;
+  const {tabs, activeTabId, enableMenu = false} = properties;
 
   return [
     {
@@ -525,7 +522,7 @@ function getDarwinTpl(
     },
     {
       label: t.__("Window"),
-      submenu: getWindowSubmenu(tabs, activeTabIndex),
+      submenu: getWindowSubmenu(tabs, activeTabId),
     },
     {
       label: t.__("Tools"),
@@ -540,7 +537,7 @@ function getDarwinTpl(
 }
 
 function getOtherTpl(properties: MenuProperties): MenuItemConstructorOptions[] {
-  const {tabs, activeTabIndex, enableMenu = false} = properties;
+  const {tabs, activeTabId, enableMenu = false} = properties;
   return [
     {
       label: t.__("File"),
@@ -673,7 +670,7 @@ function getOtherTpl(properties: MenuProperties): MenuItemConstructorOptions[] {
     },
     {
       label: t.__("Window"),
-      submenu: getWindowSubmenu(tabs, activeTabIndex),
+      submenu: getWindowSubmenu(tabs, activeTabId),
     },
     {
       label: t.__("Tools"),
@@ -704,7 +701,8 @@ async function checkForUpdate(): Promise<void> {
   await appUpdater(true);
 }
 
-function getNextServer(tabs: TabData[], activeTab: TabData): string {
+function getNextServer(tabs: TabData[], activeTabId: string): string {
+  const activeTab = tabs.find((tab) => tab.id === activeTabId)!;
   let {index} = activeTab;
   do {
     index = (index + 1) % tabs.length;
@@ -713,7 +711,8 @@ function getNextServer(tabs: TabData[], activeTab: TabData): string {
   return tabs[index].serverId!;
 }
 
-function getPreviousServer(tabs: TabData[], activeTab: TabData): string {
+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;