diff --git a/src/frontend/src/components/tableComponent/components/ResetColumns/index.tsx b/src/frontend/src/components/tableComponent/components/ResetColumns/index.tsx new file mode 100644 index 000000000..27794be1b --- /dev/null +++ b/src/frontend/src/components/tableComponent/components/ResetColumns/index.tsx @@ -0,0 +1,31 @@ +import { cn } from "../../../../utils/utils"; +import ShadTooltip from "../../../shadTooltipComponent"; +import { Toggle } from "../../../ui/toggle"; + +export default function ResetColumns({ + resetGrid, +}: { + resetGrid: () => void; +}): JSX.Element { + return ( + /*
+
setShow(!show)} + > + + +
+
*/ +
+ { + resetGrid(); + }} + > + Reset Columns + +
+ ); +} diff --git a/src/frontend/src/components/tableComponent/components/tableToolbar.tsx/index.tsx b/src/frontend/src/components/tableComponent/components/tableToolbar.tsx/index.tsx deleted file mode 100644 index bbedbad0e..000000000 --- a/src/frontend/src/components/tableComponent/components/tableToolbar.tsx/index.tsx +++ /dev/null @@ -1,3 +0,0 @@ -export default function TableToolbar({ children }): JSX.Element { - return
{children}
; -} diff --git a/src/frontend/src/components/tableComponent/index.tsx b/src/frontend/src/components/tableComponent/index.tsx index 1a9c7a44d..3b2f15be6 100644 --- a/src/frontend/src/components/tableComponent/index.tsx +++ b/src/frontend/src/components/tableComponent/index.tsx @@ -14,6 +14,7 @@ import { Alert, AlertDescription, AlertTitle } from "../ui/alert"; import { Toggle } from "../ui/toggle"; import ShadTooltip from "../shadTooltipComponent"; import resetGrid from "./utils/reset-grid-columns"; +import ResetColumns from "./components/ResetColumns"; interface TableComponentProps extends AgGridReactProps { columnDefs: NonNullable; @@ -36,6 +37,7 @@ const TableComponent = forwardRef< ref, ) => { const gridRef = useRef(null); + // @ts-ignore const realRef = ref?.current ? ref : gridRef; const dark = useDarkStore((state) => state.dark); @@ -47,6 +49,7 @@ const TableComponent = forwardRef< }; const onGridReady = (params) => { + // @ts-ignore realRef.current = params; const updatedColumnDefs = makeLastColumnNonResizable([ ...props.columnDefs, @@ -70,7 +73,7 @@ const TableComponent = forwardRef< }; if (index === props.columnDefs.length - 1) { newCol = { - ...col, + ...newCol, resizable: false, }; } @@ -131,35 +134,7 @@ const TableComponent = forwardRef< onGridReady={onGridReady} onColumnMoved={onColumnMoved} /> - {/*
-
setShow(!show)} - > - - -
-
*/} -
- - { - resetGrid(realRef); - }} - > - - - -
+ resetGrid(realRef)} /> ); },