table-layout-fix

[arvados-workbench2.git] / src / components / data-table / data-column.ts

diff --git a/src/components/data-table/data-column.ts b/src/components/data-table/data-column.ts
index f3d9576dd66d5cac933dffdc5e96c67464c9610e..bbfea7acd5c6db1e43d224e68d455e5b4e52c491 100644 (file)
--- a/src/components/data-table/data-column.ts
+++ b/src/components/data-table/data-column.ts
@@ -2,28 +2,34 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
+import { DataTableFilterItem } from "../data-table-filters/data-table-filters";
+
 export interface DataColumn<T> {
     name: string;
     selected: boolean;
     configurable?: boolean;
     key?: React.Key;
     sortDirection?: SortDirection;
-    onSortToggle?: () => void;
+    filters?: DataTableFilterItem[];
     render: (item: T) => React.ReactElement<void>;
     renderHeader?: () => React.ReactElement<void> | null;
+    width?: string;
 }
 
-export type SortDirection = "asc" | "desc";
+export type SortDirection = "asc" | "desc" | "none";
 
 export const isColumnConfigurable = <T>(column: DataColumn<T>) => {
     return column.configurable === undefined || column.configurable;
 };
 
 export const toggleSortDirection = <T>(column: DataColumn<T>): DataColumn<T> => {
-    const sortDirection = column.sortDirection === undefined || column.sortDirection === "desc" ? "asc" : "desc";
-    return { ...column, sortDirection };
+    return column.sortDirection
+        ? column.sortDirection === "asc"
+            ? { ...column, sortDirection: "desc" }
+            : { ...column, sortDirection: "asc" }
+        : column;
 };
 
 export const resetSortDirection = <T>(column: DataColumn<T>): DataColumn<T> => {
-    return { ...column, sortDirection: undefined };
+    return column.sortDirection ? { ...column, sortDirection: "none" } : column;
 };