rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3354 from loganhz/reload 

Fix current version missing issue
This commit is contained in:
Vincent Fiduccia 2019-09-13 17:17:07 -07:00 committed by GitHub
parent a7f8eabc1a f95c884acb
commit 6a399ed609
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/catalog-tab/launch/route.js
View File

@ -153,10 +153,20 @@ export default Route.extend({
}
if ( neuApp.id ) {
verArr.filter((ver) => ver.version === get(neuApp, 'externalIdInfo.version'))
.forEach((ver) => {
set(ver, 'version', `${ ver.version } (current)`);
const v = get(neuApp, 'externalIdInfo.version');
const currentVersion = verArr.filter((ver) => ver.version === v);
if ( currentVersion.length === 0 ) {
verArr.unshift({
link: get(verArr, 'firstObject.link').substring(0, get(verArr, 'firstObject.link.length') - get(verArr, 'firstObject.version.length')) + v,
sortVersion: v,
version: `${ v } (current)`
})
} else {
currentVersion.forEach((ver) => {
set(ver, 'version', `${ ver.version } (current)`);
});
}
}
if ( !params.namespaceId && params.istio ) {

7
lib/shared/addon/mixins/catalog-upgrade.js
View File

@ -68,9 +68,14 @@ export default Mixin.create(UpgradeComponent, {
if ( get(apps, 'length') ) {
const currentVersion = get(apps, 'firstObject.externalIdInfo.version');
const availableVersions = versions.filter((v) => compareVersion(v.value, currentVersion) > 0);
availableVersions.unshift({
value: currentVersion,
label: currentVersion
});
setProperties(this, {
availableVersions: versions.slice(versions.findIndex((v) => v.value === currentVersion)),
availableVersions,
templateVersion: currentVersion
});
} else {