From 10158c90e38791ef84e0fc88f9e5f241d599f85a Mon Sep 17 00:00:00 2001 From: Alex Khomenko Date: Tue, 2 Jun 2020 09:36:04 +0300 Subject: [PATCH] Search: uncheck dashboards after moved (#25256) --- .../features/search/reducers/manageDashboards.ts | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/public/app/features/search/reducers/manageDashboards.ts b/public/app/features/search/reducers/manageDashboards.ts index 2ef8a9b4935..0434c439411 100644 --- a/public/app/features/search/reducers/manageDashboards.ts +++ b/public/app/features/search/reducers/manageDashboards.ts @@ -1,4 +1,4 @@ -import { DashboardSectionItem, SearchAction } from '../types'; +import { DashboardSection, DashboardSectionItem, SearchAction } from '../types'; import { TOGGLE_ALL_CHECKED, TOGGLE_CHECKED, MOVE_ITEMS, DELETE_ITEMS } from './actionTypes'; import { dashboardsSearchState, DashboardsSearchState, searchReducer } from './dashboardSearch'; import { mergeReducers } from '../utils'; @@ -46,13 +46,18 @@ const reducer = (state: ManageDashboardsState, action: SearchAction) => { }), }; case MOVE_ITEMS: { - const { dashboards, folder } = action.payload; - const uids = dashboards.map((d: DashboardSectionItem) => d.uid); + const dashboards: DashboardSectionItem[] = action.payload.dashboards; + const folder: DashboardSection = action.payload.folder; + const uids = dashboards.map(db => db.uid); return { ...state, results: state.results.map(result => { if (folder.id === result.id) { - return { ...result, items: [...result.items, ...dashboards] }; + return { + ...result, + items: [...result.items, ...dashboards.map(db => ({ ...db, checked: false }))], + checked: false, + }; } else { return { ...result, items: result.items.filter(item => !uids.includes(item.uid)) }; }