diff --git a/src/components/enhanced-table/filter-row/FilterRow.jsx b/src/components/enhanced-table/filter-row/FilterRow.jsx
deleted file mode 100644
index 1ebc3eafd..000000000
--- a/src/components/enhanced-table/filter-row/FilterRow.jsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import TableRow from '@mui/material/TableRow'
-import TableCell from '@mui/material/TableCell'
-
-import FilterCell from '~/components/enhanced-table/filter-row/filter-cell/FilterCell'
-
-const FilterRow = ({ columns, filter = {}, isSelection }) => {
-  const { filters, setFilterByKey, clearFilterByKey } = filter
-
-  const filterCells =
-    filters &&
-    columns.map((column) => (
-      <FilterCell
-        clearFilter={clearFilterByKey(column.field)}
-        column={column}
-        filter={filters[column.field]}
-        key={column.field}
-        setFilter={setFilterByKey(column.field)}
-      />
-    ))
-
-  const emptyCell = isSelection && filters && <TableCell />
-
-  return (
-    <TableRow>
-      {emptyCell}
-      {filterCells}
-      {emptyCell}
-    </TableRow>
-  )
-}
-
-export default FilterRow
diff --git a/src/components/enhanced-table/filter-row/FilterRow.tsx b/src/components/enhanced-table/filter-row/FilterRow.tsx
new file mode 100644
index 000000000..5c640fa07
--- /dev/null
+++ b/src/components/enhanced-table/filter-row/FilterRow.tsx
@@ -0,0 +1,44 @@
+import TableRow from '@mui/material/TableRow'
+import TableCell from '@mui/material/TableCell'
+
+import FilterCell from '~/components/enhanced-table/filter-row/filter-cell/FilterCell'
+import { TableColumn, TableFilter } from '~/types'
+
+interface FilterRowProps<I, F> {
+  columns: TableColumn<I>[]
+  filter?: TableFilter<F>
+  isSelection?: boolean
+}
+const FilterRow = <I, F>({
+  columns,
+  filter,
+  isSelection
+}: FilterRowProps<I, F>) => {
+  const filters = filter?.filters
+  const setFilterByKey = filter?.setFilterByKey
+  const clearFilterByKey = filter?.clearFilterByKey
+
+  const filterCells =
+    filters &&
+    columns.map((column) => (
+      <FilterCell
+        clearFilter={clearFilterByKey?.(column.field as keyof F)}
+        column={column}
+        filter={filters[column.field as keyof F]}
+        key={column.field}
+        setFilter={setFilterByKey?.(column.field as keyof F)}
+      />
+    ))
+
+  const emptyCell = isSelection && filters && <TableCell />
+
+  return (
+    <TableRow>
+      {emptyCell}
+      {filterCells}
+      {emptyCell}
+    </TableRow>
+  )
+}
+
+export default FilterRow