Skip to content

Commit 4196155

Browse files
committed
extractReleasedDateFromHistory
1 parent 0eaea50 commit 4196155

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,16 +156,24 @@ qx.Class.define("osparc.service.Utils", {
156156
DEPRECATED_AUTOUPDATABLE_INSTRUCTIONS: qx.locale.Manager.tr("Please Stop the Service and then Update it"),
157157
RETIRED_AUTOUPDATABLE_INSTRUCTIONS: qx.locale.Manager.tr("Please Update the Service"),
158158

159-
extractVersionFromHistory: function(metadata) {
159+
getHistoryEntry: function(metadata) {
160160
if (metadata["history"]) {
161161
const found = metadata["history"].find(historyEntry => historyEntry["version"] === metadata["version"]);
162162
return found;
163163
}
164164
return null;
165165
},
166166

167+
extractReleasedDateFromHistory: function(metadata) {
168+
const historyEntry = this.getHistoryEntry(metadata);
169+
if (historyEntry && historyEntry["released"]) {
170+
return historyEntry["released"];
171+
}
172+
return null;
173+
},
174+
167175
isUpdatable: function(metadata) {
168-
const historyEntry = this.extractVersionFromHistory(metadata);
176+
const historyEntry = this.getHistoryEntry(metadata);
169177
if (historyEntry && historyEntry["compatibility"] && historyEntry["compatibility"]["canUpdateTo"]) {
170178
const latestCompatible = historyEntry["compatibility"]["canUpdateTo"];
171179
return latestCompatible && (metadata["key"] !== latestCompatible["key"] || metadata["version"] !== latestCompatible["version"]);
@@ -182,7 +190,7 @@ qx.Class.define("osparc.service.Utils", {
182190
// this works for service latest
183191
return new Date(metadata["release"]["retired"]);
184192
}
185-
const historyEntry = this.extractVersionFromHistory(metadata);
193+
const historyEntry = this.getHistoryEntry(metadata);
186194
if (historyEntry && "retired" in historyEntry && historyEntry["retired"]) {
187195
return new Date(historyEntry["retired"]);
188196
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ qx.Class.define("osparc.store.Services", {
6666
getLatestCompatible: function(key, version) {
6767
const services = this.__servicesCached;
6868
if (key in services && version in services[key]) {
69-
const historyEntry = osparc.service.Utils.extractVersionFromHistory(services[key][version]);
69+
const historyEntry = osparc.service.Utils.getHistoryEntry(services[key][version]);
7070
if (historyEntry["compatibility"] && historyEntry["compatibility"]["canUpdateTo"]) {
7171
const canUpdateTo = historyEntry["compatibility"]["canUpdateTo"];
7272
return {
@@ -95,10 +95,10 @@ qx.Class.define("osparc.store.Services", {
9595
const services = this.__servicesCached;
9696
if (
9797
key in services &&
98-
version in services[key] &&
99-
"released" in services[key][version]
98+
version in services[key]
10099
) {
101-
return services[key][version]["released"];
100+
const serviceMetadata = services[key][version];
101+
return osparc.service.Utils.extractReleasedDateFromHistory(serviceMetadata);
102102
}
103103
return null;
104104
},
@@ -243,7 +243,7 @@ qx.Class.define("osparc.store.Services", {
243243
}
244244
serviceLatest = osparc.utils.Utils.deepCloneObject(olderNonRetired);
245245
// make service metadata latest model like
246-
serviceLatest["release"] = osparc.service.Utils.extractVersionFromHistory(olderNonRetired);
246+
serviceLatest["release"] = osparc.service.Utils.getHistoryEntry(olderNonRetired);
247247
break;
248248
}
249249
}

0 commit comments

Comments
 (0)