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

[MM-23452][MM-36861] Fixed some configuration issues (#1725)

Browse Source 
* [MM-23452] Show last used server and tab correctly when restarting the app

* [MM-36861] Ensure handleConfigUpdate runs
This commit is contained in:
Devin Binnie
2021-09-10 10:48:00 -04:00
committed by GitHub
parent 54d82493bf
commit 082c95b094
9 changed files with 40 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/views/viewManager.ts
View File

@@ -16,6 +16,7 @@ import {
LOADSCREEN_END,
SET_ACTIVE_VIEW,
OPEN_TAB,
UPDATE_LAST_ACTIVE,
} from 'common/communication';
import urlUtils from 'common/utils/url';
@@ -33,6 +34,7 @@ const URL_VIEW_HEIGHT = 36;
export class ViewManager {
configServers: TeamWithTabs[];
lastActiveServer?: number;
viewOptions: BrowserViewConstructorOptions;
closedViews: Map<string, {srv: MattermostServer; tab: Tab}>;
views: Map<string, MattermostView>;
@@ -44,6 +46,7 @@ export class ViewManager {
constructor(config: CombinedConfig, mainWindow: BrowserWindow) {
this.configServers = config.teams;
this.lastActiveServer = config.lastActiveTeam;
this.viewOptions = {webPreferences: {spellcheck: config.useSpellChecker}};
this.views = new Map(); // keep in mind that this doesn't need to hold server order, only tabs on the renderer need that.
this.mainWindow = mainWindow;
@@ -121,10 +124,13 @@ export class ViewManager {
showInitial = () => {
if (this.configServers.length) {
const element = this.configServers.find((e) => e.order === 0);
if (element) {
const openTabs = element.tabs.filter((tab) => !tab.isClosed);
const tab = openTabs.find((e) => e.order === 0) || openTabs[0];
const element = this.configServers.find((e) => e.order === this.lastActiveServer || 0);
if (element && element.tabs.length) {
let tab = element.tabs.find((tab) => tab.order === element.lastActiveTab || 0);
if (tab?.isClosed) {
const openTabs = element.tabs.filter((tab) => !tab.isClosed);
tab = openTabs.find((e) => e.order === 0) || openTabs[0];
}
if (tab) {
const tabView = getTabViewName(element.name, tab.name);
this.showByName(tabView);
@@ -155,6 +161,7 @@ export class ViewManager {
if (newView.isReady()) {
// if view is not ready, the renderer will have something to display instead.
newView.show();
ipcMain.emit(UPDATE_LAST_ACTIVE, true, newView.tab.server.name, newView.tab.type);
if (newView.needsLoadingScreen()) {
this.showLoadingScreen();
} else {