[MM-14093] Rename 'team' to 'server' and 'tab' to 'view' in most cases, some additional cleanup (#2711)

* Rename MattermostTeam -> UniqueServer, MattermostTab -> UniqueView

* Rename 'team' to 'server'

* Some further cleanup

* Rename weirdly named function

* Rename 'tab' to 'view' in most instances

* Fix i18n

* PR feedback

src/types/config.ts

@@ -1,32 +1,32 @@
 // Copyright (c) 2016-present Mattermost, Inc. All Rights Reserved.
 // See LICENSE.txt for license information.
 
-export type Tab = {
+export type View = {
     name: string;
     isOpen?: boolean;
 }
 
-export type Team = {
+export type Server = {
     name: string;
     url: string;
 }
 
-export type ConfigTab = Tab & {
+export type ConfigView = View & {
     order: number;
 }
 
-export type ConfigServer = Team & {
+export type ConfigServer = Server & {
     order: number;
     lastActiveTab?: number;
-    tabs: ConfigTab[];
+    tabs: ConfigView[];
 }
 
-export type MattermostTeam = Team & {
+export type UniqueServer = Server & {
     id?: string;
     isPredefined?: boolean;
 }
 
-export type MattermostTab = Tab & {
+export type UniqueView = View & {
     id?: string;
 }
 
@@ -61,59 +61,49 @@ export type ConfigV3 = {
     appLanguage?: string;
 }
 
-export type ConfigV2 = {
-    version: 2;
-    teams: Array<{
-        name: string;
-        url: string;
-        order: number;
-    }>;
-    showTrayIcon: boolean;
-    trayIconTheme: string;
-    minimizeToTray: boolean;
-    notifications: {
-        flashWindow: number;
-        bounceIcon: boolean;
-        bounceIconType: 'critical' | 'informational';
-    };
-    showUnreadBadge: boolean;
-    useSpellChecker: boolean;
-    enableHardwareAcceleration: boolean;
-    autostart: boolean;
-    spellCheckerLocale: string;
-    spellCheckerURL?: string;
-    darkMode: boolean;
-    downloadLocation?: string;
-}
+export type ConfigV2 =
+    Omit<ConfigV3,
+    'version' |
+    'teams' |
+    'hideOnStart' |
+    'spellCheckerLocales' |
+    'lastActiveTeam' |
+    'startInFullscreen' |
+    'autoCheckForUpdates' |
+    'alwaysMinimize' |
+    'alwaysClose' |
+    'logLevel' |
+    'appLanguage'
+    > & {
+        version: 2;
+        teams: Array<{
+            name: string;
+            url: string;
+            order: number;
+        }>;
+        spellCheckerLocale: string;
+    }
 
-export type ConfigV1 = {
-    version: 1;
-    teams: Array<{
-        name: string;
-        url: string;
-    }>;
-    showTrayIcon: boolean;
-    trayIconTheme: string;
-    minimizeToTray: boolean;
-    notifications: {
-        flashWindow: number;
-        bounceIcon: boolean;
-        bounceIconType: 'critical' | 'informational';
-    };
-    showUnreadBadge: boolean;
-    useSpellChecker: boolean;
-    spellCheckerURL?: string;
-    enableHardwareAcceleration: boolean;
-    autostart: boolean;
-    spellCheckerLocale: string;
-}
+export type ConfigV1 =
+    Omit<ConfigV2,
+    'version' |
+    'teams' |
+    'darkMode' |
+    'downloadLocation'
+    > & {
+        version: 1;
+        teams: Array<{
+            name: string;
+            url: string;
+        }>;
+    }
 
 export type ConfigV0 = {version: 0; url: string};
 
 export type AnyConfig = ConfigV3 | ConfigV2 | ConfigV1 | ConfigV0;
 
 export type BuildConfig = {
-    defaultTeams?: Team[];
+    defaultServers?: Server[];
     helpLink: string;
     enableServerManagement: boolean;
     enableAutoUpdater: boolean;
@@ -122,12 +112,12 @@ export type BuildConfig = {
 }
 
 export type RegistryConfig = {
-    teams: Team[];
+    servers: Server[];
     enableServerManagement: boolean;
     enableAutoUpdater: boolean;
 }
 
-export type CombinedConfig = Omit<ConfigV3, 'teams'> & Omit<BuildConfig, 'defaultTeams'> & {
+export type CombinedConfig = Omit<Config, 'teams'> & Omit<BuildConfig, 'defaultServers'> & {
     appName: string;
     useNativeWindow: boolean;
 }

src/types/window.ts

@@ -5,7 +5,7 @@ import {ipcRenderer, Rectangle} from 'electron/renderer';
 
 import {Language} from '../../i18n/i18n';
 
-import {CombinedConfig, LocalConfiguration, MattermostTab, MattermostTeam} from './config';
+import {CombinedConfig, LocalConfiguration, UniqueView, UniqueServer} from './config';
 import {DownloadedItem, DownloadedItems, DownloadsMenuOpenEventPayload} from './downloads';
 import {SaveQueueItem} from './settings';
 
@@ -32,10 +32,10 @@ declare global {
         desktop: {
             quit: (reason: string, stack: string) => void;
             openAppMenu: () => void;
-            closeTeamsDropdown: () => void;
-            openTeamsDropdown: () => void;
-            switchTab: (tabId: string) => void;
-            closeTab: (tabId: string) => void;
+            closeServersDropdown: () => void;
+            openServersDropdown: () => void;
+            switchTab: (viewId: string) => void;
+            closeView: (viewId: string) => void;
             closeWindow: () => void;
             minimizeWindow: () => void;
             maximizeWindow: () => void;
@@ -51,10 +51,10 @@ declare global {
             updateConfiguration: (saveQueueItems: SaveQueueItem[]) => void;
 
             updateServerOrder: (serverOrder: string[]) => Promise<void>;
-            updateTabOrder: (serverId: string, tabOrder: string[]) => Promise<void>;
-            getLastActive: () => Promise<{server: string; tab: string}>;
-            getOrderedServers: () => Promise<MattermostTeam[]>;
-            getOrderedTabsForServer: (serverId: string) => Promise<MattermostTab[]>;
+            updateTabOrder: (serverId: string, viewOrder: string[]) => Promise<void>;
+            getLastActive: () => Promise<{server: string; view: string}>;
+            getOrderedServers: () => Promise<UniqueServer[]>;
+            getOrderedTabsForServer: (serverId: string) => Promise<UniqueView[]>;
             onUpdateServers: (listener: () => void) => void;
 
             getConfiguration: () => Promise<CombinedConfig[keyof CombinedConfig] | CombinedConfig>;
@@ -74,7 +74,7 @@ declare global {
             onLoadRetry: (listener: (viewId: string, retry: Date, err: string, loadUrl: string) => void) => void;
             onLoadSuccess: (listener: (viewId: string) => void) => void;
             onLoadFailed: (listener: (viewId: string, err: string, loadUrl: string) => void) => void;
-            onSetActiveView: (listener: (serverId: string, tabId: string) => void) => void;
+            onSetActiveView: (listener: (serverId: string, viewId: string) => void) => void;
             onMaximizeChange: (listener: (maximize: boolean) => void) => void;
             onEnterFullScreen: (listener: () => void) => void;
             onLeaveFullScreen: (listener: () => void) => void;
@@ -83,8 +83,8 @@ declare global {
             onModalClose: (listener: () => void) => void;
             onToggleBackButton: (listener: (showExtraBar: boolean) => void) => void;
             onUpdateMentions: (listener: (view: string, mentions: number, unreads: boolean, isExpired: boolean) => void) => void;
-            onCloseTeamsDropdown: (listener: () => void) => void;
-            onOpenTeamsDropdown: (listener: () => void) => void;
+            onCloseServersDropdown: (listener: () => void) => void;
+            onOpenServersDropdown: (listener: () => void) => void;
             onCloseDownloadsDropdown: (listener: () => void) => void;
             onOpenDownloadsDropdown: (listener: () => void) => void;
             onShowDownloadsDropdownButtonBadge: (listener: () => void) => void;
@@ -139,12 +139,12 @@ declare global {
                 showRemoveServerModal: (serverId: string) => void;
 
                 onUpdateServerDropdown: (listener: (
-                    teams: MattermostTeam[],
+                    servers: UniqueServer[],
                     darkMode: boolean,
                     windowBounds: Rectangle,
-                    activeTeam?: string,
+                    activeServer?: string,
                     enableServerManagement?: boolean,
-                    hasGPOTeams?: boolean,
+                    hasGPOServers?: boolean,
                     expired?: Map<string, boolean>,
                     mentions?: Map<string, number>,
                     unreads?: Map<string, boolean>,