17782: Fixes almost all tests (4 left) mostly by fixing namespace-type imports.

[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..f32fea2b5237c85fbdad07048258f4d94fb6794c 100644 (file)
--- a/src/components/data-table/data-column.ts
+++ b/src/components/data-table/data-column.ts
@@ -2,32 +2,52 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { DataTableFilterItem } from "../data-table-filters/data-table-filters";
+import 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;
+
+    /**
+     * If set to true, filters on this column will be displayed in a
+     * radio group and only one filter can be selected at a time.
+     */
+    mutuallyExclusiveFilters?: boolean;
     sortDirection?: SortDirection;
-    onSortToggle?: () => void;
-    filters?: DataTableFilterItem[];
-    onFiltersChange?: (filters: DataTableFilterItem[]) => 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,
+});