Skip to content
This repository has been archived by the owner on Jun 24, 2022. It is now read-only.

Commit

Permalink
Merge branch 'master' of https://github.com/bvhpatel/SODA
Browse files Browse the repository at this point in the history
  • Loading branch information
@tramngo1603
tramngo1603 committed Apr 2, 2021
2 parents 7a68f26 + b4b02f8 commit b38fc1a
Show file tree
Hide file tree
Showing 4 changed files with 73 additions and 55 deletions.
82 changes: 41 additions & 41 deletions src/main-process/native-ui/dialogs/information.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,38 +134,38 @@ ipcMain.on(
}
);

ipcMain.on("open-error-wrong-file", (event, emessage) => {
const options = {
type: "error",
title: "Non-SPARC metadata file selected",
message: emessage,
};
dialog.showMessageBox(BrowserWindow.getFocusedWindow(), options, (index) => {
event.sender.send("error-folder-selected-shown");
});
});
// ipcMain.on("open-error-wrong-file", (event, emessage) => {
// const options = {
// type: "error",
// title: "Non-SPARC metadata file selected",
// message: emessage,
// };
// dialog.showMessageBox(BrowserWindow.getFocusedWindow(), options, (index) => {
// event.sender.send("error-folder-selected-shown");
// });
// });

ipcMain.on("open-error-metadata-file-exits", (event, emessage) => {
const options = {
type: "error",
title: "Metadata file already exists",
message: emessage,
};
dialog.showMessageBox(BrowserWindow.getFocusedWindow(), options, (index) => {
event.sender.send("error-metadata-file-exists-shown");
});
});
// ipcMain.on("open-error-metadata-file-exits", (event, emessage) => {
// const options = {
// type: "error",
// title: "Metadata file already exists",
// message: emessage,
// };
// dialog.showMessageBox(BrowserWindow.getFocusedWindow(), options, (index) => {
// event.sender.send("error-metadata-file-exists-shown");
// });
// });

ipcMain.on("open-info-metadata-file-donwloaded", (event, emessage) => {
const options = {
type: "info",
title: "Download successful",
message: emessage,
};
dialog.showMessageBox(BrowserWindow.getFocusedWindow(), options, (index) => {
event.sender.send("info-metadata-downloaded-showed");
});
});
// ipcMain.on("open-info-metadata-file-donwloaded", (event, emessage) => {
// const options = {
// type: "info",
// title: "Download successful",
// message: emessage,
// };
// dialog.showMessageBox(BrowserWindow.getFocusedWindow(), options, (index) => {
// event.sender.send("info-metadata-downloaded-showed");
// });
// });

ipcMain.on("warning-banner-image-below-1024", (event, currentSize) => {
const options = {
Expand All @@ -182,17 +182,17 @@ ipcMain.on("warning-banner-image-below-1024", (event, currentSize) => {
});
});

ipcMain.on("open-info-upload-limitations", (event) => {
const options = {
type: "info",
title: "Potential upload issues",
message:
"We have encountered issues with the Blackfynn agent to upload certain datasets and are working with the Blackfynn Team to solve them. If you encounter any issues, please report to us using our feedback form (provide information such as operating system, dataset size, screenshot of error, etc.) and it will help us greatly in fixing the issues.",
};
dialog.showMessageBox(BrowserWindow.getFocusedWindow(), options, (index) => {
event.sender.send("info-upload-limitations-shown");
});
});
// ipcMain.on("open-info-upload-limitations", (event) => {
// const options = {
// type: "info",
// title: "Potential upload issues",
// message:
// "We have encountered issues with the Blackfynn agent to upload certain datasets and are working with the Blackfynn Team to solve them. If you encounter any issues, please report to us using our feedback form (provide information such as operating system, dataset size, screenshot of error, etc.) and it will help us greatly in fixing the issues.",
// };
// dialog.showMessageBox(BrowserWindow.getFocusedWindow(), options, (index) => {
// event.sender.send("info-upload-limitations-shown");
// });
// });

ipcMain.on("warning-share-with-curation-team", (event) => {
const options = {
Expand Down
19 changes: 11 additions & 8 deletions src/pysoda/curate.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1510,14 +1510,17 @@ def recursive_folder_traversal(folder, dict_folder_manifest):
file_extension = os.path.splitext(item)[1]
dict_folder_manifest["file type"].append(file_extension)

if folder["files"][item]["type"] == "bf":
dict_folder_manifest["timestamp"].append(folder["files"][item]["timestamp"])
elif folder["files"][item]["type"] == "local":
file_path = folder["files"][item]["path"]
filepath = pathlib.Path(file_path)
mtime = filepath.stat().st_mtime
lastmodtime = datetime.fromtimestamp(mtime).astimezone(local_timezone)
dict_folder_manifest["timestamp"].append(lastmodtime.isoformat().replace('.', ',').replace('+00:00', 'Z'))
if "type" in folder["files"][item].keys():
if folder["files"][item]["type"] == "bf":
dict_folder_manifest["timestamp"].append(folder["files"][item]["timestamp"])
elif folder["files"][item]["type"] == "local":
file_path = folder["files"][item]["path"]
filepath = pathlib.Path(file_path)
mtime = filepath.stat().st_mtime
lastmodtime = datetime.fromtimestamp(mtime).astimezone(local_timezone)
dict_folder_manifest["timestamp"].append(lastmodtime.isoformat().replace('.', ',').replace('+00:00', 'Z'))
else:
dict_folder_manifest["timestamp"].append("")

if "description" in folder["files"][item].keys():
dict_folder_manifest["description"].append(folder["files"][item]["description"])
Expand Down
9 changes: 7 additions & 2 deletions src/scripts/disseminate-and-metadata.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,13 @@ $(document).ready(function () {
$("#generate-submission-spinner").show();
var destinationPath = path.join(dirpath[0], filename);
if (fs.existsSync(destinationPath)) {
var emessage = "File " + filename + " already exists in " + dirpath[0];
ipcRenderer.send("open-error-metadata-file-exits", emessage);
var emessage = "File '" + filename + "' already exists in " + dirpath[0];
// ipcRenderer.send("open-error-metadata-file-exits", emessage);
Swal.fire(
'Metadata file already exists',
`${emessage}`,
'error'
)
} else {
var awardRes = $("#submission-SPARC-award-span").text();
var dateRes = $("#submission-completion-date-span").text();
Expand Down
18 changes: 14 additions & 4 deletions src/scripts/renderer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -576,8 +576,13 @@ const downloadTemplates = (templateItem, destinationFolder) => {
var destinationPath = path.join(destinationFolder, templateItem);
if (fs.existsSync(destinationPath)) {
var emessage =
"File " + templateItem + " already exists in " + destinationFolder;
ipcRenderer.send("open-error-metadata-file-exits", emessage);
"File '" + templateItem + "' already exists in " + destinationFolder;
//ipcRenderer.send("open-error-metadata-file-exits", emessage);
Swal.fire(
'Metadata file already exists',
`${emessage}`,
'error'
)
} else {
fs.createReadStream(templatePath).pipe(
fs.createWriteStream(destinationPath)
Expand Down Expand Up @@ -1872,8 +1877,13 @@ ipcRenderer.on(
$("#generate-dd-spinner").show();
var destinationPath = path.join(dirpath[0], filename);
if (fs.existsSync(destinationPath)) {
var emessage = "File " + filename + " already exists in " + dirpath[0];
ipcRenderer.send("open-error-metadata-file-exits", emessage);
var emessage = "File '" + filename + "' already exists in " + dirpath[0];
// ipcRenderer.send("open-error-metadata-file-exits", emessage);
Swal.fire(
'Metadata file already exists',
`${emessage}`,
'error'
)
} else {
var datasetInfoValueArray = grabDSInfoEntries();

Expand Down

0 comments on commit b38fc1a

Please sign in to comment.