Skip to content

Commit 7fc6f79

Browse files
odeimaizodeimaiz
committed
remove deleteId from fetch declaration
1 parent badcfe8 commit 7fc6f79

File tree

9 files changed

+41
-25
lines changed

9 files changed

+41
-25
lines changed

‎services/static-webserver/client/source/class/osparc/auth/Manager.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ qx.Class.define("osparc.auth.Manager", {
213213
}
214214
};
215215
return osparc.data.Resources.fetch("auth", "postLogout", params)
216-
.then(data => this.fireEvent("loggedOut"))
216+
.then(() => this.fireEvent("loggedOut"))
217217
.catch(error => console.log("already logged out"))
218218
.finally(this.__logoutUser());
219219
},

‎services/static-webserver/client/source/class/osparc/dashboard/StudyBrowser.js‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -687,9 +687,9 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
687687
params.url[key] = value;
688688
});
689689
if ("text" in requestParams) {
690-
return osparc.data.Resources.fetch("studies", "getPageSearch", params, undefined, options);
690+
return osparc.data.Resources.fetch("studies", "getPageSearch", params, options);
691691
}
692-
return osparc.data.Resources.fetch("studies", "getPage", params, undefined, options);
692+
return osparc.data.Resources.fetch("studies", "getPage", params, options);
693693
},
694694

695695
invalidateStudies: function() {
@@ -1545,7 +1545,10 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
15451545
"studyId": studyData["uuid"]
15461546
}
15471547
};
1548-
const fetchPromise = osparc.data.Resources.fetch("studies", "duplicate", params, null, {"pollTask": true});
1548+
const options = {
1549+
"pollTask": true
1550+
};
1551+
const fetchPromise = osparc.data.Resources.fetch("studies", "duplicate", params, options);
15491552
const interval = 1000;
15501553
const pollTasks = osparc.data.PollTasks.getInstance();
15511554
pollTasks.createPollingTask(fetchPromise, interval)

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ qx.Class.define("osparc.data.Resources", {
113113
"studies": {
114114
useCache: true,
115115
idField: "uuid",
116+
deleteId: "studyId",
116117
endpoints: {
117118
get: {
118119
method: "GET",
@@ -711,6 +712,7 @@ qx.Class.define("osparc.data.Resources", {
711712
"tokens": {
712713
useCache: true,
713714
idField: "service",
715+
deleteId: "service",
714716
endpoints: {
715717
get: {
716718
method: "GET",
@@ -1200,8 +1202,9 @@ qx.Class.define("osparc.data.Resources", {
12001202
* TAGS
12011203
*/
12021204
"tags": {
1203-
idField: "id",
12041205
useCache: true,
1206+
idField: "id",
1207+
deleteId: "tagId",
12051208
endpoints: {
12061209
get: {
12071210
method: "GET",
@@ -1244,10 +1247,9 @@ qx.Class.define("osparc.data.Resources", {
12441247
* @param {String} resource Name of the resource as defined in the static property 'resources'.
12451248
* @param {String} endpoint Name of the endpoint. Several endpoints can be defined for each resource.
12461249
* @param {Object} params Object containing the parameters for the url and for the body of the request, under the properties 'url' and 'data', respectively.
1247-
* @param {String} deleteId When deleting, id of the element that needs to be deleted from the cache.
1248-
* @param {Object} options Collections of options
1250+
* @param {Object} options Collections of options (pollTask, resolveWResponse)
12491251
*/
1250-
fetch: function(resource, endpoint, params = {}, deleteId, options = {}) {
1252+
fetch: function(resource, endpoint, params = {}, options = {}) {
12511253
return new Promise((resolve, reject) => {
12521254
if (this.self().resources[resource] == null) {
12531255
reject(Error(`Error while fetching ${resource}: the resource is not defined`));
@@ -1276,7 +1278,8 @@ qx.Class.define("osparc.data.Resources", {
12761278
}
12771279
}
12781280
if (useCache) {
1279-
if (endpoint.includes("delete")) {
1281+
if (endpoint.includes("delete") && resourceDefinition["deleteId"] && resourceDefinition["deleteId"] in params.url) {
1282+
const deleteId = params.url[resourceDefinition["deleteId"]];
12801283
this.__removeCached(resource, deleteId);
12811284
} else if (endpointDef.method === "POST" && options.pollTask !== true) {
12821285
this.__addCached(resource, data);
@@ -1489,8 +1492,8 @@ qx.Class.define("osparc.data.Resources", {
14891492

14901493
statics: {
14911494
API: "/v0",
1492-
fetch: function(resource, endpoint, params, deleteId, options = {}) {
1493-
return this.getInstance().fetch(resource, endpoint, params, deleteId, options);
1495+
fetch: function(resource, endpoint, params, options = {}) {
1496+
return this.getInstance().fetch(resource, endpoint, params, options);
14941497
},
14951498
getOne: function(resource, params, id, useCache) {
14961499
return this.getInstance().getOne(resource, params, id, useCache);

‎services/static-webserver/client/source/class/osparc/desktop/MainPage.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,10 @@ qx.Class.define("osparc.desktop.MainPage", {
232232
},
233233
data: data["studyData"]
234234
};
235-
const fetchPromise = osparc.data.Resources.fetch("studies", "postToTemplate", params, null, {"pollTask": true});
235+
const options = {
236+
"pollTask": true
237+
};
238+
const fetchPromise = osparc.data.Resources.fetch("studies", "postToTemplate", params, options);
236239
const pollTasks = osparc.data.PollTasks.getInstance();
237240
const interval = 1000;
238241
pollTasks.createPollingTask(fetchPromise, interval)

‎services/static-webserver/client/source/class/osparc/desktop/StudyEditorIdlingTracker.js‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,17 +101,18 @@ qx.Class.define("osparc.desktop.StudyEditorIdlingTracker", {
101101
const timeSinceInactivityThreshold = this.__idlingTime - inactivityThresholdT;
102102
if (timeSinceInactivityThreshold % this.self().INACTIVITY_REQUEST_PERIOD_S == 0) {
103103
// check if backend reports project as inactive
104-
osparc.data.Resources.fetch("studies", "getInactivity", {
104+
const params = {
105105
url: {
106106
studyId: this.__studyUuid
107107
}
108-
}).then(data => {
109-
if (data["is_inactive"]) {
110-
this.__displayFlashMessage(flashMessageDurationS);
111-
}
112-
}).catch(err => {
113-
console.error(err);
114-
});
108+
};
109+
osparc.data.Resources.fetch("studies", "getInactivity", params)
110+
.then(data => {
111+
if (data["is_inactive"]) {
112+
this.__displayFlashMessage(flashMessageDurationS);
113+
}
114+
})
115+
.catch(err => console.error(err));
115116
}
116117
}
117118
};

‎services/static-webserver/client/source/class/osparc/desktop/credits/TransactionsTableModel.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ qx.Class.define("osparc.desktop.credits.TransactionsTableModel", {
5858
limit: 1,
5959
offset: 0
6060
}
61-
}, undefined, {
61+
}, {
6262
resolveWResponse: true
6363
})
6464
.then(({ data: resp }) => {

‎services/static-webserver/client/source/class/osparc/desktop/credits/UsageTableModel.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ qx.Class.define("osparc.desktop.credits.UsageTableModel", {
8989
null,
9090
orderBy: JSON.stringify(this.getOrderBy())
9191
}
92-
}, undefined, {
92+
}, {
9393
resolveWResponse: true
9494
})
9595
.then(resp => {

‎services/static-webserver/client/source/class/osparc/info/CommentsList.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ qx.Class.define("osparc.info.CommentsList", {
105105
const options = {
106106
resolveWResponse: true
107107
};
108-
return osparc.data.Resources.fetch("studyComments", "getPage", params, undefined, options);
108+
return osparc.data.Resources.fetch("studyComments", "getPage", params, options);
109109
},
110110

111111
__addComments: function(comments) {

‎services/static-webserver/client/source/class/osparc/study/Utils.js‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,10 @@ qx.Class.define("osparc.study.Utils", {
165165

166166
createStudyAndPoll: function(params) {
167167
return new Promise((resolve, reject) => {
168-
const fetchPromise = osparc.data.Resources.fetch("studies", "postNewStudy", params, null, {"pollTask": true});
168+
const options = {
169+
"pollTask": true
170+
};
171+
const fetchPromise = osparc.data.Resources.fetch("studies", "postNewStudy", params, options);
169172
const pollTasks = osparc.data.PollTasks.getInstance();
170173
const interval = 1000;
171174
pollTasks.createPollingTask(fetchPromise, interval)
@@ -204,7 +207,10 @@ qx.Class.define("osparc.study.Utils", {
204207
},
205208
data: minStudyData
206209
};
207-
const fetchPromise = osparc.data.Resources.fetch("studies", "postNewStudyFromTemplate", params, null, {"pollTask": true});
210+
const options = {
211+
"pollTask": true
212+
};
213+
const fetchPromise = osparc.data.Resources.fetch("studies", "postNewStudyFromTemplate", params, options);
208214
const pollTasks = osparc.data.PollTasks.getInstance();
209215
const interval = 1000;
210216
pollTasks.createPollingTask(fetchPromise, interval)

0 commit comments

Comments
 (0)