Resource is null right after helm upgrade. Return undefined/null unti…

…l data is available. (#3)
openshift · Jan 20, 2022 · 1d5bbba · 1d5bbba
1 parent 53fb6be
commit 1d5bbba
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/frontend/packages/helm-plugin/src/actions/providers.ts b/frontend/packages/helm-plugin/src/actions/providers.ts
@@ -30,10 +30,12 @@ export const useHelmActionProviderForTopology = (element: GraphElement) => {
     const nodeType = element.getType();
     if (nodeType !== TYPE_HELM_RELEASE) return undefined;
     const releaseName = element.getLabel();
+    const resource = getResource(element);
+    if (!resource?.metadata) return null;
     const {
       namespace,
       labels: { version },
-    } = getResource(element).metadata;
+    } = resource.metadata;
     return {
       release: {
         name: releaseName,

diff --git a/frontend/packages/helm-plugin/src/topology/helm-data-transformer.ts b/frontend/packages/helm-plugin/src/topology/helm-data-transformer.ts
@@ -43,7 +43,6 @@ export const getTopologyHelmReleaseGroupItem = (
   const resourceKindName = getHelmReleaseKey(obj);
   const helmResources = helmResourcesMap[resourceKindName];
   const releaseName = helmResources?.releaseName;
-  const releaseVersion = helmResources?.releaseVersion;
   const releaseNotes = helmResources?.releaseNotes;
   const uid = obj?.metadata?.uid ?? null;
   const returnData = [];
@@ -53,8 +52,7 @@ export const getTopologyHelmReleaseGroupItem = (
   }
 
   const secret = secrets.find((nextSecret) => {
-    const { labels } = nextSecret.metadata;
-    return labels?.name === releaseName && labels?.version === releaseVersion.toString();
+    return nextSecret.metadata.labels?.name === releaseName;
   });
 
   if (secret) {

diff --git a/frontend/packages/helm-plugin/src/topology/sidebar/release-panel/resource-link.tsx b/frontend/packages/helm-plugin/src/topology/sidebar/release-panel/resource-link.tsx
@@ -8,7 +8,9 @@ import { TYPE_HELM_RELEASE } from '../../components/const';
 const helmReleasePanelResourceLink = (element: GraphElement) => {
   if (element.getType() !== TYPE_HELM_RELEASE) return undefined;
   const name = element.getLabel();
-  const { namespace } = getResource(element).metadata;
+  const resource = getResource(element);
+  if (!resource?.metadata) return null;
+  const { namespace } = resource.metadata;
   return (
     <>
       <ResourceIcon className="co-m-resource-icon--lg" kind="HelmRelease" />

diff --git a/frontend/packages/helm-plugin/src/topology/sidebar/release-panel/tab-sections.tsx b/frontend/packages/helm-plugin/src/topology/sidebar/release-panel/tab-sections.tsx
@@ -36,16 +36,18 @@ export const getHelmReleasePanelDetailsTabSection = (element: GraphElement) => {
 export const getHelmReleasePanelResourceTabSection = (element: GraphElement) => {
   if (element.getType() !== TYPE_HELM_RELEASE) return undefined;
   const { manifestResources } = element.getData().data;
-  const { namespace } = getResource(element).metadata;
+  const resource = getResource(element);
+  if (!manifestResources || !resource?.metadata) return null;
+  const { namespace } = resource.metadata;
 
-  return manifestResources ? (
+  return (
     <div className="overview__sidebar-pane-body">
       <TopologyGroupResourcesPanel
         manifestResources={manifestResources}
         releaseNamespace={namespace}
       />
     </div>
-  ) : null;
+  );
 };
 
 export const getHelmReleasePanelReleaseNotesTabSection = (element: GraphElement) => {