[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
2023-05-08 09:17:01 -04:00
parent 9f75ddcf0f
commit 316beba950
110 changed files with 1698 additions and 1757 deletions
--- a/src/main/menus/app.test.js
+++ b/src/main/menus/app.test.js
@@ -67,8 +67,8 @@ jest.mock('main/windows/mainWindow', () => ({
    sendToRenderer: jest.fn(),
 }));
 jest.mock('main/windows/settingsWindow', () => ({}));
-jest.mock('common/tabs/TabView', () => ({
-    getTabDisplayName: (name) => name,
+jest.mock('common/views/View', () => ({
+    getViewDisplayName: (name) => name,
 }));

 describe('main/menus/app', () => {
@@ -88,19 +88,19 @@ describe('main/menus/app', () => {
            url: 'https:/ /github.com/',
        },
    ];
-    const tabs = [
+    const views = [
        {
-            id: 'tab-1',
+            id: 'view-1',
            name: 'TAB_MESSAGING',
            isOpen: true,
        },
        {
-            id: 'tab-2',
+            id: 'view-2',
            name: 'TAB_FOCALBOARD',
            isOpen: true,
        },
        {
-            id: 'tab-3',
+            id: 'view-3',
            name: 'TAB_PLAYBOOKS',
            isOpen: true,
        },
@@ -109,7 +109,7 @@ describe('main/menus/app', () => {
    beforeEach(() => {
        ServerManager.getCurrentServer.mockReturnValue(servers[0]);
        ServerManager.getOrderedServers.mockReturnValue(servers);
-        ServerManager.getOrderedTabsForServer.mockReturnValue(tabs);
+        ServerManager.getOrderedTabsForServer.mockReturnValue(views);
        getDarwinDoNotDisturb.mockReturnValue(false);
    });

@@ -217,7 +217,7 @@ describe('main/menus/app', () => {
        expect(signInOption).toBe(undefined);
    });

-    it('should not show `Sign in to Another Server` if no teams are configured', () => {
+    it('should not show `Sign in to Another Server` if no servers are configured', () => {
        localizeMessage.mockImplementation((id) => {
            switch (id) {
            case 'main.menus.app.file':
@@ -247,15 +247,15 @@ describe('main/menus/app', () => {
            name: `server-${key}`,
            url: `http://server-${key}.com`,
        }));
-        const modifiedTabs = [
+        const modifiedViews = [
            {
-                id: 'tab-1',
+                id: 'view-1',
                type: 'TAB_MESSAGING',
                isOpen: true,
            },
        ];
        ServerManager.getOrderedServers.mockReturnValue(modifiedServers);
-        ServerManager.getOrderedTabsForServer.mockReturnValue(modifiedTabs);
+        ServerManager.getOrderedTabsForServer.mockReturnValue(modifiedViews);
        const menu = createTemplate(config);
        const windowMenu = menu.find((item) => item.label === '&Window');
        for (let i = 0; i < 9; i++) {
@@ -268,32 +268,32 @@ describe('main/menus/app', () => {
        }
    });

-    it('should show the first 9 tabs (using order) in the Window menu', () => {
+    it('should show the first 9 views (using order) in the Window menu', () => {
        localizeMessage.mockImplementation((id) => {
            if (id === 'main.menus.app.window') {
                return '&Window';
            }
-            if (id.startsWith('common.tabs')) {
-                return id.replace('common.tabs.', '');
+            if (id.startsWith('common.views')) {
+                return id.replace('common.views.', '');
            }
            return id;
        });
        ServerManager.getCurrentServer.mockImplementation(() => ({id: servers[0].id}));

-        const modifiedTabs = [...Array(15).keys()].map((key) => ({
-            id: `tab-${key}`,
-            type: `tab-${key}`,
+        const modifiedViews = [...Array(15).keys()].map((key) => ({
+            id: `view-${key}`,
+            type: `view-${key}`,
            isOpen: true,
        }));
-        ServerManager.getOrderedTabsForServer.mockReturnValue(modifiedTabs);
+        ServerManager.getOrderedTabsForServer.mockReturnValue(modifiedViews);
        const menu = createTemplate(config);
        const windowMenu = menu.find((item) => item.label === '&Window');
        for (let i = 0; i < 9; i++) {
-            const menuItem = windowMenu.submenu.find((item) => item.label === `    tab-${i}`);
+            const menuItem = windowMenu.submenu.find((item) => item.label === `    view-${i}`);
            expect(menuItem).not.toBe(undefined);
        }
        for (let i = 9; i < 15; i++) {
-            const menuItem = windowMenu.submenu.find((item) => item.label === `    tab-${i}`);
+            const menuItem = windowMenu.submenu.find((item) => item.label === `    view-${i}`);
            expect(menuItem).toBe(undefined);
        }
    });
--- a/src/main/menus/app.ts
+++ b/src/main/menus/app.ts
@@ -6,9 +6,9 @@
 import {app, ipcMain, Menu, MenuItemConstructorOptions, MenuItem, session, shell, WebContents, clipboard} from 'electron';
 import log from 'electron-log';

-import {OPEN_TEAMS_DROPDOWN, SHOW_NEW_SERVER_MODAL} from 'common/communication';
+import {OPEN_SERVERS_DROPDOWN, SHOW_NEW_SERVER_MODAL} from 'common/communication';
 import {t} from 'common/utils/util';
-import {getTabDisplayName, TabType} from 'common/tabs/TabView';
+import {getViewDisplayName, ViewType} from 'common/views/View';
 import {Config} from 'common/config';

 import {localizeMessage} from 'main/i18nManager';
@@ -18,7 +18,7 @@ import downloadsManager from 'main/downloadsManager';
 import Diagnostics from 'main/diagnostics';
 import ViewManager from 'main/views/viewManager';
 import SettingsWindow from 'main/windows/settingsWindow';
-import {selectNextTab, selectPreviousTab} from 'main/app/tabs';
+import {selectNextView, selectPreviousView} from 'main/app/views';
 import {switchServer} from 'main/app/servers';

 export function createTemplate(config: Config, updateManager: UpdateManager) {
@@ -233,7 +233,7 @@ export function createTemplate(config: Config, updateManager: UpdateManager) {
        }],
    });

-    const teams = ServerManager.getOrderedServers();
+    const servers = ServerManager.getOrderedServers();
    const windowMenu = {
        id: 'window',
        label: localizeMessage('main.menus.app.window', '&Window'),
@@ -257,25 +257,25 @@ export function createTemplate(config: Config, updateManager: UpdateManager) {
            label: localizeMessage('main.menus.app.window.showServers', 'Show Servers'),
            accelerator: `${process.platform === 'darwin' ? 'Cmd+Ctrl' : 'Ctrl+Shift'}+S`,
            click() {
-                ipcMain.emit(OPEN_TEAMS_DROPDOWN);
+                ipcMain.emit(OPEN_SERVERS_DROPDOWN);
            },
        }] : []),
-        ...teams.slice(0, 9).map((team, i) => {
+        ...servers.slice(0, 9).map((server, i) => {
            const items = [];
            items.push({
-                label: team.name,
+                label: server.name,
                accelerator: `${process.platform === 'darwin' ? 'Cmd+Ctrl' : 'Ctrl+Shift'}+${i + 1}`,
                click() {
-                    switchServer(team.id);
+                    switchServer(server.id);
                },
            });
-            if (ServerManager.getCurrentServer().id === team.id) {
-                ServerManager.getOrderedTabsForServer(team.id).slice(0, 9).forEach((tab, i) => {
+            if (ServerManager.getCurrentServer().id === server.id) {
+                ServerManager.getOrderedTabsForServer(server.id).slice(0, 9).forEach((view, i) => {
                    items.push({
-                        label: `    ${localizeMessage(`common.tabs.${tab.type}`, getTabDisplayName(tab.type as TabType))}`,
+                        label: `    ${localizeMessage(`common.views.${view.type}`, getViewDisplayName(view.type as ViewType))}`,
                        accelerator: `CmdOrCtrl+${i + 1}`,
                        click() {
-                            ViewManager.showById(tab.id);
+                            ViewManager.showById(view.id);
                        },
                    });
                });
@@ -285,16 +285,16 @@ export function createTemplate(config: Config, updateManager: UpdateManager) {
            label: localizeMessage('main.menus.app.window.selectNextTab', 'Select Next Tab'),
            accelerator: 'Ctrl+Tab',
            click() {
-                selectNextTab();
+                selectNextView();
            },
-            enabled: (teams.length > 1),
+            enabled: (servers.length > 1),
        }, {
            label: localizeMessage('main.menus.app.window.selectPreviousTab', 'Select Previous Tab'),
            accelerator: 'Ctrl+Shift+Tab',
            click() {
-                selectPreviousTab();
+                selectPreviousView();
            },
-            enabled: (teams.length > 1),
+            enabled: (servers.length > 1),
        }, ...(isMac ? [separatorItem, {
            role: 'front',
            label: localizeMessage('main.menus.app.window.bringAllToFront', 'Bring All to Front'),
--- a/src/main/menus/tray.ts
+++ b/src/main/menus/tray.ts
@@ -12,13 +12,13 @@ import SettingsWindow from 'main/windows/settingsWindow';
 import {switchServer} from 'main/app/servers';

 export function createTemplate() {
-    const teams = ServerManager.getOrderedServers();
+    const servers = ServerManager.getOrderedServers();
    const template = [
-        ...teams.slice(0, 9).map((team) => {
+        ...servers.slice(0, 9).map((server) => {
            return {
-                label: team.name.length > 50 ? `${team.name.slice(0, 50)}...` : team.name,
+                label: server.name.length > 50 ? `${server.name.slice(0, 50)}...` : server.name,
                click: () => {
-                    switchServer(team.id);
+                    switchServer(server.id);
                },
            };
        }), {