Skip to content

Commit a9a2879

Browse files
committed
fix observibility dashboard delete (opensearch-project#4508)
1 parent 5b46f79 commit a9a2879

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

src/plugins/dashboard/public/application/components/dashboard_listing.tsx

+12-5
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,14 @@ export const DashboardListing = () => {
3131
history,
3232
uiSettings,
3333
notifications,
34-
savedDashboards,
3534
dashboardProviders,
3635
data: { query },
3736
osdUrlStateStorage,
3837
},
3938
} = useOpenSearchDashboards<DashboardServices>();
4039

4140
const location = useLocation();
42-
const queryParameters = new URLSearchParams(location.search);
41+
const queryParameters = useMemo(() => new URLSearchParams(location.search), [location]);
4342
const initialFiltersFromURL = queryParameters.get('filter');
4443
const [initialFilter, setInitialFilter] = useState<string | null>(initialFiltersFromURL);
4544

@@ -168,10 +167,18 @@ export const DashboardListing = () => {
168167
// );
169168

170169
const deleteItems = useCallback(
171-
(dashboards: object[]) => {
172-
return savedDashboards.delete(dashboards.map((d: any) => d.id));
170+
async (dashboards: object[]) => {
171+
await Promise.all(
172+
dashboards.map((dashboard: any) => savedObjectsClient.delete(dashboard.appId, dashboard.id))
173+
).catch((error) => {
174+
notifications.toasts.addError(error, {
175+
title: i18n.translate('dashboard.dashboardListingDeleteErrorTitle', {
176+
defaultMessage: 'Error deleting dashboard',
177+
}),
178+
});
179+
});
173180
},
174-
[savedDashboards]
181+
[savedObjectsClient, notifications]
175182
);
176183

177184
useMount(() => {

0 commit comments

Comments
 (0)