Merge pull request #17726 from a110605/issue_17601

refactor: rename communityRepoRegexes to harvesterRepoRegexes and update related logic

Author: a110605

pkg/harvester-manager/list/harvesterhci.io.management.cluster.vue

@@ -15,11 +15,10 @@ import { NAME as APP_PRODUCT } from '@shell/config/product/apps';
 import { BLANK_CLUSTER } from '@shell/store/store-types.js';
 import { UI_PLUGIN_NAMESPACE } from '@shell/config/uiplugins';
 import {
-  HARVESTER_CHART, HARVESTER_COMMUNITY_REPO, HARVESTER_RANCHER_REPO, communityRepoRegexes, HARVESTER_CATALOG_IMAGES
+  HARVESTER_CHART, HARVESTER_COMMUNITY_REPO, HARVESTER_RANCHER_REPO, harvesterRepoRegexes, HARVESTER_CATALOG_IMAGES
 } from '../types';
 import {
   getLatestExtensionVersion,
-  getHelmRepositoryExact,
   getHelmRepositoryMatch,
   createHelmRepository,
   refreshHelmRepository,
@@ -67,7 +66,6 @@ export default {
     this.mgmtClusters = hash.mgmtClusters;
 
     this.harvesterRepository = await this.getHarvesterRepository();
-
     this.kubeVersion = this.$store.getters['management/byId'](MANAGEMENT.CLUSTER, 'local')?.kubernetesVersionBase || '';
   },
 
@@ -107,6 +105,7 @@ export default {
   },
 
   watch: {
+    // watch harvester repository, if it changes to a valid one, then we will check if there is an update for harvester extension, which will trigger the extension update message in the UI
     async harvesterRepository(neu) {
       if (neu) {
         await refreshHelmRepository(this.$store, neu.spec.gitRepo || neu.spec.url);
@@ -243,11 +242,7 @@ export default {
   methods: {
     async getHarvesterRepository() {
       try {
-        if (isRancherPrime()) {
-          return await getHelmRepositoryExact(this.$store, HARVESTER_REPO.gitRepo);
-        } else {
-          return await getHelmRepositoryMatch(this.$store, communityRepoRegexes, HARVESTER_CATALOG_IMAGES);
-        }
+        return await getHelmRepositoryMatch(this.$store, harvesterRepoRegexes, HARVESTER_CATALOG_IMAGES);
       } catch (error) {
         this.harvesterRepositoryError = true;
       }

pkg/harvester-manager/types.js

@@ -2,9 +2,10 @@ import { UI_PLUGINS_REPOS } from '@shell/config/uiplugins';
 
 export const HARVESTER_CATALOG_IMAGES = ['ui-plugin-catalog', 'ui-extension-harvester-ui-extension'];
 
-export const communityRepoRegexes = [
-  /^https:\/\/github\.com\/.*\/harvester-ui-extension+/g,
-  /^https:\/\/.*\.github\.io\/harvester-ui-extension+/g,
+export const harvesterRepoRegexes = [
+  /^https:\/\/github\.com\/.*\/harvester-ui-extension+/g, // e.g. https://github.com/harvester/harvester-ui-extension
+  /^https:\/\/.*\.github\.io\/harvester-ui-extension+/g, // e.g. https://github.io/harvester/harvester-ui-extension
+  UI_PLUGINS_REPOS.OFFICIAL.URL, // rancher/ui-plugin-charts
 ];
 
 export const HARVESTER_CHART = {

shell/utils/uiplugins.ts

@@ -180,18 +180,19 @@ export async function getHelmRepositoryExact(store: any, url: string): Promise<H
 /**
  *
  * @param store Vue store
- * @param urlRegexes Regex to match a community repository
+ * @param urlRegexes Regex to match against the repository's urls
  * @param catalogImages Catalog images to match against the repository's labels
  * @returns HelmRepository
  */
 export async function getHelmRepositoryMatch(store: any, urlRegexes: string[], catalogImages: string[]): Promise<HelmRepository> {
   return await getHelmRepository(store, (repository: any) => {
-    // if installed from rancher/ui-plugin-catalog or rancher/ui-extension-harvester-ui-extension
     const catalog = repository?.metadata?.labels?.[UI_PLUGIN_LABELS.CATALOG_IMAGE] || '';
 
-    if (catalogImages.includes(catalog)) {
+    // if installed from rancher/ui-plugin-catalog or rancher/ui-extension-harvester-ui-extension
+    if (catalog && catalogImages.includes(catalog)) {
       return true;
     }
+
     const target = repository.spec?.gitBranch ? repository.spec?.gitRepo : repository.spec?.url;
 
     return matchesSomeRegex(target, urlRegexes);