From 91313fca9255b0b4affd73ae3fb5da4fd6efa2d2 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Tue, 29 Oct 2024 15:34:57 +0100
Subject: [PATCH 1/9] Add uiplugins and repo variables

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 .../harvesterhci.io.management.cluster.vue    | 45 ++++++++++++++-----
 1 file changed, 34 insertions(+), 11 deletions(-)

diff --git a/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue b/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue
index e97467ed76a..11ffb1c082c 100644
--- a/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue
+++ b/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue
@@ -1,14 +1,18 @@
 <script>
+import { mapGetters } from 'vuex';
 import BrandImage from '@shell/components/BrandImage';
 import TypeDescription from '@shell/components/TypeDescription';
 import ResourceTable from '@shell/components/ResourceTable';
 import Masthead from '@shell/components/ResourceList/Masthead';
 import Loading from '@shell/components/Loading';
 import { HARVESTER_NAME as VIRTUAL } from '@shell/config/features';
-import { CAPI, HCI, MANAGEMENT } from '@shell/config/types';
+import { CAPI, HCI, MANAGEMENT, CATALOG } from '@shell/config/types';
 import { isHarvesterCluster } from '@shell/utils/cluster';
 import { allHash } from '@shell/utils/promise';
 
+const HARVESTER_REPO = 'ui-plugin-examples';
+const HARVESTER_EXTENSION = 'harvester-manager';
+
 export default {
   components: {
     BrandImage,
@@ -32,13 +36,21 @@ export default {
   async fetch() {
     const inStore = this.$store.getters['currentProduct'].inStore;
 
-    const hash = await allHash({
+    const _hash = {
       hciClusters:  this.$store.dispatch(`${ inStore }/findAll`, { type: HCI.CLUSTER }),
-      mgmtClusters: this.$store.dispatch(`${ inStore }/findAll`, { type: MANAGEMENT.CLUSTER })
-    });
+      mgmtClusters: this.$store.dispatch(`${ inStore }/findAll`, { type: MANAGEMENT.CLUSTER }),
+      catalogLoad:  this.$store.dispatch('catalog/load', { reset: true }),
+    };
+
+    if (this.$store.getters[`${ inStore }/schemaFor`](CATALOG.CLUSTER_REPO)) {
+      _hash.clusterrepos = this.$store.dispatch(`${ inStore }/findAll`, { type: CATALOG.CLUSTER_REPO, force: true });
+    }
+
+    const hash = await allHash(_hash);
 
     this.hciClusters = hash.hciClusters;
     this.mgmtClusters = hash.mgmtClusters;
+    this.clusterrepos = hash.clusterrepos;
   },
 
   data() {
@@ -52,11 +64,22 @@ export default {
       hResource:    HCI.CLUSTER,
       realSchema:   this.$store.getters['management/schemaFor'](CAPI.RANCHER_CLUSTER),
       hciClusters:  [],
-      mgmtClusters: []
+      mgmtClusters: [],
+      clusterrepos: [],
     };
   },
 
   computed: {
+    ...mapGetters({ uiplugins: 'uiplugins/plugins' }),
+
+    harvesterRepo() {
+      return this.clusterrepos?.find((c) => c.name === HARVESTER_REPO);
+    },
+
+    harvesterExtension() {
+      return this.uiplugins?.find((c) => c.name === HARVESTER_EXTENSION);
+    },
+
     importLocation() {
       return {
         name:   'c-cluster-product-resource-create',
@@ -182,12 +205,12 @@ export default {
           height="64"
         />
       </div>
-      <div class="tagline">
-        <div>{{ t('harvesterManager.cluster.description') }}</div>
-      </div>
-      <div class="tagline sub-tagline">
-        <div v-clean-html="t('harvesterManager.cluster.learnMore', {}, true)" />
-      </div>
+        <div class="tagline">
+          <div>{{ t('harvesterManager.cluster.description') }}</div>
+        </div>
+        <div class="tagline sub-tagline">
+          <div v-clean-html="t('harvesterManager.cluster.learnMore', {}, true)" />
+        </div>
     </div>
   </div>
 </template>

From 918e9d597f70407ea01f5d8751fda1441b6a2e52 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Tue, 29 Oct 2024 15:35:18 +0100
Subject: [PATCH 2/9] Add install extension label

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 pkg/harvester-manager/l10n/en-us.yaml         |   2 +
 .../harvesterhci.io.management.cluster.vue    | 144 ++++++++++--------
 2 files changed, 79 insertions(+), 67 deletions(-)

diff --git a/pkg/harvester-manager/l10n/en-us.yaml b/pkg/harvester-manager/l10n/en-us.yaml
index 7da28f81e5e..8e5c8ac10d3 100644
--- a/pkg/harvester-manager/l10n/en-us.yaml
+++ b/pkg/harvester-manager/l10n/en-us.yaml
@@ -7,6 +7,8 @@ harvesterManager:
     description: Harvester is a modern Hyperconverged infrastructure (HCI) solution built for bare metal servers using enterprise-grade open source technologies including Kubernetes, Kubevirt and Longhorn.
   plugins:
     loadError: Error loading harvester plugin
+  extension:
+    install: TO INSTALL HARVESTER EXTENSION
   rke:
     templateError: Incorrect template format
   affinity:
diff --git a/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue b/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue
index 11ffb1c082c..15f52f8ad8b 100644
--- a/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue
+++ b/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue
@@ -134,83 +134,93 @@ export default {
 <template>
   <Loading v-if="$fetchState.pending" />
   <div v-else>
-    <Masthead
-      :schema="realSchema"
-      :resource="resource"
-      :is-creatable="false"
-      :type-display="typeDisplay"
-    >
-      <template #typeDescription>
-        <TypeDescription :resource="hResource" />
-      </template>
-
-      <template
-        v-if="canCreateCluster"
-        #extraActions
+    <div v-if="!!harvesterExtension">
+      <Masthead
+        :schema="realSchema"
+        :resource="resource"
+        :is-creatable="false"
+        :type-display="typeDisplay"
       >
-        <router-link
-          :to="importLocation"
-          class="btn role-primary"
+        <template #typeDescription>
+          <TypeDescription :resource="hResource" />
+        </template>
+
+        <template
+          v-if="canCreateCluster"
+          #extraActions
         >
-          {{ t('cluster.importAction') }}
-        </router-link>
-      </template>
-    </Masthead>
-
-    <ResourceTable
-      v-if="rows && rows.length"
-      :schema="schema"
-      :rows="rows"
-      :is-creatable="true"
-      :namespaced="false"
-      :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
-    >
-      <template #col:name="{row}">
-        <td>
-          <span class="cluster-link">
-            <a
-              v-if="row.isReady"
-              class="link"
-              :disabled="navigating ? true : null"
-              @click="goToCluster(row)"
-            >{{ row.nameDisplay }}</a>
-            <span v-else>
-              {{ row.nameDisplay }}
+          <router-link
+            :to="importLocation"
+            class="btn role-primary"
+          >
+            {{ t('cluster.importAction') }}
+          </router-link>
+        </template>
+      </Masthead>
+      <ResourceTable
+        v-if="rows && rows.length"
+        :schema="schema"
+        :rows="rows"
+        :is-creatable="true"
+        :namespaced="false"
+        :use-query-params-for-simple-filtering="useQueryParamsForSimpleFiltering"
+      >
+        <template #col:name="{row}">
+          <td>
+            <span class="cluster-link">
+              <a
+                v-if="row.isReady"
+                class="link"
+                :disabled="navigating ? true : null"
+                @click="goToCluster(row)"
+              >{{ row.nameDisplay }}</a>
+              <span v-else>
+                {{ row.nameDisplay }}
+              </span>
+              <i
+                class="icon icon-spinner icon-spin ml-5"
+                :class="{'navigating': navigating === row.id}"
+              />
             </span>
-            <i
-              class="icon icon-spinner icon-spin ml-5"
-              :class="{'navigating': navigating === row.id}"
-            />
-          </span>
-        </td>
-      </template>
-
-      <template #cell:harvester="{row}">
-        <router-link
-          class="btn btn-sm role-primary"
-          :to="row.detailLocation"
-        >
-          {{ t('harvesterManager.manage') }}
-        </router-link>
-      </template>
-    </ResourceTable>
-    <div v-else>
-      <div class="no-clusters">
-        {{ t('harvesterManager.cluster.none') }}
+          </td>
+        </template>
+
+        <template #cell:harvester="{row}">
+          <router-link
+            class="btn btn-sm role-primary"
+            :to="row.detailLocation"
+          >
+            {{ t('harvesterManager.manage') }}
+          </router-link>
+        </template>
+      </ResourceTable>
+      <div v-else>
+        <div class="no-clusters">
+          {{ t('harvesterManager.cluster.none') }}
+        </div>
+        <hr class="info-section">
       </div>
-      <hr class="info-section">
+    </div>
+    <div v-if="!harvesterExtension || !rows || !rows.length">
       <div class="logo">
         <BrandImage
           file-name="harvester.png"
           height="64"
         />
       </div>
-        <div class="tagline">
-          <div>{{ t('harvesterManager.cluster.description') }}</div>
-        </div>
-        <div class="tagline sub-tagline">
-          <div v-clean-html="t('harvesterManager.cluster.learnMore', {}, true)" />
-        </div>
+      <div class="tagline">
+        <div>{{ t('harvesterManager.cluster.description') }}</div>
+      </div>
+      <div class="tagline sub-tagline">
+        <div v-clean-html="t('harvesterManager.cluster.learnMore', {}, true)" />
+      </div>
+
+      <div
+        v-if="!harvesterExtension"
+        class="tagline"
+      >
+        <div v-clean-html="t('harvesterManager.extension.install', {}, true)" />
+      </div>
     </div>
   </div>
 </template>

From 7a86900c33390f71b3ed9e4d13fb3a271df96bf2 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Tue, 29 Oct 2024 18:52:30 +0100
Subject: [PATCH 3/9] Add extension info section

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 pkg/harvester-manager/l10n/en-us.yaml         | 13 +++-
 .../harvesterhci.io.management.cluster.vue    | 72 ++++++++++++++++---
 2 files changed, 73 insertions(+), 12 deletions(-)

diff --git a/pkg/harvester-manager/l10n/en-us.yaml b/pkg/harvester-manager/l10n/en-us.yaml
index 8e5c8ac10d3..e9892b53dd1 100644
--- a/pkg/harvester-manager/l10n/en-us.yaml
+++ b/pkg/harvester-manager/l10n/en-us.yaml
@@ -8,7 +8,18 @@ harvesterManager:
   plugins:
     loadError: Error loading harvester plugin
   extension:
-    install: TO INSTALL HARVESTER EXTENSION
+    install:
+      warning: "Harvester extension is not installed"
+      steps:
+        repo:
+          1: Go to
+          2: Manage Repositories
+          3: and add the Harvester repository
+        ui:
+          1: Go to
+          2: Extensions
+          3: page and install the Harvester Extension
+    
   rke:
     templateError: Incorrect template format
   affinity:
diff --git a/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue b/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue
index 15f52f8ad8b..925f2f22cd5 100644
--- a/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue
+++ b/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue
@@ -9,9 +9,11 @@ import { HARVESTER_NAME as VIRTUAL } from '@shell/config/features';
 import { CAPI, HCI, MANAGEMENT, CATALOG } from '@shell/config/types';
 import { isHarvesterCluster } from '@shell/utils/cluster';
 import { allHash } from '@shell/utils/promise';
+import { NAME as APP_PRODUCT } from '@shell/config/product/apps';
+import { BLANK_CLUSTER } from '@shell/store/store-types.js';
 
-const HARVESTER_REPO = 'ui-plugin-examples';
-const HARVESTER_EXTENSION = 'harvester-manager';
+const HARVESTER_REPO = 'harvester-ui-extension';
+const HARVESTER_EXTENSION = 'harvester';
 
 export default {
   components: {
@@ -66,6 +68,20 @@ export default {
       hciClusters:  [],
       mgmtClusters: [],
       clusterrepos: [],
+      clusterRepoLink: {
+        name:   'c-cluster-product-resource',
+        params: {
+          cluster:  'local',
+          product:  APP_PRODUCT,
+          resource: CATALOG.CLUSTER_REPO
+        }
+      },
+      extensionsLink: {
+        name:   'c-cluster-uiplugins',
+        params: {
+          cluster: BLANK_CLUSTER,
+        }
+      },
     };
   },
 
@@ -201,7 +217,7 @@ export default {
         <hr class="info-section">
       </div>
     </div>
-    <div v-if="!harvesterExtension || !rows || !rows.length">
+    <template v-if="!harvesterExtension || !rows || !rows.length">
       <div class="logo">
         <BrandImage
           file-name="harvester.png"
@@ -211,17 +227,34 @@ export default {
       <div class="tagline">
         <div>{{ t('harvesterManager.cluster.description') }}</div>
       </div>
-      <div class="tagline sub-tagline">
+      <div class="tagline">
         <div v-clean-html="t('harvesterManager.cluster.learnMore', {}, true)" />
       </div>
+      <template v-if="!harvesterExtension">
+        <div class="tagline">
+          <div class="extension-warning" v-clean-html="t('harvesterManager.extension.install.warning', {}, true)" />
+        </div>
 
-      <div
-        v-if="!harvesterExtension"
-        class="tagline"
-      >
-        <div v-clean-html="t('harvesterManager.extension.install', {}, true)" />
-      </div>
-    </div>
+        <div class="extension-info">
+          <ol class="steps">
+            <li v-if="!harvesterRepo">
+              {{ t('harvesterManager.extension.install.steps.repo.1') }}
+              <router-link :to="clusterRepoLink">
+                {{ t('harvesterManager.extension.install.steps.repo.2') }}
+              </router-link>
+              {{ t('harvesterManager.extension.install.steps.repo.3') }}
+            </li>
+            <li>
+              {{ t('harvesterManager.extension.install.steps.ui.1') }}
+              <router-link :to="extensionsLink">
+                {{ t('harvesterManager.extension.install.steps.ui.2') }}
+              </router-link>
+              {{ t('harvesterManager.extension.install.steps.ui.3') }}
+            </li>
+          </ol>
+        </div>
+      </template>
+    </template>
   </div>
 </template>
 
@@ -267,6 +300,23 @@ export default {
     }
   }
 
+  .extension-warning {
+    font-size: 24px !important;
+    font-weight: 400;
+  }
+
+  .extension-info {
+    display: flex;
+    justify-content: center;
+
+    .steps {
+      > li {
+        margin-top: 5px;
+        font-size: 14px;
+      }
+    }
+  }
+
  .link {
     cursor: pointer;
   }

From a13654816ffc45519d534720964157bb894c2e39 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Tue, 29 Oct 2024 19:04:44 +0100
Subject: [PATCH 4/9] Code refactoring

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 .../list/harvesterhci.io.management.cluster.vue               | 4 +---
 pkg/harvester-manager/types.js                                | 2 ++
 2 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 pkg/harvester-manager/types.js

diff --git a/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue b/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue
index 925f2f22cd5..c57d2a9e090 100644
--- a/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue
+++ b/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue
@@ -11,9 +11,7 @@ import { isHarvesterCluster } from '@shell/utils/cluster';
 import { allHash } from '@shell/utils/promise';
 import { NAME as APP_PRODUCT } from '@shell/config/product/apps';
 import { BLANK_CLUSTER } from '@shell/store/store-types.js';
-
-const HARVESTER_REPO = 'harvester-ui-extension';
-const HARVESTER_EXTENSION = 'harvester';
+import { HARVESTER_EXTENSION, HARVESTER_REPO } from '../types'
 
 export default {
   components: {
diff --git a/pkg/harvester-manager/types.js b/pkg/harvester-manager/types.js
new file mode 100644
index 00000000000..389ef7efa81
--- /dev/null
+++ b/pkg/harvester-manager/types.js
@@ -0,0 +1,2 @@
+export const HARVESTER_REPO = 'harvester-ui-extension';
+export const HARVESTER_EXTENSION = 'harvester';

From 30a92eaf618c673bee548bb879b9e75f54001224 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Tue, 29 Oct 2024 19:37:14 +0100
Subject: [PATCH 5/9] Add installation steps for non-admin users

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 pkg/harvester-manager/l10n/en-us.yaml                     | 2 +-
 .../list/harvesterhci.io.management.cluster.vue           | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkg/harvester-manager/l10n/en-us.yaml b/pkg/harvester-manager/l10n/en-us.yaml
index e9892b53dd1..4f1d85391e6 100644
--- a/pkg/harvester-manager/l10n/en-us.yaml
+++ b/pkg/harvester-manager/l10n/en-us.yaml
@@ -19,7 +19,7 @@ harvesterManager:
           1: Go to
           2: Extensions
           3: page and install the Harvester Extension
-    
+      admin: Please contact your system administrator
   rke:
     templateError: Incorrect template format
   affinity:
diff --git a/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue b/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue
index c57d2a9e090..09d2fb87903 100644
--- a/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue
+++ b/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue
@@ -1,5 +1,6 @@
 <script>
 import { mapGetters } from 'vuex';
+import { isAdminUser } from '@shell/store/type-map';
 import BrandImage from '@shell/components/BrandImage';
 import TypeDescription from '@shell/components/TypeDescription';
 import ResourceTable from '@shell/components/ResourceTable';
@@ -57,6 +58,7 @@ export default {
     const resource = CAPI.RANCHER_CLUSTER;
 
     return {
+      isAdmin:      isAdminUser(this.$store.getters),
       navigating:   false,
       VIRTUAL,
       hciDashboard: HCI.DASHBOARD,
@@ -232,8 +234,7 @@ export default {
         <div class="tagline">
           <div class="extension-warning" v-clean-html="t('harvesterManager.extension.install.warning', {}, true)" />
         </div>
-
-        <div class="extension-info">
+        <div v-if="isAdmin" class="extension-info">
           <ol class="steps">
             <li v-if="!harvesterRepo">
               {{ t('harvesterManager.extension.install.steps.repo.1') }}
@@ -251,6 +252,9 @@ export default {
             </li>
           </ol>
         </div>
+        <div v-else class="tagline">
+          <div v-clean-html="t('harvesterManager.extension.install.admin', {}, true)" />
+        </div>
       </template>
     </template>
   </div>

From 690db16e312302448b46014b55247d4a4d864d46 Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Tue, 29 Oct 2024 19:38:45 +0100
Subject: [PATCH 6/9] Lint

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 .../harvesterhci.io.management.cluster.vue    | 37 +++++++++++--------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue b/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue
index 09d2fb87903..4ab54bdc478 100644
--- a/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue
+++ b/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue
@@ -12,7 +12,7 @@ import { isHarvesterCluster } from '@shell/utils/cluster';
 import { allHash } from '@shell/utils/promise';
 import { NAME as APP_PRODUCT } from '@shell/config/product/apps';
 import { BLANK_CLUSTER } from '@shell/store/store-types.js';
-import { HARVESTER_EXTENSION, HARVESTER_REPO } from '../types'
+import { HARVESTER_EXTENSION, HARVESTER_REPO } from '../types';
 
 export default {
   components: {
@@ -58,16 +58,16 @@ export default {
     const resource = CAPI.RANCHER_CLUSTER;
 
     return {
-      isAdmin:      isAdminUser(this.$store.getters),
-      navigating:   false,
+      isAdmin:         isAdminUser(this.$store.getters),
+      navigating:      false,
       VIRTUAL,
-      hciDashboard: HCI.DASHBOARD,
+      hciDashboard:    HCI.DASHBOARD,
       resource,
-      hResource:    HCI.CLUSTER,
-      realSchema:   this.$store.getters['management/schemaFor'](CAPI.RANCHER_CLUSTER),
-      hciClusters:  [],
-      mgmtClusters: [],
-      clusterrepos: [],
+      hResource:       HCI.CLUSTER,
+      realSchema:      this.$store.getters['management/schemaFor'](CAPI.RANCHER_CLUSTER),
+      hciClusters:     [],
+      mgmtClusters:    [],
+      clusterrepos:    [],
       clusterRepoLink: {
         name:   'c-cluster-product-resource',
         params: {
@@ -78,9 +78,7 @@ export default {
       },
       extensionsLink: {
         name:   'c-cluster-uiplugins',
-        params: {
-          cluster: BLANK_CLUSTER,
-        }
+        params: { cluster: BLANK_CLUSTER }
       },
     };
   },
@@ -232,9 +230,15 @@ export default {
       </div>
       <template v-if="!harvesterExtension">
         <div class="tagline">
-          <div class="extension-warning" v-clean-html="t('harvesterManager.extension.install.warning', {}, true)" />
+          <div
+            v-clean-html="t('harvesterManager.extension.install.warning', {}, true)"
+            class="extension-warning"
+          />
         </div>
-        <div v-if="isAdmin" class="extension-info">
+        <div
+          v-if="isAdmin"
+          class="extension-info"
+        >
           <ol class="steps">
             <li v-if="!harvesterRepo">
               {{ t('harvesterManager.extension.install.steps.repo.1') }}
@@ -252,7 +256,10 @@ export default {
             </li>
           </ol>
         </div>
-        <div v-else class="tagline">
+        <div
+          v-else
+          class="tagline"
+        >
           <div v-clean-html="t('harvesterManager.extension.install.admin', {}, true)" />
         </div>
       </template>

From 831d1bed2c4219f3800034fcba3000dd40d8fbcd Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Thu, 31 Oct 2024 11:00:23 +0100
Subject: [PATCH 7/9] Fix spelling and add Harvester extension repo

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 pkg/harvester-manager/l10n/en-us.yaml                     | 8 ++++----
 .../list/harvesterhci.io.management.cluster.vue           | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkg/harvester-manager/l10n/en-us.yaml b/pkg/harvester-manager/l10n/en-us.yaml
index 4f1d85391e6..9aff4343219 100644
--- a/pkg/harvester-manager/l10n/en-us.yaml
+++ b/pkg/harvester-manager/l10n/en-us.yaml
@@ -12,11 +12,11 @@ harvesterManager:
       warning: "Harvester extension is not installed"
       steps:
         repo:
-          1: Go to
-          2: Manage Repositories
-          3: and add the Harvester repository
+          1: Go to the
+          2: Apps Repositories
+          3: page and add the <a target="_blank" href="https://github.com/harvester/harvester-ui-extension" rel="noopener noreferrer nofollow">Harvester repository</a>
         ui:
-          1: Go to
+          1: Go to the
           2: Extensions
           3: page and install the Harvester Extension
       admin: Please contact your system administrator
diff --git a/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue b/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue
index 4ab54bdc478..119a813a8cf 100644
--- a/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue
+++ b/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue
@@ -245,7 +245,7 @@ export default {
               <router-link :to="clusterRepoLink">
                 {{ t('harvesterManager.extension.install.steps.repo.2') }}
               </router-link>
-              {{ t('harvesterManager.extension.install.steps.repo.3') }}
+              <span v-clean-html="t('harvesterManager.extension.install.steps.repo.3', {}, true)"></span>
             </li>
             <li>
               {{ t('harvesterManager.extension.install.steps.ui.1') }}

From bc963dc5ab32a49674bb35f2275987ee66e51872 Mon Sep 17 00:00:00 2001
From: Neil MacDougall <nmacdougall@suse.com>
Date: Thu, 31 Oct 2024 12:30:49 +0000
Subject: [PATCH 8/9] Tweak UI Extension install messages

---
 pkg/harvester-manager/l10n/en-us.yaml         |  3 ++-
 .../harvesterhci.io.management.cluster.vue    | 20 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/pkg/harvester-manager/l10n/en-us.yaml b/pkg/harvester-manager/l10n/en-us.yaml
index 9aff4343219..c319125e0ac 100644
--- a/pkg/harvester-manager/l10n/en-us.yaml
+++ b/pkg/harvester-manager/l10n/en-us.yaml
@@ -9,7 +9,8 @@ harvesterManager:
     loadError: Error loading harvester plugin
   extension:
     install:
-      warning: "Harvester extension is not installed"
+      warning: "The Harvester UI Extension is not installed"
+      prompt: "UI Integration for Harvester is now provided via the new Harvester UI Extension, which needs to be installed."
       steps:
         repo:
           1: Go to the
diff --git a/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue b/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue
index 119a813a8cf..d8186590c87 100644
--- a/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue
+++ b/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue
@@ -229,11 +229,18 @@ export default {
         <div v-clean-html="t('harvesterManager.cluster.learnMore', {}, true)" />
       </div>
       <template v-if="!harvesterExtension">
-        <div class="tagline">
+        <div class="tagline extension-warning-panel">
+          <div class="extensions-separator"></div>
           <div
             v-clean-html="t('harvesterManager.extension.install.warning', {}, true)"
             class="extension-warning"
           />
+          <div class="tagline">
+            <div
+              v-clean-html="t('harvesterManager.extension.install.prompt', {}, true)"
+              class="extension-prompt"
+            />
+          </div>
         </div>
         <div
           v-if="isAdmin"
@@ -309,6 +316,17 @@ export default {
     }
   }
 
+  .extensions-separator {
+    border: 1px solid var(--border);
+    margin-bottom: 20px;
+    width: 50%;
+  }
+
+  .extension-warning-panel {
+    align-items: center;
+    flex-direction: column;
+  }
+
   .extension-warning {
     font-size: 24px !important;
     font-weight: 400;

From a8e931353cb867426f390ce777edb17883da3f9e Mon Sep 17 00:00:00 2001
From: Francesco Torchia <francesco.torchia@suse.com>
Date: Thu, 31 Oct 2024 15:51:54 +0100
Subject: [PATCH 9/9] Fix harvester repo check

Signed-off-by: Francesco Torchia <francesco.torchia@suse.com>
---
 .../list/harvesterhci.io.management.cluster.vue                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue b/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue
index d8186590c87..3aa785da89f 100644
--- a/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue
+++ b/pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue
@@ -87,7 +87,7 @@ export default {
     ...mapGetters({ uiplugins: 'uiplugins/plugins' }),
 
     harvesterRepo() {
-      return this.clusterrepos?.find((c) => c.name === HARVESTER_REPO);
+      return this.clusterrepos?.find((c) => c.spec?.gitRepo?.includes(HARVESTER_REPO));
     },
 
     harvesterExtension() {