Merge branch 'main' into preload_imports

environments/environment-Windows.yml

@@ -20,3 +20,4 @@ dependencies:
       - hdmf >= 3.7.0
       - pytest == 7.2.2
       - pytest-cov == 4.1.0
+      - email-validator == 2.0.0

package.json

@@ -15,7 +15,7 @@
     "build:win": "npm run build && npm run build:flask:win && npm run build:electron:win",
     "build:mac": "npm run build && npm run build:flask:unix && npm run build:electron:mac",
     "build:linux": "npm run build && npm run build:flask:unix && npm run build:electron:linux",
-    "build:flask:base": "python -m PyInstaller --name nwb-guide --onedir --clean --noconfirm ./pyflask/app.py --distpath ./build/flask --collect-data jsonschema_specifications --collect-all nwbinspector --collect-all neuroconv --collect-all pynwb --collect-all hdmf --collect-all ci_info --hidden-import scipy._distributor_init --hidden-import scipy._lib.messagestream --hidden-import scipy._lib._ccallback --hidden-import scipy._lib._testutils",
+    "build:flask:base": "python -m PyInstaller --name nwb-guide --onedir --clean --noconfirm ./pyflask/app.py --distpath ./build/flask --collect-data jsonschema_specifications --collect-all nwbinspector --collect-all neuroconv --collect-all pynwb --collect-all hdmf --collect-all ci_info --collect-all ndx_dandi_icephys --hidden-import scipy._distributor_init --hidden-import scipy._lib.messagestream --hidden-import scipy._lib._ccallback --hidden-import scipy._lib._testutils --hidden-import email_validator",
     "build:flask:win": "npm run build:flask:base -- --add-data ./paths.config.json;. --add-data ./package.json;.",
     "build:flask:unix": "npm run build:flask:base -- --add-data ./paths.config.json:. --add-data ./package.json:. --collect-all ndx_dandi_icephys",
     "build:electron:win": "electron-builder build --win --publish never",
@@ -24,7 +24,8 @@
     "test": "npm run test:app && npm run test:server",
     "test:app": "vitest run",
     "test:server": "pytest pyflask/tests/ -s",
-    "test:executable": "concurrently -n EXE,TEST --kill-others \"node tests/testPyinstallerExecutable.js --port 3434 --forever\" \"pytest pyflask/tests/ -s --target http://localhost:3434\"",
+    "wait3s": "node -e \"setTimeout(() => process.exit(0),3000)\"",
+    "test:executable": "concurrently -n EXE,TEST --kill-others --success first \"node tests/testPyinstallerExecutable.js --port 3434 --forever\" \"npm run wait3s && pytest pyflask/tests/ -s --target http://localhost:3434\"",
     "test:coverage": "npm run coverage:app && npm run coverage:server",
     "coverage:app": "vitest run --coverage",
     "coverage:server": "pytest pyflask/tests/ -s --cov=pyflask --cov-report=xml",

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");

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;
     }
 

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>