Skip to content

Commit 75b335e

Browse files
nvazqueznvazquez
committed
Merge branch '4.15' into main
2 parents 55174d5 + 1182051 commit 75b335e

9 files changed

Lines changed: 129 additions & 6 deletions

File tree

‎ui/public/config.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
{
22
"apiBase": "/client/api",
3+
"servers": [
4+
{
5+
"name": "Local-Server",
6+
"apiHost": "",
7+
"apiBase": "/client/api"
8+
}
9+
],
310
"docBase": "http://docs.cloudstack.apache.org/en/latest",
411
"appTitle": "CloudStack",
512
"footer": "Licensed under the <a href='http://www.apache.org/licenses/' target='_blank'>Apache License</a>, Version 2.0.",
@@ -48,5 +55,6 @@
4855
},
4956
"plugins": [],
5057
"basicZoneEnabled": true,
58+
"multipleServer": false,
5159
"docHelpMappings": {}
5260
}

‎ui/src/components/header/UserMenu.vue‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020

2121
<translation-menu class="action"/>
2222
<header-notice class="action"/>
23+
<label class="user-menu-server-info action" v-if="$config.multipleServer">
24+
<a-icon slot="prefix" type="database" />
25+
{{ server.name || server.apiBase || 'Local-Server' }}
26+
</label>
2327
<a-dropdown>
2428
<span class="user-menu-dropdown action">
2529
<a-avatar class="user-menu-avatar avatar" size="small" :src="avatar()"/>
@@ -59,16 +63,23 @@
5963
</template>
6064

6165
<script>
66+
import Vue from 'vue'
6267
import HeaderNotice from './HeaderNotice'
6368
import TranslationMenu from './TranslationMenu'
6469
import { mapActions, mapGetters } from 'vuex'
70+
import { SERVER_MANAGER } from '@/store/mutation-types'
6571
6672
export default {
6773
name: 'UserMenu',
6874
components: {
6975
TranslationMenu,
7076
HeaderNotice
7177
},
78+
computed: {
79+
server () {
80+
return Vue.ls.get(SERVER_MANAGER) || this.$config.servers[0]
81+
}
82+
},
7283
methods: {
7384
...mapActions(['Logout']),
7485
...mapGetters(['nickname', 'avatar']),
@@ -108,5 +119,11 @@ export default {
108119
min-width: 12px;
109120
margin-right: 8px;
110121
}
122+
123+
&-server-info {
124+
.anticon {
125+
margin-right: 5px;
126+
}
127+
}
111128
}
112129
</style>

‎ui/src/components/widgets/Console.vue‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<template>
1919
<a
2020
v-if="['vm', 'systemvm', 'router', 'ilbvm'].includes($route.meta.name) && 'updateVirtualMachine' in $store.getters.apis"
21-
:href="'/client/console?cmd=access&vm=' + resource.id"
21+
:href="server + '/console?cmd=access&vm=' + resource.id"
2222
target="_blank">
2323
<a-button style="margin-left: 5px" shape="circle" type="dashed" :size="size" :disabled="['Stopped', 'Error', 'Destroyed'].includes(resource.state)" >
2424
<a-icon type="code" />
@@ -27,6 +27,9 @@
2727
</template>
2828

2929
<script>
30+
import Vue from 'vue'
31+
import { SERVER_MANAGER } from '@/store/mutation-types'
32+
3033
export default {
3134
name: 'Console',
3235
props: {
@@ -38,6 +41,19 @@ export default {
3841
type: String,
3942
default: 'small'
4043
}
44+
},
45+
computed: {
46+
server () {
47+
if (!this.$config.multipleServer) {
48+
return this.$config.apiBase.replace('/api', '')
49+
}
50+
const serverStorage = Vue.ls.get(SERVER_MANAGER)
51+
const apiBase = serverStorage.apiBase.replace('/api', '')
52+
if (!serverStorage.apiHost || serverStorage.apiHost === '/') {
53+
return [location.origin, apiBase].join('')
54+
}
55+
return [serverStorage.apiHost, apiBase].join('')
56+
}
4157
}
4258
}
4359
</script>

‎ui/src/main.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,12 @@ Vue.use(toLocaleDatePlugin)
3838

3939
fetch('config.json').then(response => response.json()).then(config => {
4040
Vue.prototype.$config = config
41-
Vue.axios.defaults.baseURL = config.apiBase
41+
let basUrl = config.apiBase
42+
if (config.multipleServer) {
43+
basUrl = (config.servers[0].apiHost || '') + config.servers[0].apiBase
44+
}
45+
46+
Vue.axios.defaults.baseURL = basUrl
4247

4348
loadLanguageAsync().then(() => {
4449
new Vue({

‎ui/src/permission.js‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import 'nprogress/nprogress.css' // progress bar style
2626
import message from 'ant-design-vue/es/message'
2727
import notification from 'ant-design-vue/es/notification'
2828
import { setDocumentTitle } from '@/utils/domUtil'
29-
import { ACCESS_TOKEN, APIS } from '@/store/mutation-types'
29+
import { ACCESS_TOKEN, APIS, SERVER_MANAGER } from '@/store/mutation-types'
3030

3131
NProgress.configure({ showSpinner: false }) // NProgress Configuration
3232

@@ -39,6 +39,20 @@ router.beforeEach((to, from, next) => {
3939
const title = i18n.t(to.meta.title) + ' - ' + Vue.prototype.$config.appTitle
4040
setDocumentTitle(title)
4141
}
42+
43+
if (Vue.prototype.$config.multipleServer) {
44+
const servers = Vue.prototype.$config.servers
45+
const serverStorage = Vue.ls.get(SERVER_MANAGER)
46+
let apiFullPath = ''
47+
if (serverStorage) {
48+
apiFullPath = (serverStorage.apiHost || '') + serverStorage.apiBase
49+
}
50+
const serverFilter = servers.filter(ser => (ser.apiHost || '') + ser.apiBase === apiFullPath)
51+
const server = serverFilter[0] || servers[0]
52+
Vue.axios.defaults.baseURL = (server.apiHost || '') + server.apiBase
53+
store.dispatch('SetServer', server)
54+
}
55+
4256
const validLogin = Vue.ls.get(ACCESS_TOKEN) || Cookies.get('userid') || Cookies.get('userid', { path: '/client' })
4357
if (validLogin) {
4458
if (to.path === '/user/login') {

‎ui/src/store/getters.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ const getters = {
3636
zones: state => state.user.zones,
3737
timezoneoffset: state => state.user.timezoneoffset,
3838
usebrowsertimezone: state => state.user.usebrowsertimezone,
39+
server: state => state.app.server,
3940
domainStore: state => state.user.domainStore
4041
}
4142

‎ui/src/store/modules/app.js‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ import {
2727
DEFAULT_FIXED_HEADER_HIDDEN,
2828
DEFAULT_CONTENT_WIDTH_TYPE,
2929
DEFAULT_MULTI_TAB,
30-
USE_BROWSER_TIMEZONE
30+
USE_BROWSER_TIMEZONE,
31+
SERVER_MANAGER
3132
} from '@/store/mutation-types'
3233

3334
const app = {
@@ -44,7 +45,8 @@ const app = {
4445
color: null,
4546
inverted: true,
4647
multiTab: true,
47-
metrics: false
48+
metrics: false,
49+
server: ''
4850
},
4951
mutations: {
5052
SET_SIDEBAR_TYPE: (state, type) => {
@@ -100,6 +102,10 @@ const app = {
100102
SET_USE_BROWSER_TIMEZONE: (state, bool) => {
101103
Vue.ls.set(USE_BROWSER_TIMEZONE, bool)
102104
state.usebrowsertimezone = bool
105+
},
106+
SET_SERVER: (state, server) => {
107+
Vue.ls.set(SERVER_MANAGER, server)
108+
state.server = server
103109
}
104110
},
105111
actions: {
@@ -147,6 +153,9 @@ const app = {
147153
},
148154
SetUseBrowserTimezone ({ commit }, bool) {
149155
commit('SET_USE_BROWSER_TIMEZONE', bool)
156+
},
157+
SetServer ({ commit }, server) {
158+
commit('SET_SERVER', server)
150159
}
151160
}
152161
}

‎ui/src/store/mutation-types.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ export const ZONES = 'ZONES'
3232
export const HEADER_NOTICES = 'HEADER_NOTICES'
3333
export const TIMEZONE_OFFSET = 'TIMEZONE_OFFSET'
3434
export const USE_BROWSER_TIMEZONE = 'USE_BROWSER_TIMEZONE'
35+
export const SERVER_MANAGER = 'SERVER_MANAGER'
3536
export const DOMAIN_STORE = 'DOMAIN_STORE'
3637

3738
export const CONTENT_WIDTH_TYPE = {

‎ui/src/views/auth/Login.vue‎

Lines changed: 53 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,23 @@
3636
<a-icon type="safety" />
3737
{{ $t('label.login.portal') }}
3838
</span>
39+
<a-form-item v-if="$config.multipleServer">
40+
<a-select
41+
size="large"
42+
:placeholder="$t('server')"
43+
v-decorator="[
44+
'server',
45+
{
46+
initialValue: (server.apiHost || '') + server.apiBase
47+
}
48+
]"
49+
@change="onChangeServer">
50+
<a-select-option v-for="item in $config.servers" :key="(item.apiHost || '') + item.apiBase">
51+
<a-icon slot="prefix" type="database" :style="{ color: 'rgba(0,0,0,.25)' }"></a-icon>
52+
{{ item.name }}
53+
</a-select-option>
54+
</a-select>
55+
</a-form-item>
3956
<a-form-item>
4057
<a-input
4158
size="large"
@@ -86,6 +103,23 @@
86103
<a-icon type="audit" />
87104
{{ $t('label.login.single.signon') }}
88105
</span>
106+
<a-form-item v-if="$config.multipleServer">
107+
<a-select
108+
size="large"
109+
:placeholder="$t('server')"
110+
v-decorator="[
111+
'server',
112+
{
113+
initialValue: (server.apiHost || '') + server.apiBase
114+
}
115+
]"
116+
@change="onChangeServer">
117+
<a-select-option v-for="item in $config.servers" :key="(item.apiHost || '') + item.apiBase">
118+
<a-icon slot="prefix" type="database" :style="{ color: 'rgba(0,0,0,.25)' }"></a-icon>
119+
{{ item.name }}
120+
</a-select-option>
121+
</a-select>
122+
</a-form-item>
89123
<a-form-item>
90124
<a-select v-decorator="['idp', { initialValue: selectedIdp } ]">
91125
<a-select-option v-for="(idp, idx) in idps" :key="idx" :value="idp.id">
@@ -112,8 +146,11 @@
112146
</template>
113147

114148
<script>
149+
import Vue from 'vue'
115150
import { api } from '@/api'
151+
import store from '@/store'
116152
import { mapActions } from 'vuex'
153+
import { SERVER_MANAGER } from '@/store/mutation-types'
117154
import TranslationMenu from '@/components/header/TranslationMenu'
118155
119156
export default {
@@ -132,10 +169,15 @@ export default {
132169
time: 60,
133170
loginBtn: false,
134171
loginType: 0
135-
}
172+
},
173+
server: ''
136174
}
137175
},
138176
created () {
177+
if (this.$config.multipleServer) {
178+
this.server = Vue.ls.get(SERVER_MANAGER) || this.$config.servers[0]
179+
}
180+
139181
this.fetchData()
140182
},
141183
methods: {
@@ -179,6 +221,11 @@ export default {
179221
180222
validateFields(validateFieldsKey, { force: true }, (err, values) => {
181223
if (!err) {
224+
if (this.$config.multipleServer) {
225+
this.axios.defaults.baseURL = (this.server.apiHost || '') + this.server.apiBase
226+
store.dispatch('SetServer', this.server)
227+
}
228+
182229
if (customActiveKey === 'cs') {
183230
const loginParams = { ...values }
184231
delete loginParams.username
@@ -219,6 +266,11 @@ export default {
219266
} else {
220267
this.$message.error(this.$t('message.login.failed'))
221268
}
269+
},
270+
onChangeServer (server) {
271+
const servers = this.$config.servers || []
272+
const serverFilter = servers.filter(ser => (ser.apiHost || '') + ser.apiBase === server)
273+
this.server = serverFilter[0] || {}
222274
}
223275
}
224276
}

0 commit comments

Comments
 (0)