Merge branch '13834-update-icons-in-context-menu'

[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 7ac568a25b5301901ffc95318f1581852dc8dfc5..06744c3a21bce90b9246ed74c06c984f9020cdf7 100644 (file)
--- a/src/components/data-table/data-column.ts
+++ b/src/components/data-table/data-column.ts
@@ -4,30 +4,36 @@
 
 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;
     key?: React.Key;
     sortDirection?: SortDirection;
-    onSortToggle?: () => void;
-    filters?: DataTableFilterItem[];
-    onFiltersChange?: (filters: DataTableFilterItem[]) => void;
+    filters?: F[];
     render: (item: T) => React.ReactElement<void>;
     renderHeader?: () => React.ReactElement<void> | null;
+    width?: string;
 }
 
-export type SortDirection = "asc" | "desc";
+export enum SortDirection {
+    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> => {
-    const sortDirection = column.sortDirection === undefined || column.sortDirection === "desc" ? "asc" : "desc";
-    return { ...column, sortDirection };
+    return column.sortDirection
+        ? 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: undefined };
+    return column.sortDirection ? { ...column, sortDirection: SortDirection.None } : column;
 };