temp: Replace index with order.

Author: shubham-padia

app/common/types.ts

@@ -29,6 +29,6 @@ export type TabData = {
   role: TabRole;
   page?: TabPage;
   label: string;
-  index: number;
+  order: number;
   id: string;
 };

app/main/menu.ts

@@ -323,7 +323,7 @@ function getWindowSubmenu(
       initialSubmenu.push({
         label: tab.label,
         accelerator:
-          tab.role === "function" ? "" : `${shortcutKey} + ${tab.index + 1}`,
+          tab.role === "function" ? "" : `${shortcutKey} + ${tab.order + 1}`,
         checked: tab === activeTab,
         click(_item, focusedWindow) {
           if (focusedWindow) {
@@ -700,25 +700,25 @@ async function checkForUpdate(): Promise<void> {
 }
 
 function getTabByOrder(tabs: TabData[], order: number): TabData | undefined {
-  return tabs.find((tab) => tab.index === order);
+  return tabs.find((tab) => tab.order === order);
 }
 
 function getNextServer(tabs: TabData[], activeTab: TabData): string {
-  let {index} = activeTab;
+  let {order} = activeTab;
   do {
-    index = (index + 1) % tabs.length;
-  } while (getTabByOrder(tabs, index)?.role !== "server");
+    order = (order + 1) % tabs.length;
+  } while (getTabByOrder(tabs, order)?.role !== "server");
 
-  return getTabByOrder(tabs, index)!.id;
+  return getTabByOrder(tabs, order)!.id;
 }
 
 function getPreviousServer(tabs: TabData[], activeTab: TabData): string {
-  let {index} = activeTab;
+  let {order} = activeTab;
   do {
-    index = (index - 1) % tabs.length;
-  } while (getTabByOrder(tabs, index)?.role !== "server");
+    order = (order - 1) % tabs.length;
+  } while (getTabByOrder(tabs, order)?.role !== "server");
 
-  return getTabByOrder(tabs, index)!.id;
+  return getTabByOrder(tabs, order)!.id;
 }
 
 export function setMenu(properties: MenuProperties): void {

app/renderer/js/components/server-tab.ts

@@ -77,13 +77,13 @@ export default class ServerTab extends Tab {
 
   generateShortcutText(): string {
     // Only provide shortcuts for server [0..9]
-    if (this.properties.index >= 9) {
+    if (this.properties.order >= 9) {
       return "";
     }
 
-    const shownIndex = this.properties.index + 1;
+    const shownIndex = this.properties.order + 1;
 
-    // Array index == Shown index - 1
+    // Array order == Shown order - 1
     ipcRenderer.send("switch-server-tab", this.properties.tabId);
 
     return process.platform === "darwin"

app/renderer/js/components/tab.ts

@@ -7,7 +7,7 @@ export type TabProperties = {
   label: string;
   $root: Element;
   onClick: () => void;
-  index: number;
+  order: number;
   tabId: string;
   onHover?: () => void;
   onHoverOut?: () => void;

app/renderer/js/main.ts

@@ -339,7 +339,7 @@ export class ServerManagerView {
         firstTab.properties.tabId,
       )!;
       let lastActiveTab = this.getTabById(lastActiveTabId)!;
-      if (lastActiveTab.properties.index >= servers.length) {
+      if (lastActiveTab.properties.order >= servers.length) {
         lastActiveTab = firstTab;
       }
 
@@ -367,15 +367,15 @@ export class ServerManagerView {
     }
   }
 
-  initServer(server: ServerConfig, index: number): ServerTab {
+  initServer(server: ServerConfig, order: number): ServerTab {
     const tabId = server.id;
     const tab: ServerTab = new ServerTab({
       role: "server",
       icon: DomainUtil.iconAsUrl(server.icon),
       label: server.alias,
       $root: this.$tabsContainer,
       onClick: this.activateLastTab.bind(this, tabId),
-      index,
+      order,
       tabId,
       onHover: this.onHover.bind(this, tabId),
       onHoverOut: this.onHoverOut.bind(this, tabId),
@@ -555,7 +555,7 @@ export class ServerManagerView {
       return;
     }
 
-    const index = this.tabs.length;
+    const order = this.tabs.length;
     const tabId = this.generateTabId();
     this.functionalTabs.set(tabProperties.page, tabId);
     const $view = await tabProperties.makeView();
@@ -568,7 +568,7 @@ export class ServerManagerView {
         label: tabProperties.label,
         page: tabProperties.page,
         $root: this.$tabsContainer,
-        index,
+        order,
         tabId,
         onClick: this.activateTab.bind(this, tabId),
         onDestroy: async () => {
@@ -636,7 +636,6 @@ export class ServerManagerView {
   }
 
   async activateLastTab(id: string): Promise<void> {
-    // Open all the tabs in background, also activate the tab based on the index
     await this.activateTab(id);
     // Save last active tab via main process to avoid JSON DB errors
     ipcRenderer.send("save-last-tab", id);
@@ -650,7 +649,7 @@ export class ServerManagerView {
       role: tab.properties.role,
       page: tab.properties.page,
       label: tab.properties.label,
-      index: tab.properties.index,
+      order: tab.properties.order,
       id: tab.properties.tabId,
     };
   }
@@ -663,7 +662,7 @@ export class ServerManagerView {
     tabs: ServerOrFunctionalTab[],
     order: number,
   ): ServerOrFunctionalTab | undefined {
-    return tabs.find((tab) => tab.properties.index === order);
+    return tabs.find((tab) => tab.properties.order === order);
   }
 
   async activateTab(id: string, hideOldTab = true): Promise<void> {
@@ -767,7 +766,7 @@ export class ServerManagerView {
   }
 
   async reloadView(): Promise<void> {
-    // Save and remember the index of last active tab so that we can use it later
+    // Save and remember the id of last active tab so that we can use it later
     const {activeTab} = this;
     if (activeTab !== undefined) {
       ConfigUtil.setConfigItem("lastActiveTabId", activeTab.properties.tabId);