Skip to content

🎨 [Frontend] Delete export-data task after downloading artifacts #7567

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 23, 2025
Merged

🎨 [Frontend] Delete export-data task after downloading artifacts #7567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8af5ed0
delete after downloading
odeimaiz Apr 23, 2025
2de49f4
minor
odeimaiz Apr 23, 2025
2563c8b
Merge branch 'master' into enh/burn-after-reading
odeimaiz Apr 23, 2025
e977b15
enable multi-download
odeimaiz Apr 23, 2025
b892b19
Merge branch 'enh/burn-after-reading' of github.com:odeimaiz/osparc-s…
odeimaiz Apr 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions services/static-webserver/client/source/class/osparc/data/Resources.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,10 @@ qx.Class.define("osparc.data.Resources", {
get: {
method: "GET",
url: statics.API + "/tasks"
},
delete: {
method: "DELETE",
url: statics.API + "/tasks/{taskId}"
}
}
},
Expand Down
9 changes: 3 additions & 6 deletions services/static-webserver/client/source/class/osparc/file/FileLabelWithActions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,7 @@ qx.Class.define("osparc.file.FileLabelWithActions", {
setItemSelected: function(selectedItem) {
if (selectedItem) {
this.__selection = [selectedItem];
const isFile = osparc.file.FilesTree.isFile(selectedItem);
const isMultiDownloadEnabled = osparc.utils.DisabledPlugins.isMultiDownloadEnabled();
this.getChildControl("download-button").setEnabled(isFile || isMultiDownloadEnabled); // folders can also be downloaded
this.getChildControl("download-button").setEnabled(true); // folders can also be downloaded
this.getChildControl("delete-button").setEnabled(true); // folders can also be deleted
this.getChildControl("selected-label").setValue(selectedItem.getLabel());
} else {
Expand Down Expand Up @@ -143,11 +141,10 @@ qx.Class.define("osparc.file.FileLabelWithActions", {
},

__retrieveURLAndDownloadSelected: function() {
const isMultiDownloadEnabled = osparc.utils.DisabledPlugins.isMultiDownloadEnabled();
if (this.isMultiSelect()) {
if (this.__selection.length === 1 && osparc.file.FilesTree.isFile(this.__selection[0])) {
this.__retrieveURLAndDownloadFile(this.__selection[0]);
} else if (this.__selection.length > 1 && isMultiDownloadEnabled) {
} else if (this.__selection.length > 1) {
const paths = this.__selection.map(item => item.getPath());
this.__retrieveURLAndExportData(paths);
}
Expand All @@ -156,7 +153,7 @@ qx.Class.define("osparc.file.FileLabelWithActions", {
if (selection) {
if (osparc.file.FilesTree.isFile(selection)) {
this.__retrieveURLAndDownloadFile(selection);
} else if (isMultiDownloadEnabled) {
} else {
const paths = [selection.getPath()];
this.__retrieveURLAndExportData(paths);
}
Expand Down
11 changes: 10 additions & 1 deletion services/static-webserver/client/source/class/osparc/task/ExportData.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,16 @@ qx.Class.define("osparc.task.ExportData", {
.then(data => {
if (data && data.link) {
const fileName = taskData["result"].split("/").pop();
osparc.utils.Utils.downloadLink(data.link, "GET", fileName);
const progressCb = null;
const loadedCb = () => {
const deleteParams = {
url: {
taskId: task.getTaskId(),
}
};
osparc.data.Resources.fetch("tasks", "delete", deleteParams);
}
osparc.utils.Utils.downloadLink(data.link, "GET", fileName, progressCb, loadedCb);
}
})
}
Expand Down
4 changes: 0 additions & 4 deletions services/static-webserver/client/source/class/osparc/utils/DisabledPlugins.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,6 @@ qx.Class.define("osparc.utils.DisabledPlugins", {
return osparc.store.StaticInfo.getInstance().isDevFeaturesEnabled();
},

isMultiDownloadEnabled: function() {
return osparc.store.StaticInfo.getInstance().isDevFeaturesEnabled();
},

isJobsEnabled: function() {
return osparc.store.StaticInfo.getInstance().isDevFeaturesEnabled();
},
Expand Down
19 changes: 10 additions & 9 deletions services/static-webserver/client/source/class/osparc/utils/Utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -858,24 +858,25 @@ qx.Class.define("osparc.utils.Utils", {
}
});
xhr.addEventListener("progress", e => {
if (xhr.readyState === XMLHttpRequest.LOADING) {
if (xhr.status === 0 || (xhr.status >= 200 && xhr.status < 400)) {
if (e["type"] === "progress" && progressCb) {
progressCb(e.loaded / e.total);
}
}
if (
progressCb &&
xhr.readyState === XMLHttpRequest.LOADING &&
(xhr.status === 0 || (xhr.status >= 200 && xhr.status < 400)) &&
e["type"] === "progress"
) {
progressCb(e.loaded / e.total);
}
});
xhr.addEventListener("load", () => {
if (xhr.status == 200) {
if (loadedCb) {
loadedCb();
}
const blob = new Blob([xhr.response]);
if (!fileName) {
fileName = this.self().filenameFromContentDisposition(xhr);
}
this.self().downloadBlobContent(blob, fileName);
if (loadedCb) {
loadedCb();
}
resolve();
} else {
reject(xhr);
Expand Down
Loading