X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/3eaf143e04107bf25e15aaef4d1b4d5d7ef68f86..72c12f527787181e4abb09fc968f07e795179c3c:/src/components/data-table/data-column.ts?ds=sidebyside

diff --git a/src/components/data-table/data-column.ts b/src/components/data-table/data-column.ts
index bbfea7ac..a5000b93 100644
--- a/src/components/data-table/data-column.ts
+++ b/src/components/data-table/data-column.ts
@@ -4,32 +4,32 @@
 
 import { DataTableFilterItem } from "../data-table-filters/data-table-filters";
 
-export interface DataColumn<T> {
+export interface DataColumn<T, F extends DataTableFilterItem = DataTableFilterItem> {
     name: string;
     selected: boolean;
-    configurable?: boolean;
+    configurable: boolean;
     key?: React.Key;
     sortDirection?: SortDirection;
-    filters?: DataTableFilterItem[];
-    render: (item: T) => React.ReactElement<void>;
-    renderHeader?: () => React.ReactElement<void> | null;
+    filters?: F[];
+    render: (item: T) => React.ReactElement<any>;
+    renderHeader?: () => React.ReactElement<any>;
     width?: string;
 }
 
-export type SortDirection = "asc" | "desc" | "none";
-
-export const isColumnConfigurable = <T>(column: DataColumn<T>) => {
-    return column.configurable === undefined || column.configurable;
-};
+export enum SortDirection {
+    ASC = "asc",
+    DESC = "desc",
+    NONE = "none"
+}
 
 export const toggleSortDirection = <T>(column: DataColumn<T>): DataColumn<T> => {
     return column.sortDirection
-        ? column.sortDirection === "asc"
-            ? { ...column, sortDirection: "desc" }
-            : { ...column, sortDirection: "asc" }
+        ? column.sortDirection === SortDirection.ASC
+            ? { ...column, sortDirection: SortDirection.DESC }
+            : { ...column, sortDirection: SortDirection.ASC }
         : column;
 };
 
 export const resetSortDirection = <T>(column: DataColumn<T>): DataColumn<T> => {
-    return column.sortDirection ? { ...column, sortDirection: "none" } : column;
+    return column.sortDirection ? { ...column, sortDirection: SortDirection.NONE } : column;
 };