Skip to content

Wall - 가상머신 모니터링 새탭링크 수정(instanceName -> uuid 로 파라미터 변경) #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dhslove merged 12 commits into from
Sep 17, 2021
Merged

Wall - 가상머신 모니터링 새탭링크 수정(instanceName -> uuid 로 파라미터 변경) #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
841f252
Merge pull request #9 from ablecloud-team/ablestack-bronto
jschoiRR Aug 18, 2021
a409ce7
mold신규버전 DB업데이트 소스반영
jschoiRR Aug 23, 2021
915ba4a
Merge pull request #10 from ablecloud-team/ablestack-bronto
jschoiRR Aug 23, 2021
fbdf54c
Update DatabaseUpgradeChecker.java
jschoiRR Sep 6, 2021
4cac32e
Update DatabaseUpgradeChecker.java
jschoiRR Sep 6, 2021
81650ae
Merge pull request #11 from ablecloud-team/ablestack-bronto
jschoiRR Sep 6, 2021
97ce56c
wall 모니터링 링크 파라미터값 수정
jschoiRR Sep 6, 2021
910f118
링크관련 메시지 문구 수정
jschoiRR Sep 6, 2021
9d9383a
테스트파일 삭제
jschoiRR Sep 6, 2021
ac5d638
불필요 소스 삭제
jschoiRR Sep 6, 2021
cd7e581
kiosk 파라미터 추가
jschoiRR Sep 17, 2021
dbc4113
대시보드 연결 아이콘 변경
jschoiRR Sep 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ui/public/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3444,9 +3444,9 @@
"label.desktop.master.version.manage": "Whether to use a Master Template",
"label.desktop.master.version.delete": "Delete Master Template",
"label.addomainname": "AD Domain Name",
"label.works.portal.url": "Works Portal Link",
"label.wall.portal.vm.url": "Realtime Monitoring Link",
"label.wall.portal.url": "Monitoring Dashboard Link",
"label.works.portal.url": "Works Portal",
"label.wall.portal.vm.url": "Realtime Monitoring",
"label.wall.portal.url": "Monitoring Dashboard",
"label.templatestate": "Template State",
"label.templateostype": "OS Type",
"label.access.type": "Access Type",
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/header/UserMenu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
</a-menu-item>
<a-menu-item class="user-menu-item" key="1">
<a :href="$store.getters.features.wallportaldashboardurl" target="_blank" v-if="$store.getters.userInfo.roletype === 'Admin'">
<a-icon class="user-menu-item-icon" type="user"/>
<a-icon class="user-menu-item-icon" type="global"/>
<span class="user-menu-item-name">{{ $t('label.wall.portal.url') }}</span>
</a>
</a-menu-item>
Expand Down
6 changes: 1 addition & 5 deletions ui/src/components/view/ActionButton.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<template slot="title">
{{ $t('label.wall.portal.vm.url') }}
</template>
<wall-link-url :resource="resource" :size="size" :ip="hostname"/>
<wall-link-url :resource="resource" :size="size" />
</a-tooltip>
<a-tooltip
v-for="(action, actionIndex) in actions"
Expand Down Expand Up @@ -104,7 +104,6 @@ export default {
data () {
return {
actionBadge: {},
hostname: this.serverIP()
}
},
mounted () {
Expand Down Expand Up @@ -203,9 +202,6 @@ export default {
}).catch(() => {})
}
},
serverIP () {
return location.hostname
}
}
}
</script>
Expand Down
6 changes: 1 addition & 5 deletions ui/src/components/widgets/WallLinkUrl.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<template>
<a
v-if="['vm'].includes($route.meta.name) && 'updateVirtualMachine' in $store.getters.apis"
:href="$store.getters.features.wallportalvmurl+'?kiosk&var-vm='+resource.instancename"
:href="$store.getters.features.wallportalvmurl+'?kiosk&var-vm_uuid='+resource.id"
target="_blank" >
<a-button style="margin-left: 5px" shape="circle" type="" :size="size" :disabled="['Stopped', 'Error', 'Destroyed'].includes(resource.state)" >
<a-icon type="global" />
Expand All @@ -37,10 +37,6 @@ export default {
type: String,
default: 'small'
},
ip: {
type: String,
default: ''
}
}
}
</script>