Latest changes from Harvester master - e6796a6fc0cffe03f47f6081c09469d59b97faf9

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>

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

@@ -13,21 +13,18 @@ import Loading from '@shell/components/Loading';
 
 import { _CREATE, _VIEW } from '@shell/config/query-params';
 import { mapFeature, UNSUPPORTED_STORAGE_DRIVERS } from '@shell/store/features';
-import {
-  STORAGE_CLASS, LONGHORN, LONGHORN_DRIVER, SECRET, NAMESPACE
+import {
+  STORAGE_CLASS, LONGHORN, LONGHORN_DRIVER, SECRET, NAMESPACE
 } from '@shell/config/types';
 import { allHash } from '@shell/utils/promise';
 import { clone } from '@shell/utils/object';
 import { CSI_DRIVER } from '../../types';
 import Tags from '../../components/DiskTags';
-
+import { DATA_ENGINE_V1, DATA_ENGINE_V2 } from '../../models/harvester/persistentvolumeclaim';
 import { LVM_DRIVER } from '../../models/harvester/storage.k8s.io.storageclass';
 
 const LONGHORN_V2_DATA_ENGINE = 'longhorn-system/v2-data-engine';
 
-export const DATA_ENGINE_V1 = 'v1';
-export const DATA_ENGINE_V2 = 'v2';
-
 export const LVM_TOPOLOGY_LABEL = 'topology.lvm.csi/node';
 
 const VOLUME_BINDING_MODE_IMMEDIATE = 'Immediate';
@@ -304,10 +301,10 @@ export default {
       class="mb-20"
     />
     <Tabbed :side-tabs="true">
-      <Tab
-        name="parameters"
-        :label="t('storageClass.parameters.label')"
-        :weight="2"
+      <Tab
+        name="parameters"
+        :label="t('storageClass.parameters.label')"
+        :weight="2"
       >
         <component
           :is="getComponent(provisioner)"
@@ -317,9 +314,9 @@ export default {
           :real-mode="realMode"
         />
       </Tab>
-      <Tab
-        name="customize"
-        :label="t('storageClass.customize.label')"
+      <Tab
+        name="customize"
+        :label="t('storageClass.customize.label')"
       >
         <div class="row mt-20">
           <div class="col span-6">

pkg/harvester/edit/harvesterhci.io.storage/provisioners/driver.longhorn.io_v1.vue

@@ -8,7 +8,7 @@ import { _CREATE, _VIEW } from '@shell/config/query-params';
 import { CSI_SECRETS } from '@pkg/harvester/config/harvester-map';
 import { clone } from '@shell/utils/object';
 import { uniq } from '@shell/utils/array';
-import { DATA_ENGINE_V1 } from '../index.vue';
+import { DATA_ENGINE_V1 } from '../../../models/harvester/persistentvolumeclaim';
 
 // UI components for Longhorn storage class parameters
 const DEFAULT_PARAMETERS = [
@@ -282,9 +282,9 @@ export default {
           :mode="mode"
         >
           <template #no-options="{ searching }">
-            <span
-              v-if="!searching"
-              class="text-muted"
+            <span
+              v-if="!searching"
+              class="text-muted"
             >
               {{ t('harvester.storage.parameters.nodeSelector.no-options', null, true) }}
             </span>
@@ -301,9 +301,9 @@ export default {
           :mode="mode"
         >
           <template #no-options="{ searching }">
-            <span
-              v-if="!searching"
-              class="text-muted"
+            <span
+              v-if="!searching"
+              class="text-muted"
             >
               {{ t('harvester.storage.parameters.diskSelector.no-options', null, true) }}
             </span>
@@ -329,9 +329,9 @@ export default {
         :options="volumeEncryptionOptions"
       />
     </div>
-    <div
-      v-if="value.parameters.encrypted === 'true'"
-      class="row mt-20"
+    <div
+      v-if="value.parameters.encrypted === 'true'"
+      class="row mt-20"
     >
       <div class="col span-6">
         <LabeledSelect

pkg/harvester/edit/harvesterhci.io.storage/provisioners/driver.longhorn.io_v2.vue

@@ -8,7 +8,7 @@ import { _CREATE, _VIEW } from '@shell/config/query-params';
 import { CSI_SECRETS } from '@pkg/harvester/config/harvester-map';
 import { clone } from '@shell/utils/object';
 import { uniq } from '@shell/utils/array';
-import { DATA_ENGINE_V2 } from '../index.vue';
+import { DATA_ENGINE_V2 } from '../../../models/harvester/persistentvolumeclaim';
 
 // UI components for Longhorn storage class parameters
 const DEFAULT_PARAMETERS = [
@@ -282,9 +282,9 @@ export default {
           :mode="mode"
         >
           <template #no-options="{ searching }">
-            <span
-              v-if="!searching"
-              class="text-muted"
+            <span
+              v-if="!searching"
+              class="text-muted"
             >
               {{ t('harvester.storage.parameters.nodeSelector.no-options', null, true) }}
             </span>
@@ -301,9 +301,9 @@ export default {
           :mode="mode"
         >
           <template #no-options="{ searching }">
-            <span
-              v-if="!searching"
-              class="text-muted"
+            <span
+              v-if="!searching"
+              class="text-muted"
             >
               {{ t('harvester.storage.parameters.diskSelector.no-options', null, true) }}
             </span>
@@ -331,9 +331,9 @@ export default {
         :disabled="true"
       />
     </div>
-    <div
-      v-if="value.parameters.encrypted === 'true'"
-      class="row mt-20"
+    <div
+      v-if="value.parameters.encrypted === 'true'"
+      class="row mt-20"
     >
       <div class="col span-6">
         <LabeledSelect