@@ -10,7 +10,6 @@ import { useAppDispatch } from '../../../redux/hooks'
1010import { deleteDBData , setQueryData , updateDBSingleData } from '../../../redux/dataModelSlice'
1111import { DBConnType } from '../../../data/defaults'
1212import TabContext from '../../layouts/tabcontext'
13- import { filter } from 'lodash'
1413
1514
1615type TablePropType = {
@@ -163,10 +162,10 @@ const Table = ({ queryData, dbConnection, mSchema, mName, isEditable, showHeader
163162 }
164163 onFilterChanged ( filter )
165164 }
166- const onFilterClear = ( ) => {
165+ const onFilterClear = ( ) => {
167166 let filter : string [ ] | undefined = undefined
168- setFilterValue ( [ 'default' , 'default' , '' ] ) ;
169- onFilterChanged ( filter ) ;
167+ setFilterValue ( [ 'default' , 'default' , '' ] )
168+ onFilterChanged ( filter )
170169 }
171170
172171 const changeSort = ( newSortIdx : string ) => {
@@ -234,9 +233,13 @@ const Table = ({ queryData, dbConnection, mSchema, mName, isEditable, showHeader
234233 < p className = "control" >
235234 < button className = "button" onClick = { onFilter } > Filter</ button >
236235 </ p >
237- < p className = "control" >
238- < button className = "button" onClick = { onFilterClear } > Clear Filter</ button >
239- </ p >
236+ { ( filterValue [ 0 ] !== 'default' || filterValue [ 1 ] !== 'default' ) && < p className = "control" >
237+ < button className = "button" onClick = { onFilterClear } >
238+ < span className = "icon is-small" >
239+ < i className = "fas fa-circle-xmark" />
240+ </ span >
241+ </ button >
242+ </ p > }
240243 </ div >
241244 </ div >
242245 { isEditable && < React . Fragment >
0 commit comments