wip: Disallow empty folders and files from being imported

fairdataihub · Oct 1, 2024 · 6da467d · 6da467d
1 parent ac3a7f8
commit 6da467d
Show file tree

Hide file tree

Showing 9 changed files with 122 additions and 155 deletions.
diff --git a/.github/workflows/Build-and-deploy-linux.yml b/.github/workflows/Build-and-deploy-linux.yml
@@ -7,7 +7,7 @@ on:
       - main
       - staging
       - pre-staging
-      - v-2019-pennsieve-agent-patch
+      - empty-folders-files-hotfix
 
 jobs:
   deploy-on-linux:

diff --git a/.github/workflows/Build-and-deploy-mac.yml b/.github/workflows/Build-and-deploy-mac.yml
@@ -7,7 +7,7 @@ on:
       - main
       - staging
       - pre-staging
-      - v-2019-pennsieve-agent-patch
+      - empty-folders-files-hotfix
 
 jobs:
   deploy-on-mac:

diff --git a/.github/workflows/Build-and-deploy-win.yml b/.github/workflows/Build-and-deploy-win.yml
@@ -7,7 +7,7 @@ on:
       - main
       - staging
       - pre-staging
-      - v-2019-pennsieve-agent-patch
+      - empty-folders-files-hotfix
 
 jobs:
   deploy-on-windows:

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "soda-for-sparc",
   "procductName": "SODA for SPARC",
-  "version": "15.2.4-beta",
+  "version": "15.2.7-beta",
   "description": "Keep Calm and Curate",
   "main": "./out/main/index.js",
   "author": "SODA Team",

diff --git a/src/pyflask/startup/minimumApiVersion.py b/src/pyflask/startup/minimumApiVersion.py
@@ -9,6 +9,6 @@ def get_api_version():
 
 
 
-    return {'version': os.getenv('API_VERSION', "15.2.4-beta")}
+    return {'version': os.getenv('API_VERSION', "15.2.7-beta")}
 
 
diff --git a/src/renderer/src/scripts/organize-dataset/curate-functions.js b/src/renderer/src/scripts/organize-dataset/curate-functions.js
@@ -502,15 +502,18 @@ window.uploadDatasetClickHandler = async (ev) => {
 };
 
 window.handleLocalDatasetImport = async (path) => {
+  console.log("Importing local dataset from path:", path);
   const list = await getFilesAndFolders(path);
+  console.log("List of files and folders:", list);
   const currentFileExplorerPath = window.organizeDSglobalPath.value.trim();
-  const buildDatasetStructure = await window.buildDatasetStructureJsonFromImportedData(
+  console.log("Current file explorer path:", currentFileExplorerPath);
+  const builtDatasetStructure = await window.buildDatasetStructureJsonFromImportedData(
     list.folders,
-    currentFileExplorerPath,
+    "dataset_root/", // Use dataset_root as the root folder since we are importing the root in this case
     true
   );
 
-  window.sodaJSONObj["dataset-structure"] = buildDatasetStructure[0];
+  window.sodaJSONObj["dataset-structure"] = builtDatasetStructure[0];
   window.sodaJSONObj["metadata-files"] = list.files;
   const forbiddenFileNames = [];
   const problematicFiles = [];
@@ -604,7 +607,7 @@ window.handleLocalDatasetImport = async (path) => {
   window.sodaJSONObj = await window.addManifestDetailsToDatasetStructure(
     window.sodaJSONObj,
     list.manifestFiles,
-    buildDatasetStructure
+    builtDatasetStructure
   );
 
   return true;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,6 +9,6 @@ def get_api_version():



		return {'version': os.getenv('API_VERSION', "15.2.4-beta")}
		return {'version': os.getenv('API_VERSION', "15.2.7-beta")}