@@ -155,6 +155,14 @@ export function TopicData({parentRef, path, database}: TopicDataProps) {
155
155
[ path , database , selectedPartition , emptyData ] ,
156
156
) ;
157
157
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
+
158
166
const scrollToOffset = React . useCallback (
159
167
( newOffset : number ) => {
160
168
const scrollTop = ( newOffset - ( baseOffset ?? 0 ) ) * DEFAULT_TABLE_ROW_HEIGHT ;
@@ -183,15 +191,17 @@ export function TopicData({parentRef, path, database}: TopicDataProps) {
183
191
184
192
const scrollToStartOffset = React . useCallback ( ( ) => {
185
193
if ( startOffset ) {
194
+ resetFilters ( ) ;
186
195
scrollToOffset ( startOffset ) ;
187
196
}
188
- } , [ startOffset , scrollToOffset ] ) ;
197
+ } , [ startOffset , scrollToOffset , resetFilters ] ) ;
189
198
190
199
const scrollToEndOffset = React . useCallback ( ( ) => {
191
200
if ( endOffset ) {
201
+ resetFilters ( ) ;
192
202
scrollToOffset ( endOffset ) ;
193
203
}
194
- } , [ endOffset , scrollToOffset ] ) ;
204
+ } , [ endOffset , scrollToOffset , resetFilters ] ) ;
195
205
196
206
const renderControls : RenderControls = ( ) => {
197
207
return (
@@ -214,20 +224,11 @@ export function TopicData({parentRef, path, database}: TopicDataProps) {
214
224
const renderEmptyDataMessage = ( ) => {
215
225
const hasFilters = selectedOffset || startTimestamp ;
216
226
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
-
226
227
return (
227
228
< EmptyFilter
228
229
title = { i18n ( 'label_nothing-found' ) }
229
230
message = { i18n ( 'description_nothing-found' ) }
230
- onShowAll = { hasFilters ? resetFilter : undefined }
231
+ onShowAll = { hasFilters ? resetFilters : undefined }
231
232
showAll = { i18n ( 'action_show-all' ) }
232
233
image = { < NoSearchResults width = { 230 } height = { 230 } /> }
233
234
/>
0 commit comments