Fixup

canonical · Aug 2, 2023 · 732cea0 · 732cea0
1 parent e70b61e
commit 732cea0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 229 deletions.
diff --git a/static/js/brand-store/components/Model/PoliciesTable.test.tsx b/static/js/brand-store/components/Model/PoliciesTable.test.tsx
@@ -26,10 +26,6 @@ describe("PoliciesTable", () => {
   it("renders the correct columns", () => {
     renderComponent();
 
-    expect(
-      screen.getByRole("columnheader", { name: "Revision" })
-    ).toBeInTheDocument();
-
     expect(
       screen.getByRole("columnheader", { name: "Signing key" })
     ).toBeInTheDocument();
@@ -43,24 +39,6 @@ describe("PoliciesTable", () => {
     ).toBeInTheDocument();
   });
 
-  it("sorts the 'Revision' column when clicking the column header", async () => {
-    renderComponent();
-
-    const user = userEvent.setup();
-    const columnHeader = screen.getByRole("columnheader", { name: "Revision" });
-
-    expect(columnHeader.getAttribute("aria-sort")).toBe("none");
-
-    await user.click(columnHeader);
-    expect(columnHeader.getAttribute("aria-sort")).toBe("ascending");
-
-    await user.click(columnHeader);
-    expect(columnHeader.getAttribute("aria-sort")).toBe("descending");
-
-    await user.click(columnHeader);
-    expect(columnHeader.getAttribute("aria-sort")).toBe("none");
-  });
-
   it("sorts the 'Signing key' column when clicking the column header", async () => {
     renderComponent();
 

diff --git a/static/js/brand-store/components/SigningKeys/CreateSigningKeyForm.test.tsx b/static/js/brand-store/components/SigningKeys/CreateSigningKeyForm.test.tsx
diff --git a/static/js/brand-store/components/SigningKeys/ModelsModal.tsx b/static/js/brand-store/components/SigningKeys/ModelsModal.tsx
@@ -1,44 +1,14 @@
 import React from "react";
 import { Modal, Icon } from "@canonical/react-components";
-import { useRecoilValue } from "recoil";
 
-import {
-  filteredModelsListState,
-  filteredPoliciesListState,
-} from "../../selectors";
-
-import type { SigningKey, Model, Policy } from "../../types/shared";
+import type { SigningKey } from "../../types/shared";
 
 type Props = {
-  modelsModalOpen: boolean;
   setModelsModalOpen: Function;
   signingKey: SigningKey;
 };
 
-function ModelsModal({
-  modelsModalOpen,
-  setModelsModalOpen,
-  signingKey,
-}: Props) {
-  const closeHandler = () => setModelsModalOpen(false);
-  const filteredModels = useRecoilValue<Array<Model>>(filteredModelsListState);
-  const filteredPolicies = useRecoilValue<Array<Policy>>(
-    filteredPoliciesListState
-  );
-
-  if (!modelsModalOpen) {
-    return null;
-  }
-
-  const relatedModels = filteredModels.filter(
-    (model) => signingKey.models && signingKey.models.includes(model.name)
-  );
-
-  const relatedPolicies = filteredPolicies.filter(
-    (policy) =>
-      signingKey.models && signingKey.models.includes(policy["model-name"])
-  );
-
+function ModelsModal({ setModelsModalOpen, signingKey }: Props) {
   return (
     <Modal
       title={
@@ -47,25 +17,15 @@ function ModelsModal({
           {` Deactivate ${signingKey.name}`}
         </>
       }
-      close={closeHandler}
+      close={() => {
+        setModelsModalOpen(false);
+      }}
     >
       <h3>{signingKey.name} is used in :</h3>
       <ul>
-        {relatedModels.map((model) => {
-          const relatedPolicy = relatedPolicies.find(
-            (policy) => policy["model-name"] === model.name
-          );
-          return (
-            <React.Fragment key={model.name}>
-              <li>{model.name}</li>
-              <li>
-                {relatedPolicy
-                  ? relatedPolicy["created-by"]
-                  : "No policy found"}
-              </li>
-            </React.Fragment>
-          );
-        })}
+        {signingKey.models &&
+          signingKey.models.length > 0 &&
+          signingKey.models.map((model) => <li key={model}>{model}</li>)}
       </ul>
       <p>
         You need to update each policy with a new key first to be able to delete

diff --git a/static/js/brand-store/components/SigningKeys/SigningKeysFilter.test.tsx b/static/js/brand-store/components/SigningKeys/SigningKeysFilter.test.tsx
diff --git a/static/js/brand-store/components/SigningKeys/SigningKeysTable.tsx b/static/js/brand-store/components/SigningKeys/SigningKeysTable.tsx
@@ -85,7 +85,6 @@ function SigningKeysTable({ setShowDisableSuccessNotification }: Props) {
     <>
       {modelsModalOpen && selectedSigningKey && (
         <ModelsModal
-          modelsModalOpen={modelsModalOpen}
           setModelsModalOpen={setModelsModalOpen}
           signingKey={selectedSigningKey}
         />