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

[MM-41392] Clean path name on browser pushes for subpaths (#1993)

Browse Source
This commit is contained in:
Devin Binnie
2022-02-04 12:21:05 -05:00
committed by GitHub
parent 94cc15168c
commit 301ba8deb2
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/windows/windowManager.ts
View File

@@ -542,9 +542,10 @@ export class WindowManager {
handleBrowserHistoryPush = (e: IpcMainEvent, viewName: string, pathName: string) => { handleBrowserHistoryPush = (e: IpcMainEvent, viewName: string, pathName: string) => {
const currentView = this.viewManager?.views.get(viewName); const currentView = this.viewManager?.views.get(viewName);
const redirectedViewName = urlUtils.getView(`${currentView?.tab.server.url}${pathName}`, Config.teams)?.name || viewName; const cleanedPathName = pathName.replace(currentView?.tab.server.url.pathname || '', '');
const redirectedViewName = urlUtils.getView(`${currentView?.tab.server.url}${cleanedPathName}`, Config.teams)?.name || viewName;
if (this.viewManager?.closedViews.has(redirectedViewName)) { if (this.viewManager?.closedViews.has(redirectedViewName)) {
this.viewManager.openClosedTab(redirectedViewName, `${currentView?.tab.server.url}${pathName}`); this.viewManager.openClosedTab(redirectedViewName, `${currentView?.tab.server.url}${cleanedPathName}`);
} }
let redirectedView = this.viewManager?.views.get(redirectedViewName) || currentView; let redirectedView = this.viewManager?.views.get(redirectedViewName) || currentView;
if (redirectedView !== currentView && redirectedView?.tab.server.name === this.currentServerName && redirectedView?.isLoggedIn) { if (redirectedView !== currentView && redirectedView?.tab.server.name === this.currentServerName && redirectedView?.isLoggedIn) {
@@ -555,8 +556,8 @@ export class WindowManager {
} }
// Special case check for Channels to not force a redirect to "/", causing a refresh // Special case check for Channels to not force a redirect to "/", causing a refresh
if (!(redirectedView !== currentView && redirectedView?.tab.type === TAB_MESSAGING && pathName === '/')) { if (!(redirectedView !== currentView && redirectedView?.tab.type === TAB_MESSAGING && cleanedPathName === '/')) {
redirectedView?.view.webContents.send(BROWSER_HISTORY_PUSH, pathName); redirectedView?.view.webContents.send(BROWSER_HISTORY_PUSH, cleanedPathName);
if (redirectedView) { if (redirectedView) {
this.handleBrowserHistoryButton(e, redirectedView.name); this.handleBrowserHistoryButton(e, redirectedView.name);
} }