chore: bump version to 1.9.0 (#1152)

Signed-off-by: Harvester Bot <94133267+harvesterhci-io-github-bot@users.noreply.github.com>

.github/pull_request_template.md

@@ -8,16 +8,12 @@
     - [ ] Yes, the backend owner is @
     - [ ] No, frontend-only.
 
-### Related Issue
+### Related Issue #
  <!-- Link the issue as harvester/harvester#<issue_number> -->
  harvester/harvester#<issue_number>
 
 
-### Test Steps
- <!-- Provide the test steps for reviewer to verify the issue -->
-1. Go to ... page
-
-### Test screenshot or video
-<!-- Attach screenshot or video of the changes and eventual comparison -->
+### Test screenshot or video (Required)
+<!-- Attach screenshot or video of the changes and eventual comparison if you find it necessary -->
 
 

.github/workflows/build-standalone-on-merge.yaml

@@ -1,7 +1,6 @@
 name: Build Standalone on PR Merge
 
 on:
-  workflow_dispatch: # manually trigger on Github Actions only support PR branch pushed to harvester/harvester-ui-extension
   push:
     branches:
       - main
@@ -30,35 +29,3 @@ jobs:
       id-token: write
     with:
       CI_BRANCH: ${{github.ref_name}}
-  comment-on-pr:
-    name: Comment build result on PR
-    # Only for manual runs so the existing push / pull_request flows are untouched.
-    if: github.event_name == 'workflow_dispatch'
-    needs:
-      - build
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-    steps:
-      - name: Add build artifact comment to the PR opened from this branch
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          BRANCH: ${{ github.ref_name }}
-        run: |
-          set -euo pipefail
-          # Match scripts/version: sanitize the branch and map main -> latest.
-          if [ "$BRANCH" = "main" ]; then
-            DIR="latest"
-          else
-            DIR=$(printf '%s' "$BRANCH" | sed -E 's/[^a-zA-Z0-9.-]+/-/g')
-          fi
-          URL="https://releases.rancher.com/harvester-ui/dashboard/${DIR}/index.html"
-
-          PR=$(gh pr list --repo "$GITHUB_REPOSITORY" --state open --base main --head "$BRANCH" --json number --jq '.[0].number // empty')
-          if [ -z "$PR" ]; then
-            echo "No open PR found for branch $BRANCH, skipping comment."
-            exit 0
-          fi
-
-          BODY=$(printf '🚀 **UI Artifact Build Status:** `SUCCESS` ✅\n> ui-index: %s\n> ui-source: external' "$URL")
-          gh pr comment "$PR" --repo "$GITHUB_REPOSITORY" --body "$BODY"

package.json

@@ -1,14 +1,13 @@
 {
   "name": "harvester-ui-extension",
-  "version": "1.10.0-dev",
+  "version": "1.9.0",
   "private": false,
   "engines": {
     "node": ">=24.0.0"
   },
   "dependencies": {
     "@babel/plugin-transform-class-static-block": "7.29.7",
-    "@novnc/novnc": "1.7.0",
-    "@rancher/shell": "3.0.13",
+    "@rancher/shell": "3.0.12-rc.7",
     "@vue-flow/background": "^1.3.0",
     "@vue-flow/controls": "^1.1.1",
     "@vue-flow/core": "^1.33.5",
@@ -28,7 +27,6 @@
     "yaml": "^2.5.1"
   },
   "resolutions": {
-    "@novnc/novnc": "1.7.0",
     "@types/node": "25.9.5",
     "cronstrue": "2.59.0",
     "d3-color": "3.1.0",
@@ -41,7 +39,7 @@
     "merge": "2.1.1",
     "node-forge": "1.4.0",
     "nth-check": "2.1.1",
-    "qs": "6.16.0",
+    "qs": "6.15.3",
     "roarr": "7.21.7",
     "semver": "7.8.5",
     "@vue/cli-service/html-webpack-plugin": "^5.0.0"
@@ -50,17 +48,15 @@
     "dev": "NODE_ENV=dev ./node_modules/.bin/vue-cli-service serve",
     "build": "./node_modules/.bin/vue-cli-service build",
     "clean": "./node_modules/@rancher/shell/scripts/clean",
-    "lint": "./node_modules/@rancher/shell/scripts/lint --max-warnings 0 --ext .js,.ts,.vue .",
-    "lint:fix": "./node_modules/@rancher/shell/scripts/lint --fix --max-warnings 0 --ext .js,.ts,.vue .",
+    "lint": "./node_modules/.bin/eslint --max-warnings 0 --ext .js,.ts,.vue .",
+    "lint:fix": "./node_modules/.bin/eslint --fix --max-warnings 0 --ext .js,.ts,.vue .",
     "build-pkg": "./node_modules/@rancher/shell/scripts/build-pkg.sh",
     "serve-pkgs": "./node_modules/@rancher/shell/scripts/serve-pkgs",
     "publish-pkgs": "./node_modules/@rancher/shell/scripts/extension/publish",
     "parse-tag-name": "./node_modules/@rancher/shell/scripts/extension/parse-tag-name",
     "commitlint": "commitlint --edit",
     "prepare": "husky",
-    "agents:generate": "./scripts/generate-agent-and-persona-mds.sh",
-    "prelint": "npm --prefix node_modules/@rancher/shell/eslint-legacy install eslint-plugin-jest@^24 --no-save --no-audit --no-fund --legacy-peer-deps --loglevel=error",
-    "prelint:fix": "npm --prefix node_modules/@rancher/shell/eslint-legacy install eslint-plugin-jest@^24 --no-save --no-audit --no-fund --legacy-peer-deps --loglevel=error"
+    "agents:generate": "./scripts/generate-agent-and-persona-mds.sh"
   },
   "devDependencies": {
     "@commitlint/load": "^19.8.1",

pkg/harvester/components/novnc/NovncConsole.vue

@@ -1,99 +1,64 @@
+<template>
+  <div>
+    <div v-if="connected && disconnected">
+      <main class="main-layout error">
+        <div class="text-center">
+          <BrandImage
+            file-name="error-desert-landscape.svg"
+            width="900"
+            height="300"
+          />
+          <h1>
+            {{ t('generic.notification.title.warning') }}
+          </h1>
+          <h2 class="text-secondary mt-20">
+            {{ t('vncConsole.error.message') }}
+          </h2>
+        </div>
+      </main>
+    </div>
+    <div v-if="reconnecting">
+      <main class="main-layout">
+        <div class="text-center">
+          <h2 class="text-secondary mt-20">
+            {{ t('vncConsole.reconnecting.message') }}：{{ retryTimes }} of {{ maximumRetryTimes }}
+          </h2>
+        </div>
+      </main>
+    </div>
+    <div
+      ref="view"
+    />
+  </div>
+</template>
+
 <script>
+import RFB from '@novnc/novnc/core/rfb';
 import BrandImage from '@shell/components/BrandImage';
-import ZoomableRFB from './ZoomableRFB';
-
-export const CONSOLE_STATUS = {
-  CONNECTING:   'connecting',
-  CONNECTED:    'connected',
-  RECONNECTING: 'reconnecting',
-  DISCONNECTED: 'disconnected',
-  FAILED:       'failed',
-};
-
-const MAXIMUM_RETRY_TIMES = 10;
-const BASE_RECONNECT_DELAY = 1000;
-const MAXIMUM_RECONNECT_DELAY = 30000;
-
-const clampLevel = (value, fallback) => {
-  const level = Number.parseInt(value, 10);
-
-  if (Number.isNaN(level)) {
-    return fallback;
-  }
-
-  return Math.min(Math.max(level, 0), 9);
-};
 
 export default {
-  name: 'NovncConsole',
-
-  components: { BrandImage },
-
   props: {
     url: {
       type:    String,
       default: ''
-    },
-
-    settings: {
-      type:    Object,
-      default: () => ({})
-    },
+    }
   },
 
-  emits: ['status-changed', 'capabilities'],
+  components: { BrandImage },
 
   data() {
     return {
       rfb:               null,
-      status:            CONSOLE_STATUS.CONNECTING,
-      statusDetail:      '',
-      desktopName:       '',
+      connected:         false,
+      disconnected:      false,
+      reconnectDelay:    3000,
+      reconnecting:      false,
+      maximumRetryTimes: 10,
       retryTimes:        0,
-      maximumRetryTimes: MAXIMUM_RETRY_TIMES,
-      reconnectTimer:    null,
-      isClosed:          false,
+      setTimeout:        null,
     };
   },
 
-  computed: {
-    statusInfo() {
-      return {
-        status:            this.status,
-        detail:            this.statusDetail,
-        desktopName:       this.desktopName,
-        retryTimes:        this.retryTimes,
-        maximumRetryTimes: this.maximumRetryTimes,
-      };
-    },
-
-    showError() {
-      return this.status === CONSOLE_STATUS.FAILED;
-    },
-
-    showReconnecting() {
-      return this.status === CONSOLE_STATUS.RECONNECTING;
-    },
-  },
-
-  watch: {
-    url() {
-      this.reconnect();
-    },
-
-    settings: {
-      deep:    true,
-      handler: 'applySettings'
-    },
-
-    statusInfo: {
-      immediate: true,
-      handler(neu) {
-        this.$emit('status-changed', neu);
-      }
-    },
-  },
-
   mounted() {
     this.$nextTick(() => {
       this.connect();
@@ -101,307 +66,88 @@ export default {
   },
 
   beforeUnmount() {
-    this.isClosed = true;
-    this.clearReconnectTimer();
-    this.teardown();
+    this.clearTimeout();
   },
 
   methods: {
-    connect(takeOver = false) {
-      if (!this.url || this.isClosed) {
-        return;
-      }
+    connect() {
+      const rfb = new RFB(this.$refs.view, this.url);
 
-      this.teardown();
+      rfb.addEventListener('connect', () => {
+        this.clearTimeout();
 
-      this.status = this.retryTimes > 0 ? CONSOLE_STATUS.RECONNECTING : CONSOLE_STATUS.CONNECTING;
+        this.connected = true;
+        this.retryTimes = 0;
+        this.reconnecting = false;
+      });
 
-      let rfb;
+      rfb.addEventListener('disconnect', (e) => {
+        this.clearTimeout();
 
-      try {
-        const url = new URL(this.url);
-
-        url.searchParams.set('preserveSession', takeOver === true ? 'false' : 'true');
-        rfb = new ZoomableRFB(this.$refs.view, url.href, { shared: true });
-      } catch (err) {
-        this.statusDetail = err?.message || `${ err }`;
-        this.status = CONSOLE_STATUS.FAILED;
-
-        return;
-      }
-
-      rfb.addEventListener('connect', this.onConnect);
-      rfb.addEventListener('disconnect', this.onDisconnect);
-      rfb.addEventListener('securityfailure', this.onSecurityFailure);
-      rfb.addEventListener('credentialsrequired', this.onCredentialsRequired);
-      rfb.addEventListener('desktopname', this.onDesktopName);
-      rfb.addEventListener('capabilities', this.onCapabilities);
+        this.disconnected = true;
+        this.rfb = null;
+        this.reconnect();
+      });
 
       this.rfb = rfb;
-      this.applySettings();
     },
 
     reconnect() {
-      this.clearReconnectTimer();
-
-      this.isClosed = false;
-      this.retryTimes = 0;
-      this.statusDetail = '';
-      this.connect();
-    },
-
-    takeOver() {
-      if (!window.confirm(this.t('harvester.virtualMachine.detail.console.takeOver.confirm'))) {
-        return;
-      }
-
-      this.clearReconnectTimer();
-      this.isClosed = false;
-      this.retryTimes = 0;
-      this.statusDetail = '';
-      this.connect(true);
-    },
-
-    disconnect() {
-      this.isClosed = true;
-      this.clearReconnectTimer();
-      this.teardown();
-      this.status = CONSOLE_STATUS.DISCONNECTED;
-    },
-
-    onConnect() {
-      this.clearReconnectTimer();
-
-      this.retryTimes = 0;
-      this.statusDetail = '';
-      this.status = CONSOLE_STATUS.CONNECTED;
-      this.applySettings();
-    },
-
-    onDisconnect() {
-      const wasConnected = this.status === CONSOLE_STATUS.CONNECTED;
-
-      this.teardown(false);
-
-      if (this.isClosed) {
-        if (this.status !== CONSOLE_STATUS.FAILED) {
-          this.status = CONSOLE_STATUS.DISCONNECTED;
-        }
-
-        return;
-      }
-
-      if (wasConnected) {
-        this.scheduleReconnect();
-      } else {
-        this.clearReconnectTimer();
-        this.statusDetail = this.t('harvester.virtualMachine.detail.console.status.unavailable');
-        this.status = CONSOLE_STATUS.FAILED;
-      }
-    },
-
-    // Authentication problems will not fix themselves, so stop retrying.
-    onSecurityFailure(e) {
-      this.statusDetail = e?.detail?.reason || '';
-      this.isClosed = true;
-      this.clearReconnectTimer();
-      this.status = CONSOLE_STATUS.FAILED;
-    },
-
-    onCredentialsRequired() {
-      this.statusDetail = this.t('harvester.virtualMachine.detail.console.status.credentialsRequired');
-      this.isClosed = true;
-      this.clearReconnectTimer();
-      this.status = CONSOLE_STATUS.FAILED;
-    },
-
-    onDesktopName(e) {
-      this.desktopName = e?.detail?.name || '';
-    },
-
-    onCapabilities(e) {
-      this.$emit('capabilities', e?.detail?.capabilities || {});
-    },
-
-    scheduleReconnect() {
-      this.clearReconnectTimer();
-
-      if (this.isClosed) {
-        return;
-      }
-
       if (this.retryTimes >= this.maximumRetryTimes) {
-        this.status = CONSOLE_STATUS.FAILED;
+        this.reconnecting = false;
+        this.connected = true;
+        this.disconnected = true;
 
         return;
       }
 
       this.retryTimes += 1;
-      this.status = CONSOLE_STATUS.RECONNECTING;
+      this.reconnecting = true;
+      this.connected = false;
+      this.disconnected = false;
 
-      const delay = Math.min(BASE_RECONNECT_DELAY * (2 ** (this.retryTimes - 1)), MAXIMUM_RECONNECT_DELAY);
-
-      this.reconnectTimer = setTimeout(() => {
-        this.reconnectTimer = null;
+      this.setTimeout = setTimeout(() => {
         this.connect();
-      }, delay);
+      }, this.reconnectDelay);
     },
 
-    clearReconnectTimer() {
-      if (this.reconnectTimer) {
-        clearTimeout(this.reconnectTimer);
-        this.reconnectTimer = null;
+    clearTimeout() {
+      if (this.setTimeout) {
+        clearTimeout(this.setTimeout);
       }
     },
 
-    teardown(disconnect = true) {
-      const rfb = this.rfb;
-
-      if (!rfb) {
-        return;
-      }
-
-      this.rfb = null;
-
-      rfb.removeEventListener('connect', this.onConnect);
-      rfb.removeEventListener('disconnect', this.onDisconnect);
-      rfb.removeEventListener('securityfailure', this.onSecurityFailure);
-      rfb.removeEventListener('credentialsrequired', this.onCredentialsRequired);
-      rfb.removeEventListener('desktopname', this.onDesktopName);
-      rfb.removeEventListener('capabilities', this.onCapabilities);
-
-      if (!disconnect) {
-        return;
-      }
-
-      try {
-        rfb.disconnect();
-      } catch (err) {
-        // The socket may already be gone, nothing left to clean up.
-      }
-    },
-
-    applySettings() {
-      const rfb = this.rfb;
-
-      if (!rfb) {
-        return;
-      }
-
-      const settings = this.settings || {};
-
-      rfb.viewOnly = !!settings.viewOnly;
-      rfb.scaleViewport = !!settings.scaleViewport;
-      rfb.resizeSession = !!settings.resizeSession;
-      rfb.clipViewport = !!settings.clipViewport;
-      rfb.dragViewport = !!settings.dragViewport;
-      rfb.zoomPercent = settings.zoomPercent;
-      rfb.focusOnClick = settings.focusOnClick !== false;
-      rfb.qualityLevel = clampLevel(settings.qualityLevel, 6);
-      rfb.compressionLevel = clampLevel(settings.compressionLevel, 2);
+    disconnect() {
+      this.rfb.disconnect();
     },
 
     ctrlAltDelete() {
-      this.rfb?.sendCtrlAltDel();
+      this.rfb.sendCtrlAltDel();
     },
 
     sendKey(keysym, code, down) {
-      this.rfb?.sendKey(keysym, code, down);
-    },
-
+      this.rfb.sendKey(keysym, code, down);
+    }
   }
 };
 </script>
 
-<template>
-  <div class="novnc-console">
-    <div
-      ref="view"
-      class="novnc-screen"
-    />
-
-    <div
-      v-if="showError || showReconnecting"
-      class="novnc-overlay"
-    >
-      <div
-        v-if="showError"
-        class="text-center"
-      >
-        <BrandImage
-          file-name="error-desert-landscape.svg"
-          width="900"
-          height="300"
-        />
-        <h1>
-          {{ t('generic.notification.title.warning') }}
-        </h1>
-        <h2 class="text-secondary mt-20">
-          {{ t('vncConsole.error.message') }}
-        </h2>
-        <p
-          v-if="statusDetail"
-          class="text-muted mt-10"
-        >
-          {{ statusDetail }}
-        </p>
-        <button
-          class="btn role-primary mt-20"
-          @click="reconnect"
-        >
-          {{ t('harvester.action.reconnect') }}
-        </button>
-        <button
-          v-if="!isClosed"
-          class="btn role-secondary mt-20 ml-10"
-          @click="takeOver"
-        >
-          {{ t('harvester.virtualMachine.detail.console.takeOver.label') }}
-        </button>
-      </div>
-
-      <h2
-        v-else
-        class="text-secondary"
-      >
-        {{ t('vncConsole.reconnecting.message') }}：{{ retryTimes }} of {{ maximumRetryTimes }}
-      </h2>
-    </div>
-  </div>
-</template>
-
 <style lang="scss" scoped>
-  .novnc-console {
-    position: relative;
-    box-sizing: border-box;
-    height: 100%;
-    padding: 8px;
+  .error {
     overflow: hidden;
-  }
 
-  .novnc-screen {
-    height: 100%;
-  }
-
-  .novnc-overlay {
-    position: absolute;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    z-index: 1;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    overflow: auto;
-    background: rgba(0, 0, 0, 0.75);
+    .row {
+      align-items: center;
+    }
 
     h1 {
       font-size: 5rem;
     }
 
-    img {
-      max-width: 100%;
+    .desert-landscape {
+      img {
+        max-width: 100%;
+      }
     }
   }
 </style>

pkg/harvester/components/novnc/NovncConsoleCustomKeys.vue

@@ -0,0 +1,264 @@
+<script>
+import { STEVE } from '@shell/config/types';
+import Banner from '@components/Banner/Banner.vue';
+import AsyncButton from '@shell/components/AsyncButton';
+import ModalWithCard from '@shell/components/ModalWithCard';
+
+const PREFERED_SHORTCUT_KEYS = 'prefered-shortcut-keys';
+
+export default {
+  name: 'NovncConsoleCustomKeys',
+
+  emits: ['close'],
+
+  components: {
+    ModalWithCard, Banner, AsyncButton
+  },
+
+  data() {
+    return {
+      keysRecord:            [],
+      addedShortcutKeys:     [],
+      preferredShortcutKeys: [],
+      isRecording:           false,
+    };
+  },
+
+  computed: {
+    savedShortcutKeys() {
+      const preference = this.$store.getters['management/all'](STEVE.PREFERENCE);
+      const preferedShortcutKeys = preference?.[0]?.data?.[PREFERED_SHORTCUT_KEYS];
+      let out = [];
+
+      if (!preferedShortcutKeys) {
+        return out;
+      }
+
+      try {
+        out = JSON.parse(preferedShortcutKeys);
+      } catch (err) {
+        this.$store.dispatch('growl/fromError', {
+          title: this.t('generic.notification.title.error', { name: this.t('harvester.virtualMachine.detail.console.customShortcutKeys') }),
+          err,
+        }, { root: true });
+      }
+
+      return out;
+    },
+
+    displayedKeys() {
+      const out = this.addedShortcutKeys.concat(this.preferredShortcutKeys).map((item) => {
+        const out = item.map((K) => ` <code>${ K.key.charAt(0).toUpperCase() + K.key.slice(1) }</code>`);
+
+        return out.join(',');
+      });
+
+      return out;
+    },
+
+    recordButton() {
+      if (this.isRecording) {
+        return 'harvester.virtualMachine.detail.console.record.stop';
+      }
+
+      return 'harvester.virtualMachine.detail.console.record.start';
+    },
+
+    keysRecordFormat() {
+      if (!this.isRecording && this.keysRecord.length === 0) {
+        return this.t('harvester.virtualMachine.detail.console.record.tips');
+      }
+
+      const out = this.keysRecord.map((item) => ` <code>${ item.key.charAt(0).toUpperCase() + item.key.slice(1) }</code>`);
+
+      return `Keys: ${ out.join(',') }`;
+    },
+
+    canAdd() {
+      const hasRecord = this.keysRecord.length > 0;
+      let validationList = [].concat(this.preferredShortcutKeys, this.addedShortcutKeys);
+
+      if (!hasRecord) {
+        return false;
+      }
+
+      validationList.push(this.keysRecord);
+
+      validationList = validationList.map((item) => {
+        const out = item.map((K) => K.key);
+
+        return out.join(',');
+      });
+
+      return validationList.length === new Set(validationList).size;
+    },
+  },
+
+  watch: {
+    savedShortcutKeys: {
+      handler() {
+        this.preferredShortcutKeys = [].concat(this.savedShortcutKeys) || [];
+      },
+      immediate: true
+    },
+  },
+
+  methods: {
+    closeRecordingModal() {
+      window.removeEventListener('keydown', this.handleShortcut);
+      this.$emit('close');
+    },
+
+    toggleRecording() {
+      this.isRecording = !this.isRecording;
+
+      if (this.isRecording) {
+        this.keysRecord = [];
+        window.addEventListener('keydown', this.handleShortcut);
+      } else {
+        window.removeEventListener('keydown', this.handleShortcut);
+      }
+    },
+
+    handleShortcut(event) {
+      event.preventDefault();
+
+      const {
+        key, keyCode, code, location, charCode
+      } = event;
+
+      this.keysRecord.push({
+        key, keyCode, code, location, charCode
+      });
+    },
+
+    addShortcutKey() {
+      this.addedShortcutKeys.push([].concat(this.keysRecord));
+    },
+
+    removeKey(keys) {
+      const key = keys.replace(/(\s*)<code>|<\/code>/g, '').replace(/\s*,\s*/g, ',');
+
+      this.addedShortcutKeys = this.addedShortcutKeys.filter((item) => {
+        const formatkey = item.map((K) => K.key.charAt(0).toUpperCase() + K.key.slice(1)).join(',');
+
+        return formatkey !== key;
+      });
+
+      this.preferredShortcutKeys = this.preferredShortcutKeys.filter((item) => {
+        const formatkey = item.map((K) => K.key.charAt(0).toUpperCase() + K.key.slice(1)).join(',');
+
+        return formatkey !== key;
+      });
+    },
+
+    async saveKeys(buttonCb) {
+      const out = [].concat(this.preferredShortcutKeys, this.addedShortcutKeys);
+      const preference = this.$store.getters['management/all'](STEVE.PREFERENCE)?.[0];
+
+      try {
+        preference.data[PREFERED_SHORTCUT_KEYS] = JSON.stringify(out);
+        await preference.save();
+        this.closeRecordingModal();
+        buttonCb(true);
+      } catch (err) {
+        buttonCb(false);
+      }
+    },
+  }
+};
+</script>
+
+<template>
+  <ModalWithCard
+    name="recordShortcutKeys"
+    :width="550"
+  >
+    <template #title>
+      <t k="harvester.virtualMachine.detail.console.customShortcutKeys" />
+    </template>
+
+    <template #content>
+      <div class="row">
+        <div class="col span-12">
+          <Banner color="info">
+            <span v-clean-html="keysRecordFormat"></span>
+          </Banner>
+        </div>
+      </div>
+      <div class="row">
+        <div class="col span-12">
+          <button
+            class="btn bg-primary"
+            @click="toggleRecording"
+          >
+            <t :k="recordButton" />
+            <i
+              class="icon icon-fw"
+              :class="isRecording ? 'icon-dot-open' : 'icon-dot'"
+            />
+          </button>
+          <button
+            :disabled="!canAdd"
+            class="btn bg-primary"
+            @click="addShortcutKey"
+          >
+            <t k="generic.add" />
+          </button>
+        </div>
+      </div>
+
+      <hr>
+
+      <div class="displayed-keys mt-20">
+        <h4
+          v-clean-html="t('harvester.virtualMachine.detail.console.record.preferredKeys')"
+          class="text-default-text"
+        />
+
+        <div class="displayed-banners">
+          <Banner
+            v-for="(keys,index) in displayedKeys"
+            :key="index"
+          >
+            <span v-clean-html="keys"></span>
+          </Banner>
+        </div>
+      </div>
+    </template>
+
+    <template #footer>
+      <div class="actions">
+        <button
+          class="btn role-secondary mr-20"
+          @click.prevent="closeRecordingModal"
+        >
+          <t k="generic.close" />
+        </button>
+        <AsyncButton
+          mode="done"
+          @click="saveKeys"
+        />
+      </div>
+    </template>
+  </ModalWithCard>
+</template>
+
+<style lang="scss" scoped>
+  .displayed-keys {
+    .banner {
+      margin: 0;
+    }
+  }
+
+  .displayed-banners {
+    max-height: 155px;
+    overflow: auto;
+  }
+
+  .actions {
+    width: 100%;
+    display: flex;
+    justify-content: flex-end;
+  }
+</style>

pkg/harvester/components/novnc/NovncConsoleWrapper.vue

@@ -1,26 +1,15 @@
 <script>
+import { STEVE } from '@shell/config/types';
 import { escapeHtml } from '@shell/utils/string';
 import { allHash } from '@shell/utils/promise';
 import KeyTable from '@novnc/novnc/core/input/keysym';
+import * as KeyboardUtil from '@novnc/novnc/core/input/util';
 import { HCI } from '../../types';
 import NovncConsole from './NovncConsole';
 import NovncConsoleItem from './NovncConsoleItem';
-import { normalizeZoom } from './ZoomableRFB';
+import NovncConsoleCustomKeys from './NovncConsoleCustomKeys';
 
-const CONSOLE_SETTINGS_KEY = 'harvester-vnc-console-settings';
-
-const VIEW_MODE = {
-  SCALE:  'scale',
-  NONE:   'none',
-};
-
-const DEFAULT_SETTINGS = {
-  viewMode:         VIEW_MODE.NONE,
-  zoomPercent:      100,
-  viewOnly:         false,
-  qualityLevel:     6,
-  compressionLevel: 2,
-};
+const PREFERED_SHORTCUT_KEYS = 'prefered-shortcut-keys';
 
 const SHORT_KEYS = {
   ControlLeft: {
@@ -116,7 +105,9 @@ const F_KEYS = {
 
 export default {
   name:       'NovncConsoleWrapper',
-  components: { NovncConsole, NovncConsoleItem },
+  components: {
+    NovncConsole, NovncConsoleItem, NovncConsoleCustomKeys
+  },
 
   async fetch() {
     const _hash = { vmResource: this.$store.dispatch('harvester/find', { type: HCI.VM, id: this.value.id }) };
@@ -140,21 +131,39 @@ export default {
     return {
       keysRecord:        [],
       vmResource:        {},
-      settings:          { ...DEFAULT_SETTINGS },
-      capabilities:      {},
-      isFullscreen:      false,
-      consoleStatus:     {
-        status:            'connecting',
-        retryTimes:        0,
-        maximumRetryTimes: 0,
-        desktopName:       '',
-      },
+      renderKeysModal:   false,
+      currentUser:       null,
+      hideCustomKeysBar: false,
     };
   },
 
   computed: {
-    canSendKeys() {
-      return this.consoleStatus.status === 'connected' && !this.settings.viewOnly;
+    savedShortcutKeys() {
+      const preference = this.$store.getters['management/all'](STEVE.PREFERENCE);
+      const preferedShortcutKeys = preference?.[0]?.data?.[PREFERED_SHORTCUT_KEYS];
+      let out = [];
+
+      if (!preference?.[0]?.data) {
+        // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+        this.hideCustomKeysBar = true;
+
+        return out;
+      }
+
+      if (!preferedShortcutKeys) {
+        return out;
+      }
+
+      try {
+        out = JSON.parse(preferedShortcutKeys);
+      } catch (err) {
+        this.$store.dispatch('growl/fromError', {
+          title: this.t('generic.notification.title.error', { name: escapeHtml(this.value.metadata.name) }),
+          err,
+        }, { root: true });
+      }
+
+      return out;
     },
 
     isDown() {
@@ -183,16 +192,13 @@ export default {
         ...F_KEYS,
       };
 
-      out.AltLeft = { ...SHORT_KEYS.AltLeft, keys: { PrintScreen: FUNCTION_KEYS.PrintScreen, ...F_KEYS } };
-      out.ControlLeft = {
-        ...SHORT_KEYS.ControlLeft,
-        keys: {
-          AltLeft: {
-            ...SHORT_KEYS.AltLeft,
-            keys: { Delete: FUNCTION_KEYS.Delete }
-          },
-          ...NORMAL_KEYS,
+      out.AltLeft.keys = { PrintScreen: FUNCTION_KEYS.PrintScreen, ...F_KEYS };
+      out.ControlLeft.keys = {
+        AltLeft: {
+          ...Object.assign(SHORT_KEYS.AltLeft, {}),
+          keys: { Delete: FUNCTION_KEYS.Delete }
         },
+        ...NORMAL_KEYS,
       };
 
       return out;
@@ -202,53 +208,14 @@ export default {
       return !!this.vmResource?.actions?.softreboot;
     },
 
-    rfbSettings() {
-      return {
-        viewOnly:         this.settings.viewOnly,
-        scaleViewport:    this.settings.viewMode === VIEW_MODE.SCALE,
-        zoomPercent:      normalizeZoom(this.settings.zoomPercent),
-        resizeSession:    false,
-        clipViewport:     false,
-        dragViewport:     false,
-        qualityLevel:     this.settings.qualityLevel,
-        compressionLevel: this.settings.compressionLevel,
-      };
+    preferredShortcutKeys() {
+      return (this.savedShortcutKeys || []).map((item) => {
+        return {
+          label: item.map((K) => K.key.charAt(0).toUpperCase() + K.key.slice(1)).join('+'),
+          value: item
+        };
+      });
     },
-
-    viewModeOptions() {
-      return Object.values(VIEW_MODE).map((value) => ({
-        value,
-        label: this.t(`harvester.virtualMachine.detail.console.settings.viewMode.${ value }`)
-      }));
-    },
-
-    statusLabel() {
-      const { status, retryTimes, maximumRetryTimes } = this.consoleStatus;
-
-      if (status === 'reconnecting') {
-        return this.t('harvester.virtualMachine.detail.console.status.reconnecting', { retryTimes, maximumRetryTimes });
-      }
-
-      return this.t(`harvester.virtualMachine.detail.console.status.${ status }`);
-    },
-  },
-
-  watch: {
-    settings: {
-      deep: true,
-      handler(neu) {
-        window.localStorage.setItem(CONSOLE_SETTINGS_KEY, JSON.stringify(neu));
-      }
-    },
-  },
-
-  mounted() {
-    this.loadSettings();
-    document.addEventListener('fullscreenchange', this.onFullscreenChange);
-  },
-
-  beforeUnmount() {
-    document.removeEventListener('fullscreenchange', this.onFullscreenChange);
   },
 
   methods: {
@@ -266,221 +233,137 @@ export default {
 
     // Send function key, e.g. ALT + F
     sendKeys() {
-      if (!this.canSendKeys || !this.$refs.novncConsole) {
-        return;
-      }
-
       this.keysRecord.forEach((key) => {
         this.$refs.novncConsole.sendKey(this.allKeys[key].value, key, true);
       });
 
-      [...this.keysRecord].reverse().forEach((key) => {
+      this.keysRecord.reverse().forEach((key) => {
         this.$refs.novncConsole.sendKey(this.allKeys[key].value, key, false);
       });
 
-      this.$refs.popover.hide();
+      this.$refs.popover.isOpen = false;
       this.keysRecord = [];
     },
 
+    sendCustomKeys(keys) {
+      const keyList = [].concat(keys);
+
+      keyList.forEach((K) => {
+        this.$refs.novncConsole.sendKey(KeyboardUtil.getKeysym(K), KeyboardUtil.getKeycode(K), true);
+      });
+
+      keyList.reverse().forEach((K) => {
+        this.$refs.novncConsole.sendKey(KeyboardUtil.getKeysym(K), KeyboardUtil.getKeycode(K), false);
+      });
+    },
+
     reconnect() {
       this.$refs.novncConsole.reconnect();
     },
 
-    loadSettings() {
-      try {
-        const saved = JSON.parse(window.localStorage.getItem(CONSOLE_SETTINGS_KEY) || '{}');
-
-        this.settings = {
-          viewMode:         Object.values(VIEW_MODE).includes(saved?.viewMode) ? saved.viewMode : DEFAULT_SETTINGS.viewMode,
-          zoomPercent:      normalizeZoom(saved?.zoomPercent ?? DEFAULT_SETTINGS.zoomPercent),
-          viewOnly:         saved?.viewOnly === true,
-          qualityLevel:     saved?.qualityLevel ?? DEFAULT_SETTINGS.qualityLevel,
-          compressionLevel: saved?.compressionLevel ?? DEFAULT_SETTINGS.compressionLevel,
-        };
-      } catch (err) {
-        this.settings = { ...DEFAULT_SETTINGS };
-      }
-    },
-
-    onStatusChanged(info) {
-      this.consoleStatus = info;
-    },
-
-    onCapabilities(capabilities) {
-      this.capabilities = capabilities;
-    },
-
-    ctrlAltDelete() {
-      if (this.canSendKeys) {
-        this.$refs.novncConsole?.ctrlAltDelete();
-      }
-    },
-
-    async toggleFullscreen() {
-      try {
-        if (document.fullscreenElement) {
-          await document.exitFullscreen();
-        } else {
-          await this.$refs.consoleContainer.requestFullscreen();
-          // Keyboard lock lets shortcuts such as Ctrl+W and F11 reach the guest.
-          await navigator.keyboard?.lock?.(['KeyW', 'F11']);
-        }
-      } catch (err) {
-        this.$store.dispatch('growl/fromError', {
-          title: this.t('generic.notification.title.error', { name: escapeHtml(this.value.metadata.name) }),
-          err,
-        }, { root: true });
-      }
-    },
-
-    onFullscreenChange() {
-      this.isFullscreen = !!document.fullscreenElement;
-
-      if (!this.isFullscreen) {
-        navigator.keyboard?.unlock?.();
-      }
-    },
-
     softReboot() {
       this.vmResource.doSoftReboot();
     },
 
+    showKeysModal() {
+      this.renderKeysModal = true;
+    },
+
+    hideKeysModal() {
+      this.renderKeysModal = false;
+    },
   }
 };
 </script>
 
 <template>
   <div id="app">
-    <div
-      ref="consoleContainer"
-      class="vm-console"
-    >
+    <div class="vm-console">
       <div class="combination-keys">
-        <div class="toolbar-group">
-          <v-dropdown
-            ref="popover"
-            placement="top"
-            trigger="click"
-            :container="false"
-            @auto-hide="keysRecord = []"
-          >
-            <button
-              class="btn btn-sm bg-primary"
-              :disabled="!canSendKeys"
+        <v-dropdown
+          ref="popover"
+          placement="top"
+          trigger="click"
+          :container="false"
+          @auto-hide="keysRecord = []"
+        >
+          <button class="btn btn-sm bg-primary">
+            {{ t("harvester.virtualMachine.detail.console.shortcutKeys") }}
+          </button>
+
+          <template #popper>
+            <novnc-console-item
+              :items="keymap"
+              :path="keysRecord"
+              :pos="0"
+              @update="update"
+              @send-keys="sendKeys"
+            />
+          </template>
+        </v-dropdown>
+
+        <button
+          v-if="hasSoftRebootAction"
+          class="btn btn-sm bg-primary"
+          @click="softReboot"
+        >
+          {{ t("harvester.action.softreboot") }}
+        </button>
+
+        <button
+          class="btn btn-sm bg-primary"
+          @click="reconnect"
+        >
+          {{ t("harvester.action.reconnect") }}
+        </button>
+
+        <v-dropdown
+          v-if="!hideCustomKeysBar"
+          ref="customKeyPopover"
+          placement="top"
+          trigger="click"
+          :container="false"
+        >
+          <button class="btn btn-sm bg-primary">
+            {{ t("harvester.virtualMachine.detail.console.customShortcutKeys") }}
+          </button>
+
+          <template #popper>
+            <div>
+              <button
+                class="btn btn-sm bg-primary"
+                @click="showKeysModal"
+              >
+                {{ t("harvester.virtualMachine.detail.console.management") }}
+              </button>
+            </div>
+
+            <hr>
+
+            <div
+              v-for="(keys, index) in preferredShortcutKeys"
+              :key="index"
             >
-              {{ t("harvester.virtualMachine.detail.console.shortcutKeys") }}
-            </button>
+              <button
+                class="btn btn-sm bg-primary"
+                @click="sendCustomKeys(keys.value)"
+              >
+                {{ keys.label }}
+              </button>
+            </div>
+          </template>
+        </v-dropdown>
 
-            <template #popper>
-              <novnc-console-item
-                :items="keymap"
-                :path="keysRecord"
-                :pos="0"
-                @update="update"
-                @send-keys="sendKeys"
-              />
-            </template>
-          </v-dropdown>
-
-          <button
-            class="btn btn-sm bg-primary"
-            :disabled="!canSendKeys"
-            @click="ctrlAltDelete"
-          >
-            Ctrl+Alt+Del
-          </button>
-
-          <v-dropdown
-            placement="top"
-            trigger="click"
-            :container="false"
-          >
-            <button class="btn btn-sm bg-primary">
-              {{ t("harvester.virtualMachine.detail.console.settings.label") }}
-            </button>
-
-            <template #popper>
-              <div class="console-panel">
-                <label>{{ t('harvester.virtualMachine.detail.console.settings.viewMode.label') }}</label>
-                <div
-                  v-for="option in viewModeOptions"
-                  :key="option.value"
-                >
-                  <label class="console-panel__option">
-                    <input
-                      v-model="settings.viewMode"
-                      type="radio"
-                      :value="option.value"
-                    >
-                    {{ option.label }}
-                  </label>
-                </div>
-
-                <label
-                  for="vnc-zoom"
-                  class="console-panel__zoom-label"
-                >
-                  <span>{{ t('harvester.virtualMachine.detail.console.settings.zoom') }}</span>
-                  <span>{{ settings.zoomPercent }}%</span>
-                </label>
-                <input
-                  id="vnc-zoom"
-                  v-model.number="settings.zoomPercent"
-                  class="console-panel__zoom"
-                  type="range"
-                  min="50"
-                  max="200"
-                  step="10"
-                  :disabled="settings.viewMode === 'scale'"
-                  :aria-valuetext="`${ settings.zoomPercent }%`"
-                >
-
-                <label class="console-panel__option">
-                  <input
-                    v-model="settings.viewOnly"
-                    type="checkbox"
-                  >
-                  {{ t('harvester.virtualMachine.detail.console.settings.viewOnly') }}
-                </label>
-              </div>
-            </template>
-          </v-dropdown>
-        </div>
-
-        <div class="toolbar-group">
-          <span class="console-status">{{ statusLabel }}</span>
-
-          <button
-            v-if="hasSoftRebootAction"
-            class="btn btn-sm bg-primary"
-            @click="softReboot"
-          >
-            {{ t("harvester.action.softreboot") }}
-          </button>
-
-          <button
-            class="btn btn-sm bg-primary"
-            @click="reconnect"
-          >
-            {{ t("harvester.action.reconnect") }}
-          </button>
-
-          <button
-            class="btn btn-sm bg-primary"
-            @click="toggleFullscreen"
-          >
-            {{ isFullscreen ? t('harvester.virtualMachine.detail.console.fullscreen.exit') : t('harvester.virtualMachine.detail.console.fullscreen.enter') }}
-          </button>
-        </div>
+        <NovncConsoleCustomKeys
+          v-if="renderKeysModal"
+          :current-user="currentUser"
+          @close="hideKeysModal"
+        />
       </div>
-
       <NovncConsole
         v-if="url && !isDown"
         ref="novncConsole"
         :url="url"
-        :settings="rfbSettings"
-        @status-changed="onStatusChanged"
-        @capabilities="onCapabilities"
       />
       <p v-if="isDown">
         {{ t("harvester.virtualMachine.detail.console.down") }}
@@ -491,56 +374,14 @@ export default {
 
 <style lang="scss" scoped>
   .vm-console {
-    height: 100vh;
-    height: 100dvh;
+    height: 100%;
     display: grid;
-    grid-template-rows: 32px minmax(0, 1fr);
+    grid-template-rows: 30px auto;
   }
 
   .combination-keys {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
     background: rgb(40, 40, 40);
   }
-
-  .toolbar-group {
-    display: flex;
-    align-items: center;
-    gap: 4px;
-  }
-
-  .console-status {
-    color: #fff;
-    font-size: 12px;
-    margin-right: 8px;
-  }
-
-  .console-panel {
-    display: flex;
-    flex-direction: column;
-    width: 260px;
-    padding: 4px;
-
-    &__zoom-label {
-      display: flex;
-      justify-content: space-between;
-      margin-top: 8px;
-      font-variant-numeric: tabular-nums;
-    }
-
-    &__zoom {
-      width: 100%;
-      margin: 4px 0 8px;
-    }
-
-    &__option {
-      display: flex;
-      align-items: center;
-      gap: 6px;
-      margin: 2px 0;
-    }
-  }
 </style>
 
 <style lang="scss">

pkg/harvester/components/novnc/ZoomableRFB.js

@@ -1,31 +0,0 @@
-import RFB from '@novnc/novnc/core/rfb';
-
-export function normalizeZoom(value) {
-  const percent = Number(value);
-
-  if (!Number.isFinite(percent)) {
-    return 100;
-  }
-
-  return Math.min(200, Math.max(50, Math.round(percent / 10) * 10));
-}
-
-export default class ZoomableRFB extends RFB {
-  get zoomPercent() {
-    return this._zoomPercent ?? 100;
-  }
-
-  set zoomPercent(value) {
-    this._zoomPercent = normalizeZoom(value);
-    this._updateScale();
-  }
-
-  _updateScale() {
-    if (this.scaleViewport) {
-      super._updateScale();
-    } else {
-      this._display.scale = this.zoomPercent / 100;
-      this._fixScrollbars();
-    }
-  }
-}

pkg/harvester/config/types.js

@@ -15,13 +15,6 @@ export const VOLUME_MODE = {
   FILE_SYSTEM: 'Filesystem'
 };
 
-export const ACCESS_MODE = {
-  READ_WRITE_MANY:     'ReadWriteMany',
-  READ_WRITE_ONCE:     'ReadWriteOnce',
-  READ_ONLY_MANY:      'ReadOnlyMany',
-  READ_WRITE_ONCE_POD: 'ReadWriteOncePod',
-};
-
 export const NETWORK_PROTOCOL = {
   IPv4: 'IPv4',
   IPv6: 'IPv6',

pkg/harvester/edit/harvesterhci.io.storage/CDISettings.vue

@@ -1,5 +1,5 @@
 <script>
-import { VOLUME_MODE, ACCESS_MODE } from '@pkg/harvester/config/types';
+import { VOLUME_MODE } from '@pkg/harvester/config/types';
 import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
 import ArrayList from '@shell/components/form/ArrayList';
 import { Checkbox } from '@components/Form/Checkbox';
@@ -10,10 +10,6 @@ import { HCI_SETTING } from '../../config/settings';
 import { allHash } from '@shell/utils/promise';
 import { _EDIT, _CREATE } from '@shell/config/query-params';
 
-const {
-  READ_WRITE_ONCE, READ_ONLY_MANY, READ_WRITE_MANY, READ_WRITE_ONCE_POD
-} = ACCESS_MODE;
-
 export default {
   name: 'CDISettings',
 
@@ -94,10 +90,10 @@ export default {
 
     accessModeOptions() {
       return [
-        { label: READ_WRITE_ONCE, value: READ_WRITE_ONCE },
-        { label: READ_ONLY_MANY, value: READ_ONLY_MANY },
-        { label: READ_WRITE_MANY, value: READ_WRITE_MANY },
-        { label: READ_WRITE_ONCE_POD, value: READ_WRITE_ONCE_POD },
+        { label: 'ReadWriteOnce', value: 'ReadWriteOnce' },
+        { label: 'ReadOnlyMany', value: 'ReadOnlyMany' },
+        { label: 'ReadWriteMany', value: 'ReadWriteMany' },
+        { label: 'ReadWriteOncePod', value: 'ReadWriteOncePod' },
       ];
     },
 

pkg/harvester/edit/harvesterhci.io.volume.vue

@@ -26,11 +26,9 @@ import { HCI, VOLUME_SNAPSHOT } from '../types';
 import { LVM_DRIVER } from '../models/harvester/storage.k8s.io.storageclass';
 import { DATA_ENGINE_V2 } from '../models/harvester/persistentvolumeclaim';
 import { GIBIBYTE } from '../utils/unit';
-import { VOLUME_MODE, ACCESS_MODE } from '@pkg/harvester/config/types';
+import { VOLUME_MODE } from '@pkg/harvester/config/types';
 import { isInternalStorageClass } from '../utils/storage-class';
 
-const { READ_WRITE_MANY, READ_WRITE_ONCE, READ_ONLY_MANY } = ACCESS_MODE;
-
 export default {
   name: 'HarvesterVolume',
 
@@ -85,7 +83,7 @@ export default {
     if (this.mode === _CREATE) {
       // default volumeMode to Block
       this.value.spec.volumeMode = VOLUME_MODE.BLOCK;
-      this.value.spec.accessModes = [READ_WRITE_MANY];
+      this.value.spec.accessModes = ['ReadWriteMany'];
     }
 
     const storage = this.value?.spec?.resources?.requests?.storage || null;
@@ -162,7 +160,7 @@ export default {
     },
 
     accessModeOptions() {
-      return [READ_WRITE_ONCE, READ_WRITE_MANY, READ_ONLY_MANY];
+      return ['ReadWriteOnce', 'ReadWriteMany', 'ReadOnlyMany'];
     },
 
     imageOption() {
@@ -357,7 +355,7 @@ export default {
 
     getAccessMode() {
       if (!this.longhornV2LVMSupport) {
-        return [READ_WRITE_MANY];
+        return ['ReadWriteMany'];
       }
 
       if (this.value?.spec?.accessModes && this.value?.spec?.accessModes?.length > 0) {
@@ -373,7 +371,7 @@ export default {
         readWriteOnce = storageClass.provisioner === LVM_DRIVER || (!this.value.thirdPartyStorageFeatureEnabled && storageClass.parameters?.dataEngine === DATA_ENGINE_V2);
       }
 
-      return readWriteOnce ? [READ_WRITE_ONCE] : [READ_WRITE_MANY];
+      return readWriteOnce ? ['ReadWriteOnce'] : ['ReadWriteMany'];
     },
     buildDataVolumeObj() {
       const storage = {

pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/index.vue

@@ -16,12 +16,10 @@ import { PLUGIN_DEVELOPER, DEV } from '@shell/store/prefs';
 import { VOLUME_HOTPLUG_ACTION, SOURCE_TYPE } from '../../../config/harvester-map';
 import { PRODUCT_NAME as HARVESTER_PRODUCT } from '../../../config/harvester';
 import { HCI } from '../../../types';
-import { VOLUME_MODE, ACCESS_MODE } from '@pkg/harvester/config/types';
+import { VOLUME_MODE } from '@pkg/harvester/config/types';
 import { OFF } from '../../../models/kubevirt.io.virtualmachine';
 import { EMPTY_IMAGE } from '../../../utils/vm';
 
-const { READ_WRITE_MANY } = ACCESS_MODE;
-
 export default {
   emits: ['update:value'],
 
@@ -71,7 +69,7 @@ export default {
 
     customAccessMode: {
       type:    String,
-      default: READ_WRITE_MANY
+      default: 'ReadWriteMany'
     },
 
     resourceType: {

pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/type/volume.vue

@@ -14,9 +14,7 @@ import { LVM_DRIVER } from '../../../../models/harvester/storage.k8s.io.storagec
 import { DATA_ENGINE_V2 } from '../../../../models/harvester/persistentvolumeclaim';
 import { GIBIBYTE } from '../../../../utils/unit';
 import { isInternalStorageClass } from '../../../../utils/storage-class';
-import { VOLUME_MODE, ACCESS_MODE } from '@pkg/harvester/config/types';
-
-const { READ_WRITE_MANY, READ_WRITE_ONCE } = ACCESS_MODE;
+import { VOLUME_MODE } from '@pkg/harvester/config/types';
 
 export default {
   name: 'HarvesterEditVolume',
@@ -207,7 +205,7 @@ export default {
 
     getAccessMode(storageClassName) {
       if (!this.longhornV2LVMSupport) {
-        return READ_WRITE_MANY;
+        return 'ReadWriteMany';
       }
 
       const storageClass = this.storageClasses.find((sc) => sc.name === storageClassName);
@@ -218,7 +216,7 @@ export default {
         readWriteOnce = storageClass.provisioner === LVM_DRIVER || (!this.thirdPartyStorageClassEnabled && storageClass.parameters?.dataEngine === DATA_ENGINE_V2);
       }
 
-      return readWriteOnce ? READ_WRITE_ONCE : READ_WRITE_MANY;
+      return readWriteOnce ? 'ReadWriteOnce' : 'ReadWriteMany';
     },
 
     update() {

pkg/harvester/l10n/en-us.yaml

@@ -953,33 +953,15 @@ harvester:
       console:
         down: This virtual machine is down. Please start it to access its console.
         shortcutKeys: Shortcut Keys
-        settings:
-          label: Settings
-          viewMode:
-            label: Display
-            scale: Scale the display to fit the window
-            resize: Resize the virtual machine display to the window
-            none: Manual zoom
-          zoom: Zoom
-          clipViewport: Clip to the window instead of showing scrollbars
-          viewOnly: View only
-          quality: JPEG quality
-          compression: Compression level
-          reset: Reset to defaults
-        fullscreen:
-          enter: Full Screen
-          exit: Exit Full Screen
-        takeOver:
-          label: Take Over
-          confirm: Take over this console? Any existing VNC session for this virtual machine will be disconnected.
-        status:
-          connecting: Connecting
-          connected: Connected
-          disconnected: Disconnected
-          failed: Connection failed
-          reconnecting: 'Reconnecting {retryTimes} of {maximumRetryTimes}'
-          credentialsRequired: This console requires credentials that the dashboard cannot provide.
-          unavailable: Unable to connect. Another VNC session may be active, or the console may be unavailable.
+        customShortcutKeys: Custom Shortcut Keys
+        management: Management Shortcut Keys
+        record:
+          start: Record
+          recording: Recording
+          stop: Stop Recording
+          tips: Press the record button to capture your keyboard inputs.
+          send: Send
+          preferredKeys: Preferred Custom Shortcut Keys
     terminationGracePeriodSeconds:
       label: Termination Grace Period
     affinity:

pkg/harvester/mixins/harvester-vm/index.js

@@ -25,9 +25,7 @@ import { HCI } from '../../types';
 import { parseVolumeClaimTemplates, EMPTY_IMAGE } from '../../utils/vm';
 import impl, { QGA_JSON, USB_TABLET } from './impl';
 import { GIBIBYTE } from '../../utils/unit';
-import { VOLUME_MODE, ACCESS_MODE, FILESYSTEM_SOURCE_TYPE } from '@pkg/harvester/config/types';
-
-const { READ_WRITE_MANY } = ACCESS_MODE;
+import { VOLUME_MODE, FILESYSTEM_SOURCE_TYPE } from '@pkg/harvester/config/types';
 
 const LONGHORN_V2_DATA_ENGINE = 'longhorn-system/v2-data-engine';
 
@@ -278,7 +276,7 @@ export default {
     },
 
     customAccessMode() {
-      return this.storageClassSetting.accessModes || READ_WRITE_MANY;
+      return this.storageClassSetting.accessModes || 'ReadWriteMany';
     },
 
     isWindows() {
@@ -506,7 +504,7 @@ export default {
           id:               randomStr(5),
           source:           SOURCE_TYPE.IMAGE,
           name:             'disk-0',
-          accessMode:       READ_WRITE_MANY, // root disk only support LHv1 volume, should be RWX
+          accessMode:       'ReadWriteMany', // root disk only support LHv1 volume, should be RWX
           bus,
           volumeName:       '',
           size,
@@ -572,7 +570,7 @@ export default {
               const pvcResource = allPVCs.find( (O) => O.id === `${ namespace }/${ volume?.persistentVolumeClaim?.claimName }`);
 
               source = SOURCE_TYPE.ATTACH_VOLUME;
-              accessMode = pvcResource?.spec?.accessModes?.[0] || READ_WRITE_MANY;
+              accessMode = pvcResource?.spec?.accessModes?.[0] || 'ReadWriteMany';
               size = pvcResource?.spec?.resources?.requests?.storage || '10Gi';
               storageClassName = pvcResource?.spec?.storageClassName;
               volumeMode = pvcResource?.spec?.volumeMode || VOLUME_MODE.BLOCK;

pkg/harvester/package.json

@@ -1,7 +1,7 @@
 {
   "name": "harvester",
   "description": "Rancher UI Extension for Harvester",
-  "version": "1.10.0-dev",
+  "version": "1.9.0",
   "private": false,
   "rancher": {
     "annotations": {

pkg/harvester/pages/c/_cluster/console/_uid/vnc.vue

@@ -1,18 +1,10 @@
 <script>
-import { defineAsyncComponent } from 'vue';
 import Loading from '@shell/components/Loading';
-import TabTitle from '@shell/components/TabTitle';
 import { HCI } from '../../../../../types';
+import NovncConsoleWrapper from '../../../../../components/novnc/NovncConsoleWrapper.vue';
 
 export default {
-  components: {
-    NovncConsoleWrapper: defineAsyncComponent({
-      loader:           () => import('../../../../../components/novnc/NovncConsoleWrapper.vue'),
-      loadingComponent: Loading,
-    }),
-    Loading,
-    TabTitle
-  },
+  components: { NovncConsoleWrapper, Loading },
 
   async fetch() {
     this.rows = await this.$store.dispatch('harvester/findAll', { type: HCI.VMI });
@@ -36,21 +28,17 @@ export default {
 
   mounted() {
     window.addEventListener('beforeunload', () => {
-      this.$refs.console?.close();
+      this.$refs.console.close();
     });
   },
 
+  head() {
+    return { title: this.vmi?.metadata?.name };
+  },
 };
 </script>
 
 <template>
-  <TabTitle
-    v-if="vmi?.metadata?.name"
-    :breadcrumb="false"
-    :show-child="false"
-  >
-    {{ vmi.metadata.name }}
-  </TabTitle>
   <Loading v-if="$fetchState.pending" />
   <NovncConsoleWrapper
     v-else

pkg/harvester/vue.config.js

@@ -1,24 +1 @@
-const path = require('path');
-
-const baseConfig = require('@rancher/shell/pkg/vue.config')(__dirname);
-
-const baseConfigureWebpack = baseConfig.configureWebpack;
-
-// noVNC >= 1.7 only publishes `./core/rfb.js` in its `exports` map, so resolve the
-// package by path to keep the keysym/input helpers importable.
-const NOVNC_DIR = path.resolve(__dirname, '..', '..', 'node_modules', '@novnc', 'novnc');
-
-module.exports = {
-  ...baseConfig,
-
-  configureWebpack(config) {
-    if (typeof baseConfigureWebpack === 'function') {
-      baseConfigureWebpack(config);
-    }
-
-    config.resolve.alias['@novnc/novnc'] = NOVNC_DIR;
-
-    // noVNC 1.7 uses top-level await for WebCodecs detection.
-    config.output = { ...config.output, environment: { ...config.output?.environment, asyncFunction: true } };
-  }
-};
+module.exports = require('@rancher/shell/pkg/vue.config')(__dirname);

vue.config.js

@@ -1,26 +1,6 @@
-const path = require('path');
 const config = require('@rancher/shell/vue.config');
 
-const baseConfig = config(__dirname, {
+module.exports = config(__dirname, {
   excludes: [],
   // excludes: ['harvester']
 });
-
-const baseConfigureWebpack = baseConfig.configureWebpack;
-
-module.exports = {
-  ...baseConfig,
-
-  configureWebpack(webpackConfig) {
-    if (typeof baseConfigureWebpack === 'function') {
-      baseConfigureWebpack(webpackConfig);
-    }
-
-    // noVNC >= 1.7 only publishes `./core/rfb.js` in its `exports` map, so resolve the
-    // package by path to keep the keysym/input helpers importable.
-    webpackConfig.resolve.alias['@novnc/novnc'] = path.resolve(__dirname, 'node_modules/@novnc/novnc');
-
-    // noVNC 1.7 uses top-level await for WebCodecs detection.
-    webpackConfig.output = { ...webpackConfig.output, environment: { ...webpackConfig.output?.environment, asyncFunction: true } };
-  }
-};