diff --git a/public/app/plugins/panel/annolist/AnnotationListItem.tsx b/public/app/plugins/panel/annolist/AnnotationListItem.tsx index 51a90eb5dca..7bc1ab178c5 100644 --- a/public/app/plugins/panel/annolist/AnnotationListItem.tsx +++ b/public/app/plugins/panel/annolist/AnnotationListItem.tsx @@ -23,7 +23,7 @@ export const AnnotationListItem: FC = ({ }) => { const styles = useStyles2(getStyles); const { showUser, showTags, showTime } = options; - const { text, login, email, avatarUrl, tags, time } = annotation; + const { text, login, email, avatarUrl, tags, time, timeEnd } = annotation; const onItemClick = (e: MouseEvent) => { e.stopPropagation(); onClick(annotation); @@ -33,6 +33,7 @@ export const AnnotationListItem: FC = ({ }; const showAvatar = login && showUser; const showTimeStamp = time && showTime; + const showTimeStampEnd = timeEnd && timeEnd !== time && showTime; return (
@@ -40,6 +41,8 @@ export const AnnotationListItem: FC = ({
{text} {showTimeStamp ? : null} + {showTimeStampEnd ? - : null} + {showTimeStampEnd ? : null}
{showAvatar ? : null} @@ -129,6 +132,7 @@ function getStyles(theme: GrafanaTheme2) { `, time: css` margin-left: ${theme.spacing(1)}; + margin-right: ${theme.spacing(1)} font-size: ${theme.typography.bodySmall.fontSize}; color: ${theme.colors.text.secondary}; `,