Skip to content

Commit

Permalink
feat(xo-web/console): added deactivated console message
Browse files Browse the repository at this point in the history
  • Loading branch information
Pizzosaure committed Nov 7, 2023
1 parent 2bfdb60 commit 205d6bc
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.unreleased.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
### Enhancements

> Users must be able to say: “Nice enhancement, I'm eager to test it”
- [Console tab] Added a message to indicate that the console view has been disabled for this VM [#6319](https://github.com/vatesfr/xen-orchestra/issues/6319)

### Bug fixes

Expand Down
1 change: 1 addition & 0 deletions packages/xo-web/src/common/intl/messages.js
Original file line number Diff line number Diff line change
Expand Up @@ -1200,6 +1200,7 @@ const messages = {
copyToClipboardLabel: 'Copy',
ctrlAltDelButtonLabel: 'Ctrl+Alt+Del',
ctrlAltDelConfirmation: 'Send Ctrl+Alt+Del to VM?',
disabledConsole: 'Console view has been disabled for this VM',
multilineCopyToClipboard: 'Multiline copy',
tipLabel: 'Tip:',
hideHeaderTooltip: 'Hide info',
Expand Down
9 changes: 7 additions & 2 deletions packages/xo-web/src/xo-app/vm/tab-console.js
Original file line number Diff line number Diff line change
Expand Up @@ -241,13 +241,18 @@ export default class TabConsole extends Component {
</Col>
</Row>
<Row className='console'>
<Col>
<NoVnc
<Col>
{vm.other.disable_pv_vnc === '1' ? (
<Container>
<p>{_('disabledConsole')}</p>
</Container>
) : <NoVnc
onClipboardChange={this._getRemoteClipboard}
ref='noVnc'
scale={scale}
url={resolveUrl(`consoles/${vm.id}`)}
/>
}
</Col>
</Row>
</Container>
Expand Down

0 comments on commit 205d6bc

Please sign in to comment.