next conflicts

[arvados-workbench2.git] / src / store / data-explorer / data-explorer-middleware.ts

diff --git a/src/store/data-explorer/data-explorer-middleware.ts b/src/store/data-explorer/data-explorer-middleware.ts
index 80a6d17e38b77cce8bba72c82c8045440719a91d..f90f9a6ce39d1ceddff638959544d1ec24c1d06c 100644 (file)
--- a/src/store/data-explorer/data-explorer-middleware.ts
+++ b/src/store/data-explorer/data-explorer-middleware.ts
@@ -3,38 +3,38 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { Middleware } from "../../../node_modules/redux";
-import { dataExplorerActions } from "./data-explorer-action";
+import { Middleware } from "redux";
+import { dataExplorerActions, bindDataExplorerActions } from "./data-explorer-action";
 import { DataExplorerMiddlewareService } from "./data-explorer-middleware-service";
 
 export const dataExplorerMiddleware = (service: DataExplorerMiddlewareService): Middleware => api => next => {
-    service.Api = api;
-    next(dataExplorerActions.SET_COLUMNS({ id: service.Id, columns: service.Columns }));
+    const actions = bindDataExplorerActions(service.getId());
+
     return action => {
         const handleAction = <T extends { id: string }>(handler: (data: T) => void) =>
             (data: T) => {
                 next(action);
-                if (data.id === service.Id) {
+                if (data.id === service.getId()) {
                     handler(data);
                 }
             };
         dataExplorerActions.match(action, {
             SET_PAGE: handleAction(() => {
-                api.dispatch(dataExplorerActions.REQUEST_ITEMS({ id: service.Id }));
+                api.dispatch(actions.REQUEST_ITEMS());
             }),
             SET_ROWS_PER_PAGE: handleAction(() => {
-                api.dispatch(dataExplorerActions.REQUEST_ITEMS({ id: service.Id }));
+                api.dispatch(actions.REQUEST_ITEMS());
             }),
             SET_FILTERS: handleAction(() => {
-                api.dispatch(dataExplorerActions.RESET_PAGINATION({ id: service.Id }));
-                api.dispatch(dataExplorerActions.REQUEST_ITEMS({ id: service.Id }));
+                api.dispatch(actions.RESET_PAGINATION());
+                api.dispatch(actions.REQUEST_ITEMS());
             }),
             TOGGLE_SORT: handleAction(() => {
-                api.dispatch(dataExplorerActions.REQUEST_ITEMS({ id: service.Id }));
+                api.dispatch(actions.REQUEST_ITEMS());
             }),
-            SET_SEARCH_VALUE: handleAction(() => {
-                api.dispatch(dataExplorerActions.RESET_PAGINATION({ id: service.Id }));
-                api.dispatch(dataExplorerActions.REQUEST_ITEMS({ id: service.Id }));
+            SET_EXPLORER_SEARCH_VALUE: handleAction(() => {
+                api.dispatch(actions.RESET_PAGINATION());
+                api.dispatch(actions.REQUEST_ITEMS());
             }),
             REQUEST_ITEMS: handleAction(() => {
                 service.requestItems(api);