fix: Make splash screen visible for new windows

kubeshop · Oct 7, 2021 · a9cd31e · a9cd31e
1 parent 70b941a
commit a9cd31e
Show file tree

Hide file tree

Showing 7 changed files with 122 additions and 116 deletions.
diff --git a/electron/main.ts b/electron/main.ts
@@ -31,6 +31,7 @@ import {createMenu, getDockMenu} from './menu';
 import {K8sResource} from '@models/k8sresource';
 import {isInPreviewModeSelector} from '@redux/selectors';
 import {HelmChart, HelmValuesFile} from '@models/helm';
+import {PROCESS_ENV} from '@utils/env';
 
 import initKubeconfig from './src/initKubeconfig';
 import terminal from '../cli/terminal';
@@ -40,7 +41,7 @@ autoUpdater.logger = console;
 
 const {MONOKLE_RUN_AS_NODE} = process.env;
 
-const isDev = process.env.NODE_ENV === 'development';
+const isDev = PROCESS_ENV.NODE_ENV === 'development';
 
 const userHomeDir = app.getPath('home');
 const APP_DEPENDENCIES = ['kubectl', 'helm'];
@@ -58,8 +59,8 @@ ipcMain.on('run-kustomize', (event, folder: string) => {
     let stdout = execSync('kubectl kustomize ./', {
       cwd: folder,
       env: {
-        NODE_ENV: process.env.NODE_ENV,
-        PUBLIC_URL: process.env.PUBLIC_URL,
+        NODE_ENV: PROCESS_ENV.NODE_ENV,
+        PUBLIC_URL: PROCESS_ENV.PUBLIC_URL,
       },
     });
 
@@ -105,8 +106,8 @@ ipcMain.on('run-helm', (event, args: any) => {
     let stdout = execSync(args.helmCommand, {
       cwd: args.cwd,
       env: {
-        NODE_ENV: process.env.NODE_ENV,
-        PUBLIC_URL: process.env.PUBLIC_URL,
+        NODE_ENV: PROCESS_ENV.NODE_ENV,
+        PUBLIC_URL: PROCESS_ENV.PUBLIC_URL,
         KUBECONFIG: args.kubeconfig,
       },
     });
@@ -308,6 +309,9 @@ terminal()
   .catch(e => console.log(e));
 
 export const setWindowTitle = (store: any, window: BrowserWindow) => {
+  if (!store || !window) {
+    return;
+  }
   const state = store.getState();
   const isInPreviewMode = isInPreviewModeSelector(state);
   const previewType = state.main.previewType;

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/redux/services/index.ts b/src/redux/services/index.ts
@@ -1,15 +1,15 @@
 import fs from 'fs';
 import path from 'path';
+import {PROCESS_ENV} from '@utils/env';
 
 /**
  * Gets the absolute path to a statically bundled resource in the /resources folder
  */
 
 export function getStaticResourcePath(resourcePath: string) {
-  return process.env.NODE_ENV === 'production'
-    ? // @ts-ignore
-      path.join(process.resourcesPath, 'resources', resourcePath)
-    : path.join('resources', resourcePath);
+  return PROCESS_ENV.NODE_ENV === 'development'
+    ? path.join('resources', resourcePath)
+    : path.join(process.resourcesPath, 'resources', resourcePath);
 }
 
 /**

diff --git a/src/redux/thunks/applyFile.ts b/src/redux/thunks/applyFile.ts
@@ -8,6 +8,7 @@ import {getShellPath} from '@utils/shell';
 import {setApplyingResource} from '@redux/reducers/main';
 import fs from 'fs';
 import {getAbsoluteFileEntryPath} from '@redux/services/fileEntry';
+import {PROCESS_ENV} from '@utils/env';
 
 /**
  * Invokes kubectl for the content of the specified resource
@@ -16,8 +17,8 @@ import {getAbsoluteFileEntryPath} from '@redux/services/fileEntry';
 function applyFileToCluster(filePath: string, kubeconfig: string) {
   const child = spawn('kubectl', ['apply', '-f', '-'], {
     env: {
-      NODE_ENV: process.env.NODE_ENV,
-      PUBLIC_URL: process.env.PUBLIC_URL,
+      NODE_ENV: PROCESS_ENV.NODE_ENV,
+      PUBLIC_URL: PROCESS_ENV.PUBLIC_URL,
       PATH: getShellPath(),
       KUBECONFIG: kubeconfig,
     },

diff --git a/src/redux/thunks/applyHelmChart.ts b/src/redux/thunks/applyHelmChart.ts
@@ -9,6 +9,7 @@ import {getAbsoluteHelmChartPath, getAbsoluteValuesFilePath} from '@redux/servic
 import {setAlert} from '@redux/reducers/alert';
 import {AlertEnum, AlertType} from '@models/alert';
 import path from 'path';
+import {PROCESS_ENV} from '@utils/env';
 
 /**
  * Invokes helm install for the specified helm chart and values file
@@ -27,8 +28,8 @@ function applyHelmChartToCluster(
     ['install', '-f', getAbsoluteValuesFilePath(valuesFile, fileMap), helmChart.name, chartPath],
     {
       env: {
-        NODE_ENV: process.env.NODE_ENV,
-        PUBLIC_URL: process.env.PUBLIC_URL,
+        NODE_ENV: PROCESS_ENV.NODE_ENV,
+        PUBLIC_URL: PROCESS_ENV.PUBLIC_URL,
         PATH: getShellPath(),
         KUBECONFIG: kubeconfig,
       },

diff --git a/src/redux/thunks/applyResource.ts b/src/redux/thunks/applyResource.ts
@@ -11,6 +11,7 @@ import {isKustomizationResource} from '@redux/services/kustomize';
 import {getShellPath} from '@utils/shell';
 import {setApplyingResource, updateResource} from '@redux/reducers/main';
 import {getResourceFromCluster} from '@redux/thunks/utils';
+import {PROCESS_ENV} from '@utils/env';
 import {performResourceDiff} from './diffResource';
 
 /**
@@ -20,8 +21,8 @@ import {performResourceDiff} from './diffResource';
 function applyK8sResource(resource: K8sResource, kubeconfig: string) {
   const child = spawn('kubectl', ['apply', '-f', '-'], {
     env: {
-      NODE_ENV: process.env.NODE_ENV,
-      PUBLIC_URL: process.env.PUBLIC_URL,
+      NODE_ENV: PROCESS_ENV.NODE_ENV,
+      PUBLIC_URL: PROCESS_ENV.PUBLIC_URL,
       PATH: getShellPath(),
       KUBECONFIG: kubeconfig,
     },
@@ -39,8 +40,8 @@ function applyKustomization(resource: K8sResource, fileMap: FileMapType, kubecon
   const folder = getAbsoluteResourceFolder(resource, fileMap);
   const child = spawn('kubectl', ['apply', '-k', folder], {
     env: {
-      NODE_ENV: process.env.NODE_ENV,
-      PUBLIC_URL: process.env.PUBLIC_URL,
+      NODE_ENV: PROCESS_ENV.NODE_ENV,
+      PUBLIC_URL: PROCESS_ENV.PUBLIC_URL,
       PATH: getShellPath(),
       KUBECONFIG: kubeconfig,
     },

diff --git a/src/utils/env.ts b/src/utils/env.ts
@@ -58,5 +58,4 @@ function shellEnvSync() {
     }
   }
 }
-
 export const PROCESS_ENV: any = shellEnvSync();
-Original file line number
+Diff line change
@@ Expand Up / @@ -58,5 +58,4 @@ function shellEnvSync() { @@
         }
       }
     }
     export const PROCESS_ENV: any = shellEnvSync();