From bf07674d68059f8eb545233adc53759b3d223d85 Mon Sep 17 00:00:00 2001 From: Devin Binnie <52460000+devinbinnie@users.noreply.github.com> Date: Thu, 13 Jun 2024 09:03:10 -0400 Subject: [PATCH] [MM-58593] Ensure desktop app reloads the current URL when reloading manually (#3061) --- src/main/views/viewManager.test.js | 19 +++++++++++++++++++ src/main/views/viewManager.ts | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/main/views/viewManager.test.js b/src/main/views/viewManager.test.js index c83788ae..dd32fad5 100644 --- a/src/main/views/viewManager.test.js +++ b/src/main/views/viewManager.test.js @@ -158,6 +158,25 @@ describe('main/views/viewManager', () => { }); }); + describe('reload', () => { + const viewManager = new ViewManager(); + const currentView = { + currentURL: new URL('http://server-1.com/team/channel'), + reload: jest.fn(), + }; + viewManager.views.set('view1', currentView); + viewManager.currentView = 'view1'; + + afterEach(() => { + jest.resetAllMocks(); + }); + + it('should reload using the current URL', () => { + viewManager.reload(); + expect(currentView.reload).toBeCalledWith(new URL('http://server-1.com/team/channel')); + }); + }); + describe('handleReloadConfiguration', () => { const viewManager = new ViewManager(); diff --git a/src/main/views/viewManager.ts b/src/main/views/viewManager.ts index 2fc5e387..63e37729 100644 --- a/src/main/views/viewManager.ts +++ b/src/main/views/viewManager.ts @@ -165,7 +165,7 @@ export class ViewManager { const currentView = this.getCurrentView(); if (currentView) { LoadingScreen.show(); - currentView.reload(); + currentView.reload(currentView.currentURL); } };