Fixup

canonical · Aug 2, 2023 · 2e1b870 · 2e1b870
1 parent 6fe0791
commit 2e1b870
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 16 deletions.
diff --git a/static/js/brand-store/components/SigningKeys/CreateSigningKeyForm.tsx b/static/js/brand-store/components/SigningKeys/CreateSigningKeyForm.tsx
@@ -13,14 +13,12 @@ import type { SigningKey } from "../../types/shared";
 
 type Props = {
   setShowNotification: Function;
-  setShowErrorNotification: Function;
   setErrorMessage: Function;
   refetch: Function;
 };
 
 function CreateSigningKeyForm({
   setShowNotification,
-  setShowErrorNotification,
   setErrorMessage,
   refetch,
 }: Props) {
@@ -42,7 +40,6 @@ function CreateSigningKeyForm({
     navigate(`/admin/${id}/signing-keys`);
     setNewSigningKey({ name: "" });
     setTimeout(() => {
-      setShowErrorNotification(false);
       setErrorMessage("");
     }, 5000);
   };
@@ -81,7 +78,6 @@ function CreateSigningKeyForm({
       const signingKeysData = await response.json();
 
       if (!signingKeysData.success) {
-        setShowErrorNotification(true);
         setErrorMessage(signingKeysData.message);
         throw new Error(signingKeysData.message);
       }
@@ -149,7 +145,6 @@ function CreateSigningKeyForm({
               onClick={() => {
                 navigate(`/admin/${id}/signing-keys`);
                 setNewSigningKey({ name: "" });
-                setShowErrorNotification(false);
                 setErrorMessage("");
               }}
             >

diff --git a/static/js/brand-store/components/SigningKeys/SigningKeys.tsx b/static/js/brand-store/components/SigningKeys/SigningKeys.tsx
@@ -9,10 +9,7 @@ import {
 } from "react-router-dom";
 import { Row, Col, Notification } from "@canonical/react-components";
 
-import { sortByDateDescending } from "../../utils";
-
 import { useSigningKeys, useModels } from "../../hooks";
-
 import {
   signingKeysListState,
   signingKeysListFilterState,
@@ -25,7 +22,7 @@ import SigningKeysFilter from "./SigningKeysFilter";
 import SigningKeysTable from "./SigningKeysTable";
 import CreateSigningKeyForm from "./CreateSigningKeyForm";
 
-import { isClosedPanel, setPageTitle } from "../../utils";
+import { isClosedPanel, setPageTitle, sortByDateDescending } from "../../utils";
 
 import type { SigningKey, Model, Policy } from "../../types/shared";
 
@@ -68,9 +65,6 @@ function SigningKeys() {
   const brandStore = useRecoilValue(brandStoreState(id));
   const [searchParams] = useSearchParams();
   const [showNotification, setShowNotification] = useState<boolean>(false);
-  const [showErrorNotification, setShowErrorNotification] = useState<boolean>(
-    false
-  );
   const [errorMessage, setErrorMessage] = useState<string>("");
   const [
     showDisableSuccessNotification,
@@ -116,12 +110,11 @@ function SigningKeys() {
                 </Notification>
               </div>
             )}
-            {showErrorNotification && errorMessage && (
+            {errorMessage && (
               <div className="u-fixed-width">
                 <Notification
                   severity="negative"
                   onDismiss={() => {
-                    setShowErrorNotification(false);
                     setErrorMessage("");
                   }}
                 >
@@ -176,7 +169,7 @@ function SigningKeys() {
         }`}
         onClick={() => {
           navigate(`/admin/${id}/signing-keys`);
-          setShowErrorNotification(false);
+          setErrorMessage("");
         }}
       ></div>
       <aside
@@ -187,7 +180,6 @@ function SigningKeys() {
         {!isClosedPanel(location.pathname, "create") && (
           <CreateSigningKeyForm
             setShowNotification={setShowNotification}
-            setShowErrorNotification={setShowErrorNotification}
             setErrorMessage={setErrorMessage}
             refetch={refetch}
           />