Merge pull request Graylog2#8842 from Graylog2/sync-url-after-adding-query-part-from-action

Sync URL after updating current query from action.

Author: kmerz

graylog2-web-interface/src/views/hooks/SyncWithQueryParameters.js

@@ -67,7 +67,7 @@ export const useSyncWithQueryParameters = (query: string) => {
   useEffect(() => syncWithQueryParameters(query, history.replace), []);
 
   useActionListeners(
-    [QueriesActions.update.completed],
+    [QueriesActions.update.completed, QueriesActions.query.completed],
     () => syncWithQueryParameters(query),
     [query],
   );

graylog2-web-interface/src/views/hooks/SyncWithQueryParameters.test.jsx

@@ -3,6 +3,7 @@ import * as React from 'react';
 import { render } from 'wrappedTestingLibrary';
 import * as Immutable from 'immutable';
 import asMock from 'helpers/mocking/AsMock';
+import mockAction from 'helpers/mocking/MockAction';
 
 import history from 'util/History';
 import { ViewStore } from 'views/stores/ViewStore';
@@ -16,11 +17,8 @@ import { syncWithQueryParameters, useSyncWithQueryParameters } from './SyncWithQ
 
 jest.mock('views/actions/QueriesActions', () => ({
   QueriesActions: {
-    update: {
-      completed: {
-        listen: jest.fn(() => () => {}),
-      },
-    },
+    update: mockAction(),
+    query: mockAction(),
   },
 }));
 
@@ -157,6 +155,7 @@ describe('SyncWithQueryParameters', () => {
       render(<TestComponent />);
 
       expect(QueriesActions.update.completed.listen).toHaveBeenCalled();
+      expect(QueriesActions.query.completed.listen).toHaveBeenCalled();
     });
   });
 });

graylog2-web-interface/test/helpers/mocking/MockAction.js

@@ -2,10 +2,13 @@
 
 import type { ListenableAction } from 'stores/StoreTypes';
 
-const mockAction = <R: function>(fn: R): ListenableAction<R> => {
-  return Object.assign(fn, {
-    listen: jest.fn(() => jest.fn()),
-    completed: { listen: jest.fn(() => jest.fn()) },
+const listenable = () => ({ listen: jest.fn(() => jest.fn()) });
+
+const noop: function = jest.fn();
+
+const mockAction = <R: function>(fn: R = noop): ListenableAction<R> => {
+  return Object.assign(fn, listenable(), {
+    completed: listenable(),
     promise: jest.fn(),
   });
 };