From 2dff7b0a93d18042ee4abd7f520605f0b9d7a85f Mon Sep 17 00:00:00 2001 From: Andy Lee Date: Fri, 14 Mar 2025 16:47:04 +0800 Subject: [PATCH] upgrade rancher/shell to 3.0.2-rc6 (#206) Signed-off-by: Andy Lee --- package.json | 2 +- .../components/settings/csi-driver-config.vue | 5 --- .../kubevirt.io.virtualmachine.vue | 10 +----- yarn.lock | 31 ++++++------------- 4 files changed, 11 insertions(+), 37 deletions(-) diff --git a/package.json b/package.json index 10097455..363919ec 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "node": ">=20.0.0" }, "dependencies": { - "@rancher/shell": "3.0.2-rc.3", + "@rancher/shell": "3.0.2-rc.6", "cache-loader": "^4.1.0", "color": "4.2.3", "ip": "2.0.1", diff --git a/pkg/harvester/components/settings/csi-driver-config.vue b/pkg/harvester/components/settings/csi-driver-config.vue index f7549a69..07db4109 100644 --- a/pkg/harvester/components/settings/csi-driver-config.vue +++ b/pkg/harvester/components/settings/csi-driver-config.vue @@ -174,10 +174,6 @@ export default { return driver === LONGHORN_DRIVER || this.allowEmptySnapshotClassNameFeatureEnabled; }, - isBackupVolumeSnapshotClassNameSelectable(driver) { - return driver === LONGHORN_DRIVER; - }, - add() { this.configArr.push({ key: '', @@ -247,7 +243,6 @@ export default { :options="getVolumeSnapshotOptions(driver.key)" :required="isBackupVolumeSnapshotRequired(driver.key)" :label="t('harvester.setting.csiDriverConfig.backupVolumeSnapshotClassName')" - @selectable="isBackupVolumeSnapshotClassNameSelectable(driver.key)" @keydown.native.enter.prevent="()=>{}" @update:value="update" /> diff --git a/pkg/harvester/promptRemove/kubevirt.io.virtualmachine.vue b/pkg/harvester/promptRemove/kubevirt.io.virtualmachine.vue index 4ecbae33..bcabf806 100644 --- a/pkg/harvester/promptRemove/kubevirt.io.virtualmachine.vue +++ b/pkg/harvester/promptRemove/kubevirt.io.virtualmachine.vue @@ -16,14 +16,12 @@ export default { return []; } }, - names: { type: Array, default: () => { return []; } }, - type: { type: String, required: true @@ -69,12 +67,6 @@ export default { return out; }, - - plusMore() { - const remaining = this.toRemove.length - this.names.length; - - return this.t('promptRemove.andOthers', { count: remaining }); - }, }, watch: { @@ -143,7 +135,7 @@ export default {
{{ t('promptRemove.attemptingToRemove', {type}) }} - +
{{ t('harvester.virtualMachine.promptRemove.title') }} diff --git a/yarn.lock b/yarn.lock index 4587861d..e540ff0d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3200,10 +3200,10 @@ resolved "https://registry.yarnpkg.com/@rancher/icons/-/icons-2.0.29.tgz#6546d69768c706bebd66bfa73b36aef3d105987a" integrity sha512-qBBqfazS9y5VjV7fJDPNXmxd9AP/2uiE05mKFWP41kpbO+tEb62RnUBXCm14XLeScDZQcOuiAKVHMmvCFzF0BA== -"@rancher/shell@3.0.2-rc.3": - version "3.0.2-rc.3" - resolved "https://registry.yarnpkg.com/@rancher/shell/-/shell-3.0.2-rc.3.tgz#745d4970425ba0bddf1a8003ff7f82d408566da8" - integrity sha512-K5jCaNfyltjCSTQUgzFFntmO5HT1Uu+vM1aJsMCjiwiyrNPBsf0Z3ic9Is6HSvOs9DB+W5j7jvHwouuq0sxUlw== +"@rancher/shell@3.0.2-rc.6": + version "3.0.2-rc.6" + resolved "https://registry.yarnpkg.com/@rancher/shell/-/shell-3.0.2-rc.6.tgz#bde65a3da391c4aa0352e2adf8180900a2575000" + integrity sha512-UpNCv0iZH16nlo+x/4xVisIX20v1JrQC47GUUtXcGDw9pde6HnnBPxpN0cF32r+Kg7F0QRp4Yvjoljmpp1HS7g== dependencies: "@aws-sdk/client-ec2" "3.658.1" "@aws-sdk/client-eks" "3.1.0" @@ -3258,7 +3258,7 @@ entities "4.5.0" eslint "7.32.0" eslint-config-standard "16.0.3" - eslint-import-resolver-node "0.3.4" + eslint-import-resolver-node "0.3.9" eslint-module-utils "2.6.1" eslint-plugin-cypress "2.12.1" eslint-plugin-import "2.31.0" @@ -3279,7 +3279,7 @@ jest-serializer-vue "2.0.2" jexl "2.3.0" jquery "3.5.1" - js-cookie "2.2.1" + js-cookie "3.0.5" js-yaml "4.1.0" js-yaml-loader "1.2.2" jsdiff "1.1.1" @@ -6999,7 +6999,7 @@ debounce@^1.2.1: resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5" integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug== -debug@2.6.9, debug@^2.6.9: +debug@2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== @@ -7672,15 +7672,7 @@ eslint-config-standard@16.0.3: resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-16.0.3.tgz#6c8761e544e96c531ff92642eeb87842b8488516" integrity sha512-x4fmJL5hGqNJKGHSjnLdgA6U6h1YW/G2dW9fA+cyVur4SK6lyue8+UgNKWlZtUDTXvgKDD/Oa3GQjmB5kjtVvg== -eslint-import-resolver-node@0.3.4: - version "0.3.4" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717" - integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA== - dependencies: - debug "^2.6.9" - resolve "^1.13.1" - -eslint-import-resolver-node@^0.3.9: +eslint-import-resolver-node@0.3.9, eslint-import-resolver-node@^0.3.9: version "0.3.9" resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz#d4eaac52b8a2e7c3cd1903eb00f7e053356118ac" integrity sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g== @@ -10275,12 +10267,7 @@ js-beautify@^1.14.9, js-beautify@^1.6.12: js-cookie "^3.0.5" nopt "^7.2.0" -js-cookie@2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8" - integrity sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ== - -js-cookie@^3.0.5: +js-cookie@3.0.5, js-cookie@^3.0.5: version "3.0.5" resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.5.tgz#0b7e2fd0c01552c58ba86e0841f94dc2557dcdbc" integrity sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==