Merge pull request #1615 from RoadieHQ/samn/argo-multi-fe

Samn/argo multi fe
RoadieHQ · Sep 16, 2024 · b140119 · b140119
2 parents 6095bfc + dc9664d
commit b140119
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/.changeset/nice-pets-build.md b/.changeset/nice-pets-build.md
@@ -0,0 +1,6 @@
+---
+'@roadiehq/backstage-plugin-argo-cd-backend': minor
+'@roadiehq/backstage-plugin-argo-cd': minor
+---
+
+Allow setting up a separate frontend URL on multiple Ar instances for linking purposes.
diff --git a/plugins/frontend/backstage-plugin-argo-cd/config.d.ts b/plugins/frontend/backstage-plugin-argo-cd/config.d.ts
@@ -34,6 +34,10 @@ export interface Config {
          * @visibility frontend
          */
         name: string;
+        /**
+         * @visibility frontend
+         */
+        frontendUrl?: string;
         /**
          * @visibility frontend
          */

diff --git a/plugins/frontend/backstage-plugin-argo-cd/src/components/ArgoCDDetailsCard.tsx b/plugins/frontend/backstage-plugin-argo-cd/src/components/ArgoCDDetailsCard.tsx
@@ -173,15 +173,18 @@ const OverviewComponent = ({
 
   const getBaseUrl = (row: any): string | undefined => {
     if (supportsMultipleArgoInstances && !baseUrl) {
-      return configApi
+      const instanceConfig = configApi
         .getConfigArray('argocd.appLocatorMethods')
         .find(value => value.getOptionalString('type') === 'config')
         ?.getOptionalConfigArray('instances')
         ?.find(
           value =>
             value.getOptionalString('name') === row.metadata?.instance?.name,
-        )
-        ?.getOptionalString('url');
+        );
+      return (
+        instanceConfig?.getOptionalString('frontendUrl') ??
+        instanceConfig?.getOptionalString('url')
+      );
     }
     return baseUrl;
   };

diff --git a/plugins/frontend/backstage-plugin-argo-cd/src/components/ArgoCDHistoryTable.tsx b/plugins/frontend/backstage-plugin-argo-cd/src/components/ArgoCDHistoryTable.tsx
@@ -29,6 +29,7 @@ export type ArgoCDHistoryTableRow = ArgoCDAppHistoryDetails & {
   app: string;
   appNamespace: string;
   instance?: string;
+  frontendUrl?: string;
   revisionDetails?: ArgoCDAppDeployRevisionDetails;
 };
 
@@ -40,21 +41,24 @@ export const ArgoCDHistoryTable = ({
   retry: () => void;
 }) => {
   const configApi = useApi(configApiRef);
-  const baseUrl = configApi.getOptionalString('argocd.baseUrl');
   const namespaced =
     configApi.getOptionalBoolean('argocd.namespacedApps') ?? false;
   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 columns: TableColumn[] = [
     {
       title: 'Name',
       field: 'name',
       render: (row: any): React.ReactNode =>
-        baseUrl ? (
+        linkUrl ? (
           <Link
-            href={`${baseUrl}/applications/${
+            href={`${linkUrl}/applications/${
               namespaced ? `${row.appNamespace}/${row.app}` : row.app
             }`}
             target="_blank"