mirror of
https://github.com/harvester/harvester-ui-extension.git
synced 2026-11-22 00:27:38 +08:00
Compare commits
20
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
96c374b7aa | ||
|
|
bbe0c4643f | ||
|
|
00584f1d19 | ||
|
|
4fa6470343 | ||
|
|
d550046189 | ||
|
|
5f32a9ade5 | ||
|
|
3f39d561be | ||
|
|
7c84269ed6 | ||
|
|
f63be73b11 | ||
|
|
fabc1cec21 | ||
|
|
ed2b6f2551 | ||
|
|
72282ae50e | ||
|
|
8fba4e7050 | ||
|
|
fbd4a1108f | ||
|
|
823a88c85b | ||
|
|
3a2c6e3a3d | ||
|
|
be6e9b5f06 | ||
|
|
a88bed9eb4 | ||
|
|
f97f14c811 | ||
|
|
f8a29a1c54 |
No files matched your search
@@ -8,12 +8,16 @@
|
|||||||
- [ ] Yes, the backend owner is @
|
- [ ] Yes, the backend owner is @
|
||||||
- [ ] No, frontend-only.
|
- [ ] No, frontend-only.
|
||||||
|
|
||||||
### Related Issue #
|
### Related Issue
|
||||||
<!-- Link the issue as harvester/harvester#<issue_number> -->
|
<!-- Link the issue as harvester/harvester#<issue_number> -->
|
||||||
harvester/harvester#<issue_number>
|
harvester/harvester#<issue_number>
|
||||||
|
|
||||||
|
|
||||||
### Test screenshot or video (Required)
|
### Test Steps
|
||||||
<!-- Attach screenshot or video of the changes and eventual comparison if you find it necessary -->
|
<!-- 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 -->
|
||||||
|
|
||||||
|
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
name: Build Standalone on PR Merge
|
name: Build Standalone on PR Merge
|
||||||
|
|
||||||
on:
|
on:
|
||||||
|
workflow_dispatch: # manually trigger on Github Actions only support PR branch pushed to harvester/harvester-ui-extension
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
@@ -29,3 +30,35 @@ jobs:
|
|||||||
id-token: write
|
id-token: write
|
||||||
with:
|
with:
|
||||||
CI_BRANCH: ${{github.ref_name}}
|
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"
|
||||||
+16
-6
@@ -7,7 +7,8 @@
|
|||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/plugin-transform-class-static-block": "7.29.7",
|
"@babel/plugin-transform-class-static-block": "7.29.7",
|
||||||
"@rancher/shell": "3.0.12-rc.3",
|
"@novnc/novnc": "1.7.0",
|
||||||
|
"@rancher/shell": "3.0.13",
|
||||||
"@vue-flow/background": "^1.3.0",
|
"@vue-flow/background": "^1.3.0",
|
||||||
"@vue-flow/controls": "^1.1.1",
|
"@vue-flow/controls": "^1.1.1",
|
||||||
"@vue-flow/core": "^1.33.5",
|
"@vue-flow/core": "^1.33.5",
|
||||||
@@ -15,12 +16,19 @@
|
|||||||
"cache-loader": "^4.1.0",
|
"cache-loader": "^4.1.0",
|
||||||
"color": "4.2.3",
|
"color": "4.2.3",
|
||||||
"ip": "2.0.1",
|
"ip": "2.0.1",
|
||||||
|
"@xterm/xterm": "6.0.0",
|
||||||
|
"@xterm/addon-fit": "0.11.0",
|
||||||
|
"@xterm/addon-search": "0.16.0",
|
||||||
|
"@xterm/addon-web-links": "0.12.0",
|
||||||
|
"@xterm/addon-webgl": "0.19.0",
|
||||||
|
"@xterm/addon-canvas": "0.7.0",
|
||||||
"node-polyfill-webpack-plugin": "^3.0.0",
|
"node-polyfill-webpack-plugin": "^3.0.0",
|
||||||
"elkjs": "^0.11.0",
|
"elkjs": "^0.11.0",
|
||||||
"vue-draggable-next": "^2.2.1",
|
"vue-draggable-next": "^2.2.1",
|
||||||
"yaml": "^2.5.1"
|
"yaml": "^2.5.1"
|
||||||
},
|
},
|
||||||
"resolutions": {
|
"resolutions": {
|
||||||
|
"@novnc/novnc": "1.7.0",
|
||||||
"@types/node": "25.9.5",
|
"@types/node": "25.9.5",
|
||||||
"cronstrue": "2.59.0",
|
"cronstrue": "2.59.0",
|
||||||
"d3-color": "3.1.0",
|
"d3-color": "3.1.0",
|
||||||
@@ -29,11 +37,11 @@
|
|||||||
"glob": "7.2.3",
|
"glob": "7.2.3",
|
||||||
"glob-parent": "6.0.2",
|
"glob-parent": "6.0.2",
|
||||||
"json5": "2.2.3",
|
"json5": "2.2.3",
|
||||||
"@types/lodash": "4.17.24",
|
"@types/lodash": "4.17.25",
|
||||||
"merge": "2.1.1",
|
"merge": "2.1.1",
|
||||||
"node-forge": "1.4.0",
|
"node-forge": "1.4.0",
|
||||||
"nth-check": "2.1.1",
|
"nth-check": "2.1.1",
|
||||||
"qs": "6.15.3",
|
"qs": "6.16.0",
|
||||||
"roarr": "7.21.7",
|
"roarr": "7.21.7",
|
||||||
"semver": "7.8.5",
|
"semver": "7.8.5",
|
||||||
"@vue/cli-service/html-webpack-plugin": "^5.0.0"
|
"@vue/cli-service/html-webpack-plugin": "^5.0.0"
|
||||||
@@ -42,15 +50,17 @@
|
|||||||
"dev": "NODE_ENV=dev ./node_modules/.bin/vue-cli-service serve",
|
"dev": "NODE_ENV=dev ./node_modules/.bin/vue-cli-service serve",
|
||||||
"build": "./node_modules/.bin/vue-cli-service build",
|
"build": "./node_modules/.bin/vue-cli-service build",
|
||||||
"clean": "./node_modules/@rancher/shell/scripts/clean",
|
"clean": "./node_modules/@rancher/shell/scripts/clean",
|
||||||
"lint": "./node_modules/.bin/eslint --max-warnings 0 --ext .js,.ts,.vue .",
|
"lint": "./node_modules/@rancher/shell/scripts/lint --max-warnings 0 --ext .js,.ts,.vue .",
|
||||||
"lint:fix": "./node_modules/.bin/eslint --fix --max-warnings 0 --ext .js,.ts,.vue .",
|
"lint:fix": "./node_modules/@rancher/shell/scripts/lint --fix --max-warnings 0 --ext .js,.ts,.vue .",
|
||||||
"build-pkg": "./node_modules/@rancher/shell/scripts/build-pkg.sh",
|
"build-pkg": "./node_modules/@rancher/shell/scripts/build-pkg.sh",
|
||||||
"serve-pkgs": "./node_modules/@rancher/shell/scripts/serve-pkgs",
|
"serve-pkgs": "./node_modules/@rancher/shell/scripts/serve-pkgs",
|
||||||
"publish-pkgs": "./node_modules/@rancher/shell/scripts/extension/publish",
|
"publish-pkgs": "./node_modules/@rancher/shell/scripts/extension/publish",
|
||||||
"parse-tag-name": "./node_modules/@rancher/shell/scripts/extension/parse-tag-name",
|
"parse-tag-name": "./node_modules/@rancher/shell/scripts/extension/parse-tag-name",
|
||||||
"commitlint": "commitlint --edit",
|
"commitlint": "commitlint --edit",
|
||||||
"prepare": "husky",
|
"prepare": "husky",
|
||||||
"agents:generate": "./scripts/generate-agent-and-persona-mds.sh"
|
"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"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@commitlint/load": "^19.8.1",
|
"@commitlint/load": "^19.8.1",
|
||||||
|
|||||||
@@ -271,4 +271,9 @@ export default {
|
|||||||
.filter-label .v-popper__arrow-container {
|
.filter-label .v-popper__arrow-container {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.fixed-header-actions .middle .filter + .btn-group {
|
||||||
|
display: inline-flex;
|
||||||
|
vertical-align: middle;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
@@ -116,6 +116,11 @@ export default {
|
|||||||
.vm-schedule-dropdown .v-popper__arrow-container {
|
.vm-schedule-dropdown .v-popper__arrow-container {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.fixed-header-actions .middle .vm-schedule-filter + .btn-group {
|
||||||
|
display: inline-flex;
|
||||||
|
vertical-align: middle;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
<script>
|
<script>
|
||||||
import { allHash } from '@shell/utils/promise';
|
import { allHash } from '@shell/utils/promise';
|
||||||
import debounce from 'lodash/debounce';
|
import debounce from 'lodash/debounce';
|
||||||
|
|
||||||
import Socket, {
|
import Socket, {
|
||||||
EVENT_CONNECTED,
|
EVENT_CONNECTED,
|
||||||
EVENT_CONNECTING,
|
EVENT_CONNECTING,
|
||||||
@@ -24,72 +23,96 @@ export default {
|
|||||||
return {
|
return {
|
||||||
socket: null,
|
socket: null,
|
||||||
terminal: null,
|
terminal: null,
|
||||||
|
textDecoder: null,
|
||||||
fitAddon: null,
|
fitAddon: null,
|
||||||
searchAddon: null,
|
searchAddon: null,
|
||||||
webglAddon: null,
|
webglAddon: null,
|
||||||
|
onResize: null,
|
||||||
isOpen: false,
|
isOpen: false,
|
||||||
isOpening: false,
|
isOpening: false,
|
||||||
backlog: [],
|
backlog: [],
|
||||||
firstTime: true,
|
firstTime: true,
|
||||||
queue: []
|
queue: [],
|
||||||
|
isDraining: false,
|
||||||
|
drainScheduled: false,
|
||||||
|
drainTimer: null,
|
||||||
|
showSearch: false,
|
||||||
|
searchQuery: '',
|
||||||
|
searchOptions: {
|
||||||
|
caseSensitive: false,
|
||||||
|
regex: false,
|
||||||
|
wholeWord: false,
|
||||||
|
incremental: true,
|
||||||
|
decorations: {
|
||||||
|
matchBackground: '#B45309',
|
||||||
|
matchBorder: '#FDBA74',
|
||||||
|
matchOverviewRuler: '#FDBA74',
|
||||||
|
activeMatchBackground: '#EA580C',
|
||||||
|
activeMatchBorder: '#FED7AA',
|
||||||
|
activeMatchColorOverviewRuler: '#FED7AA',
|
||||||
|
},
|
||||||
|
},
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
computed: {
|
computed: {
|
||||||
|
serialConsoleUrl() {
|
||||||
|
return this.value?.getSerialConsolePath || '';
|
||||||
|
},
|
||||||
|
|
||||||
xtermConfig() {
|
xtermConfig() {
|
||||||
return {
|
return {
|
||||||
allowProposedApi: true,
|
allowProposedApi: true,
|
||||||
cursorBlink: true,
|
cursorBlink: true,
|
||||||
|
cursorStyle: 'bar',
|
||||||
|
cursorWidth: 2,
|
||||||
|
scrollback: 5000,
|
||||||
useStyle: true,
|
useStyle: true,
|
||||||
fontSize: 12,
|
fontFamily: 'JetBrains Mono, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace',
|
||||||
|
fontSize: 16,
|
||||||
|
lineHeight: 1.3,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
watch: {
|
|
||||||
queue: {
|
|
||||||
handler: debounce(async function(neu) {
|
|
||||||
if (neu.length === 0) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const msg = await Promise.all(neu);
|
|
||||||
|
|
||||||
(msg || []).forEach((m) => {
|
|
||||||
this.terminal.write(m);
|
|
||||||
});
|
|
||||||
|
|
||||||
this.queue = [];
|
|
||||||
}, 10),
|
|
||||||
deep: true
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
beforeUnmount() {
|
beforeUnmount() {
|
||||||
this.close();
|
this.close();
|
||||||
},
|
},
|
||||||
|
|
||||||
|
watch: {
|
||||||
|
serialConsoleUrl() {
|
||||||
|
if (this.terminal) {
|
||||||
|
this.connect();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
async mounted() {
|
async mounted() {
|
||||||
|
this.textDecoder = new TextDecoder('utf-8');
|
||||||
await this.setupTerminal();
|
await this.setupTerminal();
|
||||||
await this.connect();
|
await this.connect();
|
||||||
|
this.onResize = debounce(() => this.fit(), 100);
|
||||||
|
window.addEventListener('resize', this.onResize);
|
||||||
|
this.scheduleFit();
|
||||||
},
|
},
|
||||||
|
|
||||||
methods: {
|
methods: {
|
||||||
async setupTerminal() {
|
async setupTerminal() {
|
||||||
const docStyle = getComputedStyle(document.querySelector('body'));
|
const docStyle = getComputedStyle(document.querySelector('body'));
|
||||||
const xterm = await import(/* webpackChunkName: "xterm" */ 'xterm');
|
const xterm = await import(/* webpackChunkName: "xterm" */ '@xterm/xterm');
|
||||||
|
|
||||||
const addons = await allHash({
|
const addons = await allHash({
|
||||||
fit: import(/* webpackChunkName: "xterm" */ 'xterm-addon-fit'),
|
fit: import(/* webpackChunkName: "xterm" */ '@xterm/addon-fit'),
|
||||||
webgl: import(/* webpackChunkName: "xterm" */ 'xterm-addon-webgl'),
|
webgl: import(/* webpackChunkName: "xterm" */ '@xterm/addon-webgl'),
|
||||||
weblinks: import(/* webpackChunkName: "xterm" */ 'xterm-addon-web-links'),
|
weblinks: import(/* webpackChunkName: "xterm" */ '@xterm/addon-web-links'),
|
||||||
search: import(/* webpackChunkName: "xterm" */ 'xterm-addon-search'),
|
search: import(/* webpackChunkName: "xterm" */ '@xterm/addon-search'),
|
||||||
|
canvas: import(/* webpackChunkName: "xterm" */ '@xterm/addon-canvas'),
|
||||||
});
|
});
|
||||||
|
|
||||||
const terminal = new xterm.Terminal({
|
const terminal = new xterm.Terminal({
|
||||||
theme: {
|
theme: {
|
||||||
background: docStyle.getPropertyValue('--terminal-bg').trim(),
|
background: docStyle.getPropertyValue('--terminal-bg').trim(),
|
||||||
cursor: docStyle.getPropertyValue('--terminal-cursor').trim(),
|
cursor: docStyle.getPropertyValue('--terminal-text').trim(),
|
||||||
foreground: docStyle.getPropertyValue('--terminal-text').trim()
|
foreground: docStyle.getPropertyValue('--terminal-text').trim()
|
||||||
},
|
},
|
||||||
...this.xtermConfig,
|
...this.xtermConfig,
|
||||||
@@ -97,25 +120,48 @@ export default {
|
|||||||
|
|
||||||
this.fitAddon = new addons.fit.FitAddon();
|
this.fitAddon = new addons.fit.FitAddon();
|
||||||
this.searchAddon = new addons.search.SearchAddon();
|
this.searchAddon = new addons.search.SearchAddon();
|
||||||
|
|
||||||
try {
|
|
||||||
this.webglAddon = new addons.webgl.WebGlAddon();
|
|
||||||
} catch (e) {
|
|
||||||
// Some browsers (Safari) don't support the webgl renderer, so don't use it.
|
|
||||||
this.webglAddon = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
terminal.loadAddon(this.fitAddon);
|
terminal.loadAddon(this.fitAddon);
|
||||||
terminal.loadAddon(this.searchAddon);
|
terminal.loadAddon(this.searchAddon);
|
||||||
terminal.loadAddon(new addons.weblinks.WebLinksAddon());
|
terminal.loadAddon(new addons.weblinks.WebLinksAddon());
|
||||||
terminal.open(this.$refs.xterm);
|
terminal.open(this.$refs.xterm);
|
||||||
|
|
||||||
if ( this.webglAddon ) {
|
// The webgl renderer can fail without throwing: the context may be lost
|
||||||
|
// mid-session, or it can attach but silently never paint, leaving the
|
||||||
|
// terminal's helper textarea at 0x0. Detect both cases and fall back to the
|
||||||
|
// canvas renderer so the terminal stays interactive.
|
||||||
|
try {
|
||||||
|
this.webglAddon = new addons.webgl.WebglAddon();
|
||||||
|
|
||||||
|
this.webglAddon.onContextLoss(() => {
|
||||||
|
if (!this.isUnmounted && this.terminal) {
|
||||||
|
this.fallbackToCanvas(terminal, addons);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
terminal.loadAddon(this.webglAddon);
|
terminal.loadAddon(this.webglAddon);
|
||||||
|
|
||||||
|
// Detect the silent "attaches but never paints" failure after a render frame.
|
||||||
|
requestAnimationFrame(() => {
|
||||||
|
if (this.isUnmounted || !this.terminal) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const textarea = this.$refs.xterm?.querySelector('.xterm-helper-textarea');
|
||||||
|
const hasPainted = textarea && textarea.getBoundingClientRect().height > 0;
|
||||||
|
|
||||||
|
if (this.webglAddon && !hasPainted) {
|
||||||
|
this.fallbackToCanvas(terminal, addons);
|
||||||
|
this.fit();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
} catch (e) {
|
||||||
|
// Some browsers (e.g. Safari) don't support the webgl renderer, so don't use it.
|
||||||
|
this.fallbackToCanvas(terminal, addons);
|
||||||
}
|
}
|
||||||
|
|
||||||
this.fit();
|
this.fit();
|
||||||
this.flush();
|
this.flush();
|
||||||
|
this.scheduleDrainQueue();
|
||||||
|
|
||||||
terminal.onData((input) => {
|
terminal.onData((input) => {
|
||||||
const msg = this.str2ab(input);
|
const msg = this.str2ab(input);
|
||||||
@@ -123,9 +169,132 @@ export default {
|
|||||||
this.write(msg);
|
this.write(msg);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
terminal.attachCustomKeyEventHandler((event) => {
|
||||||
|
const key = event.key?.toLowerCase();
|
||||||
|
|
||||||
|
if ((event.ctrlKey || event.metaKey) && key === 'f') {
|
||||||
|
event.preventDefault();
|
||||||
|
this.openSearch();
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (key === 'escape' && this.showSearch) {
|
||||||
|
event.preventDefault();
|
||||||
|
this.closeSearch();
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
});
|
||||||
|
|
||||||
this.terminal = terminal;
|
this.terminal = terminal;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
openSearch() {
|
||||||
|
this.showSearch = true;
|
||||||
|
|
||||||
|
this.$nextTick(() => {
|
||||||
|
const input = this.$refs.searchInput;
|
||||||
|
|
||||||
|
if (input) {
|
||||||
|
input.focus();
|
||||||
|
input.select();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
|
closeSearch() {
|
||||||
|
this.showSearch = false;
|
||||||
|
this.searchQuery = '';
|
||||||
|
this.clearSearchHighlights();
|
||||||
|
this.terminal?.focus();
|
||||||
|
},
|
||||||
|
|
||||||
|
clearSearchHighlights() {
|
||||||
|
this.searchAddon?.clearActiveDecoration();
|
||||||
|
this.searchAddon?.clearDecorations();
|
||||||
|
this.terminal?.clearSelection();
|
||||||
|
|
||||||
|
// Disposing the search decorations doesn't repaint the webgl/canvas
|
||||||
|
// layer, so force a refresh to remove the lingering highlight.
|
||||||
|
if (this.terminal) {
|
||||||
|
this.terminal.refresh(0, this.terminal.rows - 1);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
findNext() {
|
||||||
|
if (!this.searchAddon || !this.searchQuery) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.searchAddon.findNext(this.searchQuery, this.searchOptions);
|
||||||
|
},
|
||||||
|
|
||||||
|
findPrevious() {
|
||||||
|
if (!this.searchAddon || !this.searchQuery) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.searchAddon.findPrevious(this.searchQuery, this.searchOptions);
|
||||||
|
},
|
||||||
|
|
||||||
|
onSearchInput() {
|
||||||
|
if (!this.searchQuery) {
|
||||||
|
this.clearSearchHighlights();
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.findNext();
|
||||||
|
},
|
||||||
|
|
||||||
|
onSearchKeydown(event) {
|
||||||
|
if (event.key === 'Enter') {
|
||||||
|
event.preventDefault();
|
||||||
|
|
||||||
|
if (event.shiftKey) {
|
||||||
|
this.findPrevious();
|
||||||
|
} else {
|
||||||
|
this.findNext();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (event.key === 'Escape') {
|
||||||
|
event.preventDefault();
|
||||||
|
this.closeSearch();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
scheduleFit() {
|
||||||
|
this.$nextTick(() => {
|
||||||
|
requestAnimationFrame(() => {
|
||||||
|
this.fit();
|
||||||
|
|
||||||
|
// Re-fit after layout settles to avoid undersized rows on first paint.
|
||||||
|
setTimeout(() => this.fit(), 120);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
|
// Dispose the webgl renderer (if any) and switch to the canvas renderer.
|
||||||
|
// Used when webgl fails to construct, loses its context, or silently never paints.
|
||||||
|
fallbackToCanvas(terminal, addons) {
|
||||||
|
if (this.isUnmounted) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.webglAddon?.dispose();
|
||||||
|
this.webglAddon = null;
|
||||||
|
|
||||||
|
if (!this.canvasAddon) {
|
||||||
|
this.canvasAddon = new addons.canvas.CanvasAddon();
|
||||||
|
terminal.loadAddon(this.canvasAddon);
|
||||||
|
}
|
||||||
|
this.fit();
|
||||||
|
},
|
||||||
|
|
||||||
str2ab(str) {
|
str2ab(str) {
|
||||||
const enc = new TextEncoder();
|
const enc = new TextEncoder();
|
||||||
|
|
||||||
@@ -140,12 +309,131 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
enqueueMessage(messagePromise) {
|
||||||
|
this.queue.push(messagePromise);
|
||||||
|
this.scheduleDrainQueue();
|
||||||
|
},
|
||||||
|
|
||||||
|
scheduleDrainQueue() {
|
||||||
|
if (this.drainScheduled || this.isDraining || !this.terminal) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.drainScheduled = true;
|
||||||
|
|
||||||
|
const shouldDrainImmediately = this.queue.length <= 3;
|
||||||
|
|
||||||
|
const runDrain = () => {
|
||||||
|
this.drainScheduled = false;
|
||||||
|
this.drainTimer = null;
|
||||||
|
this.drainQueue();
|
||||||
|
};
|
||||||
|
|
||||||
|
if (shouldDrainImmediately) {
|
||||||
|
runDrain();
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.drainTimer = requestAnimationFrame(runDrain);
|
||||||
|
},
|
||||||
|
|
||||||
|
async decodeMessageData(data) {
|
||||||
|
if (typeof data === 'string') {
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!this.textDecoder) {
|
||||||
|
this.textDecoder = new TextDecoder('utf-8');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (data instanceof Blob) {
|
||||||
|
const buffer = await data.arrayBuffer();
|
||||||
|
|
||||||
|
return this.textDecoder.decode(new Uint8Array(buffer), { stream: true });
|
||||||
|
}
|
||||||
|
|
||||||
|
if (data instanceof ArrayBuffer) {
|
||||||
|
return this.textDecoder.decode(new Uint8Array(data), { stream: true });
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ArrayBuffer.isView(data)) {
|
||||||
|
const view = data;
|
||||||
|
const bytes = new Uint8Array(view.buffer, view.byteOffset, view.byteLength);
|
||||||
|
|
||||||
|
return this.textDecoder.decode(bytes, { stream: true });
|
||||||
|
}
|
||||||
|
|
||||||
|
return String(data || '');
|
||||||
|
},
|
||||||
|
|
||||||
|
async drainQueue() {
|
||||||
|
if (this.isDraining || !this.terminal) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.isDraining = true;
|
||||||
|
|
||||||
|
try {
|
||||||
|
while (this.queue.length > 0) {
|
||||||
|
const pendingMessages = this.queue.splice(0, this.queue.length);
|
||||||
|
const settledMessages = await Promise.allSettled(pendingMessages);
|
||||||
|
const messages = settledMessages
|
||||||
|
.filter((result) => result.status === 'fulfilled')
|
||||||
|
.map((result) => result.value);
|
||||||
|
const output = messages.filter(Boolean).join('');
|
||||||
|
|
||||||
|
if (output) {
|
||||||
|
await this.writeOutputInChunks(output);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.queue.length > 0) {
|
||||||
|
await this.nextFrame();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
this.isDraining = false;
|
||||||
|
|
||||||
|
// If data arrived between the last while-check and releasing the lock,
|
||||||
|
// immediately schedule another drain so output never gets stuck.
|
||||||
|
if (this.queue.length > 0 && this.terminal) {
|
||||||
|
this.scheduleDrainQueue();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
async writeOutputInChunks(output) {
|
||||||
|
if (!output) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const chunkSize = output.length > 20000 ? 16000 : output.length > 8000 ? 8000 : output.length;
|
||||||
|
|
||||||
|
if (chunkSize === output.length) {
|
||||||
|
this.terminal.write(output);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (let index = 0; index < output.length; index += chunkSize) {
|
||||||
|
this.terminal.write(output.slice(index, index + chunkSize));
|
||||||
|
|
||||||
|
if (index + chunkSize < output.length) {
|
||||||
|
await this.nextFrame();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
nextFrame() {
|
||||||
|
return new Promise((resolve) => requestAnimationFrame(resolve));
|
||||||
|
},
|
||||||
|
|
||||||
clear() {
|
clear() {
|
||||||
this.terminal.clear();
|
this.terminal.clear();
|
||||||
},
|
},
|
||||||
|
|
||||||
getSocketUrl() {
|
getSocketUrl() {
|
||||||
return `${ this.value?.getSerialConsolePath }`;
|
return this.serialConsoleUrl;
|
||||||
},
|
},
|
||||||
|
|
||||||
async connect() {
|
async connect() {
|
||||||
@@ -181,6 +469,7 @@ export default {
|
|||||||
this.fit();
|
this.fit();
|
||||||
this.flush();
|
this.flush();
|
||||||
}
|
}
|
||||||
|
this.scheduleFit();
|
||||||
|
|
||||||
if (this.firstTime) {
|
if (this.firstTime) {
|
||||||
this.socket.send(this.str2ab('\n'));
|
this.socket.send(this.str2ab('\n'));
|
||||||
@@ -195,7 +484,7 @@ export default {
|
|||||||
});
|
});
|
||||||
|
|
||||||
this.socket.addEventListener(EVENT_MESSAGE, (e) => {
|
this.socket.addEventListener(EVENT_MESSAGE, (e) => {
|
||||||
this.queue.push(e.detail.data.text());
|
this.enqueueMessage(this.decodeMessageData(e.detail.data));
|
||||||
});
|
});
|
||||||
|
|
||||||
this.socket.connect();
|
this.socket.connect();
|
||||||
@@ -218,22 +507,19 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.fitAddon.fit();
|
this.fitAddon.fit();
|
||||||
|
|
||||||
const { rows, cols } = this.fitAddon.proposeDimensions();
|
|
||||||
|
|
||||||
if ( !this.isOpen ) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const message = JSON.stringify({
|
|
||||||
Width: cols,
|
|
||||||
Height: rows
|
|
||||||
});
|
|
||||||
|
|
||||||
this.socket.send(this.str2ab(message));
|
|
||||||
},
|
},
|
||||||
|
|
||||||
close() {
|
close() {
|
||||||
|
if (this.onResize) {
|
||||||
|
window.removeEventListener('resize', this.onResize);
|
||||||
|
this.onResize = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.drainTimer) {
|
||||||
|
cancelAnimationFrame(this.drainTimer);
|
||||||
|
this.drainTimer = null;
|
||||||
|
}
|
||||||
|
|
||||||
if ( this.socket ) {
|
if ( this.socket ) {
|
||||||
this.socket.disconnect();
|
this.socket.disconnect();
|
||||||
}
|
}
|
||||||
@@ -248,6 +534,44 @@ export default {
|
|||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div class="harvester-shell-container">
|
<div class="harvester-shell-container">
|
||||||
|
<div
|
||||||
|
v-if="showSearch"
|
||||||
|
class="shell-search"
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
ref="searchInput"
|
||||||
|
v-model="searchQuery"
|
||||||
|
type="text"
|
||||||
|
class="shell-search-input"
|
||||||
|
placeholder="Search in terminal"
|
||||||
|
@input="onSearchInput"
|
||||||
|
@keydown="onSearchKeydown"
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
class="btn role-secondary btn-sm shell-search-btn"
|
||||||
|
type="button"
|
||||||
|
title="Shift+Enter"
|
||||||
|
@click="findPrevious"
|
||||||
|
>
|
||||||
|
Prev
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
class="btn role-secondary btn-sm shell-search-btn"
|
||||||
|
type="button"
|
||||||
|
title="Enter"
|
||||||
|
@click="findNext"
|
||||||
|
>
|
||||||
|
Next
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
class="btn role-secondary btn-sm shell-search-btn"
|
||||||
|
type="button"
|
||||||
|
title="Esc"
|
||||||
|
@click="closeSearch"
|
||||||
|
>
|
||||||
|
Close
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
<div
|
<div
|
||||||
ref="xterm"
|
ref="xterm"
|
||||||
class="shell-body"
|
class="shell-body"
|
||||||
@@ -257,18 +581,73 @@ export default {
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
@import '../../../../node_modules/xterm/css/xterm.css';
|
@import '../../../../node_modules/@xterm/xterm/css/xterm.css';
|
||||||
|
|
||||||
body, #__nuxt, #__layout, MAIN {
|
body, #__nuxt, #__layout, MAIN {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.harvester-shell-container {
|
.harvester-shell-container {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
position: relative;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
min-height: 0;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
|
||||||
.shell-body, .terminal.xterm {
|
.resize-observer {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.shell-search {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
justify-content: flex-end;
|
||||||
|
position: absolute;
|
||||||
|
top: 8px;
|
||||||
|
right: 10px;
|
||||||
|
z-index: 5;
|
||||||
|
padding: 8px;
|
||||||
|
border-radius: 6px;
|
||||||
|
border: 1px solid var(--border);
|
||||||
|
background: color-mix(in srgb, var(--body-bg) 88%, transparent);
|
||||||
|
}
|
||||||
|
|
||||||
|
.shell-search-input {
|
||||||
|
min-width: 220px;
|
||||||
|
max-width: 420px;
|
||||||
|
flex: 0 1 320px;
|
||||||
|
border: 1px solid var(--border);
|
||||||
|
border-radius: 4px;
|
||||||
|
background: var(--body-bg);
|
||||||
|
color: var(--body-text);
|
||||||
|
padding: 6px 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.shell-search-btn {
|
||||||
|
min-width: 64px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.shell-body {
|
||||||
|
flex: 1 1 auto;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
width: 100%;
|
||||||
|
min-height: 0;
|
||||||
|
padding: 0 10px;
|
||||||
|
box-sizing: border-box;
|
||||||
|
}
|
||||||
|
|
||||||
|
.terminal.xterm,
|
||||||
|
.terminal.xterm .xterm-viewport,
|
||||||
|
.terminal.xterm .xterm-screen,
|
||||||
|
.terminal.xterm .xterm-scrollable-element {
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.terminal.xterm .xterm-scrollable-element {
|
||||||
|
min-height: 100%;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
@@ -231,14 +231,21 @@ export default {
|
|||||||
v-if="setting.customized"
|
v-if="setting.customized"
|
||||||
class="modified"
|
class="modified"
|
||||||
>
|
>
|
||||||
Modified
|
{{ t('advancedSettings.tags.modified.label') }}
|
||||||
</span>
|
</span>
|
||||||
<span
|
<span
|
||||||
v-if="setting.experimental"
|
v-if="setting.experimental"
|
||||||
v-clean-tooltip="t('advancedSettings.experimental')"
|
v-clean-tooltip="t('advancedSettings.tags.experimental.description')"
|
||||||
class="experimental"
|
class="experimental"
|
||||||
>
|
>
|
||||||
Experimental
|
{{ t('advancedSettings.tags.experimental.label') }}
|
||||||
|
</span>
|
||||||
|
<span
|
||||||
|
v-if="setting.preview"
|
||||||
|
v-clean-tooltip="t('advancedSettings.tags.preview.description')"
|
||||||
|
class="preview"
|
||||||
|
>
|
||||||
|
{{ t('advancedSettings.tags.preview.label') }}
|
||||||
</span>
|
</span>
|
||||||
</h1>
|
</h1>
|
||||||
<h2 v-clean-html="t(setting.description, getDocLinkParams(setting) || {}, true)">
|
<h2 v-clean-html="t(setting.description, getDocLinkParams(setting) || {}, true)">
|
||||||
@@ -352,21 +359,19 @@ export default {
|
|||||||
flex: 1;
|
flex: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
.modified {
|
.modified,
|
||||||
|
.experimental,
|
||||||
|
.preview {
|
||||||
margin-left: 10px;
|
margin-left: 10px;
|
||||||
border: 1px solid var(--primary);
|
border: 1px solid;
|
||||||
border-radius: 5px;
|
border-radius: 5px;
|
||||||
padding: 2px 10px;
|
padding: 2px 10px;
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.experimental {
|
.modified { border-color: var(--primary); }
|
||||||
margin-left: 10px;
|
.experimental { border-color: var(--error); }
|
||||||
border: 1px solid var(--error);
|
.preview { border-color: var(--warning); }
|
||||||
border-radius: 5px;
|
|
||||||
padding: 2px 10px;
|
|
||||||
font-size: 12px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.no-search-match {
|
.no-search-match {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
|
|||||||
@@ -55,6 +55,10 @@ export default {
|
|||||||
const host = window.location.host;
|
const host = window.location.host;
|
||||||
const prefix = window.location.pathname.replace(this.$route.path, '');
|
const prefix = window.location.pathname.replace(this.$route.path, '');
|
||||||
const params = this.$route?.params;
|
const params = this.$route?.params;
|
||||||
|
const popupWidth = Math.max(800, screen.width - 200);
|
||||||
|
const popupHeight = Math.max(600, screen.height - 200);
|
||||||
|
const popupLeft = Math.max(0, window.screenX + Math.floor((window.outerWidth - popupWidth) / 2));
|
||||||
|
const popupTop = Math.max(0, window.screenY + Math.floor((window.outerHeight - popupHeight) / 2));
|
||||||
|
|
||||||
const url = `https://${ host }${ prefix }/${ PRODUCT_NAME }/c/${ params.cluster }/console/${ uid }/${ type }`;
|
const url = `https://${ host }${ prefix }/${ PRODUCT_NAME }/c/${ params.cluster }/console/${ uid }/${ type }`;
|
||||||
|
|
||||||
@@ -63,7 +67,7 @@ export default {
|
|||||||
window.open(
|
window.open(
|
||||||
url,
|
url,
|
||||||
'_blank',
|
'_blank',
|
||||||
`toolbars=0,width=${ screen.width - 200 },height=${ screen.height - 200 },left=0,top=0,noreferrer`
|
`toolbars=0,width=${ popupWidth },height=${ popupHeight },left=${ popupLeft },top=${ popupTop },noreferrer`
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -1,8 +1,333 @@
|
|||||||
|
<script>
|
||||||
|
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'],
|
||||||
|
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
rfb: null,
|
||||||
|
status: CONSOLE_STATUS.CONNECTING,
|
||||||
|
statusDetail: '',
|
||||||
|
desktopName: '',
|
||||||
|
retryTimes: 0,
|
||||||
|
maximumRetryTimes: MAXIMUM_RETRY_TIMES,
|
||||||
|
reconnectTimer: null,
|
||||||
|
isClosed: false,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
|
||||||
|
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();
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
|
beforeUnmount() {
|
||||||
|
this.isClosed = true;
|
||||||
|
this.clearReconnectTimer();
|
||||||
|
this.teardown();
|
||||||
|
},
|
||||||
|
|
||||||
|
methods: {
|
||||||
|
connect(takeOver = false) {
|
||||||
|
if (!this.url || this.isClosed) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.teardown();
|
||||||
|
|
||||||
|
this.status = this.retryTimes > 0 ? CONSOLE_STATUS.RECONNECTING : CONSOLE_STATUS.CONNECTING;
|
||||||
|
|
||||||
|
let rfb;
|
||||||
|
|
||||||
|
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.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;
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
this.retryTimes += 1;
|
||||||
|
this.status = CONSOLE_STATUS.RECONNECTING;
|
||||||
|
|
||||||
|
const delay = Math.min(BASE_RECONNECT_DELAY * (2 ** (this.retryTimes - 1)), MAXIMUM_RECONNECT_DELAY);
|
||||||
|
|
||||||
|
this.reconnectTimer = setTimeout(() => {
|
||||||
|
this.reconnectTimer = null;
|
||||||
|
this.connect();
|
||||||
|
}, delay);
|
||||||
|
},
|
||||||
|
|
||||||
|
clearReconnectTimer() {
|
||||||
|
if (this.reconnectTimer) {
|
||||||
|
clearTimeout(this.reconnectTimer);
|
||||||
|
this.reconnectTimer = null;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
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);
|
||||||
|
},
|
||||||
|
|
||||||
|
ctrlAltDelete() {
|
||||||
|
this.rfb?.sendCtrlAltDel();
|
||||||
|
},
|
||||||
|
|
||||||
|
sendKey(keysym, code, down) {
|
||||||
|
this.rfb?.sendKey(keysym, code, down);
|
||||||
|
},
|
||||||
|
|
||||||
|
}
|
||||||
|
};
|
||||||
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div>
|
<div class="novnc-console">
|
||||||
<div v-if="connected && disconnected">
|
<div
|
||||||
<main class="main-layout error">
|
ref="view"
|
||||||
<div class="text-center">
|
class="novnc-screen"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<div
|
||||||
|
v-if="showError || showReconnecting"
|
||||||
|
class="novnc-overlay"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
v-if="showError"
|
||||||
|
class="text-center"
|
||||||
|
>
|
||||||
<BrandImage
|
<BrandImage
|
||||||
file-name="error-desert-landscape.svg"
|
file-name="error-desert-landscape.svg"
|
||||||
width="900"
|
width="900"
|
||||||
@@ -14,140 +339,69 @@
|
|||||||
<h2 class="text-secondary mt-20">
|
<h2 class="text-secondary mt-20">
|
||||||
{{ t('vncConsole.error.message') }}
|
{{ t('vncConsole.error.message') }}
|
||||||
</h2>
|
</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>
|
</div>
|
||||||
</main>
|
|
||||||
</div>
|
<h2
|
||||||
<div v-if="reconnecting">
|
v-else
|
||||||
<main class="main-layout">
|
class="text-secondary"
|
||||||
<div class="text-center">
|
>
|
||||||
<h2 class="text-secondary mt-20">
|
|
||||||
{{ t('vncConsole.reconnecting.message') }}:{{ retryTimes }} of {{ maximumRetryTimes }}
|
{{ t('vncConsole.reconnecting.message') }}:{{ retryTimes }} of {{ maximumRetryTimes }}
|
||||||
</h2>
|
</h2>
|
||||||
</div>
|
</div>
|
||||||
</main>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
ref="view"
|
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
|
||||||
import RFB from '@novnc/novnc/core/rfb';
|
|
||||||
import BrandImage from '@shell/components/BrandImage';
|
|
||||||
|
|
||||||
export default {
|
|
||||||
props: {
|
|
||||||
url: {
|
|
||||||
type: String,
|
|
||||||
default: ''
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
components: { BrandImage },
|
|
||||||
|
|
||||||
data() {
|
|
||||||
return {
|
|
||||||
rfb: null,
|
|
||||||
connected: false,
|
|
||||||
disconnected: false,
|
|
||||||
reconnectDelay: 3000,
|
|
||||||
reconnecting: false,
|
|
||||||
maximumRetryTimes: 10,
|
|
||||||
retryTimes: 0,
|
|
||||||
setTimeout: null,
|
|
||||||
};
|
|
||||||
},
|
|
||||||
|
|
||||||
mounted() {
|
|
||||||
this.$nextTick(() => {
|
|
||||||
this.connect();
|
|
||||||
});
|
|
||||||
},
|
|
||||||
|
|
||||||
beforeUnmount() {
|
|
||||||
this.clearTimeout();
|
|
||||||
},
|
|
||||||
|
|
||||||
methods: {
|
|
||||||
connect() {
|
|
||||||
const rfb = new RFB(this.$refs.view, this.url);
|
|
||||||
|
|
||||||
rfb.addEventListener('connect', () => {
|
|
||||||
this.clearTimeout();
|
|
||||||
|
|
||||||
this.connected = true;
|
|
||||||
this.retryTimes = 0;
|
|
||||||
this.reconnecting = false;
|
|
||||||
});
|
|
||||||
|
|
||||||
rfb.addEventListener('disconnect', (e) => {
|
|
||||||
this.clearTimeout();
|
|
||||||
|
|
||||||
this.disconnected = true;
|
|
||||||
this.rfb = null;
|
|
||||||
this.reconnect();
|
|
||||||
});
|
|
||||||
|
|
||||||
this.rfb = rfb;
|
|
||||||
},
|
|
||||||
|
|
||||||
reconnect() {
|
|
||||||
if (this.retryTimes >= this.maximumRetryTimes) {
|
|
||||||
this.reconnecting = false;
|
|
||||||
this.connected = true;
|
|
||||||
this.disconnected = true;
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.retryTimes += 1;
|
|
||||||
this.reconnecting = true;
|
|
||||||
this.connected = false;
|
|
||||||
this.disconnected = false;
|
|
||||||
|
|
||||||
this.setTimeout = setTimeout(() => {
|
|
||||||
this.connect();
|
|
||||||
}, this.reconnectDelay);
|
|
||||||
},
|
|
||||||
|
|
||||||
clearTimeout() {
|
|
||||||
if (this.setTimeout) {
|
|
||||||
clearTimeout(this.setTimeout);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
|
|
||||||
disconnect() {
|
|
||||||
this.rfb.disconnect();
|
|
||||||
},
|
|
||||||
|
|
||||||
ctrlAltDelete() {
|
|
||||||
this.rfb.sendCtrlAltDel();
|
|
||||||
},
|
|
||||||
|
|
||||||
sendKey(keysym, code, down) {
|
|
||||||
this.rfb.sendKey(keysym, code, down);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.error {
|
.novnc-console {
|
||||||
|
position: relative;
|
||||||
|
box-sizing: border-box;
|
||||||
|
height: 100%;
|
||||||
|
padding: 8px;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
|
||||||
.row {
|
|
||||||
align-items: center;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.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);
|
||||||
|
|
||||||
h1 {
|
h1 {
|
||||||
font-size: 5rem;
|
font-size: 5rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.desert-landscape {
|
|
||||||
img {
|
img {
|
||||||
max-width: 100%;
|
max-width: 100%;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
</style>
|
</style>
|
||||||
@@ -1,264 +0,0 @@
|
|||||||
<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>
|
|
||||||
@@ -1,15 +1,26 @@
|
|||||||
<script>
|
<script>
|
||||||
import { STEVE } from '@shell/config/types';
|
|
||||||
import { escapeHtml } from '@shell/utils/string';
|
import { escapeHtml } from '@shell/utils/string';
|
||||||
import { allHash } from '@shell/utils/promise';
|
import { allHash } from '@shell/utils/promise';
|
||||||
import KeyTable from '@novnc/novnc/core/input/keysym';
|
import KeyTable from '@novnc/novnc/core/input/keysym';
|
||||||
import * as KeyboardUtil from '@novnc/novnc/core/input/util';
|
|
||||||
import { HCI } from '../../types';
|
import { HCI } from '../../types';
|
||||||
import NovncConsole from './NovncConsole';
|
import NovncConsole from './NovncConsole';
|
||||||
import NovncConsoleItem from './NovncConsoleItem';
|
import NovncConsoleItem from './NovncConsoleItem';
|
||||||
import NovncConsoleCustomKeys from './NovncConsoleCustomKeys';
|
import { normalizeZoom } from './ZoomableRFB';
|
||||||
|
|
||||||
const PREFERED_SHORTCUT_KEYS = 'prefered-shortcut-keys';
|
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 SHORT_KEYS = {
|
const SHORT_KEYS = {
|
||||||
ControlLeft: {
|
ControlLeft: {
|
||||||
@@ -105,9 +116,7 @@ const F_KEYS = {
|
|||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'NovncConsoleWrapper',
|
name: 'NovncConsoleWrapper',
|
||||||
components: {
|
components: { NovncConsole, NovncConsoleItem },
|
||||||
NovncConsole, NovncConsoleItem, NovncConsoleCustomKeys
|
|
||||||
},
|
|
||||||
|
|
||||||
async fetch() {
|
async fetch() {
|
||||||
const _hash = { vmResource: this.$store.dispatch('harvester/find', { type: HCI.VM, id: this.value.id }) };
|
const _hash = { vmResource: this.$store.dispatch('harvester/find', { type: HCI.VM, id: this.value.id }) };
|
||||||
@@ -131,39 +140,21 @@ export default {
|
|||||||
return {
|
return {
|
||||||
keysRecord: [],
|
keysRecord: [],
|
||||||
vmResource: {},
|
vmResource: {},
|
||||||
renderKeysModal: false,
|
settings: { ...DEFAULT_SETTINGS },
|
||||||
currentUser: null,
|
capabilities: {},
|
||||||
hideCustomKeysBar: false,
|
isFullscreen: false,
|
||||||
|
consoleStatus: {
|
||||||
|
status: 'connecting',
|
||||||
|
retryTimes: 0,
|
||||||
|
maximumRetryTimes: 0,
|
||||||
|
desktopName: '',
|
||||||
|
},
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
computed: {
|
computed: {
|
||||||
savedShortcutKeys() {
|
canSendKeys() {
|
||||||
const preference = this.$store.getters['management/all'](STEVE.PREFERENCE);
|
return this.consoleStatus.status === 'connected' && !this.settings.viewOnly;
|
||||||
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() {
|
isDown() {
|
||||||
@@ -192,13 +183,16 @@ export default {
|
|||||||
...F_KEYS,
|
...F_KEYS,
|
||||||
};
|
};
|
||||||
|
|
||||||
out.AltLeft.keys = { PrintScreen: FUNCTION_KEYS.PrintScreen, ...F_KEYS };
|
out.AltLeft = { ...SHORT_KEYS.AltLeft, keys: { PrintScreen: FUNCTION_KEYS.PrintScreen, ...F_KEYS } };
|
||||||
out.ControlLeft.keys = {
|
out.ControlLeft = {
|
||||||
|
...SHORT_KEYS.ControlLeft,
|
||||||
|
keys: {
|
||||||
AltLeft: {
|
AltLeft: {
|
||||||
...Object.assign(SHORT_KEYS.AltLeft, {}),
|
...SHORT_KEYS.AltLeft,
|
||||||
keys: { Delete: FUNCTION_KEYS.Delete }
|
keys: { Delete: FUNCTION_KEYS.Delete }
|
||||||
},
|
},
|
||||||
...NORMAL_KEYS,
|
...NORMAL_KEYS,
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
return out;
|
return out;
|
||||||
@@ -208,14 +202,53 @@ export default {
|
|||||||
return !!this.vmResource?.actions?.softreboot;
|
return !!this.vmResource?.actions?.softreboot;
|
||||||
},
|
},
|
||||||
|
|
||||||
preferredShortcutKeys() {
|
rfbSettings() {
|
||||||
return (this.savedShortcutKeys || []).map((item) => {
|
|
||||||
return {
|
return {
|
||||||
label: item.map((K) => K.key.charAt(0).toUpperCase() + K.key.slice(1)).join('+'),
|
viewOnly: this.settings.viewOnly,
|
||||||
value: item
|
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,
|
||||||
};
|
};
|
||||||
});
|
|
||||||
},
|
},
|
||||||
|
|
||||||
|
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: {
|
methods: {
|
||||||
@@ -233,53 +266,97 @@ export default {
|
|||||||
|
|
||||||
// Send function key, e.g. ALT + F
|
// Send function key, e.g. ALT + F
|
||||||
sendKeys() {
|
sendKeys() {
|
||||||
|
if (!this.canSendKeys || !this.$refs.novncConsole) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
this.keysRecord.forEach((key) => {
|
this.keysRecord.forEach((key) => {
|
||||||
this.$refs.novncConsole.sendKey(this.allKeys[key].value, key, true);
|
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.novncConsole.sendKey(this.allKeys[key].value, key, false);
|
||||||
});
|
});
|
||||||
|
|
||||||
this.$refs.popover.isOpen = false;
|
this.$refs.popover.hide();
|
||||||
this.keysRecord = [];
|
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() {
|
reconnect() {
|
||||||
this.$refs.novncConsole.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() {
|
softReboot() {
|
||||||
this.vmResource.doSoftReboot();
|
this.vmResource.doSoftReboot();
|
||||||
},
|
},
|
||||||
|
|
||||||
showKeysModal() {
|
|
||||||
this.renderKeysModal = true;
|
|
||||||
},
|
|
||||||
|
|
||||||
hideKeysModal() {
|
|
||||||
this.renderKeysModal = false;
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div id="app">
|
<div id="app">
|
||||||
<div class="vm-console">
|
<div
|
||||||
|
ref="consoleContainer"
|
||||||
|
class="vm-console"
|
||||||
|
>
|
||||||
<div class="combination-keys">
|
<div class="combination-keys">
|
||||||
|
<div class="toolbar-group">
|
||||||
<v-dropdown
|
<v-dropdown
|
||||||
ref="popover"
|
ref="popover"
|
||||||
placement="top"
|
placement="top"
|
||||||
@@ -287,7 +364,10 @@ export default {
|
|||||||
:container="false"
|
:container="false"
|
||||||
@auto-hide="keysRecord = []"
|
@auto-hide="keysRecord = []"
|
||||||
>
|
>
|
||||||
<button class="btn btn-sm bg-primary">
|
<button
|
||||||
|
class="btn btn-sm bg-primary"
|
||||||
|
:disabled="!canSendKeys"
|
||||||
|
>
|
||||||
{{ t("harvester.virtualMachine.detail.console.shortcutKeys") }}
|
{{ t("harvester.virtualMachine.detail.console.shortcutKeys") }}
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
@@ -302,6 +382,74 @@ export default {
|
|||||||
</template>
|
</template>
|
||||||
</v-dropdown>
|
</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
|
<button
|
||||||
v-if="hasSoftRebootAction"
|
v-if="hasSoftRebootAction"
|
||||||
class="btn btn-sm bg-primary"
|
class="btn btn-sm bg-primary"
|
||||||
@@ -317,53 +465,22 @@ export default {
|
|||||||
{{ t("harvester.action.reconnect") }}
|
{{ t("harvester.action.reconnect") }}
|
||||||
</button>
|
</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
|
<button
|
||||||
class="btn btn-sm bg-primary"
|
class="btn btn-sm bg-primary"
|
||||||
@click="showKeysModal"
|
@click="toggleFullscreen"
|
||||||
>
|
>
|
||||||
{{ t("harvester.virtualMachine.detail.console.management") }}
|
{{ isFullscreen ? t('harvester.virtualMachine.detail.console.fullscreen.exit') : t('harvester.virtualMachine.detail.console.fullscreen.enter') }}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<hr>
|
|
||||||
|
|
||||||
<div
|
|
||||||
v-for="(keys, index) in preferredShortcutKeys"
|
|
||||||
:key="index"
|
|
||||||
>
|
|
||||||
<button
|
|
||||||
class="btn btn-sm bg-primary"
|
|
||||||
@click="sendCustomKeys(keys.value)"
|
|
||||||
>
|
|
||||||
{{ keys.label }}
|
|
||||||
</button>
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
|
||||||
</v-dropdown>
|
|
||||||
|
|
||||||
<NovncConsoleCustomKeys
|
|
||||||
v-if="renderKeysModal"
|
|
||||||
:current-user="currentUser"
|
|
||||||
@close="hideKeysModal"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<NovncConsole
|
<NovncConsole
|
||||||
v-if="url && !isDown"
|
v-if="url && !isDown"
|
||||||
ref="novncConsole"
|
ref="novncConsole"
|
||||||
:url="url"
|
:url="url"
|
||||||
|
:settings="rfbSettings"
|
||||||
|
@status-changed="onStatusChanged"
|
||||||
|
@capabilities="onCapabilities"
|
||||||
/>
|
/>
|
||||||
<p v-if="isDown">
|
<p v-if="isDown">
|
||||||
{{ t("harvester.virtualMachine.detail.console.down") }}
|
{{ t("harvester.virtualMachine.detail.console.down") }}
|
||||||
@@ -374,14 +491,56 @@ export default {
|
|||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
.vm-console {
|
.vm-console {
|
||||||
height: 100%;
|
height: 100vh;
|
||||||
|
height: 100dvh;
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-template-rows: 30px auto;
|
grid-template-rows: 32px minmax(0, 1fr);
|
||||||
}
|
}
|
||||||
|
|
||||||
.combination-keys {
|
.combination-keys {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
background: rgb(40, 40, 40);
|
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>
|
||||||
|
|
||||||
<style lang="scss">
|
<style lang="scss">
|
||||||
|
|||||||
@@ -0,0 +1,31 @@
|
|||||||
|
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();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -15,7 +15,7 @@ import MappingColumn from './MappingColumn.vue';
|
|||||||
import StorageDefaultsModal from './StorageDefaultsModal.vue';
|
import StorageDefaultsModal from './StorageDefaultsModal.vue';
|
||||||
|
|
||||||
const DEFAULT_VOLUME_MODE = VOLUME_MODE.FILE_SYSTEM;
|
const DEFAULT_VOLUME_MODE = VOLUME_MODE.FILE_SYSTEM;
|
||||||
const DEFAULT_ACCESS_MODES = [ACCESS_MODE.READ_WRITE_MANY];
|
const DEFAULT_ACCESS_MODE = ACCESS_MODE?.READ_WRITE_MANY ?? 'ReadWriteMany';
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
providerName: { type: String, default: '' },
|
providerName: { type: String, default: '' },
|
||||||
@@ -268,9 +268,9 @@ const buildStorageEntries = () => {
|
|||||||
capacity: 0,
|
capacity: 0,
|
||||||
target: '',
|
target: '',
|
||||||
volumeMode: DEFAULT_VOLUME_MODE,
|
volumeMode: DEFAULT_VOLUME_MODE,
|
||||||
accessModes: [...DEFAULT_ACCESS_MODES],
|
accessModes: [DEFAULT_ACCESS_MODE],
|
||||||
inheritedVolumeMode: DEFAULT_VOLUME_MODE,
|
inheritedVolumeMode: DEFAULT_VOLUME_MODE,
|
||||||
inheritedAccessModes: [...DEFAULT_ACCESS_MODES],
|
inheritedAccessModes: [DEFAULT_ACCESS_MODE],
|
||||||
inheritedFromProvider: false,
|
inheritedFromProvider: false,
|
||||||
overridden: false,
|
overridden: false,
|
||||||
usedBy: [],
|
usedBy: [],
|
||||||
@@ -310,9 +310,9 @@ const buildStorageEntriesFromProvider = (datastoresData) => {
|
|||||||
capacity: ds.capacity || 0,
|
capacity: ds.capacity || 0,
|
||||||
target: '',
|
target: '',
|
||||||
volumeMode: DEFAULT_VOLUME_MODE,
|
volumeMode: DEFAULT_VOLUME_MODE,
|
||||||
accessModes: [...DEFAULT_ACCESS_MODES],
|
accessModes: [DEFAULT_ACCESS_MODE],
|
||||||
inheritedVolumeMode: DEFAULT_VOLUME_MODE,
|
inheritedVolumeMode: DEFAULT_VOLUME_MODE,
|
||||||
inheritedAccessModes: [...DEFAULT_ACCESS_MODES],
|
inheritedAccessModes: [DEFAULT_ACCESS_MODE],
|
||||||
inheritedFromProvider: false,
|
inheritedFromProvider: false,
|
||||||
overridden: false,
|
overridden: false,
|
||||||
usedBy: [],
|
usedBy: [],
|
||||||
|
|||||||
@@ -273,19 +273,6 @@ const startMigrationAction = async() => {
|
|||||||
|
|
||||||
await plan.save();
|
await plan.save();
|
||||||
|
|
||||||
const planOwnerRef = {
|
|
||||||
apiVersion: FORKLIFT_API_VERSION,
|
|
||||||
kind: 'Plan',
|
|
||||||
name: plan.metadata.name,
|
|
||||||
uid: plan.metadata.uid,
|
|
||||||
blockOwnerDeletion: true,
|
|
||||||
};
|
|
||||||
|
|
||||||
networkMap.metadata.ownerReferences = [planOwnerRef];
|
|
||||||
await networkMap.save();
|
|
||||||
storageMap.metadata.ownerReferences = [planOwnerRef];
|
|
||||||
await storageMap.save();
|
|
||||||
|
|
||||||
// Kick off the first migration through the model so the Migration payload
|
// Kick off the first migration through the model so the Migration payload
|
||||||
// lives in a single place (also reused by the dashboard start/restart action).
|
// lives in a single place (also reused by the dashboard start/restart action).
|
||||||
await plan.startMigration();
|
await plan.startMigration();
|
||||||
|
|||||||
@@ -8,16 +8,22 @@ import { useI18n } from '@shell/composables/useI18n';
|
|||||||
import { VOLUME_MODE, ACCESS_MODE } from '../../config/types';
|
import { VOLUME_MODE, ACCESS_MODE } from '../../config/types';
|
||||||
|
|
||||||
const VOLUME_MODE_OPTIONS = [VOLUME_MODE.FILE_SYSTEM, VOLUME_MODE.BLOCK];
|
const VOLUME_MODE_OPTIONS = [VOLUME_MODE.FILE_SYSTEM, VOLUME_MODE.BLOCK];
|
||||||
const ACCESS_MODE_OPTIONS = [ACCESS_MODE.READ_WRITE_ONCE, ACCESS_MODE.READ_WRITE_MANY, ACCESS_MODE.READ_ONLY_MANY];
|
const {
|
||||||
|
READ_WRITE_ONCE = 'ReadWriteOnce',
|
||||||
|
READ_ONLY_MANY = 'ReadOnlyMany',
|
||||||
|
READ_WRITE_MANY = 'ReadWriteMany',
|
||||||
|
READ_WRITE_ONCE_POD = 'ReadWriteOncePod'
|
||||||
|
} = ACCESS_MODE || {};
|
||||||
|
const ACCESS_MODE_OPTIONS = [READ_WRITE_ONCE, READ_WRITE_MANY, READ_ONLY_MANY, READ_WRITE_ONCE_POD];
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
storageClassName: { type: String, default: '' },
|
storageClassName: { type: String, default: '' },
|
||||||
providerName: { type: String, default: '' },
|
providerName: { type: String, default: '' },
|
||||||
showInherited: { type: Boolean, default: false },
|
showInherited: { type: Boolean, default: false },
|
||||||
volumeMode: { type: String, default: VOLUME_MODE.FILE_SYSTEM },
|
volumeMode: { type: String, default: VOLUME_MODE.FILE_SYSTEM },
|
||||||
accessModes: { type: Array, default: () => [ACCESS_MODE.READ_WRITE_MANY] },
|
accessModes: { type: Array, default: () => ['ReadWriteMany'] },
|
||||||
inheritedVolumeMode: { type: String, default: VOLUME_MODE.FILE_SYSTEM },
|
inheritedVolumeMode: { type: String, default: VOLUME_MODE.FILE_SYSTEM },
|
||||||
inheritedAccessModes: { type: Array, default: () => [ACCESS_MODE.READ_WRITE_MANY] },
|
inheritedAccessModes: { type: Array, default: () => ['ReadWriteMany'] },
|
||||||
});
|
});
|
||||||
|
|
||||||
const emit = defineEmits(['apply', 'close']);
|
const emit = defineEmits(['apply', 'close']);
|
||||||
@@ -26,7 +32,7 @@ const store = useStore();
|
|||||||
const { t } = useI18n(store);
|
const { t } = useI18n(store);
|
||||||
|
|
||||||
const localVolumeMode = ref(props.volumeMode || VOLUME_MODE.FILE_SYSTEM);
|
const localVolumeMode = ref(props.volumeMode || VOLUME_MODE.FILE_SYSTEM);
|
||||||
const localAccessMode = ref(props.accessModes?.[0] || ACCESS_MODE.READ_WRITE_MANY);
|
const localAccessMode = ref(props.accessModes?.[0] || READ_WRITE_MANY);
|
||||||
|
|
||||||
const volumeModeOptions = VOLUME_MODE_OPTIONS.map((value) => ({ label: value, value }));
|
const volumeModeOptions = VOLUME_MODE_OPTIONS.map((value) => ({ label: value, value }));
|
||||||
const accessModeOptions = ACCESS_MODE_OPTIONS.map((value) => ({ label: value, value }));
|
const accessModeOptions = ACCESS_MODE_OPTIONS.map((value) => ({ label: value, value }));
|
||||||
@@ -42,7 +48,7 @@ const apply = () => {
|
|||||||
// Repopulate the dropdowns with the provider default values; the user then applies.
|
// Repopulate the dropdowns with the provider default values; the user then applies.
|
||||||
const reset = () => {
|
const reset = () => {
|
||||||
localVolumeMode.value = props.inheritedVolumeMode || VOLUME_MODE.FILE_SYSTEM;
|
localVolumeMode.value = props.inheritedVolumeMode || VOLUME_MODE.FILE_SYSTEM;
|
||||||
localAccessMode.value = props.inheritedAccessModes?.[0] || ACCESS_MODE.READ_WRITE_MANY;
|
localAccessMode.value = props.inheritedAccessModes?.[0] || READ_WRITE_MANY;
|
||||||
};
|
};
|
||||||
|
|
||||||
const cancel = () => {
|
const cancel = () => {
|
||||||
|
|||||||
@@ -111,15 +111,17 @@ export const HCI_ALLOWED_SETTINGS = {
|
|||||||
[HCI_SETTING.KUBECONFIG_DEFAULT_TOKEN_TTL_MINUTES]: { kind: 'number', featureFlag: 'kubeconfigDefaultTokenTTLMinutesSetting' },
|
[HCI_SETTING.KUBECONFIG_DEFAULT_TOKEN_TTL_MINUTES]: { kind: 'number', featureFlag: 'kubeconfigDefaultTokenTTLMinutesSetting' },
|
||||||
[HCI_SETTING.LONGHORN_V2_DATA_ENGINE_ENABLED]: {
|
[HCI_SETTING.LONGHORN_V2_DATA_ENGINE_ENABLED]: {
|
||||||
kind: 'boolean',
|
kind: 'boolean',
|
||||||
experimental: true,
|
preview: true,
|
||||||
featureFlag: 'longhornV2LVMSupport'
|
featureFlag: 'longhornV2LVMSupport'
|
||||||
},
|
},
|
||||||
[HCI_SETTING.LONGHORN_V2_DATA_ENGINE_HUGEPAGE_ENABLED]: {
|
[HCI_SETTING.LONGHORN_V2_DATA_ENGINE_HUGEPAGE_ENABLED]: {
|
||||||
kind: 'boolean',
|
kind: 'boolean',
|
||||||
|
preview: true,
|
||||||
featureFlag: 'longhornV2HugepageSettings'
|
featureFlag: 'longhornV2HugepageSettings'
|
||||||
},
|
},
|
||||||
[HCI_SETTING.LONGHORN_V2_DATA_ENGINE_MEMORY_SIZE]: {
|
[HCI_SETTING.LONGHORN_V2_DATA_ENGINE_MEMORY_SIZE]: {
|
||||||
kind: 'number',
|
kind: 'number',
|
||||||
|
preview: true,
|
||||||
featureFlag: 'longhornV2HugepageSettings'
|
featureFlag: 'longhornV2HugepageSettings'
|
||||||
},
|
},
|
||||||
[HCI_SETTING.ADDITIONAL_GUEST_MEMORY_OVERHEAD_RATIO]: { kind: 'string', from: 'import' },
|
[HCI_SETTING.ADDITIONAL_GUEST_MEMORY_OVERHEAD_RATIO]: { kind: 'string', from: 'import' },
|
||||||
|
|||||||
@@ -390,14 +390,17 @@ export default {
|
|||||||
:vmi-resource="vmi"
|
:vmi-resource="vmi"
|
||||||
:vmim-resource="vmim"
|
:vmim-resource="vmim"
|
||||||
/>
|
/>
|
||||||
<DashboardMetrics
|
<div
|
||||||
v-if="showVmMetrics && liveMigrationProgressEnabled"
|
v-if="showVmMetrics && liveMigrationProgressEnabled"
|
||||||
|
class="migration-metrics-scroll mb-30"
|
||||||
|
>
|
||||||
|
<DashboardMetrics
|
||||||
:detail-url="VM_MIGRATION_DETAIL_URL"
|
:detail-url="VM_MIGRATION_DETAIL_URL"
|
||||||
graph-height="640px"
|
graph-height="960px"
|
||||||
:has-summary-and-detail="false"
|
:has-summary-and-detail="false"
|
||||||
:vars="graphVars"
|
:vars="graphVars"
|
||||||
class="mb-30"
|
|
||||||
/>
|
/>
|
||||||
|
</div>
|
||||||
<Events
|
<Events
|
||||||
v-if="liveMigrationProgressEnabled"
|
v-if="liveMigrationProgressEnabled"
|
||||||
:resource="vmi"
|
:resource="vmi"
|
||||||
@@ -436,3 +439,10 @@ export default {
|
|||||||
</Tabbed>
|
</Tabbed>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.migration-metrics-scroll {
|
||||||
|
max-height: 640px;
|
||||||
|
overflow-y: auto;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -9,7 +9,7 @@ import Loading from '@shell/components/Loading';
|
|||||||
import CreateEditView from '@shell/mixins/create-edit-view';
|
import CreateEditView from '@shell/mixins/create-edit-view';
|
||||||
import { RadioGroup } from '@components/Form/Radio';
|
import { RadioGroup } from '@components/Form/Radio';
|
||||||
import { NETWORK_PROTOCOL, NETWORK_TYPE } from '@pkg/harvester/config/types';
|
import { NETWORK_PROTOCOL, NETWORK_TYPE } from '@pkg/harvester/config/types';
|
||||||
import { set } from '@shell/utils/object';
|
import { set, remove } from '@shell/utils/object';
|
||||||
import ArrayList from '@shell/components/form/ArrayList';
|
import ArrayList from '@shell/components/form/ArrayList';
|
||||||
import { allHash } from '@shell/utils/promise';
|
import { allHash } from '@shell/utils/promise';
|
||||||
import { HCI } from '../../types';
|
import { HCI } from '../../types';
|
||||||
@@ -142,10 +142,12 @@ export default {
|
|||||||
const inStore = this.$store.getters['currentProduct'].inStore;
|
const inStore = this.$store.getters['currentProduct'].inStore;
|
||||||
const vlans = this.$store.getters[`${ inStore }/all`](HCI.VLAN) || [];
|
const vlans = this.$store.getters[`${ inStore }/all`](HCI.VLAN) || [];
|
||||||
|
|
||||||
return vlans.map((vlan) => ({
|
const options = vlans.map((vlan) => ({
|
||||||
label: vlan.id,
|
label: vlan.id,
|
||||||
value: vlan.id,
|
value: vlan.id,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
return [{ label: this.t('generic.none'), value: '' }, ...options];
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -160,6 +162,14 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
onVlanChange(value) {
|
||||||
|
if (value === '') {
|
||||||
|
remove(this.value.spec, 'vlan');
|
||||||
|
} else {
|
||||||
|
set(this.value, 'spec.vlan', value);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
async saveSubnet(buttonCb) {
|
async saveSubnet(buttonCb) {
|
||||||
const errors = [];
|
const errors = [];
|
||||||
const name = this.value?.metadata?.name;
|
const name = this.value?.metadata?.name;
|
||||||
@@ -283,12 +293,13 @@ export default {
|
|||||||
</div>
|
</div>
|
||||||
<div class="col span-6">
|
<div class="col span-6">
|
||||||
<LabeledSelect
|
<LabeledSelect
|
||||||
v-model:value="value.spec.vlan"
|
:value="value.spec.vlan ?? ''"
|
||||||
class="mb-20"
|
class="mb-20"
|
||||||
:options="vlanOptions"
|
:options="vlanOptions"
|
||||||
:placeholder="t('harvester.subnet.vlan.placeholder')"
|
:placeholder="t('harvester.subnet.vlan.placeholder')"
|
||||||
:label="t('harvester.subnet.vlan.label')"
|
:label="t('harvester.subnet.vlan.label')"
|
||||||
:mode="mode"
|
:mode="mode"
|
||||||
|
@update:value="onVlanChange"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -246,4 +246,27 @@ export default {
|
|||||||
.group-actions {
|
.group-actions {
|
||||||
display: inline;
|
display: inline;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Match the enable/disable passthrough bulk-action buttons height to the .btn (40px) on the right.
|
||||||
|
:deep(.bulk .rc-button.btn-medium.bulk-action:not(.btn-sm)) {
|
||||||
|
min-height: 40px;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Make the collapsed "Actions" dropdown button 40px too.
|
||||||
|
:deep(.bulk .rc-button.btn-medium.bulk-actions-dropdown:not(.btn-sm)) {
|
||||||
|
min-height: 40px;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Lay the bulk row out with flex so the "N selected" label can wrap below the buttons.
|
||||||
|
:deep(.bulk) {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
:deep(.bulk .action-availability) {
|
||||||
|
flex-basis: 100%;
|
||||||
|
margin-left: 0;
|
||||||
|
margin-top: 6px;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
@@ -5,6 +5,7 @@ import LabeledSelect from '@shell/components/form/LabeledSelect';
|
|||||||
import Banner from '@components/Banner/Banner.vue';
|
import Banner from '@components/Banner/Banner.vue';
|
||||||
import remove from 'lodash/remove';
|
import remove from 'lodash/remove';
|
||||||
import { set } from '@shell/utils/object';
|
import { set } from '@shell/utils/object';
|
||||||
|
import { uniq } from '@shell/utils/array';
|
||||||
import { HCI } from '../../../types';
|
import { HCI } from '../../../types';
|
||||||
import DeviceList from './DeviceList';
|
import DeviceList from './DeviceList';
|
||||||
import CompatibilityMatrix from '../CompatibilityMatrix';
|
import CompatibilityMatrix from '../CompatibilityMatrix';
|
||||||
@@ -60,7 +61,15 @@ export default {
|
|||||||
row.allowDisable = !vmDeviceNames.includes(row.metadata.name);
|
row.allowDisable = !vmDeviceNames.includes(row.metadata.name);
|
||||||
});
|
});
|
||||||
|
|
||||||
vmDevices.forEach(({ name }) => {
|
// When off, read from spec; otherwise the spec name is a placeholder ('provisioned'),
|
||||||
|
// so read the real allocated device names from the deviceAllocationDetails annotation.
|
||||||
|
const hostDeviceNames = this.vm.isOff ? [
|
||||||
|
...vmDevices.map(({ name }) => name),
|
||||||
|
] : [
|
||||||
|
...Object.values(this.vm?.provisionedHostDevices || {}).reduce((acc, devices) => [...acc, ...devices], []),
|
||||||
|
];
|
||||||
|
|
||||||
|
uniq(hostDeviceNames).forEach((name) => {
|
||||||
if (this.enabledDevices.find((device) => device?.metadata?.name === name)) {
|
if (this.enabledDevices.find((device) => device?.metadata?.name === name)) {
|
||||||
selectedDevices.push(name);
|
selectedDevices.push(name);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -63,6 +63,7 @@ export default {
|
|||||||
RANCHER_TYPES,
|
RANCHER_TYPES,
|
||||||
fvFormRuleSets: [{ path: 'spec.displayName', rules: ['required'] }],
|
fvFormRuleSets: [{ path: 'spec.displayName', rules: ['required'] }],
|
||||||
canEditPSPBindings: true,
|
canEditPSPBindings: true,
|
||||||
|
isQuotasValid: true,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
@@ -190,15 +191,13 @@ export default {
|
|||||||
this['membershipUpdate'] = update;
|
this['membershipUpdate'] = update;
|
||||||
},
|
},
|
||||||
|
|
||||||
removeQuota(key) {
|
validateQuotas(isValid) {
|
||||||
['resourceQuota', 'namespaceDefaultResourceQuota'].forEach((specProp) => {
|
this.isQuotasValid = isValid;
|
||||||
if (this.value?.spec[specProp]?.limit && this.value?.spec[specProp]?.limit[key]) {
|
},
|
||||||
delete this.value?.spec[specProp]?.limit[key];
|
|
||||||
}
|
onQuotasInput({ projectLimit, nsLimit } = {}) {
|
||||||
if (this.value?.spec[specProp]?.usedLimit && this.value?.spec[specProp]?.usedLimit[key]) {
|
this.value.spec.resourceQuota = { ...this.value.spec.resourceQuota, limit: projectLimit };
|
||||||
delete this.value?.spec[specProp]?.usedLimit[key];
|
this.value.spec.namespaceDefaultResourceQuota = { ...this.value.spec.namespaceDefaultResourceQuota, limit: nsLimit };
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
@@ -212,7 +211,7 @@ export default {
|
|||||||
:resource="value"
|
:resource="value"
|
||||||
:subtypes="[]"
|
:subtypes="[]"
|
||||||
:can-yaml="false"
|
:can-yaml="false"
|
||||||
:validation-passed="fvFormIsValid"
|
:validation-passed="fvFormIsValid && isQuotasValid"
|
||||||
@error="e=>errors=e"
|
@error="e=>errors=e"
|
||||||
@finish="save"
|
@finish="save"
|
||||||
@cancel="done"
|
@cancel="done"
|
||||||
@@ -267,10 +266,11 @@ export default {
|
|||||||
:weight="9"
|
:weight="9"
|
||||||
>
|
>
|
||||||
<ResourceQuota
|
<ResourceQuota
|
||||||
v-model:value="value"
|
:value="value"
|
||||||
:mode="canEditTabElements"
|
:mode="canEditTabElements"
|
||||||
:types="isStandaloneHarvester ? HARVESTER_TYPES : RANCHER_TYPES"
|
:types="isStandaloneHarvester ? HARVESTER_TYPES : RANCHER_TYPES"
|
||||||
@remove="removeQuota"
|
@input="onQuotasInput"
|
||||||
|
@validationChanged="validateQuotas"
|
||||||
/>
|
/>
|
||||||
</Tab>
|
</Tab>
|
||||||
<Tab
|
<Tab
|
||||||
|
|||||||
@@ -835,13 +835,13 @@ harvester:
|
|||||||
title: "Network Data:"
|
title: "Network Data:"
|
||||||
tip: "The network-data configuration allows you to customize the instance's networking interfaces by assigning subnet configuration, virtual device creation (bonds, bridges, VLANs) routes and DNS configuration. <a href='https://cloudinit.readthedocs.io/en/latest/reference/network-config-format-v1.html' target='_blank'>Learn more</a>"
|
tip: "The network-data configuration allows you to customize the instance's networking interfaces by assigning subnet configuration, virtual device creation (bonds, bridges, VLANs) routes and DNS configuration. <a href='https://cloudinit.readthedocs.io/en/latest/reference/network-config-format-v1.html' target='_blank'>Learn more</a>"
|
||||||
sysprep:
|
sysprep:
|
||||||
title: Windows Sysprep Configuration
|
title: Windows Unattended & Sysprep Configuration
|
||||||
description: "Configure Windows automated installation using autounattend.xml. The configuration will be stored in a Kubernetes Secret and mounted as a CD-ROM during installation. <a href='https://docs.microsoft.com/en-us/windows-hardware/manufacture/desktop/automate-windows-setup' target='_blank'>Learn more</a>"
|
description: "Configure Windows automated installation using autounattend.xml. The configuration will be stored in a Kubernetes Secret and mounted as a CD-ROM during installation. <a href='https://docs.microsoft.com/en-us/windows-hardware/manufacture/desktop/automate-windows-setup' target='_blank'>Learn more</a>"
|
||||||
createNew: Create new...
|
createNew: Create new...
|
||||||
createNewTitle: Create Windows Sysprep Template
|
createNewTitle: Create Windows Unattended & Sysprep Template
|
||||||
xmlContent: autounattend.xml content
|
xmlContent: autounattend.xml content
|
||||||
secret:
|
secret:
|
||||||
label: Windows Sysprep Template
|
label: Windows Unattended & Sysprep Template
|
||||||
validation:
|
validation:
|
||||||
invalidXml: Invalid XML syntax
|
invalidXml: Invalid XML syntax
|
||||||
invalidNamespace: Invalid unattend.xml namespace. Expected 'urn:schemas-microsoft-com:unattend'
|
invalidNamespace: Invalid unattend.xml namespace. Expected 'urn:schemas-microsoft-com:unattend'
|
||||||
@@ -953,15 +953,33 @@ harvester:
|
|||||||
console:
|
console:
|
||||||
down: This virtual machine is down. Please start it to access its console.
|
down: This virtual machine is down. Please start it to access its console.
|
||||||
shortcutKeys: Shortcut Keys
|
shortcutKeys: Shortcut Keys
|
||||||
customShortcutKeys: Custom Shortcut Keys
|
settings:
|
||||||
management: Management Shortcut Keys
|
label: Settings
|
||||||
record:
|
viewMode:
|
||||||
start: Record
|
label: Display
|
||||||
recording: Recording
|
scale: Scale the display to fit the window
|
||||||
stop: Stop Recording
|
resize: Resize the virtual machine display to the window
|
||||||
tips: Press the record button to capture your keyboard inputs.
|
none: Manual zoom
|
||||||
send: Send
|
zoom: Zoom
|
||||||
preferredKeys: Preferred Custom Shortcut Keys
|
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.
|
||||||
terminationGracePeriodSeconds:
|
terminationGracePeriodSeconds:
|
||||||
label: Termination Grace Period
|
label: Termination Grace Period
|
||||||
affinity:
|
affinity:
|
||||||
@@ -2417,7 +2435,15 @@ typeDescription:
|
|||||||
harvester: "Branding allows administrators to globally re-brand the UI by customizing the Harvester product name, logos and color scheme."
|
harvester: "Branding allows administrators to globally re-brand the UI by customizing the Harvester product name, logos and color scheme."
|
||||||
|
|
||||||
advancedSettings:
|
advancedSettings:
|
||||||
experimental: 'Experimental features allow users to test and evaluate early-access functionality prior to official supported releases'
|
tags:
|
||||||
|
modified:
|
||||||
|
label: Modified
|
||||||
|
experimental:
|
||||||
|
label: Experimental
|
||||||
|
description: 'Experimental: The feature is incomplete but its essential functionality is operational. The feature is not recommended for use in production environments.'
|
||||||
|
preview:
|
||||||
|
label: Technical Preview
|
||||||
|
description: 'Technical Preview: The feature is almost complete and its functionality is not expected to change significantly. Explore the feature extensively before using in production environments.'
|
||||||
descriptions:
|
descriptions:
|
||||||
'harv-vlan': Default Network Interface name of the VLAN network.
|
'harv-vlan': Default Network Interface name of the VLAN network.
|
||||||
'harv-backup-target': Custom backup target to store virtual machine backups.
|
'harv-backup-target': Custom backup target to store virtual machine backups.
|
||||||
|
|||||||
@@ -38,6 +38,10 @@ export const SSH_EXISTING_TYPE = {
|
|||||||
export default {
|
export default {
|
||||||
methods: {
|
methods: {
|
||||||
hasCloudConfigComment(userScript) {
|
hasCloudConfigComment(userScript) {
|
||||||
|
if (typeof userScript === 'string' && /^\s*#cloud-config(\s|$)/.test(userScript)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
// Check that userData contains: #cloud-config
|
// Check that userData contains: #cloud-config
|
||||||
const userDataDoc = userScript ? YAML.parseDocument(userScript) : YAML.parseDocument({});
|
const userDataDoc = userScript ? YAML.parseDocument(userScript) : YAML.parseDocument({});
|
||||||
const items = userDataDoc?.contents?.items || [];
|
const items = userDataDoc?.contents?.items || [];
|
||||||
@@ -52,6 +56,14 @@ export default {
|
|||||||
exist = true;
|
exist = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (userDataDoc?.contents?.commentBefore === 'cloud-config' || userDataDoc?.contents?.commentBefore?.includes('cloud-config\n')) {
|
||||||
|
exist = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (userDataDoc?.contents?.comment === 'cloud-config' || userDataDoc?.contents?.comment?.includes('cloud-config\n')) {
|
||||||
|
exist = true;
|
||||||
|
}
|
||||||
|
|
||||||
items.map((item) => {
|
items.map((item) => {
|
||||||
const key = item.key;
|
const key = item.key;
|
||||||
|
|
||||||
|
|||||||
@@ -1211,9 +1211,10 @@ export default {
|
|||||||
|
|
||||||
userDataDoc = config.installAgent ? this.mergeQGA({ userDataDoc, ...config }) : this.deleteQGA({ userDataDoc, ...config });
|
userDataDoc = config.installAgent ? this.mergeQGA({ userDataDoc, ...config }) : this.deleteQGA({ userDataDoc, ...config });
|
||||||
const userDataYaml = userDataDoc.toString();
|
const userDataYaml = userDataDoc.toString();
|
||||||
|
const userDataValue = userDataDoc.toJSON();
|
||||||
|
|
||||||
if (userDataYaml === '{}\n') {
|
if (userDataValue === null || (typeof userDataValue === 'object' && !Array.isArray(userDataValue) && isEmpty(userDataValue))) {
|
||||||
// When the YAML parsed value is '{}\n', it means that the userData is empty, then undefined is returned.
|
// Empty userData should not create cloud-init content like `null`.
|
||||||
return undefined;
|
return undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -69,6 +69,11 @@ export default class HarvesterResource extends SteveModel {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Disable Resources/ Extras cards in resource details pages
|
||||||
|
get resourcesCardRows() {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
cleanForSave(data, _forNew) {
|
cleanForSave(data, _forNew) {
|
||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import SYSTEM_NAMESPACES from '@shell/config/system-namespaces';
|
|||||||
import { get } from '@shell/utils/object';
|
import { get } from '@shell/utils/object';
|
||||||
import { NAMESPACE } from '@shell/config/types';
|
import { NAMESPACE } from '@shell/config/types';
|
||||||
import { PRODUCT_NAME as HARVESTER_PRODUCT } from '@pkg/harvester/config/harvester';
|
import { PRODUCT_NAME as HARVESTER_PRODUCT } from '@pkg/harvester/config/harvester';
|
||||||
|
import { FORKLIFT_NAMESPACE } from '@pkg/harvester/config/harvester-map';
|
||||||
import { HCI } from '../../types';
|
import { HCI } from '../../types';
|
||||||
|
|
||||||
const OBSCURE_NAMESPACE_PREFIX = [
|
const OBSCURE_NAMESPACE_PREFIX = [
|
||||||
@@ -93,6 +94,10 @@ export default class HciNamespace extends namespace {
|
|||||||
}
|
}
|
||||||
|
|
||||||
get isSystem() {
|
get isSystem() {
|
||||||
|
if (this.metadata?.name === FORKLIFT_NAMESPACE) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
const systemNamespaces = ['fleet-default'];
|
const systemNamespaces = ['fleet-default'];
|
||||||
|
|
||||||
if (systemNamespaces.includes(this.metadata.name)) {
|
if (systemNamespaces.includes(this.metadata.name)) {
|
||||||
|
|||||||
@@ -1315,6 +1315,18 @@ export default class VirtVm extends HarvesterResource {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get provisionedHostDevices() {
|
||||||
|
// Rancher-provisioned VMs store hostDevices.name as a placeholder ('provisioned'); the
|
||||||
|
// real allocated PCI device names live in this annotation, keyed by resourceName.
|
||||||
|
try {
|
||||||
|
const deviceAllocationDetails = JSON.parse(this.metadata?.annotations[HCI_ANNOTATIONS.VM_DEVICE_ALLOCATION_DETAILS] || '{}');
|
||||||
|
|
||||||
|
return deviceAllocationDetails?.hostdevices || {};
|
||||||
|
} catch (error) {
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
get schedulingVMBackupFeatureEnabled() {
|
get schedulingVMBackupFeatureEnabled() {
|
||||||
return this.$rootGetters['harvester-common/getFeatureEnabled']('schedulingVMBackup');
|
return this.$rootGetters['harvester-common/getFeatureEnabled']('schedulingVMBackup');
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,9 @@
|
|||||||
<script>
|
<script>
|
||||||
import Loading from '@shell/components/Loading';
|
|
||||||
import { HCI } from '../../../../../types';
|
import { HCI } from '../../../../../types';
|
||||||
import SerialConsole from '../../../../../components/SerialConsole';
|
import SerialConsole from '../../../../../components/SerialConsole';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: { SerialConsole, Loading },
|
components: { SerialConsole },
|
||||||
|
|
||||||
async fetch() {
|
async fetch() {
|
||||||
this.rows = await this.$store.dispatch('harvester/findAll', { type: HCI.VMI });
|
this.rows = await this.$store.dispatch('harvester/findAll', { type: HCI.VMI });
|
||||||
@@ -38,16 +37,44 @@ export default {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<Loading v-if="$fetchState.pending" />
|
<div class="serial-console-page">
|
||||||
<SerialConsole
|
<SerialConsole
|
||||||
v-else
|
|
||||||
ref="serialConsole"
|
ref="serialConsole"
|
||||||
v-model:value="vmi"
|
:value="vmi || {}"
|
||||||
/>
|
/>
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss">
|
||||||
body, #__nuxt, #__layout, main {
|
html,
|
||||||
|
body,
|
||||||
|
#__nuxt,
|
||||||
|
#__layout,
|
||||||
|
main {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.serial-console-page {
|
||||||
|
position: fixed;
|
||||||
|
inset: 0;
|
||||||
|
min-height: 0;
|
||||||
|
background: var(--body-bg);
|
||||||
|
color: var(--terminal-text);
|
||||||
|
|
||||||
|
&::after {
|
||||||
|
content: '';
|
||||||
|
position: absolute;
|
||||||
|
left: 0;
|
||||||
|
right: 0;
|
||||||
|
bottom: 0;
|
||||||
|
height: 6px;
|
||||||
|
pointer-events: none;
|
||||||
|
background: linear-gradient(to bottom, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.15), rgba(0, 0, 0, 0.25));
|
||||||
|
}
|
||||||
|
|
||||||
|
.harvester-shell-container {
|
||||||
|
height: 100%;
|
||||||
|
background: var(--terminal-bg);
|
||||||
|
}
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
@@ -1,10 +1,18 @@
|
|||||||
<script>
|
<script>
|
||||||
|
import { defineAsyncComponent } from 'vue';
|
||||||
import Loading from '@shell/components/Loading';
|
import Loading from '@shell/components/Loading';
|
||||||
|
import TabTitle from '@shell/components/TabTitle';
|
||||||
import { HCI } from '../../../../../types';
|
import { HCI } from '../../../../../types';
|
||||||
import NovncConsoleWrapper from '../../../../../components/novnc/NovncConsoleWrapper.vue';
|
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: { NovncConsoleWrapper, Loading },
|
components: {
|
||||||
|
NovncConsoleWrapper: defineAsyncComponent({
|
||||||
|
loader: () => import('../../../../../components/novnc/NovncConsoleWrapper.vue'),
|
||||||
|
loadingComponent: Loading,
|
||||||
|
}),
|
||||||
|
Loading,
|
||||||
|
TabTitle
|
||||||
|
},
|
||||||
|
|
||||||
async fetch() {
|
async fetch() {
|
||||||
this.rows = await this.$store.dispatch('harvester/findAll', { type: HCI.VMI });
|
this.rows = await this.$store.dispatch('harvester/findAll', { type: HCI.VMI });
|
||||||
@@ -28,17 +36,21 @@ export default {
|
|||||||
|
|
||||||
mounted() {
|
mounted() {
|
||||||
window.addEventListener('beforeunload', () => {
|
window.addEventListener('beforeunload', () => {
|
||||||
this.$refs.console.close();
|
this.$refs.console?.close();
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
head() {
|
|
||||||
return { title: this.vmi?.metadata?.name };
|
|
||||||
},
|
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
|
<TabTitle
|
||||||
|
v-if="vmi?.metadata?.name"
|
||||||
|
:breadcrumb="false"
|
||||||
|
:show-child="false"
|
||||||
|
>
|
||||||
|
{{ vmi.metadata.name }}
|
||||||
|
</TabTitle>
|
||||||
<Loading v-if="$fetchState.pending" />
|
<Loading v-if="$fetchState.pending" />
|
||||||
<NovncConsoleWrapper
|
<NovncConsoleWrapper
|
||||||
v-else
|
v-else
|
||||||
|
|||||||
@@ -68,29 +68,35 @@ export default defineComponent({
|
|||||||
return (this.value || []).map((plan) => {
|
return (this.value || []).map((plan) => {
|
||||||
const planName = plan?.metadata?.name || '-';
|
const planName = plan?.metadata?.name || '-';
|
||||||
const namespace = plan?.metadata?.namespace || '';
|
const namespace = plan?.metadata?.namespace || '';
|
||||||
|
const networkMapRef = this.getPlanMapRef(plan, 'network');
|
||||||
|
const storageMapRef = this.getPlanMapRef(plan, 'storage');
|
||||||
|
|
||||||
const migrations = existing[HCI.FORKLIFT_MIGRATION]
|
const migrations = existing[HCI.FORKLIFT_MIGRATION]
|
||||||
.filter((resource) => this.ownedByPlan(resource, plan))
|
.filter((resource) => this.ownedByPlan(resource, plan))
|
||||||
.map((resource) => ({
|
.map((resource) => resource?.metadata?.name)
|
||||||
name: resource?.metadata?.name,
|
.filter(Boolean);
|
||||||
namespace: resource?.metadata?.namespace || namespace,
|
|
||||||
}));
|
|
||||||
|
|
||||||
const matchedNetworkMap = existing[HCI.FORKLIFT_NETWORK_MAP].find((resource) => this.ownedByPlan(resource, plan));
|
const matchedNetworkMap = networkMapRef ? existing[HCI.FORKLIFT_NETWORK_MAP].find((resource) => resource?.metadata?.name === networkMapRef.name && resource?.metadata?.namespace === networkMapRef.namespace) : null;
|
||||||
const matchedStorageMap = existing[HCI.FORKLIFT_STORAGE_MAP].find((resource) => this.ownedByPlan(resource, plan));
|
const matchedStorageMap = storageMapRef ? existing[HCI.FORKLIFT_STORAGE_MAP].find((resource) => resource?.metadata?.name === storageMapRef.name && resource?.metadata?.namespace === storageMapRef.namespace) : null;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
planName,
|
planName,
|
||||||
namespace,
|
namespace,
|
||||||
migrations,
|
migrations,
|
||||||
networkMap: matchedNetworkMap ? {
|
networkMap: matchedNetworkMap ? {
|
||||||
namespace: matchedNetworkMap?.metadata?.namespace || namespace,
|
namespace: matchedNetworkMap?.metadata?.namespace || networkMapRef?.namespace || namespace,
|
||||||
name: matchedNetworkMap?.metadata?.name,
|
name: matchedNetworkMap?.metadata?.name,
|
||||||
} : null,
|
} : (networkMapRef ? {
|
||||||
|
namespace: networkMapRef.namespace,
|
||||||
|
name: networkMapRef.name,
|
||||||
|
} : null),
|
||||||
storageMap: matchedStorageMap ? {
|
storageMap: matchedStorageMap ? {
|
||||||
namespace: matchedStorageMap?.metadata?.namespace || namespace,
|
namespace: matchedStorageMap?.metadata?.namespace || storageMapRef?.namespace || namespace,
|
||||||
name: matchedStorageMap?.metadata?.name,
|
name: matchedStorageMap?.metadata?.name,
|
||||||
} : null,
|
} : (storageMapRef ? {
|
||||||
|
namespace: storageMapRef.namespace,
|
||||||
|
name: storageMapRef.name,
|
||||||
|
} : null),
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
@@ -113,6 +119,20 @@ export default defineComponent({
|
|||||||
methods: {
|
methods: {
|
||||||
resourceNames,
|
resourceNames,
|
||||||
|
|
||||||
|
getPlanMapRef(plan, mapType) {
|
||||||
|
const ref = plan?.spec?.map?.[mapType];
|
||||||
|
const name = ref?.name;
|
||||||
|
|
||||||
|
if (!name) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
name,
|
||||||
|
namespace: ref?.namespace || plan?.metadata?.namespace || '',
|
||||||
|
};
|
||||||
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Determine whether a related resource (migration / network map / storage map)
|
* Determine whether a related resource (migration / network map / storage map)
|
||||||
* is owned by the given plan by inspecting its `metadata.ownerReferences`.
|
* is owned by the given plan by inspecting its `metadata.ownerReferences`.
|
||||||
@@ -137,9 +157,8 @@ export default defineComponent({
|
|||||||
const existing = this.existingRelatedResources;
|
const existing = this.existingRelatedResources;
|
||||||
const targets = new Map();
|
const targets = new Map();
|
||||||
|
|
||||||
const addTarget = (type, resource) => {
|
const addTarget = (type, name, namespace) => {
|
||||||
const name = resource?.metadata?.name;
|
const ns = namespace || '';
|
||||||
const ns = resource?.metadata?.namespace;
|
|
||||||
|
|
||||||
if (!name) {
|
if (!name) {
|
||||||
return;
|
return;
|
||||||
@@ -153,17 +172,20 @@ export default defineComponent({
|
|||||||
};
|
};
|
||||||
|
|
||||||
for (const plan of this.value || []) {
|
for (const plan of this.value || []) {
|
||||||
existing[HCI.FORKLIFT_NETWORK_MAP]
|
const networkMapRef = this.getPlanMapRef(plan, 'network');
|
||||||
.filter((resource) => this.ownedByPlan(resource, plan))
|
const storageMapRef = this.getPlanMapRef(plan, 'storage');
|
||||||
.forEach((resource) => addTarget(HCI.FORKLIFT_NETWORK_MAP, resource));
|
|
||||||
|
|
||||||
existing[HCI.FORKLIFT_STORAGE_MAP]
|
if (networkMapRef) {
|
||||||
.filter((resource) => this.ownedByPlan(resource, plan))
|
addTarget(HCI.FORKLIFT_NETWORK_MAP, networkMapRef.name, networkMapRef.namespace);
|
||||||
.forEach((resource) => addTarget(HCI.FORKLIFT_STORAGE_MAP, resource));
|
}
|
||||||
|
|
||||||
|
if (storageMapRef) {
|
||||||
|
addTarget(HCI.FORKLIFT_STORAGE_MAP, storageMapRef.name, storageMapRef.namespace);
|
||||||
|
}
|
||||||
|
|
||||||
existing[HCI.FORKLIFT_MIGRATION]
|
existing[HCI.FORKLIFT_MIGRATION]
|
||||||
.filter((resource) => this.ownedByPlan(resource, plan))
|
.filter((resource) => this.ownedByPlan(resource, plan))
|
||||||
.forEach((resource) => addTarget(HCI.FORKLIFT_MIGRATION, resource));
|
.forEach((resource) => addTarget(HCI.FORKLIFT_MIGRATION, resource?.metadata?.name, resource?.metadata?.namespace));
|
||||||
}
|
}
|
||||||
|
|
||||||
return [...targets.values()];
|
return [...targets.values()];
|
||||||
@@ -256,11 +278,11 @@ export default defineComponent({
|
|||||||
<div>• {{ t('harvester.addons.vmMigration.labels.migration') }}:</div>
|
<div>• {{ t('harvester.addons.vmMigration.labels.migration') }}:</div>
|
||||||
<template v-if="summary.migrations.length">
|
<template v-if="summary.migrations.length">
|
||||||
<div
|
<div
|
||||||
v-for="migration in summary.migrations"
|
v-for="migrationName in summary.migrations"
|
||||||
:key="`${ migration.namespace }/${ migration.name }`"
|
:key="migrationName"
|
||||||
>
|
>
|
||||||
<div class="ml-20">
|
<div class="ml-20">
|
||||||
- {{ migration.name }}
|
- {{ migrationName }}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -1 +1,24 @@
|
|||||||
module.exports = require('@rancher/shell/pkg/vue.config')(__dirname);
|
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 } };
|
||||||
|
}
|
||||||
|
};
|
||||||
+21
-1
@@ -1,6 +1,26 @@
|
|||||||
|
const path = require('path');
|
||||||
const config = require('@rancher/shell/vue.config');
|
const config = require('@rancher/shell/vue.config');
|
||||||
|
|
||||||
module.exports = config(__dirname, {
|
const baseConfig = config(__dirname, {
|
||||||
excludes: [],
|
excludes: [],
|
||||||
// excludes: ['harvester']
|
// 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 } };
|
||||||
|
}
|
||||||
|
};
|
||||||
Reference in new issue
Block a user