X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/b62944772ff96019c1e497426784690978bb9c96..4b961d16b8f8ef8afbd13697a79fe4684acd0416:/src/store/data-explorer/data-explorer-middleware-service.ts

diff --git a/src/store/data-explorer/data-explorer-middleware-service.ts b/src/store/data-explorer/data-explorer-middleware-service.ts
index 444e7400..57fd0b59 100644
--- a/src/store/data-explorer/data-explorer-middleware-service.ts
+++ b/src/store/data-explorer/data-explorer-middleware-service.ts
@@ -2,21 +2,44 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { getDataExplorer } from "./data-explorer-reducer";
-import { MiddlewareAPI } from "../../../node_modules/redux";
-import { DataColumns } from "../../components/data-table/data-table";
+import { Dispatch, MiddlewareAPI } from "redux";
+import { RootState } from "../store";
+import { DataColumns } from "~/components/data-table/data-table";
+import { DataExplorer } from './data-explorer-reducer';
+import { ListResults } from '~/services/common-service/common-service';
+import { createTree } from "~/models/tree";
+import { DataTableFilters } from "~/components/data-table-filters/data-table-filters-tree";
 
 export abstract class DataExplorerMiddlewareService {
+    protected readonly id: string;
 
-    abstract get Id(): string;
-    abstract get Columns(): DataColumns<any>;
-    abstract requestItems (api: MiddlewareAPI): void;
-    
-    protected api: MiddlewareAPI;
-    set Api(value: MiddlewareAPI) {
-        this.api = value;
+    protected constructor(id: string) {
+        this.id = id;
     }
-    get DataExplorer () {
-        return getDataExplorer(this.api.getState(), this.Id);
+
+    public getId() {
+        return this.id;
+    }
+
+    public getColumnFilters<T>(columns: DataColumns<T>, columnName: string): DataTableFilters {
+        return getDataExplorerColumnFilters(columns, columnName);
     }
-}
\ No newline at end of file
+
+    abstract requestItems(api: MiddlewareAPI<Dispatch, RootState>, criteriaChanged?: boolean): void;
+}
+
+export const getDataExplorerColumnFilters = <T>(columns: DataColumns<T>, columnName: string): DataTableFilters => {
+    const column = columns.find(c => c.name === columnName);
+    return column ? column.filters : createTree();
+};
+
+export const dataExplorerToListParams = (dataExplorer: DataExplorer) => ({
+    limit: dataExplorer.rowsPerPage,
+    offset: dataExplorer.page * dataExplorer.rowsPerPage,
+});
+
+export const listResultsToDataExplorerItemsMeta = <R>({ itemsAvailable, offset, limit }: ListResults<R>) => ({
+    itemsAvailable,
+    page: Math.floor(offset / limit),
+    rowsPerPage: limit
+});