Merge branch 'main' into try_windows_dist_fix

NeurodataWithoutBorders · Sep 11, 2023 · 0f8235d · 0f8235d
2 parents aa88b9f + aaf537f
commit 0f8235d
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 6 deletions.
diff --git a/src/renderer/src/dependencies/simple.js b/src/renderer/src/dependencies/simple.js
@@ -12,4 +12,11 @@ export const homeDirectory = app?.getPath("home") ?? "";
 export const appDirectory = homeDirectory ? joinPath(homeDirectory, paths.root) : "";
 export const guidedProgressFilePath = homeDirectory ? joinPath(appDirectory, ...paths.subfolders.progress) : "";
 
+export const stubSaveFolderPath = homeDirectory
+    ? joinPath(homeDirectory, paths["root"], ...paths.subfolders.stubs)
+    : "";
+export const conversionSaveFolderPath = homeDirectory
+    ? joinPath(homeDirectory, paths["root"], ...paths.subfolders.conversions)
+    : "";
+
 export const isStorybook = window.location.href.includes("iframe.html");
diff --git a/src/renderer/src/progress/index.js b/src/renderer/src/progress/index.js
@@ -1,6 +1,13 @@
 import Swal from "sweetalert2";
 
-import { guidedProgressFilePath, reloadPageToHome, isStorybook, appDirectory } from "../dependencies/simple.js";
+import {
+    guidedProgressFilePath,
+    reloadPageToHome,
+    isStorybook,
+    appDirectory,
+    stubSaveFolderPath,
+    conversionSaveFolderPath,
+} from "../dependencies/simple.js";
 import { fs } from "../electron/index.js";
 import { joinPath, runOnLoad } from "../globals.js";
 import { merge } from "../stories/pages/utils.js";
@@ -102,14 +109,14 @@ export function resume(name) {
 
 export const remove = async (name) => {
     const result = await Swal.fire({
-        title: `Are you sure you would like to delete NWB GUIDE progress made on the dataset: ${name}?`,
-        text: "Your progress file will be deleted permanently, and all existing progress will be lost.",
+        title: `Are you sure you would like to delete this conversion pipeline?`,
+        html: `All related files will be deleted permanently, and existing progress will be lost.`,
         icon: "warning",
         heightAuto: false,
         showCancelButton: true,
         confirmButtonColor: "#3085d6",
         cancelButtonColor: "#d33",
-        confirmButtonText: "Delete progress file",
+        confirmButtonText: `Delete ${name}`,
         cancelButtonText: "Cancel",
         focusCancel: true,
     });
@@ -119,9 +126,17 @@ export const remove = async (name) => {
         const progressFilePathToDelete = joinPath(guidedProgressFilePath, name + ".json");
 
         //delete the progress file
-        if (fs) fs.unlinkSync(progressFilePathToDelete, (err) => console.log(err));
+        if (fs) fs.unlinkSync(progressFilePathToDelete);
         else localStorage.removeItem(progressFilePathToDelete);
 
+        if (fs) {
+            // delete default stub location
+            fs.rmSync(joinPath(stubSaveFolderPath, name), { recursive: true, force: true });
+
+            // delete default conversion location
+            fs.rmSync(joinPath(conversionSaveFolderPath, name), { recursive: true, force: true });
+        }
+
         return true;
     }
 

diff --git a/src/renderer/src/stories/pages/guided-mode/ProgressCard.js b/src/renderer/src/stories/pages/guided-mode/ProgressCard.js
@@ -126,7 +126,7 @@ export class ProgressCard extends LitElement {
                         @click=${(ev) => progress.deleteProgressCard(ev.target)}
                     >
                         <i class="fas fa-trash mr-sm-1"></i>
-                        Delete progress file
+                        Delete pipeline
                     </h2>
                 </div>
             </div>