Skip to content

Commit 4782788

Browse files
committed
retire storage/async-jobs
1 parent 96791e7 commit 4782788

File tree

4 files changed

+13
-135
lines changed

4 files changed

+13
-135
lines changed

services/static-webserver/client/source/class/osparc/data/PollTask.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
qx.Class.define("osparc.data.PollTask", {
2323
extend: qx.core.Object,
2424

25-
construct: function(taskData, interval) {
25+
construct: function(taskData, interval = 1000) {
2626
this.base(arguments);
2727

28-
interval ? this.setPollInterval(interval) : this.initPollInterval();
28+
this.setPollInterval(interval);
2929

3030
if (taskData && "task_id" in taskData) {
3131
this.set({

services/static-webserver/client/source/class/osparc/data/Resources.js

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1241,26 +1241,6 @@ qx.Class.define("osparc.data.Resources", {
12411241
}
12421242
}
12431243
},
1244-
/*
1245-
* STORAGE ASYNC
1246-
*/
1247-
"storageAsyncJobs": {
1248-
useCache: false,
1249-
endpoints: {
1250-
jobStatus: {
1251-
method: "GET",
1252-
url: statics.API + "/storage/async-jobs/{jobId}/status"
1253-
},
1254-
jobResult: {
1255-
method: "GET",
1256-
url: statics.API + "/storage/async-jobs/{jobId}/result"
1257-
},
1258-
abortJob: {
1259-
method: "POST",
1260-
url: statics.API + "/storage/async-jobs/{jobId}/abort"
1261-
},
1262-
}
1263-
},
12641244
/*
12651245
* ACTIVITY
12661246
*/

services/static-webserver/client/source/class/osparc/file/StorageAsyncJob.js

Lines changed: 0 additions & 98 deletions
This file was deleted.

services/static-webserver/client/source/class/osparc/file/TreeFolderView.js

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -160,22 +160,18 @@ qx.Class.define("osparc.file.TreeFolderView", {
160160
const totalSize = this.getChildControl("total-size-label");
161161
totalSize.getChildControl("icon").getContentElement().addClass("rotate");
162162

163-
osparc.data.Resources.fetch("storagePaths", "requestSize", { url: { pathId } })
164-
.then(resp => {
165-
const jobId = resp["job_id"];
166-
if (jobId) {
167-
const asyncJob = new osparc.file.StorageAsyncJob(jobId);
168-
asyncJob.addListener("resultReceived", e => {
169-
const size = e.getData();
170-
totalSize.set({
171-
icon: null,
172-
label: this.tr("Total size: ") + osparc.utils.Utils.bytesToSize(size),
173-
});
163+
const pollTasks = osparc.store.PollTasks.getInstance();
164+
const fetchPromise = osparc.data.Resources.fetch("storagePaths", "requestSize", { url: { pathId } })
165+
pollTasks.createPollingTask(fetchPromise)
166+
.then(task => {
167+
task.addListener("resultReceived", e => {
168+
const size = e.getData();
169+
totalSize.set({
170+
icon: null,
171+
label: this.tr("Total size: ") + osparc.utils.Utils.bytesToSize(size),
174172
});
175-
asyncJob.addListener("pollingError", e => {
176-
totalSize.hide();
177-
});
178-
}
173+
});
174+
task.addListener("pollingError", e => totalSize.hide());
179175
})
180176
.catch(err => {
181177
console.error(err);

0 commit comments

Comments
 (0)