SDA-4847 - add generic listener for enter-full-screen & async leave-full-screen (#2338)

* SDA-4847 - add generic listener for enter-full-screen & async leave-full-screen

* SDA-4847 - Fix uts

* SDA-4847 - Fix uts on windows

* SDA-4847 - Rebase

Author: KiranNiranjan

spec/miniViewHandler.spec.ts

@@ -53,6 +53,7 @@ describe('MiniViewHandler', () => {
       unmaximize: jest.fn(),
       setSize: jest.fn(),
       setAlwaysOnTop: jest.fn(),
+      once: jest.fn(),
     };
 
     mockMainWebContents = {
@@ -73,12 +74,12 @@ describe('MiniViewHandler', () => {
   });
 
   describe('activateMiniView', () => {
-    it('should set correct bounds when mainWinPosInMiniView exists', () => {
+    it('should set correct bounds when mainWinPosInMiniView exists', async () => {
       (config.getUserConfigFields as jest.Mock).mockReturnValue({
         mainWinPosInMiniView: { x: 10, y: 20, width: 500, height: 400 },
       });
 
-      miniViewHandler.activateMiniView();
+      await miniViewHandler.activateMiniView();
 
       expect(mockMainWindow.setBounds).toHaveBeenCalledWith({
         x: 10,
@@ -88,11 +89,11 @@ describe('MiniViewHandler', () => {
       });
     });
 
-    it('should set default width and preserve height when mainWinPosInMiniView does not exist or has width > DEFAULT_MINI_VIEW_WINDOW_WIDTH', () => {
+    it('should set default width and preserve height when mainWinPosInMiniView does not exist or has width > DEFAULT_MINI_VIEW_WINDOW_WIDTH', async () => {
       (config.getUserConfigFields as jest.Mock).mockReturnValue({
         mainWinPosInMiniView: { x: 10, y: 20, width: 700, height: 400 },
       });
-      miniViewHandler.activateMiniView();
+      await miniViewHandler.activateMiniView();
 
       expect(mockMainWindow.setSize).toHaveBeenCalledWith(
         DEFAULT_MINI_VIEW_WINDOW_WIDTH,
@@ -102,32 +103,46 @@ describe('MiniViewHandler', () => {
 
     it('should call setIsMiniViewTransition and notifyClient with true', (done) => {
       jest.useFakeTimers();
-      miniViewHandler.activateMiniView();
-
+      miniViewHandler.activateMiniView().then(() => {
+        expect(windowHandler.setIsMiniViewTransition).toHaveBeenLastCalledWith(
+          false,
+        );
+        expect(mockMainWebContents.send).toHaveBeenCalledWith(
+          'set-mini-view',
+          true,
+        );
+        done();
+      });
       expect(windowHandler.setIsMiniViewTransition).toHaveBeenLastCalledWith(
         true,
       );
-
       jest.runAllTimers();
-      expect(windowHandler.setIsMiniViewTransition).toHaveBeenLastCalledWith(
-        false,
-      );
-      expect(mockMainWebContents.send).toHaveBeenCalledWith(
-        'set-mini-view',
-        true,
-      );
-      done();
     });
 
-    it('should set fullscreen to false if currently is in fullscreen', () => {
+    it('should set fullscreen to false if currently is in fullscreen', async () => {
+      jest.useFakeTimers();
       (mockMainWindow.isFullScreen as jest.Mock).mockReturnValue(true);
-      miniViewHandler.activateMiniView();
+      (mockMainWindow.once as jest.Mock).mockImplementation(
+        (event, callback) => {
+          if (event === 'leave-full-screen') {
+            callback();
+            jest.runAllTimers();
+          }
+        },
+      );
+      await miniViewHandler.activateMiniView();
       expect(mockMainWindow.setFullScreen).toHaveBeenCalledWith(false);
+      expect(mockMainWindow.once).toHaveBeenCalledWith(
+        'leave-full-screen',
+        expect.any(Function),
+      );
     });
 
-    it('should call unmaximize if currently is maximized', () => {
+    it('should call unmaximize if currently is maximized', async () => {
+      jest.useFakeTimers();
       (mockMainWindow.isMaximized as jest.Mock).mockReturnValue(true);
-      miniViewHandler.activateMiniView();
+      await miniViewHandler.activateMiniView();
+      jest.runAllTimers();
       expect(mockMainWindow.unmaximize).toHaveBeenCalled();
       expect(mainEvents.publish).toHaveBeenCalledWith('unmaximize');
     });

src/app/main-api-handler.ts

@@ -63,8 +63,8 @@ import { getCommandLineArgs } from '../common/utils';
 import callNotificationHelper from '../renderer/call-notification-helper';
 import { autoUpdate, AutoUpdateTrigger } from './auto-update-handler';
 import { SDAUserSessionActionTypes } from './bi/interface';
-import { miniViewHandler } from './mini-view-handler';
 import { displayMediaRequestHandler } from './display-media-request-handler';
+import { miniViewHandler } from './mini-view-handler';
 import { openfinHandler } from './openfin-handler';
 import { presenceStatus } from './presence-status-handler';
 import { appStats } from './stats';
@@ -399,7 +399,7 @@ ipcMain.on(
               (win) =>
                 (win as ICustomBrowserWindow).winName &&
                 (win as ICustomBrowserWindow).winName ===
-                apiName.notificationWindowName,
+                  apiName.notificationWindowName,
             );
             notificationWindows.map((notificationWindow) => {
               const notificationWebContents = notificationWindow?.webContents;
@@ -468,8 +468,8 @@ ipcMain.on(
         const podUrl = urlFromCmd
           ? urlFromCmd.substr(6)
           : userConfigURL
-            ? userConfigURL
-            : globalConfigURL;
+          ? userConfigURL
+          : globalConfigURL;
         const { subdomain, domain, tld } = whitelistHandler.parseDomain(podUrl);
         const localConfig = config.getConfigFields([
           'enableBrowserLogin',

src/app/mini-view-handler.ts

@@ -1,3 +1,6 @@
+import { BrowserWindow } from 'electron';
+
+import { isMac } from '../common/env';
 import { logger } from '../common/logger';
 import { config } from './config-handler';
 import { mainEvents } from './main-event-handler';
@@ -17,13 +20,13 @@ class MiniViewHandler {
    *
    * @returns {void}
    */
-  public activateMiniView = (): void => {
+  public activateMiniView = async (): Promise<void> => {
     windowHandler.setIsMiniViewTransition(true);
     logger.info('mini-view-handler: activateMiniView called');
     const mainWindow = windowHandler.getMainWindow();
     if (mainWindow && windowExists(mainWindow)) {
       if (mainWindow.isFullScreen()) {
-        mainWindow.setFullScreen(false);
+        await this.exitFullscreenAsync(mainWindow);
       }
       if (mainWindow.isMaximized()) {
         mainWindow.unmaximize();
@@ -117,6 +120,28 @@ class MiniViewHandler {
       mainWebContents.send('set-mini-view', miniViewState);
     }
   };
+
+  private exitFullscreenAsync = (window: BrowserWindow): Promise<void> => {
+    return new Promise<void>((resolve) => {
+      window.once('leave-full-screen', () => {
+        if (!window || !windowExists(window)) {
+          logger.error(
+            'mini-view-handler: window does not exist or is destroyed',
+          );
+          resolve();
+          return;
+        }
+        if (isMac) {
+          resolve();
+        } else {
+          setTimeout(() => {
+            resolve();
+          }, 0);
+        }
+      });
+      window.setFullScreen(false);
+    });
+  };
 }
 
 const miniViewHandler = new MiniViewHandler();

src/app/window-handler.ts

@@ -528,6 +528,16 @@ export class WindowHandler {
         }
       }
     });
+
+    this.mainWindow.on('enter-full-screen', () => {
+      if (this.isMiniViewFeatureEnabled && this.isMiniViewEnabled) {
+        miniViewHandler.notifyClient(false);
+        const appMenu = this.appMenu;
+        if (appMenu) {
+          appMenu.buildMenu();
+        }
+      }
+    });
     if (isMaximized || isMaximizedFlag) {
       this.mainWindow.maximize();
       logger.info(

src/app/window-utils.ts

@@ -55,7 +55,6 @@ import { notification } from '../renderer/notification';
 import { autoLaunchInstance } from './auto-launch-controller';
 import { autoUpdate, AutoUpdateTrigger } from './auto-update-handler';
 import { mainEvents } from './main-event-handler';
-import { miniViewHandler } from './mini-view-handler';
 import { openfinHandler } from './openfin-handler';
 import { presenceStatus } from './presence-status-handler';
 import { presenceStatusStore } from './stores';
@@ -1408,16 +1407,6 @@ export const loadWebContentsView = async (
       });
     }, 500);
     mainEvents.publish('enter-full-screen');
-    if (
-      windowHandler.getIsMiniViewFeatureEnabled() &&
-      windowHandler.getIsMiniViewEnabled()
-    ) {
-      miniViewHandler.notifyClient(false);
-      const appMenu = windowHandler.appMenu;
-      if (appMenu) {
-        appMenu.buildMenu();
-      }
-    }
   });
   mainWindow.on('leave-full-screen', () => {
     logger.info('EVENT leave-full-screen!!');