diff --git a/package.json b/package.json index 69cf884b..4a056308 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "node": ">=20.0.0" }, "dependencies": { - "@rancher/shell": "3.0.5-rc.3", + "@rancher/shell": "3.0.5-rc.5", "cache-loader": "^4.1.0", "color": "4.2.3", "ip": "2.0.1", diff --git a/pkg/harvester/config/harvester-cluster.js b/pkg/harvester/config/harvester-cluster.js index 1d4a3e56..b7dba1ad 100644 --- a/pkg/harvester/config/harvester-cluster.js +++ b/pkg/harvester/config/harvester-cluster.js @@ -34,6 +34,7 @@ import { SNAPSHOT_TARGET_VOLUME, IMAGE_VIRTUAL_SIZE, IMAGE_STORAGE_CLASS, + HARVESTER_DESCRIPTION } from './table-headers'; const TEMPLATE = HCI.VM_VERSION; @@ -223,7 +224,7 @@ export function init($plugin, store) { STATE, NAME_COL, NAMESPACE_COL, - DESCRIPTION, + HARVESTER_DESCRIPTION, IMAGE_STORAGE_CLASS, IMAGE_PROGRESS, IMAGE_DOWNLOAD_SIZE, diff --git a/pkg/harvester/config/table-headers.js b/pkg/harvester/config/table-headers.js index dc5234f6..2dc69822 100644 --- a/pkg/harvester/config/table-headers.js +++ b/pkg/harvester/config/table-headers.js @@ -1,6 +1,7 @@ /** * Harvester */ +import { DESCRIPTION } from '@shell/config/table-headers'; // image export const IMAGE_DOWNLOAD_SIZE = { @@ -96,5 +97,10 @@ export const IMAGE_STORAGE_CLASS = { sort: 'imageStorageClass', value: 'imageStorageClass', align: 'left', - width: 200, + width: 150, +}; + +export const HARVESTER_DESCRIPTION = { + ...DESCRIPTION, + width: 150, }; diff --git a/yarn.lock b/yarn.lock index 0b3aae00..fb2a9b62 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2831,6 +2831,11 @@ resolved "https://registry.yarnpkg.com/@jsep-plugin/regex/-/regex-1.0.4.tgz#cb2fc423220fa71c609323b9ba7f7d344a755fcc" integrity sha512-q7qL4Mgjs1vByCaTnDFcBnV9HS7GVPJX5vyVoCgZHNSC9rjwIlmbXG5sUuorR5ndfHAIlJ8pVStxvjXHbNvtUg== +"@kurkle/color@^0.3.0": + version "0.3.4" + resolved "https://registry.yarnpkg.com/@kurkle/color/-/color-0.3.4.tgz#4d4ff677e1609214fc71c580125ddddd86abcabf" + integrity sha512-M5UknZPHRu3DEDWoipU6sE8PdkZ6Z/S+v4dD+Ke8IaNlpdSQah50lz1KtcFBa2vsdOnwbbnxJwVM4wty6udA5w== + "@leichtgewicht/ip-codec@^2.0.1": version "2.0.5" resolved "https://registry.yarnpkg.com/@leichtgewicht/ip-codec/-/ip-codec-2.0.5.tgz#4fc56c15c580b9adb7dc3c333a134e540b44bfb1" @@ -2978,10 +2983,10 @@ resolved "https://registry.yarnpkg.com/@rancher/icons/-/icons-2.0.29.tgz#6546d69768c706bebd66bfa73b36aef3d105987a" integrity sha512-qBBqfazS9y5VjV7fJDPNXmxd9AP/2uiE05mKFWP41kpbO+tEb62RnUBXCm14XLeScDZQcOuiAKVHMmvCFzF0BA== -"@rancher/shell@3.0.5-rc.3": - version "3.0.5-rc.3" - resolved "https://registry.yarnpkg.com/@rancher/shell/-/shell-3.0.5-rc.3.tgz#8dae16e7a9f1ec7c952449d194023ad7eeefdb2f" - integrity sha512-2EkcS2WECWJz/wEnd2NZFHPomST8wWrJqml1z7rTRkF9vTJMltTOpshZGyAhIBmeNLRYOJKh/VU5l7YInALlcQ== +"@rancher/shell@3.0.5-rc.5": + version "3.0.5-rc.5" + resolved "https://registry.yarnpkg.com/@rancher/shell/-/shell-3.0.5-rc.5.tgz#1b6d37f77e5da848523fe45696248dd7bcd352e9" + integrity sha512-RlNlQ73TIleIeFaIQIBVQmi7hAZS7QxLQsFDVYmqTi0nayk/v++2wLV8QVCkg2n+hxs1M+436VI7eRYlhW3P0w== dependencies: "@aws-sdk/client-ec2" "3.658.1" "@aws-sdk/client-eks" "3.1.0" @@ -3012,6 +3017,7 @@ babel-plugin-module-resolver "4.0.0" babel-preset-vue "2.0.2" cache-loader "4.1.0" + chart.js "4.4.8" clipboard-polyfill "4.0.1" codemirror ">=5.64.0 <6" codemirror-editor-vue3 "2.8.0" @@ -5581,6 +5587,13 @@ char-regex@^1.0.2: resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw== +chart.js@4.4.8: + version "4.4.8" + resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-4.4.8.tgz#54645b638e9d585099bc16b892947b5e6cd2a552" + integrity sha512-IkGZlVpXP+83QpMm4uxEiGqSI7jFizwVtF3+n5Pc3k7sMO+tkd0qxh2OzLhenM0K80xtmAONWGBn082EiBQSDA== + dependencies: + "@kurkle/color" "^0.3.0" + check-more-types@2.24.0, check-more-types@^2.24.0: version "2.24.0" resolved "https://registry.yarnpkg.com/check-more-types/-/check-more-types-2.24.0.tgz#1420ffb10fd444dcfc79b43891bbfffd32a84600"