updated to fix the tests

RoadieHQ · Aug 4, 2023 · 6580746 · 6580746
1 parent bd70499
commit 6580746
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/.changeset/polite-bags-notice.md b/.changeset/polite-bags-notice.md
@@ -2,4 +2,4 @@
 '@roadiehq/backstage-plugin-argo-cd': patch
 ---
 
-Filtered null values from ArgoCD data
+Filtered null values from ArgoCD revision history
diff --git a/plugins/frontend/backstage-plugin-argo-cd/src/components/ArgoCDDetailsCard.tsx b/plugins/frontend/backstage-plugin-argo-cd/src/components/ArgoCDDetailsCard.tsx
@@ -254,6 +254,15 @@ const ArgoCDDetails = ({
     );
   }
   if (value) {
+    if ((value as ArgoCDAppList).items !== undefined) {
+      return (
+        <OverviewComponent
+          data={value as ArgoCDAppList}
+          retry={retry}
+          extraColumns={extraColumns}
+        />
+      );
+    }
     if (Array.isArray(value)) {
       const wrapped: ArgoCDAppList = {
         items: value as Array<ArgoCDAppDetails>,

diff --git a/plugins/frontend/backstage-plugin-argo-cd/src/components/ArgoCDHistoryCard.tsx b/plugins/frontend/backstage-plugin-argo-cd/src/components/ArgoCDHistoryCard.tsx
@@ -192,6 +192,9 @@ const ArgoCDHistory = ({ entity }: { entity: Entity }) => {
   }
 
   if (value) {
+    if ((value as ArgoCDAppList).items !== undefined) {
+      return <HistoryTable data={value as ArgoCDAppList} retry={retry} />;
+    }
     if (Array.isArray(value)) {
       const wrapped: ArgoCDAppList = {
         items: value as Array<ArgoCDAppDetails>,

diff --git a/plugins/frontend/backstage-plugin-argo-cd/src/components/useAppDetails.ts b/plugins/frontend/backstage-plugin-argo-cd/src/components/useAppDetails.ts
@@ -166,7 +166,7 @@ export const useAppDetails = ({
             output.filter(n => n),
           );
         }
-        return result.items?.filter(n => n);
+        return result;
       }
       return Promise.reject('Neither appName nor appSelector provided');
     } catch (e: any) {