phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[MM-50485] Migrate app to ServerManager, remove view names and replace with IDs (#2672)

Browse Source 
* Migrate app to ServerManager, remove view names and replace with IDs

* Fixed a test

* Fixed a bug when adding the initial server

* Merge'd

* Bug fixes and PR feedback
This commit is contained in:
Devin Binnie
2023-04-12 12:52:34 -04:00
committed by GitHub
parent d87097b1eb
commit 686b4ac9f1
58 changed files with 1570 additions and 2175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/menus/tray.ts
View File

@@ -4,20 +4,20 @@
'use strict';
import {Menu, MenuItem, MenuItemConstructorOptions} from 'electron';
import {CombinedConfig} from 'types/config';
import WindowManager from 'main/windows/windowManager';
import {localizeMessage} from 'main/i18nManager';
import ServerManager from 'common/servers/serverManager';
import SettingsWindow from 'main/windows/settingsWindow';
export function createTemplate(config: CombinedConfig) {
const teams = config.teams;
export function createTemplate() {
const teams = ServerManager.getOrderedServers();
const template = [
...teams.sort((teamA, teamB) => teamA.order - teamB.order).slice(0, 9).map((team) => {
...teams.slice(0, 9).map((team) => {
return {
label: team.name.length > 50 ? `${team.name.slice(0, 50)}...` : team.name,
click: () => {
WindowManager.switchServer(team.name);
WindowManager.switchServer(team.id);
},
};
}), {
@@ -36,7 +36,7 @@ export function createTemplate(config: CombinedConfig) {
return template;
}
export function createMenu(config: CombinedConfig) {
export function createMenu() {
// Electron is enforcing certain variables that it doesn't need
return Menu.buildFromTemplate(createTemplate(config) as Array<MenuItemConstructorOptions | MenuItem>);
return Menu.buildFromTemplate(createTemplate() as Array<MenuItemConstructorOptions | MenuItem>);
}