Merge branch 'master'

[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 06744c3a21bce90b9246ed74c06c984f9020cdf7..a5000b935bcea4b1420b14408516d03718dacb67 100644 (file)
--- a/src/components/data-table/data-column.ts
+++ b/src/components/data-table/data-column.ts
@@ -7,33 +7,29 @@ import { DataTableFilterItem } from "../data-table-filters/data-table-filters";
 export interface DataColumn<T, F extends DataTableFilterItem = DataTableFilterItem> {
     name: string;
     selected: boolean;
-    configurable?: boolean;
+    configurable: boolean;
     key?: React.Key;
     sortDirection?: SortDirection;
     filters?: F[];
-    render: (item: T) => React.ReactElement<void>;
-    renderHeader?: () => React.ReactElement<void> | null;
+    render: (item: T) => React.ReactElement<any>;
+    renderHeader?: () => React.ReactElement<any>;
     width?: string;
 }
 
 export enum SortDirection {
-    Asc = "asc",
-    Desc = "desc",
-    None = "none"
+    ASC = "asc",
+    DESC = "desc",
+    NONE = "none"
 }
 
-export const isColumnConfigurable = <T>(column: DataColumn<T>) => {
-    return column.configurable === undefined || column.configurable;
-};
-
 export const toggleSortDirection = <T>(column: DataColumn<T>): DataColumn<T> => {
     return column.sortDirection
-        ? column.sortDirection === SortDirection.Asc
-            ? { ...column, sortDirection: SortDirection.Desc }
-            : { ...column, sortDirection: 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: SortDirection.None } : column;
+    return column.sortDirection ? { ...column, sortDirection: SortDirection.NONE } : column;
 };