[UI/UX] Replace native dialogs

package.json

@@ -227,7 +227,6 @@
     "typescript": "^4.6.3",
     "vite": "^3.0.3",
     "vite-plugin-electron": "^0.8.3",
-    "vite-plugin-svgr": "^2.2.1",
-    "vite-tsconfig-paths": "^3.5.0"
+    "vite-plugin-svgr": "^2.2.1"
   }
 }

src/backend/api/helpers.ts

@@ -4,7 +4,7 @@ import {
   InstallPlatform,
   ConnectivityChangedCallback,
   ConnectivityStatus
-} from '../../common/types'
+} from 'common/types'
 
 export const notify = (notification: string[]) =>
   ipcRenderer.send('Notify', notification)

src/backend/api/library.ts

@@ -1,5 +1,5 @@
 import { ipcRenderer } from 'electron'
-import { Runner, InstallParams, LaunchParams } from '../../common/types'
+import { Runner, InstallParams, LaunchParams } from 'common/types'
 
 export const removeFolder = (args: [path: string, folderName: string]) =>
   ipcRenderer.send('removeFolder', args)
@@ -9,8 +9,6 @@ export const openDialog = async (args: Electron.OpenDialogOptions) =>
 
 export const install = async (args: InstallParams) =>
   ipcRenderer.invoke('install', args)
-export const openMessageBox = async (args: Electron.MessageBoxOptions) =>
-  ipcRenderer.invoke('openMessageBox', args)
 export const uninstall = async (
   args: [appName: string, shouldRemovePrefix: boolean, runner: Runner]
 ) => ipcRenderer.invoke('uninstall', args)

src/backend/api/menu.ts

@@ -1,5 +1,5 @@
 import { ipcRenderer } from 'electron'
-import { Runner } from '../../common/types'
+import { Runner } from 'common/types'
 
 export const removeShortcut = (appName: string, runner: Runner) =>
   ipcRenderer.send('removeShortcut', appName, runner)

src/backend/api/misc.ts

@@ -1,6 +1,6 @@
 import { GOGCloudSavesLocation } from 'common/types/gog'
 import { ipcRenderer } from 'electron'
-import { Runner, Tools } from '../../common/types'
+import { Runner, Tools, ButtonOptions, DialogType } from 'common/types'
 
 export const clearCache = () => ipcRenderer.send('clearCache')
 export const resetHeroic = () => ipcRenderer.send('resetHeroic')
@@ -83,12 +83,18 @@ export const clipboardReadText = async () =>
 export const clipboardWriteText = async (text: string) =>
   ipcRenderer.send('clipboardWriteText', text)
 
-export const handleShowErrorDialog = (
-  onError: (e: Electron.IpcRendererEvent, title: string, error: string) => void
+export const handleShowDialog = (
+  onMessage: (
+    e: Electron.IpcRendererEvent,
+    title: string,
+    message: string,
+    type: DialogType,
+    buttons?: Array<ButtonOptions>
+  ) => void
 ) => {
-  ipcRenderer.on('showErrorDialog', onError)
+  ipcRenderer.on('showDialog', onMessage)
   return () => {
-    ipcRenderer.removeListener('showErrorDialog', onError)
+    ipcRenderer.removeListener('showDialog', onMessage)
   }
 }
 

src/backend/api/settings.ts

@@ -20,8 +20,6 @@ export const showUpdateSetting = async () =>
   ipcRenderer.invoke('showUpdateSetting')
 export const egsSync = async (args: string) =>
   ipcRenderer.invoke('egsSync', args)
-export const showErrorBox = async (args: [title: string, message: string]) =>
-  ipcRenderer.invoke('showErrorBox', args)
 
 export const showLogFileInFolder = (args: {
   appName: string

src/backend/api/wine.ts

@@ -1,5 +1,5 @@
 import { ipcRenderer } from 'electron'
-import { RuntimeName, WineVersionInfo } from '../../common/types'
+import { RuntimeName, WineVersionInfo } from 'common/types'
 import { ProgressInfo, State } from 'heroic-wine-downloader'
 
 export const toggleDXVK = (

src/backend/dialog/__mocks__/dialog.ts

@@ -1,6 +1,6 @@
 const dialog = jest.requireActual('../dialog')
 
-dialog.showErrorBoxModalAuto = jest.fn()
+dialog.showDialogBoxModalAuto = jest.fn()
 
 module.exports = dialog
 export {}

src/backend/dialog/dialog.ts

@@ -1,30 +1,55 @@
 import { LogPrefix, logWarning } from '../logger/logger'
 import { BrowserWindow, dialog } from 'electron'
+import { ButtonOptions, DialogType } from 'common/types'
 
-const { showErrorBox } = dialog
+const { showErrorBox, showMessageBox } = dialog
 
-function showErrorBoxModalAuto(props: {
+function showDialogBoxModalAuto(props: {
   event?: Electron.IpcMainInvokeEvent
   title: string
-  error: string
+  message: string
+  type: DialogType
+  buttons?: Array<ButtonOptions>
 }) {
   if (props.event) {
-    props.event.sender.send('showErrorDialog', props.title, props.error)
+    props.event.sender.send(
+      'showDialog',
+      props.title,
+      props.message,
+      props.type,
+      props.buttons
+    )
   } else {
     let window: BrowserWindow | null
     try {
       window = BrowserWindow.getFocusedWindow()
       if (!window) {
         window = BrowserWindow.getAllWindows()[0]
       }
-      window.webContents.send('showErrorDialog', props.title, props.error)
+      window.webContents.send(
+        'showDialog',
+        props.title,
+        props.message,
+        props.type,
+        props.buttons
+      )
     } catch (error) {
-      logWarning(['showErrorBoxModalAuto:', error], {
+      logWarning(['showDialogBoxModalAuto:', error], {
         prefix: LogPrefix.Backend
       })
-      showErrorBox(props.title, props.error)
+      switch (props.type) {
+        case 'ERROR':
+          showErrorBox(props.title, props.message)
+          break
+        default:
+          showMessageBox(BrowserWindow.getAllWindows()[0], {
+            title: props.title,
+            message: props.message
+          })
+          break
+      }
     }
   }
 }
 
-export { showErrorBoxModalAuto }
+export { showDialogBoxModalAuto }

src/backend/gog/games.ts

@@ -49,7 +49,7 @@ import {
   GogInstallPlatform
 } from 'common/types/gog'
 import { t } from 'i18next'
-import { showErrorBoxModalAuto } from '../dialog/dialog'
+import { showDialogBoxModalAuto } from '../dialog/dialog'
 
 class GOGGame extends Game {
   public appName: string
@@ -337,9 +337,10 @@ class GOGGame extends Game {
         this.logFileLocation,
         `Launch aborted: ${launchPrepFailReason}`
       )
-      showErrorBoxModalAuto({
+      showDialogBoxModalAuto({
         title: t('box.error.launchAborted', 'Launch aborted'),
-        error: launchPrepFailReason!
+        message: launchPrepFailReason!,
+        type: 'ERROR'
       })
       return false
     }
@@ -365,9 +366,10 @@ class GOGGame extends Game {
           `Launch aborted: ${wineLaunchPrepFailReason}`
         )
         if (wineLaunchPrepFailReason) {
-          showErrorBoxModalAuto({
+          showDialogBoxModalAuto({
             title: t('box.error.launchAborted', 'Launch aborted'),
-            error: wineLaunchPrepFailReason
+            message: wineLaunchPrepFailReason!,
+            type: 'ERROR'
           })
         }
         return false

src/backend/launcher.ts

@@ -49,7 +49,7 @@ import { spawn } from 'child_process'
 import shlex from 'shlex'
 import { Game } from './games'
 import { isOnline } from './online_monitor'
-import { showErrorBoxModalAuto } from './dialog/dialog'
+import { showDialogBoxModalAuto } from './dialog/dialog'
 
 async function prepareLaunch(
   game: LegendaryGame | GOGGame,
@@ -172,16 +172,17 @@ async function prepareWineLaunch(game: LegendaryGame | GOGGame): Promise<{
       )
     )
     if (!bottleExists) {
-      showErrorBoxModalAuto({
+      showDialogBoxModalAuto({
         title: i18next.t(
           'box.error.cx-bottle-not-found.title',
           'CrossOver bottle not found'
         ),
-        error: i18next.t(
+        message: i18next.t(
           'box.error.cx-bottle-not-found.message',
           `The CrossOver bottle "{{bottle_name}}" does not exist, can't launch!`,
           { bottle_name: gameSettings.wineCrossoverBottle }
-        )
+        ),
+        type: 'ERROR'
       })
       return { success: false }
     }
@@ -394,27 +395,29 @@ export async function validWine(
   const wineBin = wineVersion.bin
 
   if (!wineBin) {
-    showErrorBoxModalAuto({
+    showDialogBoxModalAuto({
       title: i18next.t('box.error.wine-not-found.title', 'Wine Not Found'),
-      error: i18next.t(
+      message: i18next.t(
         'box.error.wine-not-found.message',
         'No Wine Version Selected. Check Game Settings!'
-      )
+      ),
+      type: 'ERROR'
     })
     return false
   }
 
   if (!existsSync(wineBin)) {
-    showErrorBoxModalAuto({
+    showDialogBoxModalAuto({
       title: i18next.t('box.error.wine-not-found.title', 'Wine Not Found'),
-      error: i18next.t('box.error.wine-not-found.invalid', {
+      message: i18next.t('box.error.wine-not-found.invalid', {
         defaultValue:
           "The selected wine version was not found. Install it or select a different version in the game's settings{{newline}}Version: {{version}}{{newline}}Path: {{path}}",
         version: wineVersion.name,
         path: wineBin,
         newline: '\n',
         interpolation: { escapeValue: false }
-      })
+      }),
+      type: 'ERROR'
     })
     return false
   }

src/backend/legendary/games.ts

@@ -40,7 +40,7 @@ import { removeNonSteamGame } from '../shortcuts/nonesteamgame/nonesteamgame'
 import shlex from 'shlex'
 import { t } from 'i18next'
 import { isOnline } from '../online_monitor'
-import { showErrorBoxModalAuto } from '../dialog/dialog'
+import { showDialogBoxModalAuto } from '../dialog/dialog'
 
 class LegendaryGame extends Game {
   public appName: string
@@ -578,9 +578,10 @@ class LegendaryGame extends Game {
         this.logFileLocation,
         `Launch aborted: ${launchPrepFailReason}`
       )
-      showErrorBoxModalAuto({
+      showDialogBoxModalAuto({
         title: t('box.error.launchAborted', 'Launch aborted'),
-        error: launchPrepFailReason!
+        message: launchPrepFailReason!,
+        type: 'ERROR'
       })
       return false
     }
@@ -611,9 +612,10 @@ class LegendaryGame extends Game {
           `Launch aborted: ${wineLaunchPrepFailReason}`
         )
         if (wineLaunchPrepFailReason) {
-          showErrorBoxModalAuto({
+          showDialogBoxModalAuto({
             title: t('box.error.launchAborted', 'Launch aborted'),
-            error: wineLaunchPrepFailReason
+            message: wineLaunchPrepFailReason!,
+            type: 'ERROR'
           })
         }
         return false

src/backend/logger/__tests__/logger.test.ts

@@ -1,6 +1,6 @@
 import * as logger from '../logger'
 import { appendMessageToLogFile } from '../logfile'
-import { showErrorBoxModalAuto } from '../../dialog/dialog'
+import { showDialogBoxModalAuto } from '../../dialog/dialog'
 
 jest.mock('../logfile')
 jest.mock('../../dialog/dialog')
@@ -12,7 +12,7 @@ const testData = [
   'normalString',
   ['string1', 'string2'],
   { key1: 100, key2: 'value', key3: { subKey: ['hello', 'world'] } },
-  new Error('FAILED')
+  'Error: FAILED'
 ]
 
 type logLevel = 'WARNING' | 'ERROR' | 'INFO' | 'DEBUG'
@@ -122,9 +122,10 @@ describe('logger/logger.ts', () => {
         showDialog: true
       })
 
-      expect(showErrorBoxModalAuto).toBeCalledWith({
+      expect(showDialogBoxModalAuto).toBeCalledWith({
         title: 'Backend',
-        error: expect.stringContaining(getStringPassedToLogFile(level, true))
+        message: getStringPassedToLogFile(level, true),
+        type: 'ERROR'
       })
     })
   })

src/backend/logger/logger.ts

@@ -4,7 +4,7 @@
  *        Note that with console.log and console.warn everything will be saved too.
  *        error equals console.error
  */
-import { showErrorBoxModalAuto } from '../dialog/dialog'
+import { showDialogBoxModalAuto } from '../dialog/dialog'
 import { appendMessageToLogFile, getLongestPrefix } from './logfile'
 
 export enum LogPrefix {
@@ -119,9 +119,10 @@ function logBase(
   }
 
   if (options?.showDialog) {
-    showErrorBoxModalAuto({
+    showDialogBoxModalAuto({
       title: options?.prefix ?? LogPrefix.Backend,
-      error: text
+      message: text,
+      type: 'ERROR'
     })
   }