Merge pull request #1072 from planeiii-te/revision-history-clean-up

Filter `null` values from ArgoCD response
RoadieHQ · Aug 8, 2023 · 0716d0b · 0716d0b
2 parents 85496fb + 6580746
commit 0716d0b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/.changeset/polite-bags-notice.md b/.changeset/polite-bags-notice.md
@@ -0,0 +1,5 @@
+---
+'@roadiehq/backstage-plugin-argo-cd': patch
+---
+
+Filtered null values from ArgoCD revision history
diff --git a/plugins/frontend/backstage-plugin-argo-cd/src/components/useAppDetails.ts b/plugins/frontend/backstage-plugin-argo-cd/src/components/useAppDetails.ts
@@ -143,8 +143,9 @@ export const useAppDetails = ({
             return newItem;
           },
         );
-        const result = await Promise.all(getRevisionHistroyPromises);
-        return result;
+        return Promise.all(getRevisionHistroyPromises).then(result =>
+          result.filter(n => n),
+        );
       }
       if (appSelector || projectName) {
         const result = await api.listApps({ url, appSelector, projectName });
@@ -161,7 +162,9 @@ export const useAppDetails = ({
               return newItem;
             },
           );
-          return await Promise.all(getRevisionHistroyPromises);
+          return Promise.all(getRevisionHistroyPromises).then(output =>
+            output.filter(n => n),
+          );
         }
         return result;
       }