Merge pull request #1715 from tdabasinskas/argo_url_fix

fix(argocd): update linkUrl logic for multi-instance support
RoadieHQ · Nov 12, 2024 · d440218 · d440218
2 parents b59b4b4 + 7520be9
commit d440218
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/.changeset/fresh-pears-fix.md b/.changeset/fresh-pears-fix.md
@@ -0,0 +1,5 @@
+---
+'@roadiehq/backstage-plugin-argo-cd': patch
+---
+
+update linkUrl logic in ArgoCDHistory component for multi-instance support
diff --git a/plugins/frontend/backstage-plugin-argo-cd/src/components/ArgoCDHistoryTable.tsx b/plugins/frontend/backstage-plugin-argo-cd/src/components/ArgoCDHistoryTable.tsx
@@ -43,13 +43,25 @@ export const ArgoCDHistoryTable = ({
   const configApi = useApi(configApiRef);
   const namespaced =
     configApi.getOptionalBoolean('argocd.namespacedApps') ?? false;
+  const baseUrl = configApi.getOptionalString('argocd.baseUrl');
   const supportsMultipleArgoInstances: boolean = Boolean(
     configApi.getOptionalConfigArray('argocd.appLocatorMethods')?.length,
   );
-  const linkUrl = (row: any) =>
-    supportsMultipleArgoInstances && row.metadata?.instance?.frontendUrl
-      ? row.metadata?.instance?.frontendUrl
-      : configApi.getOptionalString('argocd.baseUrl');
+
+  const linkUrl = (row: any): string | undefined => {
+    if (supportsMultipleArgoInstances && !baseUrl) {
+      const instanceConfig = configApi
+        .getConfigArray('argocd.appLocatorMethods')
+        .find(value => value.getOptionalString('type') === 'config')
+        ?.getOptionalConfigArray('instances')
+        ?.find(value => value.getOptionalString('name') === row?.instance);
+      return (
+        instanceConfig?.getOptionalString('frontendUrl') ??
+        instanceConfig?.getOptionalString('url')
+      );
+    }
+    return baseUrl;
+  };
 
   const columns: TableColumn[] = [
     {