Merge pull request #5155 from rohitkrai03/help-topology-icon-fix

Bug 1826933: Show helm chart icon in group label in topology
openshift · Apr 29, 2020 · 9d06fe6 · 9d06fe6
2 parents 495e688 + 144a37a
commit 9d06fe6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/frontend/packages/console-shared/src/utils/icon-utils.ts b/frontend/packages/console-shared/src/utils/icon-utils.ts
@@ -6,9 +6,14 @@ export const getImageForCSVIcon = (icon: CSVIcon | undefined) => {
   return icon ? `data:${icon.mediatype};base64,${icon.base64data}` : operatorLogo;
 };
 
-export const isIconUrl = (s: string): boolean => {
-  const urlRegex = /^\s*data:([a-z]+\/[a-z0-9-+.]+(;[a-z-]+=[a-z0-9-]+)?)?(;base64)?,([a-z0-9!$&',()*+;=\-._~:@/?%\s]*)\s*$/i;
-  return !!s.match(urlRegex);
+export const isIconUrl = (url: string): boolean => {
+  try {
+    // eslint-disable-next-line no-new
+    new URL(url);
+    return true;
+  } catch {
+    return false;
+  }
 };
 
 export const getDefaultOperatorIcon = () => operatorLogo;
diff --git a/frontend/packages/dev-console/src/components/topology/helm/components/HelmReleaseGroup.tsx b/frontend/packages/dev-console/src/components/topology/helm/components/HelmReleaseGroup.tsx
@@ -113,7 +113,7 @@ const HelmReleaseGroup: React.FC<HelmReleaseGroupProps> = ({
           paddingY={4}
           kind="HelmRelease"
           dragRef={dragLabelRef}
-          typeIconClass="icon-helm"
+          typeIconClass={element.getData().data.chartIcon || 'icon-helm'}
         >
           {element.getLabel()}
         </SvgBoxedText>

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
@@ -78,6 +78,7 @@ export const getTopologyHelmReleaseGroupItem = (
     routes: null,
   };
   dataModel.data = {
+    chartIcon: helmResources?.chartIcon,
     manifestResources: helmResources?.manifestResources || [],
     releaseNotes,
   };