Merge branch '15020-collection-with-the-same-content-adress'

[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 146867c3492702d62a9f518daf5449a7b2e3a679..e377f3410fef8ba215747fcd5dbb41f16931e10f 100644 (file)
--- a/src/store/data-explorer/data-explorer-middleware.ts
+++ b/src/store/data-explorer/data-explorer-middleware.ts
@@ -8,35 +8,36 @@ import { dataExplorerActions, bindDataExplorerActions } from "./data-explorer-ac
 import { DataExplorerMiddlewareService } from "./data-explorer-middleware-service";
 
 export const dataExplorerMiddleware = (service: DataExplorerMiddlewareService): Middleware => api => next => {
-    const handleAction = <T extends { id: string }>(handler: (data: T) => void) =>
-        (data: T) => {
-            if (data.id === service.getId()) {
-                handler(data);
-            }
-        };
     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.getId()) {
+                    handler(data);
+                }
+            };
         dataExplorerActions.match(action, {
             SET_PAGE: handleAction(() => {
-                api.dispatch(actions.REQUEST_ITEMS());
+                api.dispatch(actions.REQUEST_ITEMS(false));
             }),
             SET_ROWS_PER_PAGE: handleAction(() => {
-                api.dispatch(actions.REQUEST_ITEMS());
+                api.dispatch(actions.REQUEST_ITEMS(true));
             }),
             SET_FILTERS: handleAction(() => {
                 api.dispatch(actions.RESET_PAGINATION());
-                api.dispatch(actions.REQUEST_ITEMS());
+                api.dispatch(actions.REQUEST_ITEMS(true));
             }),
             TOGGLE_SORT: handleAction(() => {
-                api.dispatch(actions.REQUEST_ITEMS());
+                api.dispatch(actions.REQUEST_ITEMS(true));
             }),
-            SET_SEARCH_VALUE: handleAction(() => {
+            SET_EXPLORER_SEARCH_VALUE: handleAction(() => {
                 api.dispatch(actions.RESET_PAGINATION());
-                api.dispatch(actions.REQUEST_ITEMS());
+                api.dispatch(actions.REQUEST_ITEMS(true));
             }),
-            REQUEST_ITEMS: handleAction(() => {
-                service.requestItems(api);
+            REQUEST_ITEMS: handleAction(({ criteriaChanged }) => {
+                service.requestItems(api, criteriaChanged);
             }),
             default: () => next(action)
         });