Skip to content

Commit

Permalink
wip: Create 15.2.1 release builds
Browse files Browse the repository at this point in the history
  • Loading branch information
JacobiClark committed Oct 1, 2024
2 parents d09b19f + d239093 commit ebadaa7
Show file tree
Hide file tree
Showing 8 changed files with 135 additions and 158 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "soda-for-sparc",
"procductName": "SODA for SPARC",
"version": "15.2.0",
"version": "15.2.1",
"description": "Keep Calm and Curate",
"main": "./out/main/index.js",
"author": "SODA Team",
Expand Down
2 changes: 1 addition & 1 deletion src/preload/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ if (process.contextIsolated) {
},
checkForPennsieveAgent: () => {
return new Promise((resolve, reject) => {
let agentStartSpawn = spawn("pennsieve", {
let agentStartSpawn = spawn("pennsieve", ["agent"], {
shell: true,
env: window.process.env,
});
Expand Down
2 changes: 1 addition & 1 deletion src/pyflask/startup/minimumApiVersion.py
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.0")}
return {'version': os.getenv('API_VERSION', "15.2.1")}


15 changes: 10 additions & 5 deletions src/renderer/src/scripts/guided-mode/guided-curate-dataset.js
Original file line number Diff line number Diff line change
Expand Up @@ -4127,11 +4127,16 @@ const guidedShowTreePreview = (new_dataset_name, targetElementId) => {

//Add the manifest files that have been created to the preview
for (const manifestFileKey of Object.keys(window.sodaJSONObj["guided-manifest-files"])) {
dsJsonObjCopy["folders"][manifestFileKey]["files"]["manifest.xlsx"] = {
action: ["new"],
path: "",
type: "local",
};
const hlfStillExistsForManifestFile = Object.keys(dsJsonObjCopy["folders"]).includes(
manifestFileKey
);
if (hlfStillExistsForManifestFile) {
dsJsonObjCopy["folders"][manifestFileKey]["files"]["manifest.xlsx"] = {
action: ["new"],
path: "",
type: "local",
};
}
}

//Add the Readme file to the preview if it exists in JSON
Expand Down
11 changes: 7 additions & 4 deletions src/renderer/src/scripts/organize-dataset/curate-functions.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [];
Expand Down Expand Up @@ -604,7 +607,7 @@ window.handleLocalDatasetImport = async (path) => {
window.sodaJSONObj = await window.addManifestDetailsToDatasetStructure(
window.sodaJSONObj,
list.manifestFiles,
buildDatasetStructure
builtDatasetStructure
);

return true;
Expand Down
Loading

0 comments on commit ebadaa7

Please sign in to comment.