Skip to content

Commit 491eb03

Browse files
committed
fix
1 parent 7c268a0 commit 491eb03

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

src/containers/Tenant/Diagnostics/TopicData/TopicData.tsx

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,14 @@ export function TopicData({parentRef, path, database}: TopicDataProps) {
155155
[path, database, selectedPartition, emptyData],
156156
);
157157

158+
const resetFilters = React.useCallback(() => {
159+
handleSelectedOffsetChange(undefined);
160+
handleStartTimestampChange(undefined);
161+
if (topicDataFilter === 'TIMESTAMP') {
162+
setControlsKey((prev) => prev + 1);
163+
}
164+
}, [handleSelectedOffsetChange, handleStartTimestampChange, topicDataFilter]);
165+
158166
const scrollToOffset = React.useCallback(
159167
(newOffset: number) => {
160168
const scrollTop = (newOffset - (baseOffset ?? 0)) * DEFAULT_TABLE_ROW_HEIGHT;
@@ -183,15 +191,17 @@ export function TopicData({parentRef, path, database}: TopicDataProps) {
183191

184192
const scrollToStartOffset = React.useCallback(() => {
185193
if (startOffset) {
194+
resetFilters();
186195
scrollToOffset(startOffset);
187196
}
188-
}, [startOffset, scrollToOffset]);
197+
}, [startOffset, scrollToOffset, resetFilters]);
189198

190199
const scrollToEndOffset = React.useCallback(() => {
191200
if (endOffset) {
201+
resetFilters();
192202
scrollToOffset(endOffset);
193203
}
194-
}, [endOffset, scrollToOffset]);
204+
}, [endOffset, scrollToOffset, resetFilters]);
195205

196206
const renderControls: RenderControls = () => {
197207
return (
@@ -214,20 +224,11 @@ export function TopicData({parentRef, path, database}: TopicDataProps) {
214224
const renderEmptyDataMessage = () => {
215225
const hasFilters = selectedOffset || startTimestamp;
216226

217-
const resetFilter = () => {
218-
if (topicDataFilter === 'OFFSET') {
219-
handleSelectedOffsetChange(undefined);
220-
} else if (topicDataFilter === 'TIMESTAMP') {
221-
handleStartTimestampChange(undefined);
222-
setControlsKey((prev) => prev + 1);
223-
}
224-
};
225-
226227
return (
227228
<EmptyFilter
228229
title={i18n('label_nothing-found')}
229230
message={i18n('description_nothing-found')}
230-
onShowAll={hasFilters ? resetFilter : undefined}
231+
onShowAll={hasFilters ? resetFilters : undefined}
231232
showAll={i18n('action_show-all')}
232233
image={<NoSearchResults width={230} height={230} />}
233234
/>

0 commit comments

Comments
 (0)