Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions ui/public/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,7 @@
"label.copied.clipboard": "Copied to clipboard",
"label.copy": "Copy",
"label.copy.clipboard": "Copy to clipboard",
"label.copy.consoleurl": "Copy console URL to clipboard",
"label.copyid": "Copy ID",
"label.core": "Core",
"label.core.zone.type": "Core zone type",
Expand Down
21 changes: 20 additions & 1 deletion ui/src/components/view/ActionButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,26 @@
<template #title>
{{ $t('label.view.console') }}
</template>
<console :resource="resource" :size="size" />
<console
style="margin-top: -5px;"
:resource="resource"
size="default"
v-if="resource.id"
icon="code"
/>
</a-tooltip>
<a-tooltip arrowPointAtCenter placement="bottomRight" v-if="resource && resource.id && dataView">
<template #title>
{{ $t('label.copy.consoleurl') }}
</template>
<console
copyUrlToClipboard
style="margin-top: -5px;"
:resource="resource"
size="default"
v-if="resource.id"
icon="copy"
/>
</a-tooltip>
<a-tooltip
v-for="(action, actionIndex) in actions"
Expand Down
19 changes: 18 additions & 1 deletion ui/src/components/view/InfoCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,24 @@
<template #title>
<span>{{ $t('label.view.console') }}</span>
</template>
<console style="margin-top: -5px;" :resource="resource" size="default" v-if="resource.id" />
<console
style="margin-top: -5px;"
:resource="resource"
size="default"
v-if="resource.id"
/>
</a-tooltip>
<a-tooltip placement="right" >
<template #title>
<span>{{ $t('label.copy.consoleurl') }}</span>
</template>
<console
copyUrlToClipboard
style="margin-top: -5px;"
:resource="resource"
size="default"
v-if="resource.id"
/>
</a-tooltip>
</div>
</slot>
Expand Down
22 changes: 19 additions & 3 deletions ui/src/components/widgets/Console.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@
v-if="['vm', 'systemvm', 'router', 'ilbvm'].includes($route.meta.name) && 'listVirtualMachines' in $store.getters.apis && 'createConsoleEndpoint' in $store.getters.apis"
@click="consoleUrl">
<a-button style="margin-left: 5px" shape="circle" type="dashed" :size="size" :disabled="['Stopped', 'Error', 'Destroyed'].includes(resource.state) || resource.hostcontrolstate === 'Offline'" >
<code-outlined />
<code-outlined v-if="!copyUrlToClipboard"/>
<copy-outlined v-else />
</a-button>
</a>
</template>
Expand All @@ -39,7 +40,8 @@ export default {
size: {
type: String,
default: 'small'
}
},
copyUrlToClipboard: Boolean
},
data () {
return {
Expand All @@ -53,7 +55,21 @@ export default {
api('createConsoleEndpoint', params).then(json => {
this.url = (json && json.createconsoleendpointresponse) ? json.createconsoleendpointresponse.consoleendpoint.url : '#/exception/404'
if (json.createconsoleendpointresponse.consoleendpoint.success) {
window.open(this.url, '_blank')
if (this.copyUrlToClipboard) {
this.$message.success({
content: this.$t('label.copied.clipboard')
})
const hiddenElement = document.createElement('textarea')
hiddenElement.value = this.url
document.body.appendChild(hiddenElement)
hiddenElement.focus()
hiddenElement.select()

document.execCommand('copy')
document.body.removeChild(hiddenElement)
} else {
window.open(this.url, '_blank')
}
} else {
this.$notification.error({
message: this.$t('error.execute.api.failed') + ' ' + 'createConsoleEndpoint',
Expand Down