Skip to content

Commit 70fc8ff

Browse files
committed
timeout as Resource arg
1 parent 410ebcd commit 70fc8ff

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1256,17 +1256,11 @@ qx.Class.define("osparc.data.Resources", {
12561256
}
12571257

12581258
const resourceDefinition = this.self().resources[resource];
1259-
const res = new osparc.io.rest.Resource(resourceDefinition.endpoints);
1259+
const res = new osparc.io.rest.Resource(resourceDefinition.endpoints, options.timeout);
12601260
if (!res.includesRoute(endpoint)) {
12611261
reject(Error(`Error while fetching ${resource}: the endpoint is not defined`));
12621262
}
12631263

1264-
if (options.timeout) {
1265-
res.configureRequest(request => {
1266-
request.setTimeout(options.timeout);
1267-
});
1268-
}
1269-
12701264
const sendRequest = () => {
12711265
res[endpoint](params.url || null, params.data || null);
12721266
}

services/static-webserver/client/source/class/osparc/io/rest/Resource.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
qx.Class.define("osparc.io.rest.Resource", {
2222
extend: qx.io.rest.Resource,
2323

24-
construct: function(description) {
24+
construct: function(description, timeout = 0) {
2525
this.base(arguments, description);
2626

2727
this.configureRequest(request => {
@@ -41,6 +41,10 @@ qx.Class.define("osparc.io.rest.Resource", {
4141
}
4242

4343
headers.forEach(item => request.setRequestHeader(item.key, item.value));
44+
45+
if (timeout) {
46+
request.setTimeout(timeout);
47+
}
4448
});
4549
},
4650

0 commit comments

Comments
 (0)