diff --git a/frontend/src/component/common/Table/cells/FeatureSeenCell/FeatureEnvironmentSeenCell.tsx b/frontend/src/component/common/Table/cells/FeatureSeenCell/FeatureEnvironmentSeenCell.tsx index c28d9798fb..eadb37691f 100644 --- a/frontend/src/component/common/Table/cells/FeatureSeenCell/FeatureEnvironmentSeenCell.tsx +++ b/frontend/src/component/common/Table/cells/FeatureSeenCell/FeatureEnvironmentSeenCell.tsx @@ -9,7 +9,10 @@ interface IFeatureSeenCellProps { export const FeatureEnvironmentSeenCell: VFC = ({ feature, }) => { - const environments = Object.values(feature.environments); + const environments = Boolean(feature.environments) + ? Object.values(feature.environments) + : []; + return ( ; @@ -63,10 +64,14 @@ interface ILastSeenTooltipProps { export const LastSeenTooltip = ({ environments, + featureLastSeen, ...rest }: ILastSeenTooltipProps) => { const getColor = useLastSeenColors(); const [, defaultTextColor] = getColor(); + const environmentsHaveLastSeen = environments?.some(environment => + Boolean(environment.lastSeenAt) + ); return ( @@ -75,46 +80,84 @@ export const LastSeenTooltip = ({ Usage is reported from connected applications through metrics - {environments && - environments.map(({ name, lastSeenAt }) => ( - - - {name} - - - { - const [, textColor] = - getColor(unit); - return ( - - {`${value} ${unit}${ - value !== 1 ? 's' : '' - } ${suffix}`} - - ); - }} + + {environments?.map(({ name, lastSeenAt }) => ( + + + {name} + + + { + const [, textColor] = + getColor(unit); + return ( + + {`${value} ${unit}${ + value !== 1 + ? 's' + : '' + } ${suffix}`} + + ); + }} + /> + } + elseShow={ + + no usage + + } /> - } - elseShow={ - - no usage - - } - /> - - - ))} + + + ))} + + } + elseShow={ + { + const [, textColor] = getColor(unit); + return ( + + {`Reported ${value} ${unit}${ + value !== 1 ? 's' : '' + } ${suffix}`} + + ); + }} + /> + } + /> ); }; diff --git a/frontend/src/component/feature/FeatureView/FeatureEnvironmentSeen/FeatureEnvironmentSeen.tsx b/frontend/src/component/feature/FeatureView/FeatureEnvironmentSeen/FeatureEnvironmentSeen.tsx index 58fb7d6747..00a037dd30 100644 --- a/frontend/src/component/feature/FeatureView/FeatureEnvironmentSeen/FeatureEnvironmentSeen.tsx +++ b/frontend/src/component/feature/FeatureView/FeatureEnvironmentSeen/FeatureEnvironmentSeen.tsx @@ -91,6 +91,7 @@ export const FeatureEnvironmentSeen = ({ sx={sx} tooltip={ }