Merge branch 'staging' into sds3

CHANGELOG.md

@@ -14,6 +14,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Fixed an issue in the manifest creation and banner image upload/edit features of the `Advanced Features` tab that made it so users without Pennsieve Agents were not directed to the Pennsieve Agent download page. Instead they were told 'the pennsieve agent is not running.'
 - It was possible for an upload to fail early in 'Prepare Datasets Step-by-Step' and 'Upload Dataset' such that the catch statement referenced a variable that was not yet defined. This has been fixed.
 
+## v15.2.1 - 2024-10-01
+
+## Feature Additions:
+
+- Removed the ability to import empty folders and files into SODA.
+
+## Bug Fixes:
+
+- Fixed an issue preventing users with pre-2.0 Pennsieve agent versions from being able to update.
+
 ## v15.2.0 - 2024-08-21
 
 ## Feature Additions:

CITATION.cff

@@ -1,6 +1,6 @@
 title: SODA (Software to Organize Data Automatically) for SPARC
 authors:
-  - given-names: Christopher
+  - given-names: Aaron
     family-names: Marroquin
     email: cmarroquin@calmi2.org
     affiliation: FAIR Data Innovations Hub, California Medical Innovations Institute
@@ -19,7 +19,7 @@ authors:
   - given-names: Tram
     family-names: Ngo
     affiliation: FAIR Data Innovations Hub, California Medical Innovations Institute
- - given-names: Bhavesh
+  - given-names: Bhavesh
     family-names: Patel
     email: bpatel@calmi2.org
     affiliation: FAIR Data Innovations Hub, California Medical Innovations Institute
@@ -28,7 +28,7 @@ message: If you use this software, please cite it using the metadata from this f
 type: software
 identifiers:
   - type: doi
-    value: 10.5281/zenodo.12774826
+    value: 10.5281/zenodo.13874674
 abstract: Simplifying data curation for researchers funded by the NIH SPARC initiative
 keywords:
   - SPARC
@@ -41,5 +41,5 @@ keywords:
   - windows
 license: MIT
 repository-code: https://github.com/fairdataihub/SODA-for-SPARC
-version: 15.1.0
-date-released: 2024-07-19
+version: 15.2.1
+date-released: 2024-10-01

codemeta.json

@@ -1,6 +1,6 @@
 {
   "name": "SODA (Software to Organize Data Automatically) for SPARC",
-  "@context": "https://doi.org/10.5063/schema/codemeta-2.0",
+  "@context": "https://w3id.org/codemeta/3.0",
   "applicationCategory": "Scientific",
   "author": [
     {
@@ -71,17 +71,13 @@
   ],
   "codeRepository": "https://github.com/fairdataihub/SODA-for-SPARC",
   "dateCreated": "2021-10-08",
-  "dateModified": "2024-07-19",
+  "dateModified": "2024-10-01",
   "datePublished": "2021-10-08",
   "description": "Simplifying data curation for researchers funded by the NIH SPARC initiative",
   "developmentStatus": "active",
   "downloadUrl": "https://fairdataihub.org/sodaforsparc",
-  "funder": {
-    "name": "National Institutes of Health (NIH)",
-    "type": "Organization"
-  },
   "funding": "OT2OD030213",
-  "identifier": "10.5281/zenodo.12774826",
+  "identifier": "10.5281/zenodo.13874674",
   "isPartOf": "https://fairdataihub.org/",
   "issueTracker": "https://github.com/fairdataihub/SODA-for-SPARC/issues",
   "keywords": ["SPARC", "FAIR", "data", "curation", "mac", "sparc-dataset", "ubuntu", "windows"],
@@ -97,7 +93,8 @@
   "referencePublication": "https://doi.org/10.1101/2021.02.10.430563",
   "relatedLink": [],
   "runtimePlatform": [],
+  "schema:releaseNotes": "## Feature Additions:\n\n- Removed the ability to import empty folders and files into SODA.\n\n## Bug Fixes:\n\n- Fixed an issue preventing users with pre-2.0 Pennsieve agent versions from being able to update.",
   "softwareRequirements": [],
-  "version": "15.1.0",
+  "version": "15.2.1",
   "type": "SoftwareSourceCode"
 }

src/renderer/src/scripts/others/renderer.js

@@ -4168,7 +4168,6 @@ const localFolderPathAndSubFoldersHaveNoFiles = (localFolderPath) => {
       if (statsObj.isFile) {
         // If a file with size > 0 is found, the folder is not considered empty
         if (window.fs.fileSizeSync(itemPath) > 0) {
-          console.log("File is not empty");
           return false; // Found a non-empty file
         }
       }
@@ -4185,7 +4184,7 @@ const localFolderPathAndSubFoldersHaveNoFiles = (localFolderPath) => {
     // If no files with size > 0 are found, the folder is considered empty
     return true;
   } catch (error) {
-    console.error(`Error reading folder: ${error.message}`);
+    window.log.error(`Error reading folder: ${error.message}`);
     return false; // Return false on error as we couldn't verify the folder
   }
 };