fix topology failing to load after installing a Helm Chart

openshift · Sep 22, 2020 · 59daaa0 · 59daaa0
1 parent 759c30d
commit 59daaa0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/frontend/packages/dev-console/src/components/helm/details/resources/HelmReleaseResources.tsx b/frontend/packages/dev-console/src/components/helm/details/resources/HelmReleaseResources.tsx
@@ -24,8 +24,9 @@ export interface HelmReleaseResourcesProps {
 const HelmReleaseResources: React.FC<HelmReleaseResourcesProps> = ({ match, customData }) => {
   const namespace = match.params.ns;
   const helmManifest = customData ? safeLoadAll(customData.manifest) : [];
-  const helmManifestResources: FirehoseResource[] = helmManifest.map(
-    (resource: K8sResourceKind) => {
+  const helmManifestResources: FirehoseResource[] = helmManifest
+    .filter((obj) => obj)
+    .map((resource: K8sResourceKind) => {
       const resourceKind = referenceFor(resource);
       const model = modelFor(resourceKind);
       return {
@@ -36,8 +37,7 @@ const HelmReleaseResources: React.FC<HelmReleaseResourcesProps> = ({ match, cust
         isList: false,
         optional: true,
       };
-    },
-  );
+    });
   return (
     <MultiListPage
       filterLabel="Resources by name"

diff --git a/frontend/packages/dev-console/src/components/topology/helm/helm-data-transformer.ts b/frontend/packages/dev-console/src/components/topology/helm/helm-data-transformer.ts
@@ -164,7 +164,8 @@ const getHelmReleaseMap = (namespace: string) => {
     .then((releases) =>
       releases.reduce((acc, release) => {
         try {
-          const manifestResources: K8sResourceKind[] = safeLoadAll(release.manifest);
+          let manifestResources: K8sResourceKind[] = safeLoadAll(release.manifest);
+          manifestResources = manifestResources.filter((obj) => obj);
           manifestResources.forEach((resource) => {
             const resourceKindName = getHelmReleaseKey(resource);
             if (!acc.hasOwnProperty(resourceKindName)) {