Backport 23.4.x fixes

src/app/app-cache-handler.ts

@@ -1,4 +1,10 @@
-import { app, BrowserWindow, dialog, session } from 'electron';
+import {
+  app,
+  BrowserWindow,
+  dialog,
+  MessageBoxOptions,
+  session,
+} from 'electron';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as rimraf from 'rimraf';
@@ -103,7 +109,7 @@ export const cleanAppCacheOnCrash = (window: BrowserWindow): void => {
       ) {
         return;
       }
-      const options: Electron.MessageBoxOptions = {
+      const options: MessageBoxOptions = {
         type: 'question',
         title: i18n.t('Relaunch Application')(),
         message: i18n.t(

src/app/dialog-handler.ts

@@ -1,4 +1,4 @@
-import { app, BrowserWindow, dialog } from 'electron';
+import { app, BrowserWindow, dialog, MessageBoxOptions } from 'electron';
 
 import { i18n } from '../common/i18n';
 import { logger } from '../common/logger';
@@ -178,7 +178,7 @@ export const titleBarChangeDialog = async (
   if (!focusedWindow || !windowExists(focusedWindow)) {
     return;
   }
-  const options: Electron.MessageBoxOptions = {
+  const options: MessageBoxOptions = {
     type: 'question',
     title: i18n.t('Relaunch Application')(),
     message: i18n.t(
@@ -208,7 +208,7 @@ export const restartDialog = async (configFields: any) => {
   if (!focusedWindow || !windowExists(focusedWindow)) {
     return;
   }
-  const options: Electron.MessageBoxOptions = {
+  const options: MessageBoxOptions = {
     type: 'question',
     title: i18n.t('Relaunch Application')(),
     message: i18n.t(

src/app/screen-snippet-handler.ts

@@ -14,7 +14,7 @@ import * as path from 'path';
 
 import { ChildProcess, execFile, ExecFileException } from 'child_process';
 import * as util from 'util';
-import { IScreenSnippet } from '../common/api-interface';
+import { apiName, IScreenSnippet } from '../common/api-interface';
 import {
   isDevEnv,
   isElectronQA,
@@ -95,7 +95,7 @@ class ScreenSnippet {
     const currentWindowName = (currentWindowObj as ICustomBrowserWindow)
       ?.winName;
     const mainWindow = windowHandler.getMainWindow();
-
+    windowHandler.closeSnippingToolWindow();
     if (hideOnCapture) {
       this.storeWindowsState(mainWindow, currentWindowObj);
       winStore.hideWindowsOnCapturing(hideOnCapture);
@@ -465,44 +465,54 @@ class ScreenSnippet {
     const windowObj = winStore.getWindowStore();
     const currentWindowName = (currentWindowObj as ICustomBrowserWindow)
       ?.winName;
-    if (windowObj.windows.length < 1) {
-      const allWindows = BrowserWindow.getAllWindows();
-      let windowsArr: IWindowState[] = [];
-      const mainArr: IWindowState[] = [
-        {
-          id: 'main',
-          focused: mainWindow?.isFocused(),
-          minimized: mainWindow?.isMinimized(),
-        },
-      ];
-
-      allWindows.forEach((window) => {
-        if (
-          (window as ICustomBrowserWindow).winName !== currentWindowName &&
-          (window as ICustomBrowserWindow).winName !== 'main'
-        ) {
-          windowsArr.push({
-            id: (window as ICustomBrowserWindow).winName,
-            focused: window.isFocused(),
-            minimized: window?.isMinimized(),
-          });
-        }
-      });
-
-      if (currentWindowName !== 'main') {
+    if (windowObj.windows.length > 0) {
+      winStore.destroyWindowStore();
+    }
+    const allWindows = BrowserWindow.getAllWindows();
+    let windowsArr: IWindowState[] = [];
+    const mainArr: IWindowState[] = [
+      {
+        id: 'main',
+        focused: mainWindow?.isFocused(),
+        minimized: mainWindow?.isMinimized(),
+        isFullScreen: mainWindow?.isFullScreen(),
+        isVisible: mainWindow?.isVisible(),
+      },
+    ];
+
+    allWindows.forEach((window) => {
+      if (
+        (window as ICustomBrowserWindow).winName &&
+        (window as ICustomBrowserWindow).winName !== currentWindowName &&
+        (window as ICustomBrowserWindow).winName !== 'main' &&
+        (window as ICustomBrowserWindow).winName !==
+          apiName.notificationWindowName
+      ) {
         windowsArr.push({
-          id: currentWindowName,
-          focused: currentWindowObj?.isFocused(),
-          minimized: currentWindowObj?.isMinimized(),
+          id: (window as ICustomBrowserWindow).winName,
+          focused: window.isFocused(),
+          minimized: window?.isMinimized(),
+          isFullScreen: window?.isFullScreen(),
+          isVisible: window?.isVisible(),
         });
-        windowsArr = mainArr.concat(windowsArr);
-      } else {
-        windowsArr = windowsArr.concat(mainArr);
       }
-      winStore.setWindowStore({
-        windows: windowsArr,
+    });
+
+    if (currentWindowName !== 'main') {
+      windowsArr.push({
+        id: currentWindowName,
+        focused: currentWindowObj?.isFocused(),
+        minimized: currentWindowObj?.isMinimized(),
+        isFullScreen: currentWindowObj?.isFullScreen(),
+        isVisible: currentWindowObj?.isVisible(),
       });
+      windowsArr = mainArr.concat(windowsArr);
+    } else {
+      windowsArr = windowsArr.concat(mainArr);
     }
+    winStore.setWindowStore({
+      windows: windowsArr,
+    });
   };
 
   /**

src/app/stores/window-store.ts

@@ -1,5 +1,6 @@
 import { BrowserWindow } from 'electron';
 import { presenceStatusStore } from '.';
+import { apiName } from '../../common/api-interface';
 import { isMac, isWindowsOS } from '../../common/env';
 import { logger } from '../../common/logger';
 import { presenceStatus } from '../presence-status-handler';
@@ -15,6 +16,7 @@ export interface IWindowState {
   minimized?: boolean;
   focused?: boolean;
   isFullScreen?: boolean;
+  isVisible?: boolean;
 }
 
 export class WindowStore {
@@ -47,17 +49,25 @@ export class WindowStore {
 
       currentWindows.forEach((currentWindow) => {
         const isFullScreen = currentWindow.isFullScreen();
-        if (isFullScreen) {
-          this.hideFullscreenWindow(currentWindow);
-        } else {
-          currentWindow?.hide();
+        const isMinimized = currentWindow.isMinimized();
+        if (
+          (currentWindow as ICustomBrowserWindow).winName !==
+          apiName.notificationWindowName
+        ) {
+          if (isFullScreen) {
+            this.hideFullscreenWindow(currentWindow);
+            // No need to hide minimized windows
+          } else if (!isMinimized) {
+            currentWindow?.hide();
+          }
         }
       });
     }
   };
 
   public restoreWindows = (hideOnCapture?: boolean) => {
     if (hideOnCapture) {
+      this.restoreNotificationProperties();
       const storedWindows = this.getWindowStore();
       let currentWindow = storedWindows.windows.find(
         (currentWindow) => currentWindow.focused,
@@ -75,7 +85,7 @@ export class WindowStore {
       const fullscreenedWindows: IWindowState[] = [];
       // Restoring all windows except focused one
       storedWindows.windows.forEach((currentWindow) => {
-        if (currentWindow) {
+        if (currentWindow && currentWindow.isVisible) {
           const window: ICustomBrowserWindow | undefined = getWindowByName(
             currentWindow.id || '',
           ) as ICustomBrowserWindow;
@@ -119,6 +129,25 @@ export class WindowStore {
     }
   };
 
+  /**
+   * Restores notification properties reset to default post hiding main window
+   * @param windowsNames
+   */
+  private restoreNotificationProperties = () => {
+    const windows = BrowserWindow.getAllWindows();
+
+    windows
+      .filter(
+        (window) =>
+          (window as ICustomBrowserWindow).winName ===
+          apiName.notificationWindowName,
+      )
+      .map((notificationWindow) => {
+        notificationWindow.setAlwaysOnTop(true);
+        notificationWindow.setSkipTaskbar(true);
+      });
+  };
+
   private hideFullscreenWindow = (window: BrowserWindow) => {
     window.once('leave-full-screen', () => {
       if (isMac) {

src/app/version-handler.ts

@@ -183,10 +183,10 @@ class VersionHandler {
       /* Get SFE version */
       let urlSfeVersion: string;
       let newUrlSfeVersion: string;
-      urlSfeVersion = mainUrl?.includes('/daily/')
+      urlSfeVersion = mainUrl?.includes('/daily')
         ? `${protocol}//${hostname}/bff-daily/daily/version.json`
         : `${protocol}//${hostname}/client-bff/version.json`;
-      newUrlSfeVersion = mainUrl?.includes('/daily/')
+      newUrlSfeVersion = mainUrl?.includes('/daily')
         ? `${protocol}//${hostname}/apps/client2/daily/info`
         : `${protocol}//${hostname}/apps/client2/info`;
       const sfeVersionInfo: string = mainUrl?.includes('client2')

src/app/window-actions.ts

@@ -229,6 +229,7 @@ export const updateAlwaysOnTop = async (
   }
   if (browserWins.length > 0) {
     browserWins
+      .filter((browser) => browser && windowExists(browser))
       .filter((browser) => typeof browser.notificationData !== 'object')
       .forEach((browser) => browser.setAlwaysOnTop(shouldSetAlwaysOnTop));
 

src/app/window-handler.ts

@@ -170,7 +170,7 @@ export class WindowHandler {
   private screenSharingFrameWindow: Electron.BrowserWindow | null = null;
   private basicAuthWindow: Electron.BrowserWindow | null = null;
   private notificationSettingsWindow: Electron.BrowserWindow | null = null;
-  private snippingToolWindow: Electron.BrowserWindow | null = null;
+  private snippingToolWindow: ICustomBrowserWindow | null = null;
   private finishedLoading: boolean = false;
   private readonly opts: Electron.BrowserViewConstructorOptions | undefined;
   private hideOnCapture: boolean = false;
@@ -1141,7 +1141,7 @@ export class WindowHandler {
   /**
    * Creates a about app window
    */
-  public createAboutAppWindow(windowName: string): void {
+  public async createAboutAppWindow(windowName: string): Promise<void> {
     // This prevents creating multiple instances of the
     // about window
     if (didVerifyAndRestoreWindow(this.aboutAppWindow)) {
@@ -1176,6 +1176,8 @@ export class WindowHandler {
       }
     };
 
+    await versionHandler.getClientVersion(true, this.url);
+
     if (
       this.mainWindow &&
       windowExists(this.mainWindow) &&
@@ -1362,7 +1364,11 @@ export class WindowHandler {
       opts.modal = true;
     }
 
-    this.snippingToolWindow = createComponentWindow('snipping-tool', opts);
+    this.snippingToolWindow = createComponentWindow(
+      'snipping-tool',
+      opts,
+    ) as ICustomBrowserWindow;
+    this.snippingToolWindow.winName = apiName.snippingToolWindowName;
     this.moveWindow(this.snippingToolWindow, undefined, parentWindow);
     this.snippingToolWindow.setVisibleOnAllWorkspaces(true);
 

src/app/window-utils.ts

@@ -1007,6 +1007,9 @@ export const didVerifyAndRestoreWindow = (
   if (browserWindow.isMinimized()) {
     browserWindow.restore();
   }
+  if (!browserWindow.isVisible()) {
+    browserWindow.show();
+  }
   browserWindow.focus();
   return true;
 };

src/common/api-interface.ts

@@ -83,6 +83,7 @@ export enum apiName {
   mainWindowName = 'main',
   notificationWindowName = 'notification-window',
   welcomeScreenName = 'welcome-screen',
+  snippingToolWindowName = 'snipping-tool-window',
 }
 
 export const NOTIFICATION_WINDOW_TITLE = 'Notification - Symphony';