11import React from 'react' ;
22
3+ import { TriangleExclamation } from '@gravity-ui/icons' ;
34import DataTable from '@gravity-ui/react-data-table' ;
4- import { HelpMark , Text } from '@gravity-ui/uikit' ;
5+ import { ActionTooltip , Icon , Popover , Text } from '@gravity-ui/uikit' ;
56import { isNil } from 'lodash' ;
67import { Link } from 'react-router-dom' ;
78
@@ -88,6 +89,9 @@ export const tsDiffColumn: Column<TopicMessageEnhanced> = {
8889 header : TOPIC_DATA_COLUMNS_TITLES [ TOPIC_DATA_COLUMNS_IDS . TS_DIFF ] ,
8990 align : DataTable . RIGHT ,
9091 render : ( { row} ) => {
92+ if ( isNil ( row . TimestampDiff ) ) {
93+ return EMPTY_DATA_PLACEHOLDER ;
94+ }
9195 const numericValue = safeParseNumber ( row . TimestampDiff ) ;
9296 return (
9397 < span className = { b ( 'ts-diff' , { danger : numericValue >= 100_000 } ) } >
@@ -271,10 +275,11 @@ function Offset({offset, removed, notLoaded}: PartitionIdProps) {
271275
272276 if ( removed ) {
273277 return (
274- < Text className = { b ( 'offset' , { removed : true } ) } variant = "body-2" >
275- { offset }
276- < HelpMark > { i18n ( 'description_removed-message' ) } </ HelpMark >
277- </ Text >
278+ < ActionTooltip title = { i18n ( 'description_removed-message' ) } placement = { 'right' } >
279+ < Text className = { b ( 'offset' , { removed : true } ) } variant = "body-2" >
280+ { offset }
281+ </ Text >
282+ </ ActionTooltip >
278283 ) ;
279284 }
280285
@@ -297,9 +302,16 @@ function Offset({offset, removed, notLoaded}: PartitionIdProps) {
297302 { offset }
298303 </ Text >
299304 { notLoaded && (
300- < HelpMark >
301- < Text className = { b ( 'help' ) } > { i18n ( 'description_not-loaded-message' ) } </ Text >
302- </ HelpMark >
305+ < Popover
306+ content = {
307+ < Text className = { b ( 'help' ) } > { i18n ( 'description_not-loaded-message' ) } </ Text >
308+ }
309+ className = { b ( 'help-popover' ) }
310+ >
311+ < Text color = "secondary" className = { b ( 'help-popover' ) } >
312+ < Icon data = { TriangleExclamation } />
313+ </ Text >
314+ </ Popover >
303315 ) }
304316 </ Link >
305317 ) ;
0 commit comments