Skip to content

Commit 8efbc24

Browse files
committed
getLatest
1 parent 6ca5a87 commit 8efbc24

File tree

10 files changed

+21
-21
lines changed

10 files changed

+21
-21
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ qx.Class.define("osparc.dashboard.NewPlusMenu", {
319319
if (versions.length && newStudyData) {
320320
// scale to latest compatible
321321
const latestVersion = versions[0];
322-
const latestCompatible = osparc.service.Utils.getLatestCompatible(key, latestVersion);
322+
const latestCompatible = osparc.store.Services.getLatestCompatible(key, latestVersion);
323323
osparc.store.Services.getService(latestCompatible["key"], latestCompatible["version"])
324324
.then(latestMetadata => {
325325
// make sure this one is not deprecated

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -958,7 +958,7 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
958958
if (versions.length && newStudyData) {
959959
// scale to latest compatible
960960
const latestVersion = versions[0];
961-
const latestCompatible = osparc.service.Utils.getLatestCompatible(key, latestVersion);
961+
const latestCompatible = osparc.store.Services.getLatestCompatible(key, latestVersion);
962962
osparc.store.Services.getService(latestCompatible["key"], latestCompatible["version"])
963963
.then(latestMetadata => {
964964
// make sure this one is not deprecated

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ qx.Class.define("osparc.dashboard.TemplateBrowser", {
326326
const templatePromises = [];
327327
for (const nodeId in studyData["workbench"]) {
328328
const node = studyData["workbench"][nodeId];
329-
const latestCompatible = osparc.service.Utils.getLatestCompatible(node["key"], node["version"]);
329+
const latestCompatible = osparc.store.Services.getLatestCompatible(node["key"], node["version"]);
330330
if (latestCompatible && (node["key"] !== latestCompatible["key"] || node["version"] !== latestCompatible["version"])) {
331331
const patchData = {};
332332
if (node["key"] !== latestCompatible["key"]) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1222,7 +1222,7 @@ qx.Class.define("osparc.data.model.Node", {
12221222
if (!["int"].includes(type)) {
12231223
return;
12241224
}
1225-
const metadata = osparc.service.Utils.getLatest("simcore/services/frontend/data-iterator/int-range")
1225+
const metadata = osparc.store.Services.getLatest("simcore/services/frontend/data-iterator/int-range")
12261226
if (metadata) {
12271227
const value = this.__getOutputData("out_1");
12281228
const label = this.getLabel();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ qx.Class.define("osparc.desktop.credits.CreditsServiceListItem", {
3131

3232
const icon = this.getChildControl("icon");
3333
const name = this.getChildControl("title");
34-
const serviceMetadata = osparc.service.Utils.getLatest(serviceKey);
34+
const serviceMetadata = osparc.store.Services.getLatest(serviceKey);
3535
if (serviceMetadata) {
3636
const source = osparc.utils.Utils.getIconFromResource(serviceMetadata);
3737
icon.setSource(source);

services/static-webserver/client/source/class/osparc/metadata/ServicesInStudyUpdate.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ qx.Class.define("osparc.metadata.ServicesInStudyUpdate", {
113113
},
114114

115115
__updateService: async function(nodeId, key, version, button) {
116-
const latestCompatible = osparc.service.Utils.getLatestCompatible(key, version);
116+
const latestCompatible = osparc.store.Services.getLatestCompatible(key, version);
117117
const patchData = {};
118118
if (key !== latestCompatible["key"]) {
119119
patchData["key"] = latestCompatible["key"];
@@ -184,7 +184,7 @@ qx.Class.define("osparc.metadata.ServicesInStudyUpdate", {
184184
const compatibleVersionLabel = new qx.ui.basic.Label().set({
185185
font: "text-14"
186186
});
187-
const latestCompatible = osparc.service.Utils.getLatestCompatible(node["key"], node["version"]);
187+
const latestCompatible = osparc.store.Services.getLatestCompatible(node["key"], node["version"]);
188188
if (latestCompatible) {
189189
// updatable
190190
osparc.store.Services.getService(latestCompatible["key"], latestCompatible["version"])

services/static-webserver/client/source/class/osparc/node/LifeCycleView.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ qx.Class.define("osparc.node.LifeCycleView", {
110110
});
111111
updateButton.addListener("execute", () => {
112112
updateButton.setFetching(true);
113-
const latestCompatible = osparc.service.Utils.getLatestCompatible(node.getKey(), node.getVersion());
113+
const latestCompatible = osparc.store.Services.getLatestCompatible(node.getKey(), node.getVersion());
114114
if (node.getKey() !== latestCompatible["key"]) {
115115
node.setKey(latestCompatible["key"]);
116116
}

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

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* Here is a little example of how to use the widget.
2525
*
2626
* <pre class='javascript'>
27-
* let latestSrv = osparc.service.Utils.getLatest(key);
27+
* let latestSrv = osparc.store.Services.getLatest(key);
2828
* </pre>
2929
*/
3030

@@ -149,17 +149,6 @@ qx.Class.define("osparc.service.Utils", {
149149
return versions.reverse();
150150
},
151151

152-
getLatest: function(key) {
153-
const services = osparc.store.Services.servicesCached;
154-
if (key in services) {
155-
const versions = this.getVersions(key, true);
156-
if (versions.length) {
157-
return services[key][versions[0]];
158-
}
159-
}
160-
return null;
161-
},
162-
163152
getLatestCompatible: function(key, version) {
164153
const services = osparc.store.Services.servicesCached;
165154
if (key in services && version in services[key]) {

services/static-webserver/client/source/class/osparc/store/Services.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,17 @@ qx.Class.define("osparc.store.Services", {
5555
});
5656
},
5757

58+
getLatest: function(key) {
59+
const services = this.servicesCached;
60+
if (key in services) {
61+
const versions = this.getVersions(key, true);
62+
if (versions.length) {
63+
return services[key][versions[0]];
64+
}
65+
}
66+
return null;
67+
},
68+
5869
getService: function(key, version, useCache = true) {
5970
return new Promise(resolve => {
6071
if (useCache && this.__isInCache(key, version)) {

services/static-webserver/client/source/class/osparc/workbench/ServiceCatalog.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ qx.Class.define("osparc.workbench.ServiceCatalog", {
229229

230230
const groupedServicesList = [];
231231
for (const key in filteredServicesObj) {
232-
const serviceMetadata = osparc.service.Utils.getLatest(key);
232+
const serviceMetadata = osparc.store.Services.getLatest(key);
233233
if (serviceMetadata) {
234234
const service = new osparc.data.model.Service(serviceMetadata);
235235
groupedServicesList.push(service);

0 commit comments

Comments
 (0)