fix(prefs): Adding/editing API key no longer shows "Deleted" message …

…MAASENG-2812 (#5334)
canonical · Mar 11, 2024 · 38fc68e · 38fc68e
1 parent fe11629
commit 38fc68e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/app/preferences/views/APIKeys/APIKeyDeleteForm/APIKeyDeleteForm.tsx b/src/app/preferences/views/APIKeys/APIKeyDeleteForm/APIKeyDeleteForm.tsx
@@ -2,6 +2,7 @@ import { useDispatch, useSelector } from "react-redux";
 import { useNavigate } from "react-router-dom-v5-compat";
 
 import ModelActionForm from "@/app/base/components/ModelActionForm";
+import { useAddMessage } from "@/app/base/hooks";
 import urls from "@/app/base/urls";
 import { actions as tokenActions } from "@/app/store/token";
 import tokenSelectors from "@/app/store/token/selectors";
@@ -12,6 +13,8 @@ const APIKeyDeleteForm = ({ id }: { id: number }) => {
   const saved = useSelector(tokenSelectors.saved);
   const saving = useSelector(tokenSelectors.saving);
 
+  useAddMessage(saved, tokenActions.cleanup, "API key deleted successfully.");
+
   return (
     <ModelActionForm
       aria-label="Delete API Key"

diff --git a/src/app/preferences/views/APIKeys/APIKeyList/APIKeyList.tsx b/src/app/preferences/views/APIKeys/APIKeyList/APIKeyList.tsx
@@ -2,11 +2,7 @@ import { Notification } from "@canonical/react-components";
 import { useSelector } from "react-redux";
 
 import TableActions from "@/app/base/components/TableActions";
-import {
-  useFetchActions,
-  useAddMessage,
-  useWindowTitle,
-} from "@/app/base/hooks";
+import { useFetchActions, useWindowTitle } from "@/app/base/hooks";
 import urls from "@/app/base/urls";
 import SettingsTable from "@/app/settings/components/SettingsTable";
 import { actions as tokenActions } from "@/app/store/token";
@@ -54,9 +50,6 @@ const APIKeyList = (): JSX.Element => {
   const loading = useSelector(tokenSelectors.loading);
   const loaded = useSelector(tokenSelectors.loaded);
   const tokens = useSelector(tokenSelectors.all);
-  const saved = useSelector(tokenSelectors.saved);
-
-  useAddMessage(saved, tokenActions.cleanup, "API key deleted successfully.");
 
   useFetchActions([tokenActions.fetch]);