diff --git a/datanode-ui/src/libs/enums/Status.ts b/datanode-ui/src/libs/enums/Status.ts index f45344a3..f26a2880 100644 --- a/datanode-ui/src/libs/enums/Status.ts +++ b/datanode-ui/src/libs/enums/Status.ts @@ -20,6 +20,7 @@ export enum Status { IN_PROGRESS = "IN_PROGRESS", IN_PROGRESS_RELOAD = "IN_PROGRESS_RELOAD", SUCCESS = "SUCCESS", + DELETE_SUCCESS = "DELETE_SUCCESS", ERROR = "ERROR", DISABLED = "DISABLED", } \ No newline at end of file diff --git a/datanode-ui/src/libs/hooks/useEntity/useEntity.reducer.ts b/datanode-ui/src/libs/hooks/useEntity/useEntity.reducer.ts index 8c79559d..aed8a647 100644 --- a/datanode-ui/src/libs/hooks/useEntity/useEntity.reducer.ts +++ b/datanode-ui/src/libs/hooks/useEntity/useEntity.reducer.ts @@ -55,7 +55,7 @@ export const reducer = ( draft.status = Status.IN_PROGRESS; break; case EntityActions.DELETE_ENTITY_SUCCESS: - draft.status = Status.SUCCESS; + draft.status = Status.DELETE_SUCCESS; break; // case EntityActions.DELETE_ENTITY_ERROR: // draft.status = Status.ERROR; diff --git a/datanode-ui/src/modules/Admin/DatabaseEntity/DatabaseEntity.tsx b/datanode-ui/src/modules/Admin/DatabaseEntity/DatabaseEntity.tsx index 4c6411dd..92e345bc 100644 --- a/datanode-ui/src/modules/Admin/DatabaseEntity/DatabaseEntity.tsx +++ b/datanode-ui/src/modules/Admin/DatabaseEntity/DatabaseEntity.tsx @@ -15,7 +15,7 @@ * */ -import { Route, Routes, useParams } from "react-router"; +import { Route, Routes, useNavigate, useParams } from "react-router"; import { tabs } from "./DatabaseEntity.config"; import React, { useContext, useEffect } from "react"; @@ -50,6 +50,7 @@ export const DatabaseEntity: React.FC = () => { }, id ); + const navigate = useNavigate(); const handleSave = (newValue: any, keyFile?: any, isAdmin?: boolean) => { const fd = new FormData(); @@ -84,6 +85,11 @@ export const DatabaseEntity: React.FC = () => { ); }, [entity, dispatch]); + useEffect(() => { + if(status === Status.DELETE_SUCCESS) + navigate("/administration/databases"); + }, [status]); + const handleDelete = () => { showDialog(ConfirmationDialog, { onSubmit: deleteEntity,