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 d3b147362651256d2c1cf546643ef2788de2c7f0..a5000b935bcea4b1420b14408516d03718dacb67 100644 (file)
--- a/src/components/data-table/data-column.ts
+++ b/src/components/data-table/data-column.ts
@@ -2,15 +2,34 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-export interface DataColumn<T> {
+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;
-    render: (item: T) => React.ReactElement<void>;
-    renderHeader?: () => React.ReactElement<void> | null;
+    sortDirection?: SortDirection;
+    filters?: F[];
+    render: (item: T) => React.ReactElement<any>;
+    renderHeader?: () => React.ReactElement<any>;
+    width?: string;
+}
+
+export enum SortDirection {
+    ASC = "asc",
+    DESC = "desc",
+    NONE = "none"
 }
 
-export const isColumnConfigurable = <T>(column: DataColumn<T>) => {
-    return column.configurable === undefined || column.configurable;
-};
\ No newline at end of file
+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;
+};
+
+export const resetSortDirection = <T>(column: DataColumn<T>): DataColumn<T> => {
+    return column.sortDirection ? { ...column, sortDirection: SortDirection.NONE } : column;
+};