From 9cd3cd64923b232714fbb9f471a44f8129d54adf Mon Sep 17 00:00:00 2001
From: "andy.lee" <andy.lee@suse.com>
Date: Mon, 24 Feb 2025 14:53:05 +0800
Subject: [PATCH] Add labels tab in VM edit pae

Signed-off-by: andy.lee <andy.lee@suse.com>
---
 package.json                                  |  2 +-
 .../edit/kubevirt.io.virtualmachine/index.vue | 60 +++++++++++--------
 pkg/harvester/l10n/en-us.yaml                 |  4 ++
 pkg/harvester/package.json                    |  2 +-
 4 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/package.json b/package.json
index 7fa814a9..8aa997bb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "harvester-ui-extension",
-  "version": "1.5.0-rc2",
+  "version": "1.5.0-dev",
   "private": false,
   "engines": {
     "node": ">=20.0.0"
diff --git a/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue b/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue
index 722a6172..ce6a5624 100644
--- a/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue
+++ b/pkg/harvester/edit/kubevirt.io.virtualmachine/index.vue
@@ -10,8 +10,6 @@ import { LabeledInput } from '@components/Form/LabeledInput';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 import NameNsDescription from '@shell/components/form/NameNsDescription';
 import UnitInput from '@shell/components/form/UnitInput';
-import Labels from '@shell/components/form/Labels';
-
 import NodeScheduling from '@shell/components/form/NodeScheduling';
 import PodAffinity from '@shell/components/form/PodAffinity';
 import VGpuDevices from './VirtualMachineVGpuDevices/index';
@@ -65,7 +63,6 @@ export default {
     PodAffinity,
     AccessCredentials,
     Reserved,
-    Labels,
     PciDevices,
     RestartVMDialog,
     UnitInput,
@@ -703,39 +700,50 @@ export default {
         />
       </Tab>
 
+      <Tab
+        name="labels"
+        :label="t('generic.labels')"
+        :weight="-9"
+      >
+        <Banner color="info">
+          <t k="harvester.virtualMachine.labels.banner" />
+        </Banner>
+        <KeyValue
+          key="labels"
+          :value="value.labels"
+          :add-label="t('labels.addLabel')"
+          :mode="mode"
+          :read-allowed="false"
+          :value-can-be-empty="true"
+          @update:value="value.setLabels($event)"
+        />
+      </Tab>
+
       <Tab
         name="instanceLabel"
         :label="t('harvester.tab.instanceLabel')"
-        :weight="-8"
+        :weight="-10"
       >
-        <Labels
-          :default-container-class="'labels-and-annotations-container'"
-          :value="value"
+        <Banner color="info">
+          <t k="harvester.virtualMachine.instanceLabels.banner" />
+        </Banner>
+        <KeyValue
+          key="instance-labels"
+          :value="value.instanceLabels"
+          :protected-keys="value.systemLabels || []"
+          :toggle-filter="toggler"
+          :add-label="t('labels.addLabel')"
           :mode="mode"
-          :display-side-by-side="false"
-          :show-annotations="false"
-          :show-label-title="false"
-        >
-          <template #labels="{toggler}">
-            <KeyValue
-              key="labels"
-              :value="value.instanceLabels"
-              :protected-keys="value.systemLabels || []"
-              :toggle-filter="toggler"
-              :add-label="t('labels.addLabel')"
-              :mode="mode"
-              :read-allowed="false"
-              :value-can-be-empty="true"
-              @update:value="value.setInstanceLabels($event)"
-            />
-          </template>
-        </Labels>
+          :read-allowed="false"
+          :value-can-be-empty="true"
+          @update:value="value.setInstanceLabels($event)"
+        />
       </Tab>
 
       <Tab
         name="advanced"
         :label="t('harvester.tab.advanced')"
-        :weight="-9"
+        :weight="-11"
       >
         <div class="row mb-20">
           <div class="col span-6">
diff --git a/pkg/harvester/l10n/en-us.yaml b/pkg/harvester/l10n/en-us.yaml
index 6e727501..ddba74a2 100644
--- a/pkg/harvester/l10n/en-us.yaml
+++ b/pkg/harvester/l10n/en-us.yaml
@@ -773,6 +773,10 @@ harvester:
         inNamespaces: "Workloads in these namespaces"
       namespaces:
         label: Namespaces
+    instanceLabels:
+      banner: These labels are automatically synchronized to the virtual machine instance.
+    labels:
+      banner: These key values are added as labels to the virtual machine.  
 
   volume:
     label: Volumes
diff --git a/pkg/harvester/package.json b/pkg/harvester/package.json
index 1f714c02..7a7ae5cf 100644
--- a/pkg/harvester/package.json
+++ b/pkg/harvester/package.json
@@ -1,7 +1,7 @@
 {
   "name": "harvester",
   "description": "Rancher UI Extension for Harvester",
-  "version": "1.5.0-rc2",
+  "version": "1.5.0-dev",
   "private": false,
   "rancher": {
     "annotations": {