Merge video call window review fixes (#3359) into telephony branch

# Conflicts:
#	src/ui/main/serverView/index.ts
#	src/videoCallWindow/ipc.ts

Author: jeanfbrito

src/ipc/channels.ts

@@ -33,6 +33,7 @@ type ChannelToArgsMap = {
     }
   ) => void;
   'video-call-window/open-url': (url: string) => void;
+  'video-call-window/open-in-main-window': (path: string) => void;
   'video-call-window/web-contents-id': (webContentsId: number) => void;
   'video-call-window/open-screen-picker': () => { success: boolean };
   'video-call-window/screen-sharing-source-responded': (source: string) => void;

src/preload.ts

@@ -6,6 +6,7 @@ import { JitsiMeetElectron } from './jitsi/preload';
 import { listenToNotificationsRequests } from './notifications/preload';
 import { listenToScreenSharingRequests } from './screenSharing/preload';
 import { RocketChatDesktop } from './servers/preload/api';
+import { listenToNavigateToRouteRequests } from './servers/preload/navigateToRoute';
 import { setServerUrl } from './servers/preload/urls';
 import { createRendererReduxStore, listen } from './store';
 import { listenToTelephonyRequests } from './telephony/preload';
@@ -66,6 +67,7 @@ const start = async (): Promise<void> => {
   await invoke('server-view/ready');
 
   listenToTelephonyRequests();
+  listenToNavigateToRouteRequests();
 
   console.log('[Rocket.Chat Desktop] waiting for RocketChatDesktop.onReady');
   RocketChatDesktop.onReady(() => {

src/servers/preload/api.ts

@@ -29,6 +29,7 @@ import {
   getInternalVideoChatWindowEnabled,
   openInternalVideoChatWindow,
 } from './internalVideoChatWindow';
+import { onNavigateToRoute } from './navigateToRoute';
 import { openInBrowser } from './openInBrowser';
 import { reloadServer } from './reloadServer';
 import {
@@ -59,6 +60,7 @@ type ExtendedIRocketChatDesktop = IRocketChatDesktop & {
     callback: (payload: { phoneNumber: string; rawUri: string }) => void
   ) => void;
   supportedDocumentViewerFormats: () => string[];
+  onNavigateToRoute: (callback: (path: string) => void) => void;
 };
 
 declare global {
@@ -108,4 +110,5 @@ export const RocketChatDesktop: Window['RocketChatDesktop'] = {
   reloadServer,
   getE2ePdfPreviewSizeLimit,
   onTelephonyCallRequested,
+  onNavigateToRoute,
 };

src/servers/preload/navigateToRoute.spec.ts

@@ -0,0 +1,65 @@
+type IpcListener = (event: unknown, path: string) => void;
+
+const ipcListeners = new Map<string, IpcListener>();
+const on = jest.fn((channel: string, listener: IpcListener) => {
+  ipcListeners.set(channel, listener);
+});
+
+jest.mock('electron', () => ({
+  ipcRenderer: {
+    on: (channel: string, listener: IpcListener) => on(channel, listener),
+  },
+}));
+
+const emit = (path: string) => {
+  const listener = ipcListeners.get('navigate-to-route');
+  if (!listener) throw new Error('navigate-to-route listener not registered');
+  listener({}, path);
+};
+
+describe('servers/preload/navigateToRoute', () => {
+  let onNavigateToRoute: (cb: (path: string) => void) => void;
+  let listenToNavigateToRouteRequests: () => void;
+
+  beforeEach(async () => {
+    jest.resetModules();
+    ipcListeners.clear();
+    on.mockClear();
+    const mod = await import('./navigateToRoute');
+    onNavigateToRoute = mod.onNavigateToRoute;
+    listenToNavigateToRouteRequests = mod.listenToNavigateToRouteRequests;
+  });
+
+  it('registers the ipcRenderer listener only once', () => {
+    listenToNavigateToRouteRequests();
+    listenToNavigateToRouteRequests();
+    expect(on).toHaveBeenCalledTimes(1);
+    expect(on).toHaveBeenCalledWith('navigate-to-route', expect.any(Function));
+  });
+
+  it('delivers the path to a callback registered before the event', () => {
+    listenToNavigateToRouteRequests();
+    const cb = jest.fn();
+    onNavigateToRoute(cb);
+
+    emit('/channel/general');
+
+    expect(cb).toHaveBeenCalledWith('/channel/general');
+  });
+
+  it('buffers a path that arrives before the callback registers, then flushes once', () => {
+    listenToNavigateToRouteRequests();
+
+    emit('/admin/rooms');
+
+    const cb = jest.fn();
+    onNavigateToRoute(cb);
+    expect(cb).toHaveBeenCalledTimes(1);
+    expect(cb).toHaveBeenCalledWith('/admin/rooms');
+
+    // The buffered path is consumed: a later registration gets nothing extra.
+    const cb2 = jest.fn();
+    onNavigateToRoute(cb2);
+    expect(cb2).not.toHaveBeenCalled();
+  });
+});

src/servers/preload/navigateToRoute.ts

@@ -0,0 +1,36 @@
+import { ipcRenderer } from 'electron';
+
+let navigateCallback: ((path: string) => void) | null = null;
+let pendingPath: string | null = null;
+
+// Registered by the web client to receive in-app route changes requested by the
+// desktop shell (e.g. from the standalone video call window). `path` is a
+// server-relative route, e.g. "/channel/general".
+export const onNavigateToRoute = (callback: (path: string) => void): void => {
+  navigateCallback = callback;
+  if (pendingPath) {
+    callback(pendingPath);
+    pendingPath = null;
+  }
+};
+
+let listening = false;
+
+// Relays the main-process 'navigate-to-route' event (delivered to this preload's
+// ipcRenderer, since the server webview is contextIsolated) to the web client's
+// callback. Buffers the latest path if a request arrives before the web client
+// has registered its handler.
+export const listenToNavigateToRouteRequests = (): void => {
+  if (listening) {
+    return;
+  }
+  listening = true;
+
+  ipcRenderer.on('navigate-to-route', (_event, path: string) => {
+    if (navigateCallback) {
+      navigateCallback(path);
+    } else {
+      pendingPath = path;
+    }
+  });
+};

src/ui/main/menuBar.ts

@@ -605,7 +605,11 @@ const createHelpMenu = createSelector(
         label: t('menus.toggleDevTools'),
         accelerator: 'CommandOrControl+Shift+D',
         click: async () => {
-          const browserWindow = await getRootWindow();
+          // Target the focused window (e.g. the video call window) so DevTools
+          // open where the user is looking; fall back to the main window when
+          // nothing is focused.
+          const browserWindow =
+            BrowserWindow.getFocusedWindow() ?? (await getRootWindow());
 
           if (!browserWindow.isVisible()) {
             browserWindow.showInactive();

src/ui/main/serverView/index.ts

@@ -133,12 +133,20 @@ export const setupServerViewPermissionHandler = (
       switch (permission) {
         case 'media': {
           const { mediaTypes = [] } = details as MediaAccessPermissionRequest;
-          await handleMediaPermissionRequest(
-            mediaTypes as ReadonlyArray<'audio' | 'video'>,
-            rootWindow,
-            'recordMessage',
-            callback
-          );
+          try {
+            await handleMediaPermissionRequest(
+              mediaTypes as ReadonlyArray<'audio' | 'video'>,
+              rootWindow,
+              'recordMessage',
+              callback
+            );
+          } catch (error) {
+            console.error(
+              'Error handling media permission request in server view:',
+              error
+            );
+            callback(false);
+          }
           return;
         }
 
@@ -518,7 +526,7 @@ export const attachGuestWebContentsEvents = async (): Promise<void> => {
 
   listen(SIDE_BAR_SERVER_COPY_URL, async (action) => {
     const guestWebContents = getWebContentsByServerUrl(action.payload);
-    const currentUrl = await guestWebContents?.getURL();
+    const currentUrl = guestWebContents?.getURL();
     clipboard.writeText(currentUrl || '');
   });
 
@@ -588,7 +596,7 @@ export const attachGuestWebContentsEvents = async (): Promise<void> => {
         label: t('sidebar.item.copyCurrentUrl'),
         click: async () => {
           const guestWebContents = getWebContentsByServerUrl(serverUrl);
-          const currentUrl = await guestWebContents?.getURL();
+          const currentUrl = guestWebContents?.getURL();
           clipboard.writeText(currentUrl || '');
         },
       },