Properly select new active dashboard tab when tab is removed. (#17081)

Graylog2 · Oct 31, 2023 · 7b43330 · 7b43330
1 parent b383be0
commit 7b43330
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/graylog2-web-interface/src/views/logic/slices/viewSlice.ts b/graylog2-web-interface/src/views/logic/slices/viewSlice.ts
@@ -16,7 +16,7 @@
  */
 import type { PayloadAction } from '@reduxjs/toolkit';
 import { createSlice } from '@reduxjs/toolkit';
-import type * as Immutable from 'immutable';
+import * as Immutable from 'immutable';
 
 import type { AppDispatch } from 'stores/useAppDispatch';
 import type { ViewState, RootState, GetState } from 'views/types';
@@ -217,7 +217,7 @@ export const removeQuery = (queryId: string) => async (dispatch: AppDispatch, ge
     .build();
 
   const indexedQueryIds = search.queries.map((query) => query.id).toList();
-  const newActiveQuery = FindNewActiveQueryId(indexedQueryIds, activeQuery);
+  const newActiveQuery = FindNewActiveQueryId(indexedQueryIds, activeQuery, Immutable.List([queryId]));
 
   await dispatch(selectQuery(newActiveQuery));
   await dispatch(updateView(newView, true));

diff --git a/graylog2-web-interface/src/views/logic/views/FindNewActiveQuery.test.ts b/graylog2-web-interface/src/views/logic/views/FindNewActiveQuery.test.ts
@@ -18,9 +18,11 @@ import * as Immutable from 'immutable';
 
 import FindNewActiveQuery from 'views/logic/views/FindNewActiveQuery';
 
+const emptyList = Immutable.List<string>();
+
 describe('FindNewActiveQuery', () => {
   it('does not break when there are no queries left', () => {
-    expect(FindNewActiveQuery(Immutable.List(), 'deadbeef')).toBeUndefined();
+    expect(FindNewActiveQuery(emptyList, 'deadbeef', emptyList)).toBeUndefined();
     expect(FindNewActiveQuery(Immutable.List(['foo']), 'deadbeef', Immutable.List(['foo']))).toBeUndefined();
   });
 

diff --git a/graylog2-web-interface/src/views/logic/views/FindNewActiveQuery.ts b/graylog2-web-interface/src/views/logic/views/FindNewActiveQuery.ts
@@ -16,9 +16,9 @@
  */
 
 // Returns a new query ID, in case the active query gets deleted.
-import { List } from 'immutable';
+import type { List } from 'immutable';
 
-const FindNewActiveQueryId = (queryIds: List<string>, activeQueryId: string, removedQueryIds: List<string> = List()) => {
+const FindNewActiveQueryId = (queryIds: List<string>, activeQueryId: string, removedQueryIds: List<string>) => {
   const currentQueryIdIndex = queryIds.indexOf(activeQueryId);
   const priorQueryIds = queryIds.slice(0, currentQueryIdIndex).toList();
   const listToPickNewIdFrom = priorQueryIds.isEmpty()