From 4e9e91094f8e631acd649b4027a39a4e395e7890 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2024 06:43:17 +0000 Subject: [PATCH 1/6] fix(deps): update dependency dragselect to v3.0.7 --- package-lock.json | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2a9b157b5..18faa4fae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "soda-for-sparc", - "version": "15.1.0", + "version": "15.2.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "soda-for-sparc", - "version": "15.1.0", + "version": "15.2.0", "hasInstallScript": true, "license": "MIT", "dependencies": { @@ -6612,9 +6612,10 @@ "dev": true }, "node_modules/dragselect": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/dragselect/-/dragselect-3.0.4.tgz", - "integrity": "sha512-LkGjPpkBGsIFyM9UsOM0wkMhUHuwhlHCDouufy2Zyroghhoj0RHSXnl78imvDWdlvFUk3Q5SXTXh0HfAC/NMrw==" + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/dragselect/-/dragselect-3.0.7.tgz", + "integrity": "sha512-67AkMH67kuyGaJ1HyIkNARqmp62J40NUfTtS6s7YrOdfzXuhb4vZhzogFGIsc/bSEThTJDL4oaOfA4RcqzJxhw==", + "license": "GPL-3.0" }, "node_modules/duplexer2": { "version": "0.0.2", From abc8217e1af34c9d099ed4471857ebbfaf1f7e53 Mon Sep 17 00:00:00 2001 From: Jacob Clark Date: Tue, 1 Oct 2024 13:30:39 -0700 Subject: [PATCH 2/6] wip: Update CHANGELOG for 15.2.1 release --- CHANGELOG.md | 10 ++++++++++ src/renderer/src/scripts/others/renderer.js | 3 +-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b8c828fbc..2448a6acd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,16 @@ All notable changes to SODA will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## 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: diff --git a/src/renderer/src/scripts/others/renderer.js b/src/renderer/src/scripts/others/renderer.js index eb4784757..83fdb92fd 100644 --- a/src/renderer/src/scripts/others/renderer.js +++ b/src/renderer/src/scripts/others/renderer.js @@ -4242,7 +4242,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 } } @@ -4259,7 +4258,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 } }; From f0d84515bb3a6c42b225a7dd87981b5c86b50710 Mon Sep 17 00:00:00 2001 From: "codefair-app[bot]" <165336008+codefair-app[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 22:27:51 +0000 Subject: [PATCH 3/6] =?UTF-8?q?feat:=20=E2=9C=A8=20update=20codemeta=20fil?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- codemeta.json | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/codemeta.json b/codemeta.json index f5410a2c9..e83153bd6 100644 --- a/codemeta.json +++ b/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,20 +71,25 @@ ], "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"], + "keywords": [ + "SPARC", + "FAIR", + "data", + "curation", + "mac", + "sparc-dataset", + "ubuntu", + "windows" + ], "license": "https://spdx.org/licenses/MIT", "operatingSystem": [ "Windows 10", @@ -93,11 +98,17 @@ "Windows 11", "Ubuntu" ], - "programmingLanguage": ["JavaScript", "HTML", "Python", "CSS"], + "programmingLanguage": [ + "JavaScript", + "HTML", + "Python", + "CSS" + ], "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" -} +} \ No newline at end of file From 063f2e56d59cb8d47e64390effa7230e4cb5cb12 Mon Sep 17 00:00:00 2001 From: "codefair-app[bot]" <165336008+codefair-app[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 22:27:52 +0000 Subject: [PATCH 4/6] =?UTF-8?q?feat:=20=E2=9C=A8=20update=20citation=20fil?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CITATION.cff | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index baf933b16..97398d5ed 100644 --- a/CITATION.cff +++ b/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 From d8e41bdb6b1c73f93722e27581ae26bb9a8a6872 Mon Sep 17 00:00:00 2001 From: fairdataihub-bot Date: Tue, 1 Oct 2024 22:30:06 +0000 Subject: [PATCH 5/6] =?UTF-8?q?style:=20=F0=9F=8E=A8=20fix=20code=20style?= =?UTF-8?q?=20issues=20with=20Prettier?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- codemeta.json | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/codemeta.json b/codemeta.json index e83153bd6..add2d1955 100644 --- a/codemeta.json +++ b/codemeta.json @@ -80,16 +80,7 @@ "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" - ], + "keywords": ["SPARC", "FAIR", "data", "curation", "mac", "sparc-dataset", "ubuntu", "windows"], "license": "https://spdx.org/licenses/MIT", "operatingSystem": [ "Windows 10", @@ -98,12 +89,7 @@ "Windows 11", "Ubuntu" ], - "programmingLanguage": [ - "JavaScript", - "HTML", - "Python", - "CSS" - ], + "programmingLanguage": ["JavaScript", "HTML", "Python", "CSS"], "referencePublication": "https://doi.org/10.1101/2021.02.10.430563", "relatedLink": [], "runtimePlatform": [], @@ -111,4 +97,4 @@ "softwareRequirements": [], "version": "15.2.1", "type": "SoftwareSourceCode" -} \ No newline at end of file +} From 43ffc7ca8f8d81b2bed0327ab2cbe8ae6b25ce22 Mon Sep 17 00:00:00 2001 From: fairdataihub-bot Date: Wed, 9 Oct 2024 20:47:37 +0000 Subject: [PATCH 6/6] =?UTF-8?q?style:=20=F0=9F=8E=A8=20fix=20code=20style?= =?UTF-8?q?=20issues=20with=20Prettier?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8401ecd97..770ea2bd5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,6 @@ All notable changes to SODA will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). - ## v15.2.2 - 2024-10-09 ## Bug Fixes: @@ -25,7 +24,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - 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: