refactor: shell moved to nodejs server

fairdataihub · Jan 18, 2024 · 2f53e62 · 2f53e62
1 parent 05679cc
commit 2f53e62
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 9 deletions.
diff --git a/src/main/index.js b/src/main/index.js
@@ -19,6 +19,7 @@ import "./main-process/native-ui/dialogs/open-file"
 import "./strain"
 import "./checkDiskSpace"
 import "./spreadsheet-import-gm"
+import "./shell"
 
 
 const sodaVersion = app.getVersion();

diff --git a/src/main/shell.js b/src/main/shell.js
@@ -0,0 +1,10 @@
+import {shell, ipcMain } from 'electron'
+
+ipcMain.handle("shell-open-external", (event, url) => {
+    return shell.openExternal(url)
+})
+
+
+ipcMain.handle("shell-open-path", (event, path) => {
+    return shell.openPath(path)
+})
diff --git a/src/renderer/src/scripts/guided-mode/guided-curate-dataset.js b/src/renderer/src/scripts/guided-mode/guided-curate-dataset.js
@@ -3851,7 +3851,7 @@ document
 
         if (viewReportResult.isConfirmed) {
           // open a shell to the raw validation report
-          shell.openPath(validationReportPath);
+          window.electron.ipcRenderer.invoke("shell-open-path", validationReportPath);
         }
       } else {
         await Swal.fire({

diff --git a/src/renderer/src/scripts/organize-dataset/validation-functions.js b/src/renderer/src/scripts/organize-dataset/validation-functions.js
@@ -307,7 +307,7 @@ window.validateOrganizedDataset = async () => {
 
     if (viewReportResult.isConfirmed) {
       // open a shell to the raw validation report
-      shell.openPath(validationReportPath);
+      window.electron.ipcRenderer.invoke("shell-open-path", validationReportPath);
     }
     return;
   }
@@ -358,7 +358,7 @@ document.querySelector(".validate-raw-report_btn").addEventListener("click", (e)
   // open the text file stored at the raw validation report path
   let pathToRawReport = window.path.join(window.os.homedir(), "SODA", "validation.txt");
 
-  shell.openPath(pathToRawReport);
+  window.electron.ipcRenderer.invoke("shell-open-path", pathToRawReport);
 });
 
 const displayValidationReportErrors = (validationReport, tableBody, validationErrorsContainer) => {

diff --git a/src/renderer/src/scripts/others/renderer.js b/src/renderer/src/scripts/others/renderer.js
@@ -9231,13 +9231,12 @@ const gettingStarted = () => {
 
 const sodaVideo = () => {
   document.getElementById("overview-column-1").blur();
-  window.shell.openExternal("https://docs.sodaforsparc.io/docs/getting-started/user-interface");
+  window.electron.ipcRenderer.invoke("shell-open-external", "https://docs.sodaforsparc.io/docs/getting-started/user-interface")
 };
 
 const directToDocumentation = () => {
-  window.shell.openExternal(
-    "https://docs.sodaforsparc.io/docs/getting-started/organize-and-submit-sparc-datasets-with-soda"
-  );
+  window.electron.ipcRenderer.invoke("shell-open-external", "https://docs.sodaforsparc.io/docs/getting-started/organize-and-submit-sparc-datasets-with-soda")
+
   document.getElementById("overview-column-2").blur();
   // window.open('https://docs.sodaforsparc.io', '_blank');
 };

diff --git a/src/renderer/src/scripts/validator/validate.js b/src/renderer/src/scripts/validator/validate.js
@@ -314,7 +314,7 @@ const validateLocalDataset = async () => {
 
     if (viewReportResult.isConfirmed) {
       // open a shell to the raw validation report
-      shell.openPath(validationReportPath);
+      window.electron.ipcRenderer.invoke("shell-open-path", validationReportPath);
     }
     return;
   }
@@ -598,7 +598,7 @@ const validatePennsieveDatasetStandAlone = async () => {
 
     if (viewReportResult.isConfirmed) {
       // open a shell to the raw validation report
-      shell.openPath(validationReportPath);
+      window.electron.ipcRenderer.invoke("shell-open-path", validationReportPath);
     }
     return;
   }