Skip to content

Commit 0d735f1

Browse files
committed
fixup
1 parent ef7386b commit 0d735f1

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

ui/src/components/page/GlobalFooter.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export default {
5555
if (this.$store.getters?.features?.cloudstackversion && this.$store.getters?.latestVersion?.version) {
5656
const currentVersion = getParsedVersion(this.$store.getters?.features?.cloudstackversion)
5757
const latestVersion = getParsedVersion(this.$store.getters?.latestVersion?.version)
58-
return semver.gt(latestVersion, currentVersion)
58+
return semver.valid(currentVersion) && semver.valid(latestVersion) && semver.gt(latestVersion, currentVersion)
5959
}
6060
return false
6161
}

ui/src/components/page/GlobalLayout.vue

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,7 @@ export default {
162162
collapsed: false,
163163
menus: [],
164164
showSetting: false,
165-
showClear: false,
166-
numberOfAlerts: 0
165+
showClear: false
167166
}
168167
},
169168
computed: {

ui/src/components/view/ListView.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
<span v-else>
9191
<router-link :to="{ path: $route.path + '/' + record.id }" v-if="record.id">{{ text }}</router-link>
9292
<router-link :to="{ path: $route.path + '/' + record.name }" v-else>{{ text }}</router-link>
93-
<span v-if="['guestnetwork','vpc'].includes($route.path.split('/')[1]) && record.restartrequired">
93+
<span v-if="['guestnetwork','vpc'].includes($route.path.split('/')[1]) && record.restartrequired && !record.vpcid">
9494
&nbsp;
9595
<a-tooltip>
9696
<template #title>{{ $t('label.restartrequired') }}</template>

ui/src/store/modules/user.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,10 @@ const user = {
173173
vueProps.$localStorage.set(OAUTH_PROVIDER, provider)
174174
},
175175
SET_LATEST_VERSION: (state, version) => {
176-
// if (version?.fetchedTs > 0) {
177-
vueProps.$localStorage.set(LATEST_CS_VERSION, version)
178-
state.latestVersion = version
179-
// }
176+
if (version?.fetchedTs > 0) {
177+
vueProps.$localStorage.set(LATEST_CS_VERSION, version)
178+
state.latestVersion = version
179+
}
180180
}
181181
},
182182

ui/src/utils/util.js

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,14 @@ export function sanitizeReverse (value) {
7171
.replace(/&gt;/g, '>')
7272
}
7373

74+
export function getParsedVersion (version) {
75+
version = version.split('-')[0]
76+
if (semver.valid(version) === null) {
77+
version = version.split('.').slice(1).join('.')
78+
}
79+
return version
80+
}
81+
7482
export function toCsv ({ keys = null, data = null, columnDelimiter = ',', lineDelimiter = '\n' }) {
7583
if (data === null || !data.length) {
7684
return null
@@ -94,10 +102,3 @@ export function toCsv ({ keys = null, data = null, columnDelimiter = ',', lineDe
94102

95103
return result
96104
}
97-
98-
export function getParsedVersion (version) {
99-
if (semver.valid(version) === null) {
100-
version = version.split('4.')[1]
101-
}
102-
return version
103-
}

0 commit comments

Comments
 (0)