[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/anticheat/utils.ts

@@ -2,7 +2,7 @@ import { heroicAnticheatDataPath, isLinux } from '../constants'
 import * as axios from 'axios'
 import { logInfo, LogPrefix, logWarning } from '../logger/logger'
 import { readFileSync, writeFileSync } from 'graceful-fs'
-import { AntiCheatInfo } from 'common/types'
+import { AntiCheatInfo } from '@@/common/types'
 import { runOnceWhenOnline } from '../online_monitor'
 
 async function downloadAntiCheatData() {

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 { 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/config.ts

@@ -12,7 +12,7 @@ import {
   AppSettings,
   GlobalConfigVersion,
   WineInstallation
-} from 'common/types'
+} from '@@/common/types'
 import { LegendaryUser } from './legendary/user'
 import {
   currentGlobalConfigVersion,

src/backend/constants.ts

@@ -4,7 +4,7 @@ import { join, resolve } from 'path'
 import Store from 'electron-store'
 import { parse } from '@node-steam/vdf'
 
-import { GameConfigVersion, GlobalConfigVersion } from 'common/types'
+import { GameConfigVersion, GlobalConfigVersion } from '@@/common/types'
 import { logDebug, LogPrefix } from './logger/logger'
 import { createNewLogFileAndClearOldOnces } from './logger/logfile'
 import { env } from 'process'

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/game_config.ts

@@ -1,6 +1,6 @@
 import { existsSync, readFileSync, writeFileSync } from 'graceful-fs'
 
-import { GameConfigVersion, GameSettings } from 'common/types'
+import { GameConfigVersion, GameSettings } from '@@/common/types'
 import { GlobalConfig } from './config'
 import {
   currentGameConfigVersion,

src/backend/games.ts

@@ -1,12 +1,12 @@
-import { GOGCloudSavesLocation, GogInstallInfo } from 'common/types/gog'
-import { LegendaryInstallInfo } from 'common/types/legendary'
+import { GOGCloudSavesLocation, GogInstallInfo } from '@@/common/types/gog'
+import { LegendaryInstallInfo } from '@@/common/types/legendary'
 import {
   ExecResult,
   ExtraInfo,
   GameInfo,
   GameSettings,
   InstallArgs
-} from 'common/types'
+} from '@@/common/types'
 
 import { BrowserWindow } from 'electron'
 import { join } from 'path'

src/backend/gog/games.ts

@@ -18,7 +18,7 @@ import {
   ExecResult,
   InstallArgs,
   InstalledInfo
-} from 'common/types'
+} from '@@/common/types'
 import { appendFileSync, existsSync, rmSync } from 'graceful-fs'
 import {
   heroicGamesConfigPath,
@@ -47,9 +47,9 @@ import {
   GOGCloudSavesLocation,
   GogInstallInfo,
   GogInstallPlatform
-} from 'common/types/gog'
+} 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
@@ -336,9 +336,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
     }
@@ -363,9 +364,10 @@ class GOGGame extends Game {
           this.logFileLocation,
           `Launch aborted: ${wineLaunchPrepFailReason}`
         )
-        showErrorBoxModalAuto({
+        showDialogBoxModalAuto({
           title: t('box.error.launchAborted', 'Launch aborted'),
-          error: wineLaunchPrepFailReason!
+          message: wineLaunchPrepFailReason!,
+          type: 'ERROR'
         })
         return false
       }

src/backend/gog/library.ts

@@ -7,8 +7,8 @@ import {
   GOGImportData,
   ExecResult,
   CallRunnerOptions
-} from 'common/types'
-import { GOGCloudSavesLocation, GogInstallInfo } from 'common/types/gog'
+} from '@@/common/types'
+import { GOGCloudSavesLocation, GogInstallInfo } from '@@/common/types/gog'
 import { join } from 'node:path'
 import { existsSync, readFileSync } from 'graceful-fs'
 

src/backend/gog/setup.ts

@@ -9,7 +9,7 @@ import {
 import { copySync } from 'fs-extra'
 import path from 'node:path'
 import { GOGLibrary } from './library'
-import { GameInfo, InstalledInfo } from 'common/types'
+import { GameInfo, InstalledInfo } from '@@/common/types'
 import { execAsync, quoteIfNecessary } from '../utils'
 import { GameConfig } from '../game_config'
 import { logError, logInfo, LogPrefix, logWarning } from '../logger/logger'

src/backend/gog/user.ts

@@ -1,6 +1,6 @@
 import axios from 'axios'
 import { logError, logInfo, LogPrefix, logWarning } from '../logger/logger'
-import { GOGLoginData } from 'common/types'
+import { GOGLoginData } from '@@/common/types'
 import { configStore, libraryStore } from '../gog/electronStores'
 import { errorHandler } from '../utils'
 import { isOnline } from '../online_monitor'

src/backend/launcher.ts

@@ -43,12 +43,12 @@ import {
   GameSettings,
   LaunchPreperationResult,
   RpcClient
-} from 'common/types'
+} from '@@/common/types'
 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,
@@ -151,12 +151,13 @@ async function prepareWineLaunch(game: LegendaryGame | GOGGame): Promise<{
   // Verify that a Wine binary is set
   // This happens when there aren't any Wine versions installed
   if (!gameSettings.wineVersion.bin) {
-    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 { success: false }
   }
@@ -180,16 +181,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 }
     }

src/backend/legendary/games.ts

@@ -8,7 +8,7 @@ import {
   GameInfo,
   InstallArgs,
   InstallPlatform
-} from 'common/types'
+} from '@@/common/types'
 import { Game } from '../games'
 import { GameConfig } from '../game_config'
 import { GlobalConfig } from '../config'
@@ -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
@@ -582,9 +582,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
     }
@@ -614,9 +615,10 @@ class LegendaryGame extends Game {
           this.logFileLocation,
           `Launch aborted: ${wineLaunchPrepFailReason}`
         )
-        showErrorBoxModalAuto({
+        showDialogBoxModalAuto({
           title: t('box.error.launchAborted', 'Launch aborted'),
-          error: wineLaunchPrepFailReason!
+          message: wineLaunchPrepFailReason!,
+          type: 'ERROR'
         })
         return false
       }