feat(xo-web/console): add disabled console message (#7161)

Fixes #6319
vatesfr · Nov 21, 2023 · f3e0227 · f3e0227
1 parent 4504141
commit f3e0227
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md
@@ -8,6 +8,7 @@
 > Users must be able to say: “Nice enhancement, I'm eager to test it”
 
 - [Netbox] Ability to synchronize XO users as Netbox tenants (PR [#7158](https://github.com/vatesfr/xen-orchestra/pull/7158))
+- [VM/Console] Add a message to indicate that the console view has been [disabled](https://support.citrix.com/article/CTX217766/how-to-disable-the-console-for-the-vm-in-xencenter) for this VM [#6319](https://github.com/vatesfr/xen-orchestra/issues/6319) (PR [#7161](https://github.com/vatesfr/xen-orchestra/pull/7161))
 
 ### Bug fixes
 
@@ -42,6 +43,6 @@
 - xo-server patch
 - xo-server-netbox minor
 - xo-vmdk-to-vhd patch
-- xo-web patch
+- xo-web minor
 
 <!--packages-end-->
diff --git a/packages/xo-web/src/common/intl/messages.js b/packages/xo-web/src/common/intl/messages.js
@@ -1200,6 +1200,7 @@ const messages = {
   copyToClipboardLabel: 'Copy',
   ctrlAltDelButtonLabel: 'Ctrl+Alt+Del',
   ctrlAltDelConfirmation: 'Send Ctrl+Alt+Del to VM?',
+  disabledConsole: 'Console is disabled for this VM',
   multilineCopyToClipboard: 'Multiline copy',
   tipLabel: 'Tip:',
   hideHeaderTooltip: 'Hide info',

diff --git a/packages/xo-web/src/xo-app/vm/tab-console.js b/packages/xo-web/src/xo-app/vm/tab-console.js
@@ -242,12 +242,16 @@ export default class TabConsole extends Component {
         </Row>
         <Row className='console'>
           <Col>
-            <NoVnc
-              onClipboardChange={this._getRemoteClipboard}
-              ref='noVnc'
-              scale={scale}
-              url={resolveUrl(`consoles/${vm.id}`)}
-            />
+            {vm.other.disable_pv_vnc === '1' ? (
+              _('disabledConsole')
+            ) : (
+              <NoVnc
+                onClipboardChange={this._getRemoteClipboard}
+                ref='noVnc'
+                scale={scale}
+                url={resolveUrl(`consoles/${vm.id}`)}
+              />
+            )}
           </Col>
         </Row>
       </Container>