X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/1a9eb2261e6030ba78078e2a206bad27653f2475..b693bdde231b0ca4171015e578d9760c6001749b:/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 f3d9576d..28e93bee 100644
--- a/src/components/data-table/data-column.ts
+++ b/src/components/data-table/data-column.ts
@@ -2,28 +2,46 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
+import * as React from "react";
+import { DataTableFilters } from "../data-table-filters/data-table-filters-tree";
+import { createTree } from '~/models/tree';
+
 export interface DataColumn<T> {
+    key?: React.Key;
     name: string;
     selected: boolean;
-    configurable?: boolean;
-    key?: React.Key;
+    configurable: boolean;
     sortDirection?: SortDirection;
-    onSortToggle?: () => void;
-    render: (item: T) => React.ReactElement<void>;
-    renderHeader?: () => React.ReactElement<void> | null;
+    filters: DataTableFilters;
+    render: (item: T) => React.ReactElement<any>;
+    renderHeader?: () => React.ReactElement<any>;
 }
 
-export type SortDirection = "asc" | "desc";
-
-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> => {
-    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;
 };
+
+export const createDataColumn = <T>(dataColumn: Partial<DataColumn<T>>): DataColumn<T> => ({
+    key: '',
+    name: '',
+    selected: true,
+    configurable: true,
+    sortDirection: SortDirection.NONE,
+    filters: createTree(),
+    render: () => React.createElement('span'),
+    ...dataColumn,
+});