Merge pull request #2607 from RedisInsight/build/bugfix/RI-4881_open_app_problems_with_tray

#RI-4881 - Application can be opened via application icon if the application is in tray

Author: mariasergeenko

redisinsight/desktop/src/lib/app/app.handlers.ts

@@ -1,13 +1,14 @@
 import { app } from 'electron'
 import log from 'electron-log'
-import { getBackendGracefulShutdown, WindowType, getWindows, windowFactory } from 'desktopSrc/lib'
+import { getBackendGracefulShutdown } from 'desktopSrc/lib'
 import { deepLinkHandler, deepLinkWindowHandler } from 'desktopSrc/lib/app/deep-link.handlers'
+import { showOrCreateWindow } from 'desktopSrc/utils'
 
 export const initAppHandlers = () => {
-  app.on('activate', () => {
+  app.on('activate', async () => {
     // On macOS it's common to re-create a window in the app when the
     // dock icon is clicked and there are no other windows open.
-    if (getWindows()?.size === 0) windowFactory(WindowType.Main)
+    await showOrCreateWindow()
   })
 
   app.on('certificate-error', (event, _webContents, _url, _error, _certificate, callback) => {

redisinsight/desktop/src/lib/app/deep-link.handlers.ts

@@ -43,6 +43,7 @@ export const deepLinkWindowHandler = async (parsedDeepLink?: IParsedDeepLink) =>
     if (parsedDeepLink?.target === '_blank') {
       await windowFactory(WindowType.Main, null, { parsedDeepLink })
     } else if (currentWindow) {
+      currentWindow?.show()
       currentWindow?.webContents.send(IpcOnEvent.deepLinkAction, parsedDeepLink)
       focusWindow(currentWindow)
     } else {

redisinsight/desktop/src/lib/tray/tray.ts

@@ -1,6 +1,7 @@
-import { app, Menu, shell, Tray, nativeImage, BrowserWindow, MenuItemConstructorOptions } from 'electron'
+import { app, Menu, shell, Tray, nativeImage, MenuItemConstructorOptions } from 'electron'
 import path from 'path'
-import { WindowType, getWindows, windowFactory } from 'desktopSrc/lib'
+import { getWindows } from 'desktopSrc/lib'
+import { showOrCreateWindow } from 'desktopSrc/utils'
 // eslint-disable-next-line import/no-cycle
 import { setToQuiting } from './trayManager'
 
@@ -100,14 +101,7 @@ export class TrayBuilder {
     this.tray.setToolTip(name)
   }
 
-  private openApp() {
-    if (getWindows()?.size) {
-      getWindows()?.forEach((window: BrowserWindow) => window.show())
-      app.dock?.show()
-    }
-
-    if (!getWindows()?.size) {
-      windowFactory(WindowType.Main)
-    }
+  private async openApp() {
+    await showOrCreateWindow()
   }
 }

redisinsight/desktop/src/lib/window/window.handlers.ts

@@ -10,7 +10,6 @@ import {
   WindowType,
 } from 'desktopSrc/lib'
 import { IpcInvokeEvent, ElectronStorageItem, IpcOnEvent } from 'uiSrc/electron/constants'
-import { Pages } from 'uiSrc/constants/pages'
 
 export const initWindowHandlers = (
   newWindow: BrowserWindow,

redisinsight/desktop/src/utils/index.ts

@@ -1,3 +1,4 @@
 export * from './resolveHtmlPath'
 export * from './wrapErrorSensitiveData'
 export * from './getAssetPath'
+export * from './showOrCreateWindow'

redisinsight/desktop/src/utils/showOrCreateWindow.ts

@@ -0,0 +1,14 @@
+import { BrowserWindow, app } from 'electron'
+import { WindowType, getWindows, windowFactory } from 'desktopSrc/lib'
+
+export const showOrCreateWindow = async () => {
+  const windows = getWindows()
+  if (windows?.size) {
+    windows?.forEach((window: BrowserWindow) => window.show())
+    app.dock?.show()
+  }
+
+  if (!windows?.size) {
+    await windowFactory(WindowType.Main)
+  }
+}