IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

DeleteDashboard: Redirect to home after deleting a dashboard (#78918)

Browse Source
This commit is contained in:
Ivan Ortega Alba 2023-12-01 10:15:41 +01:00 committed by GitHub
parent 303c3ddc24
commit 8d7314bb9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
public/app/features/dashboard/components/DeleteDashboard/DeleteDashboardModal.tsx
View File

@ -4,12 +4,12 @@ import React from 'react';
import { connect, ConnectedProps } from 'react-redux';
import useAsyncFn from 'react-use/lib/useAsyncFn';
import { locationService } from '@grafana/runtime';
import { Modal, ConfirmModal, Button } from '@grafana/ui';
import { config } from 'app/core/config';
import { DashboardModel, PanelModel } from 'app/features/dashboard/state';
import { cleanUpDashboardAndVariables } from 'app/features/dashboard/state/actions';
import { useDashboardDelete } from './useDashboardDelete';
import { deleteDashboard } from 'app/features/manage-dashboards/state/actions';
type DeleteDashboardModalProps = {
hideModal(): void;
@ -26,11 +26,12 @@ type Props = DeleteDashboardModalProps & ConnectedProps<typeof connector>;
const DeleteDashboardModalUnconnected = ({ hideModal, cleanUpDashboardAndVariables, dashboard }: Props) => {
const isProvisioned = dashboard.meta.provisioned;
const { onDeleteDashboard } = useDashboardDelete(dashboard.uid, cleanUpDashboardAndVariables);
const [, onConfirm] = useAsyncFn(async () => {
await onDeleteDashboard();
await deleteDashboard(dashboard.uid, true);
cleanUpDashboardAndVariables();
hideModal();
locationService.replace('/');
}, [hideModal]);
const modalBody = getModalBody(dashboard.panels, dashboard.title);

21
public/app/features/dashboard/components/DeleteDashboard/useDashboardDelete.tsx
View File

@ -1,21 +0,0 @@
import { useEffect } from 'react';
import { useAsyncFn } from 'react-use';
import { locationService } from '@grafana/runtime';
import { useAppNotification } from 'app/core/copy/appNotification';
import { deleteDashboard } from 'app/features/manage-dashboards/state/actions';
export const useDashboardDelete = (uid: string, cleanUpDashboardAndVariables: () => void) => {
const [state, onDeleteDashboard] = useAsyncFn(() => deleteDashboard(uid, false), []);
const notifyApp = useAppNotification();
useEffect(() => {
if (state.value) {
cleanUpDashboardAndVariables();
locationService.replace('/');
notifyApp.success('Dashboard Deleted', `${state.value.title} has been deleted`);
}
}, [state, notifyApp, cleanUpDashboardAndVariables]);
return { state, onDeleteDashboard };
};