show error message only if load error happens in main frame (#584)

* show error message only if load error happens in main frame * downgrade conda
jupyterlab · Feb 18, 2023 · 3b938d2 · 3b938d2
1 parent 285775a
commit 3b938d2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -24,6 +24,8 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: s-weigand/setup-conda@v1
+      # downgrade conda since v23.1.0 is causing issues in "Create Application Server Installer" step
+      - run: conda install -c conda-forge conda=22.11.1 -y
 
       - name: Install node
         uses: actions/setup-node@v3

diff --git a/src/main/labview/labview.ts b/src/main/labview/labview.ts
@@ -123,9 +123,17 @@ export class LabView implements IDisposable {
 
     this._view.webContents.once(
       'did-fail-load',
-      (event: Electron.Event, errorCode: number, errorDescription: string) => {
-        if (errorCallback) {
+      (
+        event: Electron.Event,
+        errorCode: number,
+        errorDescription: string,
+        validatedURL: string,
+        isMainFrame: boolean
+      ) => {
+        if (isMainFrame && errorCallback) {
           errorCallback(errorCode, errorDescription);
+        } else {
+          console.warn('Failed to load labview', errorDescription);
         }
       }
     );