diff --git a/package.json b/package.json index 2756dfa1..c15f12f4 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ }, "dependencies": { "@babel/plugin-transform-class-static-block": "7.29.7", + "@novnc/novnc": "1.7.0", "@rancher/shell": "3.0.13", "@vue-flow/background": "^1.3.0", "@vue-flow/controls": "^1.1.1", @@ -27,6 +28,7 @@ "yaml": "^2.5.1" }, "resolutions": { + "@novnc/novnc": "1.7.0", "@types/node": "25.9.5", "cronstrue": "2.59.0", "d3-color": "3.1.0", diff --git a/pkg/harvester/components/novnc/NovncConsole.vue b/pkg/harvester/components/novnc/NovncConsole.vue index 7142648f..21fa8f31 100644 --- a/pkg/harvester/components/novnc/NovncConsole.vue +++ b/pkg/harvester/components/novnc/NovncConsole.vue @@ -1,64 +1,99 @@ - - - - - - - - {{ t('generic.notification.title.warning') }} - - - {{ t('vncConsole.error.message') }} - - - - - - - - - {{ t('vncConsole.reconnecting.message') }}:{{ retryTimes }} of {{ maximumRetryTimes }} - - - - - - - - - diff --git a/pkg/harvester/components/novnc/NovncConsoleCustomKeys.vue b/pkg/harvester/components/novnc/NovncConsoleCustomKeys.vue deleted file mode 100644 index 25a84c84..00000000 --- a/pkg/harvester/components/novnc/NovncConsoleCustomKeys.vue +++ /dev/null @@ -1,264 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pkg/harvester/components/novnc/NovncConsoleWrapper.vue b/pkg/harvester/components/novnc/NovncConsoleWrapper.vue index bad750aa..4300a6cf 100644 --- a/pkg/harvester/components/novnc/NovncConsoleWrapper.vue +++ b/pkg/harvester/components/novnc/NovncConsoleWrapper.vue @@ -1,15 +1,26 @@ - + - - - {{ t("harvester.virtualMachine.detail.console.shortcutKeys") }} - - - - - - - - - {{ t("harvester.action.softreboot") }} - - - - {{ t("harvester.action.reconnect") }} - - - - - {{ t("harvester.virtualMachine.detail.console.customShortcutKeys") }} - - - - - - {{ t("harvester.virtualMachine.detail.console.management") }} - - - - - - + + - - {{ keys.label }} - - - - + {{ t("harvester.virtualMachine.detail.console.shortcutKeys") }} + - + + + + + + + Ctrl+Alt+Del + + + + + {{ t("harvester.virtualMachine.detail.console.settings.label") }} + + + + + {{ t('harvester.virtualMachine.detail.console.settings.viewMode.label') }} + + + + {{ option.label }} + + + + + {{ t('harvester.virtualMachine.detail.console.settings.zoom') }} + {{ settings.zoomPercent }}% + + + + + + {{ t('harvester.virtualMachine.detail.console.settings.viewOnly') }} + + + + + + + + {{ statusLabel }} + + + {{ t("harvester.action.softreboot") }} + + + + {{ t("harvester.action.reconnect") }} + + + + {{ isFullscreen ? t('harvester.virtualMachine.detail.console.fullscreen.exit') : t('harvester.virtualMachine.detail.console.fullscreen.enter') }} + + + {{ t("harvester.virtualMachine.detail.console.down") }} @@ -374,14 +491,56 @@ export default {
{{ t("harvester.virtualMachine.detail.console.down") }} @@ -374,14 +491,56 @@ export default {