Fix some issues with creating signing key

canonical · Aug 1, 2023 · 3237102 · 3237102
1 parent 9d2e8e3
commit 3237102
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 10 deletions.
diff --git a/static/js/brand-store/components/SigningKeys/CreateSigningKeyForm.tsx b/static/js/brand-store/components/SigningKeys/CreateSigningKeyForm.tsx
@@ -52,6 +52,17 @@ function CreateSigningKeyForm({
 
       navigate(`/admin/${id}/signing-keys`);
 
+      setSigningKeysList((oldSigningKeysList: Array<SigningKey>) => {
+        return [
+          {
+            name: newSigningKey.name,
+            "created-at": new Date().toISOString(),
+            "modified-at": new Date().toISOString(),
+          },
+          ...oldSigningKeysList,
+        ];
+      });
+
       return fetch(`/admin/store/${id}/signing-keys`, {
         method: "POST",
         body: formData,
@@ -113,7 +124,7 @@ function CreateSigningKeyForm({
               }}
               error={
                 checkSigningKeyExists(newSigningKey.name, signingKeysList)
-                  ? `Model ${newSigningKey.name} already exists`
+                  ? `Signing key ${newSigningKey.name} already exists`
                   : null
               }
               required
@@ -129,7 +140,7 @@ function CreateSigningKeyForm({
             <Button
               className="u-no-margin--bottom"
               onClick={() => {
-                navigate(`/admin/${id}/models`);
+                navigate(`/admin/${id}/signing-keys`);
                 setNewSigningKey({ name: "" });
                 setShowErrorNotification(false);
               }}

diff --git a/static/js/brand-store/types/shared.ts b/static/js/brand-store/types/shared.ts
@@ -132,11 +132,11 @@ export type Policy = {
 export type SigningKey = {
   name: string;
   "created-at": string;
-  "created-by": string;
+  "created-by"?: string;
   "modified-at": string;
-  "modified-by": string;
-  fingerprint: string;
-  "sha3-384": string;
+  "modified-by"?: string;
+  fingerprint?: string;
+  "sha3-384"?: string;
   models?: Array<string>;
   policies?: Array<Policy>;
 };
diff --git a/static/js/brand-store/utils/getFilteredSigningKeys.ts b/static/js/brand-store/utils/getFilteredSigningKeys.ts
@@ -1,16 +1,22 @@
 import type { SigningKey } from "../types/shared";
 
-function getFilteredSigningKeys(signingKeys: Array<SigningKey>, filterQuery?: string | null) {
+function getFilteredSigningKeys(
+  signingKeys: Array<SigningKey>,
+  filterQuery?: string | null
+) {
   if (!filterQuery) {
     return signingKeys;
   }
 
   return signingKeys.filter((signingKey: SigningKey) => {
     if (
       (signingKey.name && signingKey.name.includes(filterQuery)) ||
-      (signingKey["created-at"] && signingKey["created-at"].includes(filterQuery)) ||
-      (signingKey["modified-at"] && signingKey["modified-at"].includes(filterQuery)) ||
-      signingKey.fingerprint.toString().includes(filterQuery)
+      (signingKey["created-at"] &&
+        signingKey["created-at"].includes(filterQuery)) ||
+      (signingKey["modified-at"] &&
+        signingKey["modified-at"].includes(filterQuery)) ||
+      (signingKey.fingerprint &&
+        signingKey.fingerprint.toString().includes(filterQuery))
     ) {
       return true;
     }