diff --git a/plugins/catalog/src/components/AboutCard/AboutCard.tsx b/plugins/catalog/src/components/AboutCard/AboutCard.tsx index 3214ea3385..821778d3d8 100644 --- a/plugins/catalog/src/components/AboutCard/AboutCard.tsx +++ b/plugins/catalog/src/components/AboutCard/AboutCard.tsx @@ -125,9 +125,7 @@ export function AboutCard({ entity, variant }: AboutCardProps) { disabled={!entity.spec?.implementsApis} label="View API" icon={} - href={`./${ - entity.metadata.namespace || ENTITY_DEFAULT_NAMESPACE - }:${entity.metadata.name}/api`} + href="api" /> } diff --git a/plugins/catalog/src/components/AboutCard/IconLinkVertical/IconLinkVertical.tsx b/plugins/catalog/src/components/AboutCard/IconLinkVertical/IconLinkVertical.tsx index 580dcff0f5..c054bc0d4e 100644 --- a/plugins/catalog/src/components/AboutCard/IconLinkVertical/IconLinkVertical.tsx +++ b/plugins/catalog/src/components/AboutCard/IconLinkVertical/IconLinkVertical.tsx @@ -17,6 +17,7 @@ import * as React from 'react'; import classnames from 'classnames'; import { makeStyles, Link } from '@material-ui/core'; import LinkIcon from '@material-ui/icons/Link'; +import { Link as RouterLink } from 'react-router-dom'; export type IconLinkVerticalProps = { icon?: React.ReactNode; @@ -64,8 +65,18 @@ export function IconLinkVertical({ ); } + // Absolute links should not be using RouterLink + if (href?.startsWith('//') || href?.includes('://')) { + return ( + + {icon} + {props.label} + + ); + } + return ( - + {icon} {props.label} diff --git a/plugins/catalog/src/components/Router.tsx b/plugins/catalog/src/components/Router.tsx index c6e706c15b..0a002ba907 100644 --- a/plugins/catalog/src/components/Router.tsx +++ b/plugins/catalog/src/components/Router.tsx @@ -31,7 +31,7 @@ const DefaultEntityPage = () => ( title="Overview" element={ - This is default entity page. + This is the default entity page. To override this component with your custom implementation, read docs on{' '} @@ -62,9 +62,9 @@ export const Router = ({ EntityPage?: ComponentType; }) => ( - } /> + } />