Merge pull request #141 from harvester/mergify/bp/release-harvester-v1.5/pr-140

update yarn.lock (backport #140)

.github/mergify.yml

@@ -0,0 +1,19 @@
+pull_request_rules:
+- name: Automatically open backport PR to release-harvester-v1.5
+  conditions:
+    - base=main
+  actions:
+    backport:
+      branches:
+        - "release-harvester-v1.5"
+      assignees:
+        - "{{ author }}"
+      labels:
+        - "v1.5 backport PR"
+
+- name: Ask to resolve conflict
+  conditions:
+    - conflict
+  actions:
+    comment:
+      message: This pull request is now in conflict. Could you fix it @{{author}}? 🙏

.github/workflows/build-and-upload-release.yaml

@@ -0,0 +1,21 @@
+name: Build Dashboard (Release)
+on:
+  push:
+    tags:
+      - v[1-9].*
+
+jobs:
+  build-validation:
+    name: Build Test
+    uses: ./.github/workflows/test.yaml
+  build:
+    name: Build and Upload Package
+    uses: ./.github/workflows/build-and-upload.yaml
+    needs:
+      - build-validation
+    permissions:
+      contents: read
+      packages: write
+      id-token: write
+    with:
+      CI_BUILD_TAG: ${{github.ref_name}}

README.md

@@ -70,7 +70,7 @@ For developers, after reading through the introduction on this page, head over t
 
 License
 =======
-Copyright (c) 2014-2023 [Rancher Labs, Inc.](http://rancher.com)
+Copyright (c) 2014-2025 [SUSE, LLC.](https://www.suse.com/)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package.json

@@ -6,13 +6,14 @@
     "node": ">=20.0.0"
   },
   "dependencies": {
-    "@rancher/shell": "3.0.1-rc.4",
+    "@rancher/shell": "3.0.2-rc.3",
     "cache-loader": "^4.1.0",
     "color": "4.2.3",
     "ip": "2.0.1",
     "node-polyfill-webpack-plugin": "^3.0.0",
-    "sortablejs-vue3": "^1.2.11",
-    "yaml": "^2.5.1"
+    "vue-draggable-next": "^2.2.1",
+    "yaml": "^2.5.1",
+    "@babel/plugin-transform-class-static-block": "7.26.0"
   },
   "resolutions": {
     "@types/node": "~20.10.0",
@@ -46,4 +47,4 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^7.1.0"
   }
-}
+}

pkg/harvester/babel.config.js

@@ -1 +1,9 @@
-module.exports = require('@rancher/shell/pkg/babel.config');
+const baseConfig = require('@rancher/shell/pkg/babel.config');
+
+module.exports = {
+  ...baseConfig,
+  plugins: [
+    ...(baseConfig.plugins || []),
+    '@babel/plugin-transform-class-static-block'
+  ]
+};

pkg/harvester/components/FilterVMSchedule.vue

@@ -25,6 +25,9 @@ export default {
 
       return Array.from(new Set(options));
     },
+    enableFilterButton() {
+      return this.rows.some((r) => r.sourceSchedule !== undefined);
+    }
   },
 
   methods: {
@@ -63,27 +66,30 @@ export default {
 </script>
 
 <template>
-  <div class="vm-schedule-filter">
-    <template>
-      <span
-        v-if="selected"
-        class="banner-item bg-warning"
-      >
-        {{ t('harvester.tableHeaders.vmSchedule') }}{{ selected ? ` = ${selected}`: '' }}<i
-          class="icon icon-close ml-5"
-          @click="remove"
-        />
-      </span>
-    </template>
-
+  <div
+    class="vm-schedule-filter"
+  >
+    <span
+      v-if="selected"
+      class="banner-item bg-warning"
+    >
+      {{ t('harvester.tableHeaders.vmSchedule') }}{{ selected ? ` = ${selected}`: '' }}
+      <i
+        class="icon icon-close ml-5"
+        @click="remove"
+      />
+    </span>
     <v-dropdown
+      popper-class="vm-schedule-dropdown"
       :triggers="scheduleOptions.length ? ['click'] : []"
       placement="bottom-end"
       offset="1"
+      :distance="20"
     >
       <button
         ref="actionDropDown"
         class="btn bg-primary mr-10"
+        :disabled="!enableFilterButton"
       >
         <slot name="title">
           {{ t('harvester.fields.filterSchedule') }}
@@ -98,7 +104,7 @@ export default {
             name="model"
             :options="scheduleOptions"
             :labels="scheduleOptions"
-            @input="onSelect"
+            @update:value="onSelect"
           />
         </div>
       </template>
@@ -106,6 +112,12 @@ export default {
   </div>
 </template>
 
+<style lang="scss">
+.vm-schedule-dropdown .v-popper__arrow-container {
+  display: none;
+}
+</style>
+
 <style lang="scss" scoped>
 .vm-schedule-filter {
   display: inline-block;

pkg/harvester/components/HarvesterUpgrade.vue

@@ -5,8 +5,10 @@ import { Checkbox } from '@components/Form/Checkbox';
 import ModalWithCard from '@shell/components/ModalWithCard';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import { Banner } from '@components/Banner';
+import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
 import { HCI } from '../types';
 import UpgradeInfo from './UpgradeInfo';
+
 export default {
   name: 'HarvesterUpgrade',
 
@@ -28,14 +30,15 @@ export default {
 
   data() {
     return {
-      upgrade:          [],
-      upgradeMessage:   [],
-      errors:           '',
-      selectMode:       true,
-      version:          '',
-      enableLogging:    true,
-      readyReleaseNote: false,
-      isOpen:           false
+      upgrade:                      [],
+      upgradeMessage:               [],
+      errors:                       '',
+      selectMode:                   true,
+      version:                      '',
+      enableLogging:                true,
+      skipSingleReplicaDetachedVol: false,
+      readyReleaseNote:             false,
+      isOpen:                       false
     };
   },
 
@@ -68,6 +71,10 @@ export default {
       return this.$store.getters['harvester/schemaFor'](HCI.UPGRADE_LOG);
     },
 
+    skipSingleReplicaDetachedVolFeatureEnabled() {
+      return this.$store.getters['harvester-common/getFeatureEnabled']('skipSingleReplicaDetachedVol');
+    },
+
     releaseLink() {
       return `https://github.com/harvester/harvester/releases/tag/${ this.version }`;
     }
@@ -104,6 +111,11 @@ export default {
         spec: { version: this.version }
       };
 
+      if (this.skipSingleReplicaDetachedVolFeatureEnabled && this.skipSingleReplicaDetachedVol) {
+        upgradeValue.metadata.annotations =
+          { [HCI_ANNOTATIONS.SKIP_SINGLE_REPLICA_DETACHED_VOL]: JSON.stringify(this.skipSingleReplicaDetachedVol) };
+      }
+
       if (this.canEnableLogging) {
         upgradeValue.spec.logEnabled = this.enableLogging;
       }
@@ -190,6 +202,21 @@ export default {
             />
           </div>
 
+          <div
+            v-if="skipSingleReplicaDetachedVolFeatureEnabled"
+            class="mb-5"
+          >
+            <Checkbox
+              v-model:value="skipSingleReplicaDetachedVol"
+              class="check"
+              type="checkbox"
+              :label="t('harvester.upgradePage.skipSingleReplicaDetachedVol')"
+            />
+          </div>
+          <hr
+            v-if="version"
+            class="divider"
+          />
           <div v-if="version">
             <p
               v-clean-html="t('harvester.upgradePage.releaseTip', {url: releaseLink}, true)"

pkg/harvester/components/SerialConsole/index.vue

@@ -60,7 +60,8 @@ export default {
         });
 
         this.queue = [];
-      }, 5)
+      }, 10),
+      deep: true
     }
   },
 

pkg/harvester/components/settings/storage-network.vue

@@ -12,6 +12,9 @@ import { NODE } from '@shell/config/types';
 import { HCI } from '../../types';
 import { DOC } from '../../config/doc-links';
 import { docLink } from '../../utils/feature-flags';
+import { NETWORK_TYPE } from '../../config/types';
+
+const { L2VLAN, UNTAGGED } = NETWORK_TYPE;
 
 export default {
   name: 'HarvesterEditStorageNetwork',
@@ -57,11 +60,14 @@ export default {
   data() {
     let parsedDefaultValue = {};
     let openVlan = false;
+    let networkType = L2VLAN;
 
     try {
       parsedDefaultValue = JSON.parse(this.value.value);
+      networkType = 'vlan' in parsedDefaultValue ? L2VLAN : UNTAGGED; // backend doesn't provide networkType, so we check if vlan is provided instead
       openVlan = true;
     } catch (error) {
+      networkType = L2VLAN;
       parsedDefaultValue = {
         vlan:           '',
         clusterNetwork: '',
@@ -73,6 +79,7 @@ export default {
 
     return {
       openVlan,
+      networkType,
       errors:          [],
       exclude,
       parsedDefaultValue,
@@ -87,16 +94,35 @@ export default {
   },
 
   computed: {
+    showVlan() {
+      return this.networkType === L2VLAN;
+    },
+    networkTypes() {
+      const types = [L2VLAN];
+
+      if (this.untaggedNetworkSettingEnabled) {
+        types.push(UNTAGGED);
+      }
+
+      return types;
+    },
     storageNetworkExampleLink() {
       const version = this.$store.getters['harvester-common/getServerVersion']();
 
       return docLink(DOC.STORAGE_NETWORK_EXAMPLE, version);
     },
+
+    untaggedNetworkSettingEnabled() {
+      return this.$store.getters['harvester-common/getFeatureEnabled']('untaggedNetworkSetting');
+    },
+
     clusterNetworkOptions() {
       const inStore = this.$store.getters['currentProduct'].inStore;
       const clusterNetworks = this.$store.getters[`${ inStore }/all`](HCI.CLUSTER_NETWORK) || [];
+      // untaggedNetwork filter out mgmt cluster network
+      const clusterNetworksOptions = this.networkType === UNTAGGED ? clusterNetworks.filter((net) => net.id !== 'mgmt') : clusterNetworks;
 
-      return clusterNetworks.map((n) => {
+      return clusterNetworksOptions.map((n) => {
         const disabled = !n.isReadyForStorageNetwork;
 
         return {
@@ -108,7 +134,50 @@ export default {
     },
   },
 
+  watch: {
+    networkType: {
+      handler(neu) {
+        this.parsedDefaultValue.clusterNetwork = '';
+
+        if (neu === L2VLAN) {
+          this.parsedDefaultValue.vlan = '';
+        } else {
+          delete this.parsedDefaultValue.vlan;
+        }
+      },
+      deep: true
+    }
+  },
+
   methods: {
+    inputVlan(neu) {
+      if (neu === '') {
+        this.parsedDefaultValue.vlan = '';
+
+        return;
+      }
+      const newValue = Number(neu);
+
+      if (newValue > 4094) {
+        this.parsedDefaultValue.vlan = 4094;
+      } else if (newValue < 1) {
+        this.parsedDefaultValue.vlan = 1;
+      } else {
+        this.parsedDefaultValue.vlan = newValue;
+      }
+    },
+
+    useDefault() {
+      this.openVlan = false;
+      this.networkType = L2VLAN;
+      this.parsedDefaultValue = {
+        vlan:           '',
+        clusterNetwork: '',
+        range:          '',
+        exclude:        []
+      };
+    },
+
     update() {
       const exclude = this.exclude.filter((ip) => ip);
 
@@ -138,7 +207,7 @@ export default {
           errors.push(this.t('harvester.setting.storageNetwork.range.invalid', null, true));
         }
 
-        if (!this.parsedDefaultValue.vlan) {
+        if (this.networkType === L2VLAN && !this.parsedDefaultValue.vlan) {
           errors.push(this.t('validation.required', { key: this.t('harvester.setting.storageNetwork.vlan') }, true));
         }
 
@@ -191,13 +260,25 @@ export default {
     />
 
     <div v-if="openVlan">
+      <LabeledSelect
+        v-model:value="networkType"
+        class="mb-20"
+        :options="networkTypes"
+        :mode="mode"
+        :label="t('harvester.fields.type')"
+        required
+      />
+
       <LabeledInput
+        v-if="showVlan"
         v-model:value.number="parsedDefaultValue.vlan"
         type="number"
         class="mb-20"
         :mode="mode"
         required
+        placeholder="e.g. 1 - 4094"
         label-key="harvester.setting.storageNetwork.vlan"
+        @update:value="inputVlan"
       />
 
       <LabeledSelect

pkg/harvester/config/feature-flags.js

@@ -17,9 +17,15 @@ const featuresV132 = [
   'improveMaintenanceMode',
 ];
 
+// TODO: add v1.3.3 official release note
+// https://github.com/harvester/dashboard/releases/tag/v1.3.3-dev-20250105
+const featuresV133 = [
+  ...featuresV132,
+];
+
 // https://github.com/harvester/dashboard/releases/tag/v1.4.0
 const featuresV140 = [
-  ...featuresV132,
+  ...featuresV133,
   'cpuPinning',
   'usbPassthrough',
   'volumeEncryption',
@@ -29,16 +35,32 @@ const featuresV140 = [
   'improveMaintenanceMode',
 ];
 
-// TODO: add v1.4.1 official release note
-// https://github.com/harvester/dashboard/releases/tag/v1.4.1-rc1
+// https://github.com/harvester/dashboard/releases/tag/v1.4.1
 const featuresV141 = [
   ...featuresV140
 ];
 
+// TODO: add v1.4.2 official release note
+const featuresV142 = [
+  ...featuresV141
+];
+
+// TODO: add v1.5.0 official release note
+const featuresV150 = [
+  ...featuresV142,
+  'tpmPersistentState',
+  'efiPersistentState',
+  'untaggedNetworkSetting',
+  'skipSingleReplicaDetachedVol'
+];
+
 export const RELEASE_FEATURES = {
   'v1.3.0': featuresV130,
   'v1.3.1': featuresV131,
   'v1.3.2': featuresV132,
+  'v1.3.3': featuresV133,
   'v1.4.0': featuresV140,
   'v1.4.1': featuresV141,
+  'v1.4.2': featuresV142,
+  'v1.5.0': featuresV150
 };

pkg/harvester/config/labels-annotations.js

@@ -7,60 +7,61 @@ export const LABELS_TO_IGNORE_REGEX = [
 ];
 
 export const HCI = {
-  CLOUD_INIT:                     'harvesterhci.io/cloud-init-template',
-  CURRENT_IP:                     'rke2.io/internal-ip',
-  IMAGE_ID:                       'harvesterhci.io/imageId',
-  SSH_NAMES:                      'harvesterhci.io/sshNames',
-  NETWORK_IPS:                    'network.harvesterhci.io/ips',
-  TEMPLATE_VERSION_CUSTOM_NAME:   'template-version.harvesterhci.io/customName',
-  CREATOR:                        'harvesterhci.io/creator',
-  OS:                             'harvesterhci.io/os',
-  NETWORK_TYPE:                   'network.harvesterhci.io/type',
-  VM_NAME:                        'harvesterhci.io/vmName',
-  VM_NAME_PREFIX:                 'harvesterhci.io/vmNamePrefix',
-  VM_RESERVED_MEMORY:             'harvesterhci.io/reservedMemory',
-  MAINTENANCE_STATUS:             'harvesterhci.io/maintain-status',
-  HOST_CUSTOM_NAME:               'harvesterhci.io/host-custom-name',
-  HOST_CONSOLE_URL:               'harvesterhci.io/host-console-url',
-  RESTORE_NAME:                   'restore.harvesterhci.io/name',
-  NODE_ROLE_MASTER:               'node-role.kubernetes.io/master',
-  NODE_ROLE_CONTROL_PLANE:        'node-role.kubernetes.io/control-plane',
-  NODE_ROLE_ETCD:                 'node-role.harvesterhci.io/witness',
-  PROMOTE_STATUS:                 'harvesterhci.io/promote-status',
-  MIGRATION_STATE:                'harvesterhci.io/migrationState',
-  VOLUME_CLAIM_TEMPLATE:          'harvesterhci.io/volumeClaimTemplates',
-  IMAGE_NAME:                     'harvesterhci.io/image-name',
-  INIT_IP:                        'etcd.rke2.cattle.io/node-address',
-  NODE_SCHEDULABLE:               'kubevirt.io/schedulable',
-  NETWORK_ROUTE:                  'network.harvesterhci.io/route',
-  MATCHED_NODES:                  'network.harvesterhci.io/matched-nodes',
-  OS_UPGRADE_IMAGE:               'harvesterhci.io/os-upgrade-image',
-  LATEST_UPGRADE:                 'harvesterhci.io/latestUpgrade',
-  UPGRADE_STATE:                  'harvesterhci.io/upgradeState',
-  REAY_MESSAGE:                   'harvesterhci.io/read-message',
-  DYNAMIC_SSHKEYS_NAMES:          'harvesterhci.io/dynamic-ssh-key-names',
-  DYNAMIC_SSHKEYS_USERS:          'harvesterhci.io/dynamic-ssh-key-users',
-  IMAGE_SUFFIX:                   'harvesterhci.io/image-type',
-  OS_TYPE:                        'harvesterhci.io/os-type',
-  STORAGE_PROVISIONER:            'harvesterhci.io/storageProvisioner',
-  HOST_REQUEST:                   'management.cattle.io/pod-requests',
-  STORAGE_CLASS:                  'harvesterhci.io/storageClassName',
-  STORAGE_NETWORK:                'storage-network.settings.harvesterhci.io',
-  ADDON_EXPERIMENTAL:             'addon.harvesterhci.io/experimental',
-  VOLUME_ERROR:                   'longhorn.io/volume-scheduling-error',
-  KVM_AMD_CPU:                    'cpu-feature.node.kubevirt.io/svm',
-  KVM_INTEL_CPU:                  'cpu-feature.node.kubevirt.io/vmx',
-  NODE_MANUFACTURER:              'manufacturer',
-  NODE_MODEL:                     'model',
-  NODE_SERIAL_NUMBER:             'serialNumber',
-  VM_INSUFFICIENT:                'harvesterhci.io/insufficient-resource-quota',
-  NODE_NTP_SYNC_STATUS:           'node.harvesterhci.io/ntp-service',
-  PARENT_SRIOV:                   'harvesterhci.io/parent-sriov-network-device',
-  PARENT_SRIOV_GPU:               'harvesterhci.io/parentSRIOVGPUDevice',
-  VM_MAINTENANCE_MODE_STRATEGY:   'harvesterhci.io/maintain-mode-strategy',
-  NODE_CPU_MANAGER_UPDATE_STATUS: 'harvesterhci.io/cpu-manager-update-status',
-  CPU_MANAGER:                    'cpumanager',
-  VM_DEVICE_ALLOCATION_DETAILS:   'harvesterhci.io/deviceAllocationDetails',
-  SVM_BACKUP_ID:                  'harvesterhci.io/svmbackupId',
-  DISABLE_LONGHORN_V2_ENGINE:     'node.longhorn.io/disable-v2-data-engine',
+  CLOUD_INIT:                       'harvesterhci.io/cloud-init-template',
+  CURRENT_IP:                       'rke2.io/internal-ip',
+  IMAGE_ID:                         'harvesterhci.io/imageId',
+  SSH_NAMES:                        'harvesterhci.io/sshNames',
+  NETWORK_IPS:                      'network.harvesterhci.io/ips',
+  TEMPLATE_VERSION_CUSTOM_NAME:     'template-version.harvesterhci.io/customName',
+  CREATOR:                          'harvesterhci.io/creator',
+  OS:                               'harvesterhci.io/os',
+  NETWORK_TYPE:                     'network.harvesterhci.io/type',
+  VM_NAME:                          'harvesterhci.io/vmName',
+  VM_NAME_PREFIX:                   'harvesterhci.io/vmNamePrefix',
+  VM_RESERVED_MEMORY:               'harvesterhci.io/reservedMemory',
+  MAINTENANCE_STATUS:               'harvesterhci.io/maintain-status',
+  HOST_CUSTOM_NAME:                 'harvesterhci.io/host-custom-name',
+  HOST_CONSOLE_URL:                 'harvesterhci.io/host-console-url',
+  RESTORE_NAME:                     'restore.harvesterhci.io/name',
+  NODE_ROLE_MASTER:                 'node-role.kubernetes.io/master',
+  NODE_ROLE_CONTROL_PLANE:          'node-role.kubernetes.io/control-plane',
+  NODE_ROLE_ETCD:                   'node-role.harvesterhci.io/witness',
+  PROMOTE_STATUS:                   'harvesterhci.io/promote-status',
+  MIGRATION_STATE:                  'harvesterhci.io/migrationState',
+  VOLUME_CLAIM_TEMPLATE:            'harvesterhci.io/volumeClaimTemplates',
+  IMAGE_NAME:                       'harvesterhci.io/image-name',
+  INIT_IP:                          'etcd.rke2.cattle.io/node-address',
+  NODE_SCHEDULABLE:                 'kubevirt.io/schedulable',
+  NETWORK_ROUTE:                    'network.harvesterhci.io/route',
+  MATCHED_NODES:                    'network.harvesterhci.io/matched-nodes',
+  OS_UPGRADE_IMAGE:                 'harvesterhci.io/os-upgrade-image',
+  LATEST_UPGRADE:                   'harvesterhci.io/latestUpgrade',
+  UPGRADE_STATE:                    'harvesterhci.io/upgradeState',
+  REAY_MESSAGE:                     'harvesterhci.io/read-message',
+  DYNAMIC_SSHKEYS_NAMES:            'harvesterhci.io/dynamic-ssh-key-names',
+  DYNAMIC_SSHKEYS_USERS:            'harvesterhci.io/dynamic-ssh-key-users',
+  IMAGE_SUFFIX:                     'harvesterhci.io/image-type',
+  OS_TYPE:                          'harvesterhci.io/os-type',
+  STORAGE_PROVISIONER:              'harvesterhci.io/storageProvisioner',
+  SKIP_SINGLE_REPLICA_DETACHED_VOL: 'harvesterhci.io/skipSingleReplicaDetachedVol',
+  HOST_REQUEST:                     'management.cattle.io/pod-requests',
+  STORAGE_CLASS:                    'harvesterhci.io/storageClassName',
+  STORAGE_NETWORK:                  'storage-network.settings.harvesterhci.io',
+  ADDON_EXPERIMENTAL:               'addon.harvesterhci.io/experimental',
+  VOLUME_ERROR:                     'longhorn.io/volume-scheduling-error',
+  KVM_AMD_CPU:                      'cpu-feature.node.kubevirt.io/svm',
+  KVM_INTEL_CPU:                    'cpu-feature.node.kubevirt.io/vmx',
+  NODE_MANUFACTURER:                'manufacturer',
+  NODE_MODEL:                       'model',
+  NODE_SERIAL_NUMBER:               'serialNumber',
+  VM_INSUFFICIENT:                  'harvesterhci.io/insufficient-resource-quota',
+  NODE_NTP_SYNC_STATUS:             'node.harvesterhci.io/ntp-service',
+  PARENT_SRIOV:                     'harvesterhci.io/parent-sriov-network-device',
+  PARENT_SRIOV_GPU:                 'harvesterhci.io/parentSRIOVGPUDevice',
+  VM_MAINTENANCE_MODE_STRATEGY:     'harvesterhci.io/maintain-mode-strategy',
+  NODE_CPU_MANAGER_UPDATE_STATUS:   'harvesterhci.io/cpu-manager-update-status',
+  CPU_MANAGER:                      'cpumanager',
+  VM_DEVICE_ALLOCATION_DETAILS:     'harvesterhci.io/deviceAllocationDetails',
+  SVM_BACKUP_ID:                    'harvesterhci.io/svmbackupId',
+  DISABLE_LONGHORN_V2_ENGINE:       'node.longhorn.io/disable-v2-data-engine',
 };

pkg/harvester/config/settings.ts

@@ -65,7 +65,9 @@ export const HCI_ALLOWED_SETTINGS = {
   [HCI_SETTING.SUPPORT_BUNDLE_EXPIRATION]:              {},
   [HCI_SETTING.SUPPORT_BUNDLE_NODE_COLLECTION_TIMEOUT]: { featureFlag: 'supportBundleNodeCollectionTimeoutSetting' },
   [HCI_SETTING.SUPPORT_BUNDLE_IMAGE]:                   { kind: 'json', from: 'import' },
-  [HCI_SETTING.STORAGE_NETWORK]:                        { kind: 'custom', from: 'import' },
+  [HCI_SETTING.STORAGE_NETWORK]:                        {
+    kind: 'custom', from: 'import', canReset: true
+  },
   [HCI_SETTING.VM_FORCE_RESET_POLICY]:                  { kind: 'json', from: 'import' },
   [HCI_SETTING.SSL_CERTIFICATES]:                       { kind: 'json', from: 'import' },
   [HCI_SETTING.SSL_PARAMETERS]:                         {

pkg/harvester/config/types.js

@@ -2,3 +2,8 @@ export const BACKUP_TYPE = {
   BACKUP:   'backup',
   SNAPSHOT: 'snapshot'
 };
+
+export const NETWORK_TYPE = {
+  L2VLAN:   'L2VlanNetwork',
+  UNTAGGED: 'UntaggedNetwork'
+};

pkg/harvester/detail/harvesterhci.io.host/VirtualMachineInstance.vue

@@ -24,35 +24,24 @@ export default {
   },
 
   async fetch() {
-    const hash = await allHash({
+    await allHash({
       vms:               this.$store.dispatch('harvester/findAll', { type: HCI.VM }),
       vmis:              this.$store.dispatch('harvester/findAll', { type: HCI.VMI }),
       allClusterNetwork: this.$store.dispatch('harvester/findAll', { type: HCI.CLUSTER_NETWORK }),
     });
-    const instanceMap = {};
-
-    (hash.vmis || []).forEach((vmi) => {
-      const vmiUID = vmi?.metadata?.ownerReferences?.[0]?.uid;
-
-      if (vmiUID) {
-        instanceMap[vmiUID] = vmi;
-      }
-    });
-
-    this.allClusterNetwork = hash.allClusterNetwork;
-    this.rows = hash.vms.filter((row) => {
-      return instanceMap[row.metadata?.uid]?.status?.nodeName === this.node?.metadata?.labels?.[HOSTNAME];
-    });
-  },
-
-  data() {
-    return {
-      rows:              [],
-      allClusterNetwork: []
-    };
   },
 
   computed: {
+    allClusterNetwork() {
+      return this.$store.getters['harvester/all'](HCI.CLUSTER_NETWORK);
+    },
+
+    rows() {
+      const vms = this.$store.getters['harvester/all'](HCI.VM);
+
+      return vms.filter((vm) => vm.vmi?.status?.nodeName === this.node?.metadata?.labels?.[HOSTNAME]);
+    },
+
     headers() {
       return [
         STATE,
@@ -87,8 +76,6 @@ export default {
       ];
     },
   },
-
-  methods: {}
 };
 </script>
 

pkg/harvester/dialog/ConfirmExecutionDialog.vue

@@ -0,0 +1,173 @@
+<script>
+import { mapState } from 'vuex';
+import { exceptionToErrorsArray } from '@shell/utils/error';
+import { alternateLabel } from '@shell/utils/platform';
+import AsyncButton from '@shell/components/AsyncButton';
+import { Banner } from '@components/Banner';
+import { Card } from '@components/Card';
+import { escapeHtml } from '@shell/utils/string';
+
+/**
+ * @name ConfirmExecutionDialog
+ * @description Dialog component to confirm the related resources before executing the action.
+ */
+export default {
+  name: 'ConfirmExecutionDialog',
+
+  emits: ['close'],
+
+  components: {
+    AsyncButton,
+    Banner,
+    Card,
+  },
+
+  props: {
+    /**
+     * @property resources to be deleted.
+     * @type {Resource[]} Array of the resource model's instance
+     */
+    resources: {
+      type:     Array,
+      required: true
+    }
+  },
+
+  data() {
+    return { errors: [] };
+  },
+
+  computed: {
+    ...mapState('action-menu', ['modalData']),
+
+    warningMessageKey() {
+      return this.modalData.warningMessageKey;
+    },
+
+    names() {
+      return this.resources.map((obj) => obj.nameDisplay).slice(0, 5);
+    },
+
+    resourceNames() {
+      return this.names.reduce((res, name, i) => {
+        if (i >= 5) {
+          return res;
+        }
+        res += `<b>${ escapeHtml(name) }</b>`;
+        if (i === this.names.length - 1) {
+          res += this.plusMore;
+        } else {
+          res += i === this.resources.length - 2 ? ' and ' : ', ';
+        }
+
+        return res;
+      }, '');
+    },
+
+    plusMore() {
+      const remaining = this.resources.length - this.names.length;
+
+      return this.t('dialog.confirmExecution.andOthers', { count: remaining });
+    },
+
+    type() {
+      const types = new Set(this.resources.reduce((array, each) => {
+        array.push(each.type);
+
+        return array;
+      }, []));
+
+      if (types.size > 1) {
+        return this.t('generic.resource', { count: this.resources.length });
+      }
+
+      const schema = this.resources[0]?.schema;
+
+      if ( !schema ) {
+        return `resource${ this.resources.length === 1 ? '' : 's' }`;
+      }
+
+      return this.$store.getters['type-map/labelFor'](schema, this.resources.length);
+    },
+
+    protip() {
+      return this.t('dialog.confirmExecution.protip', { alternateLabel });
+    },
+  },
+
+  methods: {
+    escapeHtml,
+
+    close() {
+      this.errors = [];
+      this.$emit('close');
+    },
+
+    async apply(buttonDone) {
+      try {
+        for (const resource of this.resources) {
+          await resource.doActionGrowl(this.modalData.action, {});
+        }
+        buttonDone(true);
+        this.close();
+      } catch (e) {
+        this.errors = exceptionToErrorsArray(e);
+        buttonDone(false);
+      }
+    }
+  }
+};
+</script>
+
+<template>
+  <Card :show-highlight-border="false">
+    <template #title>
+      <h4 class="text-default-text">
+        {{ t('dialog.confirmExecution.title') }}
+      </h4>
+    </template>
+
+    <template #body>
+      <div class="pl-10 pr-10">
+        <span
+          v-clean-html="t(warningMessageKey, { type, names: resourceNames }, true)"
+        ></span>
+        <div class="text-info mt-20">
+          {{ protip }}
+        </div>
+        <Banner
+          v-for="(error, i) in errors"
+          :key="i"
+        />
+      </div>
+    </template>
+
+    <template #actions>
+      <div class="actions">
+        <button
+          class="btn role-secondary"
+          @click="close"
+        >
+          {{ t('generic.cancel') }}
+        </button>
+        <AsyncButton
+          mode="apply"
+          class="btn bg-primary ml-10"
+          :disabled="applyDisabled"
+          @click="apply"
+        />
+      </div>
+    </template>
+  </Card>
+</template>
+
+<style lang='scss' scoped>
+  .modal-container {
+    max-width: 400px;
+  }
+
+  .actions {
+    width: 100%;
+    text-align: right;
+  }
+</style>

pkg/harvester/edit/harvesterhci.io.addon/vm-import-controller.vue

@@ -1,34 +1,31 @@
 <script>
+import merge from 'lodash/merge';
+import jsyaml from 'js-yaml';
 import { LabeledInput } from '@components/Form/LabeledInput';
 import Tabbed from '@shell/components/Tabbed';
 import Tab from '@shell/components/Tabbed/Tab';
 import { RadioGroup } from '@components/Form/Radio';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
-
 import CreateEditView from '@shell/mixins/create-edit-view';
-
 import { STORAGE_CLASS } from '@shell/config/types';
 import { allHash } from '@shell/utils/promise';
-import { set, get, clone } from '@shell/utils/object';
-
-const VALUES_YAML_KEYS = [
-  'resources.requests.cpu',
-  'resources.requests.memory',
-  'resources.limits.cpu',
-  'resources.limits.memory',
-  'pvcClaim.enabled',
-  'pvcClaim.size',
-  'pvcClaim.storageClassName',
-];
 
 const DEFAULT_VALUES = {
-  'resources.requests.cpu':    '0.5',
-  'resources.requests.memory': '2Gi',
-  'resources.limits.cpu':      '2',
-  'resources.limits.memory':   '4Gi',
-  'pvcClaim.enabled':          false,
-  'pvcClaim.size':             '200Gi',
-  'pvcClaim.storageClassName': '',
+  resources: {
+    requests: {
+      cpu:    '0.5',
+      memory: '2Gi'
+    },
+    limits: {
+      cpu:    '2',
+      memory: '4Gi'
+    }
+  },
+  pvcClaim: {
+    enabled:          false,
+    size:             '200Gi',
+    storageClassName: ''
+  }
 };
 
 export default {
@@ -64,19 +61,7 @@ export default {
   },
 
   data() {
-    let valuesObj = {};
-
-    try {
-      valuesObj = JSON.parse(this.value?.spec?.valuesContent || '{}');
-    } catch (err) {}
-
-    const valuesContent = clone(valuesObj);
-
-    VALUES_YAML_KEYS.map((key) => {
-      if (!get(valuesObj, key)) {
-        set(valuesContent, key, DEFAULT_VALUES[key]);
-      }
-    });
+    const valuesContent = this.parseValuesContent();
 
     return { valuesContent };
   },
@@ -100,8 +85,21 @@ export default {
   },
 
   methods: {
+    parseValuesContent() {
+      try {
+        return merge({}, DEFAULT_VALUES, jsyaml.load(this.value.spec.valuesContent));
+      } catch (err) {
+        this.$store.dispatch('growl/fromError', {
+          title: this.$store.getters['i18n/t']('generic.notification.title.error'),
+          err:   err.data || err,
+        }, { root: true });
+
+        return DEFAULT_VALUES;
+      }
+    },
+
     update() {
-      set(this.value, 'spec.valuesContent', JSON.stringify(this.valuesContent));
+      this.value.spec.valuesContent = jsyaml.dump(this.valuesContent);
     },
 
     setDefaultClassName() {

pkg/harvester/edit/harvesterhci.io.logging.output.vue

@@ -93,7 +93,7 @@ export default {
     const selectedProviderDefault = providers.find((p) => p.name === selectedProvider)?.default || providers[0].default;
 
     if (this.mode !== _VIEW) {
-      this.$set(this.value.spec, selectedProvider, this.value.spec[selectedProvider] || clone(selectedProviderDefault));
+      set(this.value.spec, selectedProvider, this.value.spec[selectedProvider] || clone(selectedProviderDefault));
     }
 
     return {

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

@@ -11,6 +11,9 @@ import { HCI as HCI_LABELS_ANNOTATIONS } from '@pkg/harvester/config/labels-anno
 import CreateEditView from '@shell/mixins/create-edit-view';
 import { allHash } from '@shell/utils/promise';
 import { HCI } from '../types';
+import { NETWORK_TYPE } from '../config/types';
+
+const { L2VLAN, UNTAGGED } = NETWORK_TYPE;
 
 const AUTO = 'auto';
 const MANUAL = 'manual';
@@ -48,7 +51,7 @@ export default {
       config.bridge = config.bridge.slice(0, -3);
     }
 
-    const type = this.value.vlanType || 'L2VlanNetwork' ;
+    const type = this.value.vlanType || L2VLAN ;
 
     return {
       config,
@@ -101,15 +104,15 @@ export default {
     },
 
     networkType() {
-      return ['L2VlanNetwork', 'UntaggedNetwork'];
+      return [L2VLAN, UNTAGGED];
     },
 
     isUntaggedNetwork() {
       if (this.isView) {
-        return this.value.vlanType === 'UntaggedNetwork';
+        return this.value.vlanType === UNTAGGED;
       }
 
-      return this.type === 'UntaggedNetwork';
+      return this.type === UNTAGGED;
     }
   },
 

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

@@ -24,6 +24,7 @@ const CLONE = 'clone';
 const DOWNLOAD = 'download';
 const UPLOAD = 'upload';
 const rawORqcow2 = 'raw_qcow2';
+const LONGHORN = 'longhorn';
 
 export default {
   name: 'EditImage',
@@ -60,10 +61,7 @@ export default {
       images:         this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.IMAGE }),
       storageClasses: this.$store.dispatch(`${ inStore }/findAll`, { type: STORAGE_CLASS }),
     });
-
-    const defaultStorage = this.$store.getters[`${ inStore }/all`](STORAGE_CLASS).find((s) => s.isDefault);
-
-    this['storageClassName'] = this.storageClassName || defaultStorage?.metadata?.name || 'longhorn';
+    this['storageClassName'] = this.storageClassName || this.defaultStorageClassName();
     this.images = this.$store.getters[`${ inStore }/all`](HCI.IMAGE);
 
     const { securityParameters } = this.value.spec;
@@ -144,10 +142,23 @@ export default {
       ];
     },
 
-    storageClassOptions() {
+    encryptedStorageClasses() {
       const inStore = this.$store.getters['currentProduct'].inStore;
       const storages = this.$store.getters[`${ inStore }/all`](STORAGE_CLASS);
 
+      return storages.filter((s) => s.isEncrypted);
+    },
+
+    nonEncryptedStorageClasses() {
+      const inStore = this.$store.getters['currentProduct'].inStore;
+      const storages = this.$store.getters[`${ inStore }/all`](STORAGE_CLASS);
+
+      return storages.filter((s) => !s.isEncrypted);
+    },
+
+    storageClassOptions() {
+      const storages = this.value.spec?.securityParameters?.cryptoOperation === ENCRYPT ? this.encryptedStorageClasses : this.nonEncryptedStorageClasses;
+
       return storages
         .filter((s) => !s.parameters?.backingImage && s.provisioner !== LVM_DRIVER) // Lvm storage is not supported.
         .map((s) => {
@@ -239,6 +250,13 @@ export default {
         this.$refs.file.value = null;
       }
     },
+    'value.spec.securityParameters.cryptoOperation'() {
+      if (this.value.spec?.securityParameters?.cryptoOperation === ENCRYPT) {
+        this.storageClassName = this.encryptedStorageClasses[0]?.name || '';
+      } else { // URL / FILE / DECRYPT should use default storage class
+        this.storageClassName = this.defaultStorageClassName();
+      }
+    }
   },
 
   methods: {
@@ -385,6 +403,18 @@ export default {
           return str.toLowerCase().includes(os.value.toLowerCase()) ? os.value : false;
         }
       });
+    },
+
+    defaultStorageClassName() {
+      const inStore = this.$store.getters['currentProduct'].inStore;
+      const defaultStorage = this.$store.getters[`${ inStore }/all`](STORAGE_CLASS).find((s) => s.isDefault);
+
+      if (!defaultStorage) {
+        return LONGHORN;
+      }
+
+      // if default sc is encrypted, use longhorn as default
+      return defaultStorage.isEncrypted ? LONGHORN : defaultStorage?.metadata?.name;
     }
   },
 };

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

@@ -434,7 +434,7 @@ export default {
         <div class="spacer"></div>
         <Checkbox
           v-if="value.cpuPinningFeatureEnabled"
-          v-model="cpuPinning"
+          v-model:value="cpuPinning"
           class="check"
           type="checkbox"
           tooltip-key="harvester.virtualMachine.cpuPinning.tooltip"
@@ -465,11 +465,29 @@ export default {
           :mode="mode"
         />
 
+        <Checkbox
+          v-if="value.tpmPersistentStateFeatureEnabled && tpmEnabled"
+          v-model:value="tpmPersistentStateEnabled"
+          class="check"
+          type="checkbox"
+          :label="t('harvester.virtualMachine.advancedOptions.tpmPersistentState')"
+          :mode="mode"
+        />
+
         <Checkbox
           v-model:value="efiEnabled"
           class="check"
           type="checkbox"
-          :label="t('harvester.virtualMachine.efiEnabled')"
+          :label="t('harvester.virtualMachine.advancedOptions.efiEnabled')"
+          :mode="mode"
+        />
+
+        <Checkbox
+          v-if="value.efiPersistentStateFeatureEnabled && efiEnabled"
+          v-model:value="efiPersistentStateEnabled"
+          class="check"
+          type="checkbox"
+          :label="t('harvester.virtualMachine.advancedOptions.efiPersistentState')"
           :mode="mode"
         />
 
@@ -478,7 +496,7 @@ export default {
           v-model:value="secureBoot"
           class="check"
           type="checkbox"
-          :label="t('harvester.virtualMachine.secureBoot')"
+          :label="t('harvester.virtualMachine.advancedOptions.secureBoot')"
           :mode="mode"
         />
       </Tab>

pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineSSHKey.vue

@@ -249,7 +249,7 @@ export default {
       :searchable="searchable"
       :disabled="disabled"
       :options="sshOption"
-      @update:value="update"
+      @input="update"
     />
 
     <ModalWithCard

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

@@ -46,10 +46,13 @@ export default {
       this[key] = res[key];
     }
 
-    uniq([
+    const vGpus = this.vm.isOff ? [
       ...(this.value?.domain?.devices?.gpus || []).map(({ name }) => name),
+    ] : [
       ...Object.values(this.vm?.provisionedVGpus).reduce((acc, gpus) => [...acc, ...gpus], [])
-    ]).forEach((name) => {
+    ];
+
+    uniq(vGpus).forEach((name) => {
       if (this.enabledDevices.find((device) => device?.metadata?.name === name)) {
         this.selectedDevices.push(name);
       }

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

@@ -1,5 +1,5 @@
 <script>
-import { Sortable } from 'sortablejs-vue3';
+import { VueDraggableNext } from 'vue-draggable-next';
 import InfoBox from '@shell/components/InfoBox';
 import { Banner } from '@components/Banner';
 import BadgeStateFormatter from '@shell/components/formatter/BadgeStateFormatter';
@@ -22,7 +22,7 @@ export default {
   emits: ['update:value'],
 
   components: {
-    Banner, BadgeStateFormatter, Sortable, InfoBox, LabeledInput, UnitInput, LabeledSelect, ModalWithCard
+    Banner, BadgeStateFormatter, VueDraggableNext, InfoBox, LabeledInput, UnitInput, LabeledSelect, ModalWithCard
   },
 
   props: {
@@ -272,129 +272,130 @@ export default {
       color="info"
       label-key="harvester.virtualMachine.volume.dragTip"
     />
-    <Sortable
+    <VueDraggableNext
       :list="rows"
-      :options="{disabled: isView}"
+      :disabled="isView"
       item-key="id"
       @end="update"
     >
-      <template #item="{element: volume, index: i}">
-        <div :key="volume.name">
-          <InfoBox class="box">
-            <button
+      <div
+        v-for="(volume, i) in rows"
+        :key="volume.id"
+      >
+        <InfoBox class="box">
+          <button
+            v-if="!isView"
+            type="button"
+            class="role-link btn btn-sm remove"
+            @click="removeVolume(volume)"
+          >
+            <i class="icon icon-x" />
+          </button>
+          <button
+            v-if="volume.hotpluggable && isView"
+            type="button"
+            class="role-link btn remove"
+            @click="unplugVolume(volume)"
+          >
+            {{ t('harvester.virtualMachine.unplug.detachVolume') }}
+          </button>
+          <h3>
+            <span
+              v-if="volume.to && isVirtualType"
+              class="title"
+            >
+              <router-link :to="volume.to">
+                {{ t('harvester.virtualMachine.volume.edit') }} {{ headerFor(volume.source) }}
+              </router-link>
+
+              <BadgeStateFormatter
+                v-if="volume.pvc"
+                class="ml-10 state"
+                :arbitrary="true"
+                :row="volume.pvc"
+                :value="volume.pvc.state"
+              />
+              <a
+                v-if="dev && !!volume.pvc && !!volume.pvc.resourceExternalLink"
+                v-clean-tooltip="t(volume.pvc.resourceExternalLink.tipsKey || 'generic.resourceExternalLinkTips')"
+                class="ml-5 resource-external"
+                rel="nofollow noopener noreferrer"
+                target="_blank"
+                :href="volume.pvc.resourceExternalLink.url"
+              >
+                <i class="icon icon-external-link" />
+              </a>
+            </span>
+
+            <span v-else>
+              {{ headerFor(volume.source, !!volume?.volumeBackups) }}
+            </span>
+          </h3>
+          <div>
+            <component
+              :is="componentFor(volume.source)"
+              :value="rows[i]"
+              :rows="rows"
+              :namespace="namespace"
+              :is-create="isCreate"
+              :is-edit="isEdit"
+              :is-view="isView"
+              :is-virtual-type="isVirtualType"
+              :mode="mode"
+              :idx="i"
+              :validate-required="validateRequired"
+              @update="update"
+            />
+          </div>
+
+          <div class="bootOrder">
+            <div
               v-if="!isView"
-              type="button"
-              class="role-link btn btn-sm remove"
-              @click="removeVolume(volume)"
+              class="mr-15"
             >
-              <i class="icon icon-x" />
-            </button>
-            <button
-              v-if="volume.hotpluggable && isView"
-              type="button"
-              class="role-link btn remove"
-              @click="unplugVolume(volume)"
-            >
-              {{ t('harvester.virtualMachine.unplug.detachVolume') }}
-            </button>
-            <h3>
-              <span
-                v-if="volume.to && isVirtualType"
-                class="title"
+              <button
+                :disabled="i === 0"
+                class="btn btn-sm role-primary"
+                @click.prevent="changeSort(i, false)"
               >
-                <router-link :to="volume.to">
-                  {{ t('harvester.virtualMachine.volume.edit') }} {{ headerFor(volume.source) }}
-                </router-link>
+                <i class="icon icon-lg icon-chevron-up"></i>
+              </button>
 
-                <BadgeStateFormatter
-                  v-if="volume.pvc"
-                  class="ml-10 state"
-                  :arbitrary="true"
-                  :row="volume.pvc"
-                  :value="volume.pvc.state"
-                />
-                <a
-                  v-if="dev && !!volume.pvc && !!volume.pvc.resourceExternalLink"
-                  v-clean-tooltip="t(volume.pvc.resourceExternalLink.tipsKey || 'generic.resourceExternalLinkTips')"
-                  class="ml-5 resource-external"
-                  rel="nofollow noopener noreferrer"
-                  target="_blank"
-                  :href="volume.pvc.resourceExternalLink.url"
-                >
-                  <i class="icon icon-external-link" />
-                </a>
-              </span>
-
-              <span v-else>
-                {{ headerFor(volume.source, !!volume?.volumeBackups) }}
-              </span>
-            </h3>
-            <div>
-              <component
-                :is="componentFor(volume.source)"
-                :value="rows[i]"
-                :rows="rows"
-                :namespace="namespace"
-                :is-create="isCreate"
-                :is-edit="isEdit"
-                :is-view="isView"
-                :is-virtual-type="isVirtualType"
-                :mode="mode"
-                :idx="i"
-                :validate-required="validateRequired"
-                @update="update"
-              />
-            </div>
-
-            <div class="bootOrder">
-              <div
-                v-if="!isView"
-                class="mr-15"
+              <button
+                :disabled="i === rows.length -1"
+                class="btn btn-sm role-primary"
+                @click.prevent="changeSort(i, true)"
               >
-                <button
-                  :disabled="i === 0"
-                  class="btn btn-sm role-primary"
-                  @click.prevent="changeSort(i, false)"
-                >
-                  <i class="icon icon-lg icon-chevron-up"></i>
-                </button>
-
-                <button
-                  :disabled="i === rows.length -1"
-                  class="btn btn-sm role-primary"
-                  @click.prevent="changeSort(i, true)"
-                >
-                  <i class="icon icon-lg icon-chevron-down"></i>
-                </button>
-              </div>
-
-              <div class="text-muted">
-                bootOrder: {{ i + 1 }}
-              </div>
+                <i class="icon icon-lg icon-chevron-down"></i>
+              </button>
             </div>
 
-            <div class="mt-15">
-              <Banner
-                v-if="volume.volumeStatus && !isCreate"
-                class="volume-status"
-                color="warning"
-                :label="ucFirst(volume.volumeStatus)"
-              />
-              <Banner
-                v-if="value.volumeBackups && value.volumeBackups.error && value.volumeBackups.error.message"
-                color="error"
-                :label="ucFirst(value.volumeBackups.error.message)"
-              />
-              <Banner
-                v-if="isLonghornV2(volume) && !isView"
-                color="warning"
-                :label="t('harvester.volume.longhorn.disableResize')"
-              />
+            <div class="text-muted">
+              bootOrder: {{ i + 1 }}
             </div>
-          </InfoBox>
-        </div>
-      </template>
-    </Sortable>
+          </div>
+
+          <div class="mt-15">
+            <Banner
+              v-if="volume.volumeStatus && !isCreate"
+              class="volume-status"
+              color="warning"
+              :label="ucFirst(volume.volumeStatus)"
+            />
+            <Banner
+              v-if="value.volumeBackups && value.volumeBackups.error && value.volumeBackups.error.message"
+              color="error"
+              :label="ucFirst(value.volumeBackups.error.message)"
+            />
+            <Banner
+              v-if="isLonghornV2(volume) && !isView"
+              color="warning"
+              :label="t('harvester.volume.longhorn.disableResize')"
+            />
+          </div>
+        </InfoBox>
+      </div>
+    </VueDraggableNext>
     <Banner
       v-if="showVolumeTip"
       color="warning"

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

@@ -873,11 +873,29 @@ export default {
           :mode="mode"
         />
 
+        <Checkbox
+          v-if="value.tpmPersistentStateFeatureEnabled && tpmEnabled"
+          v-model:value="tpmPersistentStateEnabled"
+          class="check"
+          type="checkbox"
+          :label="t('harvester.virtualMachine.advancedOptions.tpmPersistentState')"
+          :mode="mode"
+        />
+
         <Checkbox
           v-model:value="efiEnabled"
           class="check"
           type="checkbox"
-          :label="t('harvester.virtualMachine.efiEnabled')"
+          :label="t('harvester.virtualMachine.advancedOptions.efiEnabled')"
+          :mode="mode"
+        />
+
+        <Checkbox
+          v-if="value.efiPersistentStateFeatureEnabled && efiEnabled"
+          v-model:value="efiPersistentStateEnabled"
+          class="check"
+          type="checkbox"
+          :label="t('harvester.virtualMachine.advancedOptions.efiPersistentState')"
           :mode="mode"
         />
 
@@ -886,9 +904,10 @@ export default {
           v-model:value="secureBoot"
           class="check"
           type="checkbox"
-          :label="t('harvester.virtualMachine.secureBoot')"
+          :label="t('harvester.virtualMachine.advancedOptions.secureBoot')"
           :mode="mode"
         />
+
         <Banner
           v-if="showCpuPinningBanner"
           color="warning"

pkg/harvester/formatters/HarvesterDiskState.vue

@@ -58,7 +58,7 @@ export default {
       const out = [];
 
       blockDevices.map((b) => {
-        if (b.metadata.state.error) {
+        if (b?.metadata?.state?.error) {
           out.push(b.metadata.state.message);
         }
       });

pkg/harvester/l10n/en-us.yaml

@@ -38,7 +38,27 @@ asyncButton:
     success: Restarted
     waiting: Restarting…
 
+dialog:
+  confirmExecution:
+    title: Are you sure?
+    andOthers: |-
+      {count, plural,
+      =0 {}
+      =1 { and <b>one other </b>}
+      other { and <b>{count} other </b>}
+      }
+    protip: "Tip: Hold the {alternateLabel} key while clicking action to bypass this confirmation"
+    stop:
+      message: "Are you sure you want to continue stop the {type} {names}?"
+    pause:
+      message: "Are you sure you want to continue pause the {type} {names}?"
+
 harvester:
+  branding:
+    logos:
+      tip: 'Upload a logo to replace the Harvester logo in the top-level navigation header. Image height should be 21 pixels with a max width of 200 pixels. Max file size is 20KB. Accepted formats: JPEG, PNG, SVG.'
+    favicon:
+      tip: 'Upload an icon to replace the Harvester favicon in the browser tab. Max file size is 20KB'
   productLabel: 'Harvester'
   modal:
     backup:
@@ -579,15 +599,17 @@ harvester:
     enableUsb: Enable USB Tablet
     advancedOptions:
       tpm: Enable TPM
+      tpmPersistentState: TPM Persistent State
       cpuManager:
         prefix: You must enable CPU Manager for at least one node in
         middle: 'host page'
         suffix: to enable CPU Pinning for VM
+      efiEnabled: Booting in EFI mode
+      efiPersistentState: EFI Persistent State
+      secureBoot: Secure Boot
     usbTip: Provides an absolute pointer device which often helps with getting a consistent mouse cursor position in VNC.
     sshTitle: Add Public SSH Key
     imageTip: An external URL to the .iso, .img, .qcow2 or .raw that the virtual machine should be created from.
-    efiEnabled: Booting in EFI mode
-    secureBoot: Secure Boot
     volume:
       dragTip: Drag and drop volumes, or use the volume's arrows, to change the boot order.
       volumeTip: The virtual machine only contains a CD-ROM volume. You may want to add additional disk volumes.
@@ -742,6 +764,9 @@ harvester:
     terminationGracePeriodSeconds:
       label: Termination Grace Period
     affinity:
+      addLabel: Add Workload Selector
+      topologyKey:
+        placeholder: 'topology.kubernetes.io/zone'
       thisPodNamespace: This virtual machine's namespace
       matchExpressions:
         inNamespaces: "Workloads in these namespaces"
@@ -830,6 +855,7 @@ harvester:
     currentVersion: CURRENT VERSION
     versionLabel: AVAILABLE COMPATIBLE VERSIONS
     enableLogging: Enable Logging
+    skipSingleReplicaDetachedVol: Skip checking single-replica detached volumes
     upgradeNode: Upgrading Node
     upgradeSysService: Upgrading System Service
     upgradeImage: Download Upgrade Image
@@ -858,14 +884,14 @@ harvester:
       doc: Read the <a href="{url}" target="_blank">documentation</a> before starting the upgrade process. Ensure that you complete procedures that are relevant to your environment and the version you are upgrading to.
       tip: Unmet system requirements and incorrectly performed procedures may cause complete upgrade failure and other issues that require manual workarounds.
       moreNotes: For more details about the release notes, please visit -
-     
+
   schedule:
     label: Virtual Machine Schedules
     createTitle: Create Schedule
     createButtonText: Create Schedule
     scheduleType: Virtual Machine Schedule Type
     cron: Cron Schedule
-    detail: 
+    detail:
       namespace: Namespace
       sourceVM: Source Virtual Machine
     tabs:
@@ -875,12 +901,12 @@ harvester:
     message:
       noSetting:
         suffix: before creating a backup schedule
-    retain: 
+    retain:
       label: Retain
       count: Count
-      tooltip: Number of up-to-date VM backups to retain. Maximum to 250, minimum to 2. 
+      tooltip: Number of up-to-date VM backups to retain. Maximum to 250, minimum to 2.
     maxFailure:
-      label: Max Failure 
+      label: Max Failure
       count: Count
       tooltip: Max number of consecutive failed backups that could be tolerated. If reach this threshold, Harvester controller will suspend the schedule job. This value should less than retain count
     virtualMachine:
@@ -1003,7 +1029,7 @@ harvester:
         invalid: '"Exclude list" is invalid.'
         addIp: Add Exclude IP
       warning: 'WARNING: <br/> Any change to storage-network requires shutting down all virtual machines before applying this setting. <br/> Users have to ensure the cluster network is configured and VLAN Configuration will cover all nodes and ensure the network connectivity is working and expected in all nodes.'
-      tip: 'Specify an IP range in the IPv4 CIDR format. <code>Number of IPs Required = Number of Nodes * 4 + Number of Disks * 2 + Number of Images to Download/Upload </code>. For more information about storage network settings, see the <a href="{url}" target="_blank">documentation</a>.'
+      tip: 'Specify an IP range in the IPv4 CIDR format. <code>Number of IPs Required = Number of Nodes * 2 + Number of Disks * 2 + Number of Images to Download/Upload </code>. For more information about storage network settings, see the <a href="{url}" target="_blank">documentation</a>.'
     vmForceDeletionPolicy:
       period: Period
     ratio : Ratio
@@ -1494,17 +1520,13 @@ harvester:
       pollingInterval:
         label: Polling Interval
 
-  affinity:
-    thisPodNamespace: This virtual machine's namespace
-    matchExpressions:
-      inNamespaces: "Workloads in these namespaces"
-    vmAffinityTitle: Virtual Machine Scheduling
-    namespaces:
-      placeholder: e.g. default,system,base
-      label: Namespaces
-    addLabel: Add Workload Selector
-    topologyKey:
-      placeholder: 'topology.kubernetes.io/zone'
+typeDescription:
+  # Map of
+  # type: Description to be shown on the top of list view describing the type.
+  #       Should fit on one line.
+  #       If you link to anything external, it MUST have
+  #       target="_blank" rel="noopener noreferrer nofollow"
+  harvester: "Branding allows administrators to globally re-brand the UI by customizing the Harvester product name, logos and color scheme."
 
 advancedSettings:
   experimental: 'Experimental features allow users to test and evaluate early-access functionality prior to official supported releases'

pkg/harvester/list/harvesterhci.io.virtualmachinetemplateversion.vue

@@ -101,7 +101,7 @@ export default {
     v-bind="$attrs"
     :headers="headers"
     :sub-rows="true"
-    :groupable="false"
+    :groupable="true"
     :rows="rows"
     :group-title-by="groupTitleBy"
     :group-by="groupBy"

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

@@ -137,7 +137,15 @@ export default {
     },
 
     isTpmEnabled(spec) {
-      return !!spec?.template?.spec?.domain?.devices?.tpm ;
+      return !!spec?.template?.spec?.domain?.devices?.tpm;
+    },
+
+    isTPMPersistentStateEnabled(spec) {
+      return !!spec?.template?.spec?.domain?.devices?.tpm?.persistent;
+    },
+
+    isEFIPersistentStateEnabled(spec) {
+      return !!spec?.template?.spec?.domain?.firmware?.bootloader?.efi?.persistent;
     },
 
     isSecureBoot(spec) {

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

@@ -164,6 +164,8 @@ export default {
       accessCredentials:             [],
       efiEnabled:                    false,
       tpmEnabled:                    false,
+      tpmPersistentStateEnabled:     false,
+      efiPersistentStateEnabled:     false,
       secureBoot:                    false,
       userDataTemplateId:            '',
       saveUserDataAsClearText:       false,
@@ -217,7 +219,7 @@ export default {
       const selectedVMNetworks = networkNames.map((name) => vmNetworks.find((n) => n.id === name)).filter((n) => n?.id);
       const clusterNetworks = uniq(selectedVMNetworks.map((n) => n.clusterNetworkResource?.id));
 
-      return nodes.filter((N) => !N.isUnSchedulable).map((node) => {
+      return nodes.filter((N) => !N.isUnSchedulable && N.isEtcd !== 'true').map((node) => {
         const requireLabelKeys = [];
         let isNetworkSchedule = true;
 
@@ -282,14 +284,14 @@ export default {
 
     affinityLabels() {
       return {
-        namespaceInputLabel:      this.t('harvesterManager.affinity.namespaces.label'),
+        namespaceInputLabel:      this.t('harvester.virtualMachine.affinity.namespaces.label'),
         namespaceSelectionLabels: [
-          this.t('harvesterManager.affinity.thisPodNamespace'),
+          this.t('harvester.virtualMachine.affinity.thisPodNamespace'),
           this.t('workload.scheduling.affinity.allNamespaces'),
-          this.t('harvesterManager.affinity.matchExpressions.inNamespaces')
+          this.t('harvester.virtualMachine.affinity.matchExpressions.inNamespaces')
         ],
-        addLabel:               this.t('harvesterManager.affinity.addLabel'),
-        topologyKeyPlaceholder: this.t('harvesterManager.affinity.topologyKey.placeholder')
+        addLabel:               this.t('harvester.virtualMachine.affinity.addLabel'),
+        topologyKeyPlaceholder: this.t('harvester.virtualMachine.affinity.topologyKey.placeholder')
       };
     },
   },
@@ -367,6 +369,8 @@ export default {
       const installAgent = this.hasInstallAgent(userData, osType, true);
       const efiEnabled = this.isEfiEnabled(spec);
       const tpmEnabled = this.isTpmEnabled(spec);
+      const tpmPersistentStateEnabled = this.isTPMPersistentStateEnabled(spec);
+      const efiPersistentStateEnabled = this.isEFIPersistentStateEnabled(spec);
       const secureBoot = this.isSecureBoot(spec);
       const cpuPinning = this.isCpuPinning(spec);
 
@@ -398,7 +402,9 @@ export default {
 
       this['installUSBTablet'] = installUSBTablet;
       this['efiEnabled'] = efiEnabled;
+      this['efiPersistentStateEnabled'] = efiPersistentStateEnabled;
       this['tpmEnabled'] = tpmEnabled;
+      this['tpmPersistentStateEnabled'] = tpmPersistentStateEnabled;
       this['secureBoot'] = secureBoot;
       this['cpuPinning'] = cpuPinning;
 
@@ -1383,13 +1389,21 @@ export default {
       }
     },
 
-    setBootMethod(boot = { efi: false, secureBoot: false }) {
-      if (boot.efi && boot.secureBoot) {
-        set(this.spec.template.spec.domain, 'features.smm.enabled', true);
-        set(this.spec.template.spec.domain, 'firmware.bootloader.efi.secureBoot', true);
-      } else if (boot.efi && !boot.secureBoot) {
-        // set(this.spec.template.spec.domain, 'features.smm.enabled', false);
+    setBootMethod(boot = {
+      efi: false, secureBoot: false, efiPersistentStateEnabled: false
+    }) {
+      if (boot.efi) {
+        set(this.spec.template.spec.domain, 'firmware.bootloader.efi.secureBoot', boot.secureBoot);
+      } else {
+        delete this.spec.template.spec.domain['firmware'];
+        delete this.spec.template.spec.domain.features['smm'];
 
+        return;
+      }
+
+      if (boot.secureBoot) {
+        set(this.spec.template.spec.domain, 'features.smm.enabled', true);
+      } else {
         try {
           delete this.spec.template.spec.domain.features.smm['enabled'];
           const noKeys = Object.keys(this.spec.template.spec.domain.features.smm).length === 0;
@@ -1398,10 +1412,12 @@ export default {
             delete this.spec.template.spec.domain.features['smm'];
           }
         } catch (e) {}
-        set(this.spec.template.spec.domain, 'firmware.bootloader.efi.secureBoot', false);
+      }
+
+      if (boot.efiPersistentStateEnabled) {
+        set(this.spec.template.spec.domain, 'firmware.bootloader.efi.persistent', true);
       } else {
-        delete this.spec.template.spec.domain['firmware'];
-        delete this.spec.template.spec.domain.features['smm'];
+        delete this.spec.template.spec.domain.firmware.bootloader.efi['persistent'];
       }
     },
 
@@ -1413,9 +1429,9 @@ export default {
       }
     },
 
-    setTPM(tpmEnabled) {
+    setTPM({ tpmEnabled = false, tpmPersistentStateEnabled = false } = {}) {
       if (tpmEnabled) {
-        set(this.spec.template.spec.domain.devices, 'tpm', {});
+        set(this.spec.template.spec.domain.devices, 'tpm', tpmPersistentStateEnabled ? { persistent: true } : {});
       } else {
         delete this.spec.template.spec.domain.devices['tpm'];
       }
@@ -1529,11 +1545,21 @@ export default {
     },
 
     efiEnabled(val) {
-      this.setBootMethod({ efi: val, secureBoot: this.secureBoot });
+      this.setBootMethod({
+        efi: val, secureBoot: this.secureBoot, efiPersistentStateEnabled: this.efiPersistentStateEnabled
+      });
     },
 
     secureBoot(val) {
-      this.setBootMethod({ efi: this.efiEnabled, secureBoot: val });
+      this.setBootMethod({
+        efi: this.efiEnabled, secureBoot: val, efiPersistentStateEnabled: this.efiPersistentStateEnabled
+      });
+    },
+
+    efiPersistentStateEnabled(val) {
+      this.setBootMethod({
+        efi: this.efiEnabled, secureBoot: this.secureBoot, efiPersistentStateEnabled: val
+      });
     },
 
     cpuPinning(value) {
@@ -1541,7 +1567,11 @@ export default {
     },
 
     tpmEnabled(val) {
-      this.setTPM(val);
+      this.setTPM({ tpmEnabled: val, tpmPersistentStateEnabled: this.tpmPersistentStateEnabled });
+    },
+
+    tpmPersistentStateEnabled(val) {
+      this.setTPM({ tpmEnabled: this.tpmEnabled, tpmPersistentStateEnabled: val });
     },
 
     installAgent: {

pkg/harvester/models/harvester/node.js

@@ -470,7 +470,7 @@ export default class HciNode extends HarvesterResource {
   get canDelete() {
     const nodes = this.$rootGetters['harvester/all'](NODE) || [];
 
-    return nodes.length > 1;
+    return nodes.length > 1 && super.canDelete;
   }
 
   get vlanStatuses() {

pkg/harvester/models/harvester/persistentvolumeclaim.js

@@ -238,7 +238,7 @@ export default class HciPv extends HarvesterResource {
   }
 
   get isEncrypted() {
-    return this.relatedPV?.spec.csi.volumeAttributes.encrypted === 'true';
+    return this.relatedPV?.spec?.csi?.volumeAttributes?.encrypted === 'true';
   }
 
   get longhornVolume() {

pkg/harvester/models/harvester/schema.js

@@ -3,4 +3,4 @@ import SteveSchema from '@shell/models/steve-schema';
 /**
  * This is the steve schema that's used for the harvester store
  */
-export default class HarvesterStoreSchema extends SteveSchema { }
+export default class HarvesterStoreSchema extends SteveSchema {}

pkg/harvester/models/harvester/storage.k8s.io.storageclass.js

@@ -58,6 +58,10 @@ export default class HciStorageClass extends StorageClass {
     return key ? this.$rootGetters['i18n/t'](key) : this.provisioner;
   }
 
+  get isEncrypted() {
+    return this.parameters?.encrypted === 'true';
+  }
+
   get isLonghornV2() {
     return this.provisioner === LONGHORN_DRIVER && this.longhornVersion === DATA_ENGINE_V2;
   }

pkg/harvester/models/harvesterhci.io.blockdevice.js

@@ -64,4 +64,10 @@ export default class HciBlockDevice extends HarvesterResource {
     // spec.fileSystem.provisioned is deprecated
     return this.spec?.fileSystem?.provisioned || this.spec?.provision;
   }
+
+  // Overwrite cleanForSave() in shell/plugins/steve/steve-class.js as it deleted status object in harvesterhci.io.blockdevice CRD
+  // but /v1/harvester/harvesterhci.io.blockdevices/longhorn-system/{id} API requires status object
+  cleanForSave(data) {
+    return data;
+  }
 }

pkg/harvester/models/harvesterhci.io.schedulevmbackup.js

@@ -1,6 +1,4 @@
 import HarvesterResource from './harvester';
-import { get } from '@shell/utils/object';
-import { findBy } from '@shell/utils/array';
 import { colorForState, stateDisplay, STATES } from '@shell/plugins/dashboard-store/resource-class';
 import { _CREATE } from '@shell/config/query-params';
 import { ucFirst, escapeHtml } from '@shell/utils/string';
@@ -66,15 +64,12 @@ export default class ScheduleVmBackup extends HarvesterResource {
     }
   }
 
+  get stateObj() {
+    return this?.metadata?.state || {};
+  }
+
   get state() {
-    const conditions = get(this, 'status.conditions');
-    const isSuspended = findBy(conditions, 'type', 'BackupSuspend')?.status === 'True';
-
-    if (isSuspended) {
-      return STATES.suspended.label;
-    }
-
-    return this.metadata.state.name;
+    return this.status?.suspended === true ? STATES.suspended.label : STATES.active.label;
   }
 
   get stateDescription() {

pkg/harvester/models/harvesterhci.io.virtualmachinebackup.js

@@ -132,7 +132,7 @@ export default class HciVmBackup extends HarvesterResource {
   }
 
   get sourceSchedule() {
-    return this.metadata?.annotations[HCI_ANNOTATIONS.SVM_BACKUP_ID];
+    return this.metadata?.annotations?.[HCI_ANNOTATIONS.SVM_BACKUP_ID];
   }
 
   get attachVM() {

pkg/harvester/models/harvesterhci.io.virtualmachinetemplateversion.js

@@ -210,6 +210,10 @@ export default class HciVmTemplateVersion extends HarvesterResource {
     await templateResource.save();
   }
 
+  get cpuPinningFeatureEnabled() {
+    return this.$rootGetters['harvester-common/getFeatureEnabled']('cpuPinning');
+  }
+
   get defaultVersion() {
     const templates = this.$rootGetters['harvester/all'](HCI.VM_TEMPLATE);
     const template = templates.find((T) => this.templateId === T.id);
@@ -272,4 +276,12 @@ export default class HciVmTemplateVersion extends HarvesterResource {
 
     this.spec.vm.spec.template.metadata['labels'] = { ...wasIgnored, ...val };
   }
+
+  get tpmPersistentStateFeatureEnabled() {
+    return this.$rootGetters['harvester-common/getFeatureEnabled']('tpmPersistentState');
+  }
+
+  get efiPersistentStateFeatureEnabled() {
+    return this.$rootGetters['harvester-common/getFeatureEnabled']('efiPersistentState');
+  }
 }

pkg/harvester/models/k8s.cni.cncf.io.networkattachmentdefinition.js

@@ -1,5 +1,8 @@
 import SteveModel from '@shell/plugins/steve/steve-class';
 import { HCI } from '@shell/config/labels-annotations';
+import { NETWORK_TYPE } from '../config/types';
+
+const { UNTAGGED } = NETWORK_TYPE;
 
 export default class NetworkAttachmentDef extends SteveModel {
   applyDefaults() {
@@ -42,7 +45,7 @@ export default class NetworkAttachmentDef extends SteveModel {
   }
 
   get vlanId() {
-    return this.vlanType === 'UntaggedNetwork' ? 'N/A' : this.parseConfig.vlan;
+    return this.vlanType === UNTAGGED ? 'N/A' : this.parseConfig.vlan;
   }
 
   get customValidationRules() {
@@ -65,7 +68,7 @@ export default class NetworkAttachmentDef extends SteveModel {
     const route = annotations[HCI.NETWORK_ROUTE];
     let config = {};
 
-    if (this.vlanType === 'UntaggedNetwork') {
+    if (this.vlanType === UNTAGGED) {
       return 'N/A';
     }
 

pkg/harvester/models/kubevirt.io.virtualmachine.js

@@ -102,11 +102,13 @@ export default class VirtVm extends HarvesterResource {
 
     return [
       {
-        action:   'stopVM',
-        enabled:  !!this.actions?.stop,
-        icon:     'icon icon-close',
-        label:    this.t('harvester.action.stop'),
-        bulkable: true
+        action:     'stopVM',
+        altAction:  'altStopVM',
+        enabled:    !!this.actions?.stop,
+        icon:       'icon icon-close',
+        label:      this.t('harvester.action.stop'),
+        bulkable:   true,
+        bulkAction: 'stopVM',
       },
       {
         action:   'forceStop',
@@ -116,10 +118,11 @@ export default class VirtVm extends HarvesterResource {
         bulkable: true
       },
       {
-        action:  'pauseVM',
-        enabled: !!this.actions?.pause,
-        icon:    'icon icon-pause',
-        label:   this.t('harvester.action.pause')
+        action:    'pauseVM',
+        altAction: 'altPauseVM',
+        enabled:   !!this.actions?.pause,
+        icon:      'icon icon-pause',
+        label:     this.t('harvester.action.pause')
       },
       {
         action:  'unpauseVM',
@@ -402,7 +405,16 @@ export default class VirtVm extends HarvesterResource {
     return node?.id;
   }
 
-  pauseVM() {
+  pauseVM(resources = this) {
+    this.$dispatch('promptModal', {
+      resources,
+      action:            'pause',
+      warningMessageKey: 'dialog.confirmExecution.pause.message',
+      component:         'ConfirmExecutionDialog'
+    });
+  }
+
+  altPauseVM() {
     this.doActionGrowl('pause', {});
   }
 
@@ -417,7 +429,16 @@ export default class VirtVm extends HarvesterResource {
     this.doActionGrowl('unpause', {});
   }
 
-  stopVM() {
+  stopVM(resources = this) {
+    this.$dispatch('promptModal', {
+      resources,
+      action:            'stop',
+      warningMessageKey: 'dialog.confirmExecution.stop.message',
+      component:         'ConfirmExecutionDialog'
+    });
+  }
+
+  altStopVM() {
     this.doActionGrowl('stop', {});
   }
 
@@ -619,6 +640,10 @@ export default class VirtVm extends HarvesterResource {
   }
 
   get encryptedVolumeType() {
+    if (!this.volumes || this.volumes.length === 0) {
+      return 'none';
+    }
+
     if (this.volumes.every((vol) => vol.isEncrypted)) {
       return 'all';
     } else if (this.volumes.some((vol) => vol.isEncrypted)) {
@@ -1120,10 +1145,6 @@ export default class VirtVm extends HarvesterResource {
     return qemu?.status === 'True';
   }
 
-  get warnDeletionMessage() {
-    return this.t('harvester.virtualMachine.promptRemove.tips');
-  }
-
   get instanceLabels() {
     const all = this.spec?.template?.metadata?.labels || {};
 
@@ -1154,6 +1175,14 @@ export default class VirtVm extends HarvesterResource {
     return this.$rootGetters['harvester-common/getFeatureEnabled']('volumeEncryption');
   }
 
+  get tpmPersistentStateFeatureEnabled() {
+    return this.$rootGetters['harvester-common/getFeatureEnabled']('tpmPersistentState');
+  }
+
+  get efiPersistentStateFeatureEnabled() {
+    return this.$rootGetters['harvester-common/getFeatureEnabled']('efiPersistentState');
+  }
+
   setInstanceLabels(val) {
     if ( !this.spec?.template?.metadata?.labels ) {
       set(this, 'spec.template.metadata.labels', {});

pkg/harvester/package.json

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

pkg/harvester/pages/c/_cluster/brand/index.vue

@@ -164,7 +164,7 @@ export default {
     <h1 class="mb-20">
       {{ t('branding.label') }}
     </h1>
-    <TypeDescription resource="branding" />
+    <TypeDescription resource="harvester" />
     <div>
       <div class="row mb-20">
         <div class="col span-6">
@@ -180,7 +180,7 @@ export default {
         {{ t('branding.logos.label') }}
       </h3>
       <label class="text-label">
-        {{ t('branding.logos.tip', {}, true) }}
+        {{ t('harvester.branding.logos.tip', {}, true) }}
       </label>
       <div class="row mt-10 mb-20">
         <Checkbox
@@ -244,7 +244,7 @@ export default {
         {{ t('branding.favicon.label') }}
       </h3>
       <label class="text-label">
-        {{ t('branding.favicon.tip', {}, true) }}
+        {{ t('harvester.branding.favicon.tip', {}, true) }}
       </label>
       <div class="row mt-10 mb-20">
         <Checkbox

pkg/harvester/promptRemove/kubevirt.io.virtualmachine.vue

@@ -4,6 +4,7 @@ import { isEmpty } from '@shell/utils/object';
 import Parse from 'url-parse';
 import { resourceNames } from '@shell/utils/string';
 import { HCI } from '../types';
+import { alternateLabel as alternateLabelButton } from '@shell/utils/platform';
 
 export default {
   name: 'HarvesterPromptRemove',
@@ -39,8 +40,9 @@ export default {
 
   data() {
     return {
-      checkedList: [],
-      checkAll:    true
+      checkedList:    [],
+      checkAll:       true,
+      alternateLabel: alternateLabelButton
     };
   },
 
@@ -138,44 +140,53 @@ export default {
 </script>
 
 <template>
-  <div class="mt-10">
-    {{ t('promptRemove.attemptingToRemove', {type}) }}
-    <span v-clean-html="resourceNames(names, plusMore, t)"></span>
-
+  <div>
     <div class="mt-10">
-      {{ t('harvester.virtualMachine.promptRemove.title') }}
-    </div>
-    <div v-if="value.length === 1">
-      <span
-        v-for="(name, i) in removeNameArr[value[0].id]"
-        :key="i"
-      >
-        <label class="checkbox-container mr-15"><input
-                                                  v-model="checkedList"
-                                                  type="checkbox"
-                                                  :label="name"
-                                                  :value="name"
-                                                />
+      {{ t('promptRemove.attemptingToRemove', {type}) }}
+      <span v-clean-html="resourceNames(names, plusMore, t)"></span>
+
+      <div class="mt-10">
+        {{ t('harvester.virtualMachine.promptRemove.title') }}
+      </div>
+      <div v-if="value.length === 1">
+        <span
+          v-for="(name, i) in removeNameArr[value[0].id]"
+          :key="i"
+        >
+          <label class="checkbox-container mr-15">
+            <input
+              v-model="checkedList"
+              type="checkbox"
+              :label="name"
+              :value="name"
+            />
+            <span
+              class="checkbox-custom mr-5"
+              role="checkbox"
+            />
+            {{ name }}
+          </label>
+        </span>
+      </div>
+      <div v-else>
+        <label class="checkbox-container mr-15">
+          <input
+            v-model="checkedList"
+            type="checkbox"
+          />
           <span
             class="checkbox-custom mr-5"
             role="checkbox"
           />
-          {{ name }}
+          {{ t('harvester.virtualMachine.promptRemove.deleteAll') }}
         </label>
-      </span>
+      </div>
     </div>
-
-    <div v-else>
-      <label class="checkbox-container mr-15"><input
-                                                v-model="checkAll"
-                                                type="checkbox"
-                                              />
-        <span
-          class="checkbox-custom mr-5"
-          role="checkbox"
-        />
-        {{ t('harvester.virtualMachine.promptRemove.deleteAll') }}
-      </label>
+    <div class="text-warning mb-10 mt-10">
+      {{ t('harvester.virtualMachine.promptRemove.tips') }}
+    </div>
+    <div class="text-info mt-20">
+      {{ t('promptRemove.protip', { alternateLabel }) }}
     </div>
   </div>
 </template>

pkg/harvester/tsconfig.json

@@ -8,6 +8,7 @@
     "importHelpers": true,
     "moduleResolution": "node",
     "skipLibCheck": true,
+    "useDefineForClassFields": false,
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
     "sourceMap": true,