From 5cc8a690524e03d9610751adf5240baefcf69576 Mon Sep 17 00:00:00 2001
From: "andy.lee" <andy.lee@suse.com>
Date: Tue, 12 Nov 2024 15:16:04 +0800
Subject: [PATCH] add harvester verison column

---
 pkg/harvester/config/harvester-manager.js                 | 8 ++++++++
 pkg/harvester/l10n/en-us.yaml                             | 3 +++
 pkg/harvester/list/harvesterhci.io.management.cluster.vue | 1 +
 .../models/harvesterhci.io.management.cluster.js          | 8 ++++++--
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/pkg/harvester/config/harvester-manager.js b/pkg/harvester/config/harvester-manager.js
index b157a8b4..8a4dae81 100644
--- a/pkg/harvester/config/harvester-manager.js
+++ b/pkg/harvester/config/harvester-manager.js
@@ -52,8 +52,16 @@ export function init($plugin, store) {
   headers(HCI.CLUSTER, [
     STATE,
     NAME_COL,
+    {
+      name:     'harvesterVersion',
+      sort:     'harvesterVersion',
+      labelKey: 'harvesterManager.tableHeaders.harvesterVersion',
+      value:    'HarvesterVersion',
+      getValue: (row) => row.harvesterVersion
+    },
     {
       ...VERSION,
+      labelKey: 'harvesterManager.tableHeaders.kubernetesVersion',
       value:    'kubernetesVersion',
       getValue: (row) => row.kubernetesVersion
     },
diff --git a/pkg/harvester/l10n/en-us.yaml b/pkg/harvester/l10n/en-us.yaml
index 7d7f6b51..edec8730 100644
--- a/pkg/harvester/l10n/en-us.yaml
+++ b/pkg/harvester/l10n/en-us.yaml
@@ -1,5 +1,8 @@
 harvesterManager:
   manage: Manage
+  tableHeaders:
+    kubernetesVersion: Kubernetes Version
+    harvesterVersion: Harvester Version
   cluster:
     label: Harvester Clusters
     none: There are no Harvester Clusters
diff --git a/pkg/harvester/list/harvesterhci.io.management.cluster.vue b/pkg/harvester/list/harvesterhci.io.management.cluster.vue
index b73dc9d3..a0633dff 100644
--- a/pkg/harvester/list/harvesterhci.io.management.cluster.vue
+++ b/pkg/harvester/list/harvesterhci.io.management.cluster.vue
@@ -83,6 +83,7 @@ export default {
           if (row.isReady) {
             row.setSupportedHarvesterVersion();
           }
+
           return row;
         });
     },
diff --git a/pkg/harvester/models/harvesterhci.io.management.cluster.js b/pkg/harvester/models/harvesterhci.io.management.cluster.js
index bec44c74..06574c47 100644
--- a/pkg/harvester/models/harvesterhci.io.management.cluster.js
+++ b/pkg/harvester/models/harvesterhci.io.management.cluster.js
@@ -5,12 +5,14 @@ import { SETTING } from '@shell/config/settings';
 import { colorForState, stateDisplay, STATES_ENUM } from '@shell/plugins/dashboard-store/resource-class';
 
 export default class HciCluster extends ProvCluster {
-  _isSupportedHarvester = undefined;
-
   get isSupportedHarvester() {
     return this._isSupportedHarvester === undefined ? true : this._isSupportedHarvester;
   }
 
+  get harvesterVersion() {
+    return this._harvesterVersion;
+  }
+
   get stateObj() {
     if (!this.isSupportedHarvester) {
       return { error: true, message: this.t('harvesterManager.cluster.supportMessage') };
@@ -212,8 +214,10 @@ export default class HciCluster extends ProvCluster {
     try {
       const setting = await this.$dispatch('request', { url: `${ url }/${ HCI.SETTING }s/server-version` });
 
+      this._harvesterVersion = setting?.value;
       this._isSupportedHarvester = this.$rootGetters['harvester-common/getFeatureEnabled']('supportHarvesterClusterVersion', setting?.value);
     } catch (error) {
+      console.error('unable to get harvester version from settings/server-version', error); // eslint-disable-line no-console
     }
   }
 }