Merge pull request #535 from ZIMkaRU/feature/make-two-loading-wins-for-startup-and-common-as-modal

Make two loading windows for startup and common as modal

Author: ezewer

src/auto-updater/index.js

@@ -18,6 +18,7 @@ const isMac = process.platform === 'darwin'
 const log = require('../error-manager/log')
 const BfxMacUpdater = require('./bfx.mac.updater')
 const wins = require('../window-creators/windows')
+const WINDOW_NAMES = require('../window-creators/window.names')
 const {
   showLoadingWindow,
   hideLoadingWindow
@@ -291,6 +292,7 @@ const _autoUpdaterFactory = () => {
 
     autoUpdater.addInstallingUpdateEventHandler(() => {
       return showLoadingWindow({
+        windowName: WINDOW_NAMES.LOADING_WINDOW,
         description: i18next.t('autoUpdater.loadingWindow.description'),
         isRequiredToCloseAllWins: true
       })
@@ -330,7 +332,10 @@ const _autoUpdaterFactory = () => {
 
       isProgressToastEnabled = false
 
-      await hideLoadingWindow({ isRequiredToShowMainWin: false })
+      await hideLoadingWindow({
+        windowName: WINDOW_NAMES.LOADING_WINDOW,
+        isRequiredToShowMainWin: false
+      })
 
       _switchMenuItem({
         isCheckMenuItemDisabled: false,

src/enforce-macos-app-location.js

@@ -8,6 +8,7 @@ const {
   showLoadingWindow,
   hideLoadingWindow
 } = require('./window-creators/change-loading-win-visibility-state')
+const WINDOW_NAMES = require('./window-creators/window.names')
 
 module.exports = async () => {
   if (
@@ -47,12 +48,11 @@ module.exports = async () => {
   }
 
   await showLoadingWindow({
+    windowName: WINDOW_NAMES.STARTUP_LOADING_WINDOW,
     description: i18next
       .t('enforceMacOSAppLocation.loadingWindow.description'),
     isRequiredToCloseAllWins: true,
-    isIndeterminateMode: true,
-    shouldCloseBtnBeShown: true,
-    shouldMinimizeBtnBeShown: true
+    isIndeterminateMode: true
   })
 
   app.moveToApplicationsFolder({
@@ -76,5 +76,7 @@ module.exports = async () => {
     }
   })
 
-  await hideLoadingWindow()
+  await hideLoadingWindow({
+    windowName: WINDOW_NAMES.STARTUP_LOADING_WINDOW
+  })
 }

src/export-db.js

@@ -14,6 +14,7 @@ const {
   setLoadingDescription
 } = require('./window-creators/change-loading-win-visibility-state')
 const wins = require('./window-creators/windows')
+const WINDOW_NAMES = require('./window-creators/window.names')
 const isMainWinAvailable = require('./helpers/is-main-win-available')
 const {
   DEFAULT_ARCHIVE_DB_FILE_NAME,
@@ -39,8 +40,8 @@ module.exports = ({
   const secretKeyPath = path.join(pathToUserData, SECRET_KEY_FILE_NAME)
 
   return async () => {
-    const win = isMainWinAvailable(wins.mainWindow)
-      ? wins.mainWindow
+    const win = isMainWinAvailable(wins[WINDOW_NAMES.MAIN_WINDOW])
+      ? wins[WINDOW_NAMES.MAIN_WINDOW]
       : BrowserWindow.getFocusedWindow()
 
     try {
@@ -69,6 +70,7 @@ module.exports = ({
       }
 
       await showLoadingWindow({
+        windowName: WINDOW_NAMES.LOADING_WINDOW,
         description: i18next
           .t('exportDB.loadingWindow.description')
       })
@@ -90,7 +92,11 @@ module.exports = ({
           : ''
         const description = `${_description}${archived}`
 
-        await setLoadingDescription({ progress, description })
+        await setLoadingDescription({
+          windowName: WINDOW_NAMES.LOADING_WINDOW,
+          progress,
+          description
+        })
       }
 
       await zip(filePath, [
@@ -99,7 +105,9 @@ module.exports = ({
         dbWalPath,
         secretKeyPath
       ], { progressHandler })
-      await hideLoadingWindow()
+      await hideLoadingWindow({
+        windowName: WINDOW_NAMES.LOADING_WINDOW
+      })
 
       await showMessageModalDialog(win, {
         buttons: [
@@ -111,7 +119,9 @@ module.exports = ({
       })
     } catch (err) {
       try {
-        await hideLoadingWindow()
+        await hideLoadingWindow({
+          windowName: WINDOW_NAMES.LOADING_WINDOW
+        })
         await showErrorModalDialog(
           win,
           i18next.t('exportDB.modalDialog.title'),

src/import-db.js

@@ -13,6 +13,7 @@ const pauseApp = require('./pause-app')
 const relaunch = require('./relaunch')
 const { rm, isMainWinAvailable } = require('./helpers')
 const wins = require('./window-creators/windows')
+const WINDOW_NAMES = require('./window-creators/window.names')
 const {
   setLoadingDescription
 } = require('./window-creators/change-loading-win-visibility-state')
@@ -44,8 +45,8 @@ module.exports = ({
   pathToUserDocuments
 }) => {
   return async () => {
-    const win = isMainWinAvailable(wins.mainWindow)
-      ? wins.mainWindow
+    const win = isMainWinAvailable(wins[WINDOW_NAMES.MAIN_WINDOW])
+      ? wins[WINDOW_NAMES.MAIN_WINDOW]
       : BrowserWindow.getFocusedWindow()
 
     try {
@@ -99,7 +100,11 @@ module.exports = ({
           : ''
         const description = `${_description}${unzipped}`
 
-        await setLoadingDescription({ progress, description })
+        await setLoadingDescription({
+          windowName: WINDOW_NAMES.LOADING_WINDOW,
+          progress,
+          description
+        })
       }
 
       await pauseApp({
@@ -130,8 +135,8 @@ module.exports = ({
       relaunch()
     } catch (err) {
       try {
-        const _win = isMainWinAvailable(wins.loadingWindow)
-          ? wins.loadingWindow
+        const _win = isMainWinAvailable(wins[WINDOW_NAMES.LOADING_WINDOW])
+          ? wins[WINDOW_NAMES.LOADING_WINDOW]
           : win
         await showErrorModalDialog(
           _win,

src/initialize-app.js

@@ -28,6 +28,7 @@ const {
 const {
   hideLoadingWindow
 } = require('./window-creators/change-loading-win-visibility-state')
+const WINDOW_NAMES = require('./window-creators/window.names')
 const makeOrReadSecretKey = require('./make-or-read-secret-key')
 const {
   configsKeeperFactory
@@ -53,10 +54,6 @@ const manageWorkerMessages = require(
 )
 const printToPDF = require('./print-to-pdf')
 
-const pathToLayouts = path.join(__dirname, 'window-creators/layouts')
-const pathToLayoutAppInitErr = path
-  .join(pathToLayouts, 'app-init-error.html')
-
 const { rule: schedulerRule } = require(
   '../bfx-reports-framework/config/schedule.json'
 )
@@ -218,14 +215,17 @@ module.exports = async () => {
     manageWorkerMessages(ipc)
     await isServerReadyPromise
     await triggerSyncAfterUpdates()
-    await hideLoadingWindow({ isRequiredToShowMainWin: true })
+    await hideLoadingWindow({
+      windowName: WINDOW_NAMES.STARTUP_LOADING_WINDOW,
+      isRequiredToShowMainWin: true
+    })
     await triggerElectronLoad(portsMap)
     await checkForUpdatesAndNotify()
 
     printToPDF()
   } catch (err) {
     await app.whenReady()
-    await createErrorWindow(pathToLayoutAppInitErr)
+    await createErrorWindow()
 
     throw err
   }

src/pause-app.js

@@ -4,6 +4,7 @@ const ipcs = require('./ipcs')
 const {
   showLoadingWindow
 } = require('./window-creators/change-loading-win-visibility-state')
+const WINDOW_NAMES = require('./window-creators/window.names')
 
 const _closeServer = () => {
   return new Promise((resolve, reject) => {
@@ -35,6 +36,7 @@ module.exports = async (opts) => {
   } = opts ?? {}
 
   await showLoadingWindow({
+    windowName: WINDOW_NAMES.LOADING_WINDOW,
     isRequiredToCloseAllWins: true,
     ...loadingWinParams
   })