From 0c3d5560567a47a4f9a49c52d9ddebd504b1b59a Mon Sep 17 00:00:00 2001
From: Eduard M <4310497+edisile@users.noreply.github.com>
Date: Thu, 9 Oct 2025 12:14:33 +0200
Subject: [PATCH 1/2] chore: move signing keys page to Publisher layout

---
 static/js/publisher/index.tsx                 |   7 +-
 .../pages/SigningKeys/SigningKeys.tsx         | 232 +++++++++---------
 2 files changed, 119 insertions(+), 120 deletions(-)

diff --git a/static/js/publisher/index.tsx b/static/js/publisher/index.tsx
index 08edeaa515..b9a067b216 100644
--- a/static/js/publisher/index.tsx
+++ b/static/js/publisher/index.tsx
@@ -94,6 +94,11 @@ root.render(
             <Route path="admin/:id/snaps" element={<Snaps />} />
             <Route path="admin/:id/members" element={<Members />} />
             <Route path="admin/:id/settings" element={<BrandStoreSettings />} />
+            <Route path="admin/:id/signing-keys" element={<SigningKeys />} />
+            <Route
+              path="admin/:id/signing-keys/create"
+              element={<SigningKeys />}
+            />
           </Route>
           {/* END publisher routes */}
 
@@ -108,8 +113,6 @@ root.render(
                 path="models/:model_id/policies/create"
                 element={<Policies />}
               />
-              <Route path="signing-keys" element={<SigningKeys />} />
-              <Route path="signing-keys/create" element={<SigningKeys />} />
             </Route>
           </Route>
           {/* END brand store routes */}
diff --git a/static/js/publisher/pages/SigningKeys/SigningKeys.tsx b/static/js/publisher/pages/SigningKeys/SigningKeys.tsx
index aed4f9d3ef..7b712fa9f0 100644
--- a/static/js/publisher/pages/SigningKeys/SigningKeys.tsx
+++ b/static/js/publisher/pages/SigningKeys/SigningKeys.tsx
@@ -18,20 +18,17 @@ import {
 } from "../../state/signingKeysState";
 import { policiesListState } from "../../state/policiesState";
 import { brandIdState, brandStoreState } from "../../state/brandStoreState";
-
 import Filter from "../../components/Filter";
 import SigningKeysTable from "./SigningKeysTable";
 import CreateSigningKeyForm from "./CreateSigningKeyForm";
-import Navigation from "../../components/Navigation";
-
 import {
   isClosedPanel,
   setPageTitle,
   sortByDateDescending,
   getPolicies,
 } from "../../utils";
-
 import type { SigningKey, Model } from "../../types/shared";
+import { PortalEntry } from "../Portals/Portals";
 
 function SigningKeys(): React.JSX.Element {
   const { id } = useParams();
@@ -95,124 +92,123 @@ function SigningKeys(): React.JSX.Element {
   }, [models]);
 
   return (
-    <div className="l-application" role="presentation">
-      <Navigation />
-      <main className="l-main">
-        <div className="p-panel u-flex-column">
-          <div className="p-panel__content u-flex-column u-flex-grow">
-            <div className="u-fixed-width">
-              <h1 className="p-heading--4">Signing keys</h1>
-            </div>
-            {showNotification && (
-              <div className="u-fixed-width">
-                <Notification
-                  severity="positive"
-                  onDismiss={() => {
-                    setShowNotification(false);
-                  }}
-                >
-                  New signing key created
-                </Notification>
-              </div>
-            )}
-            {errorMessage && (
-              <div className="u-fixed-width">
-                <Notification
-                  severity="negative"
-                  onDismiss={() => {
-                    setErrorMessage("");
-                  }}
-                >
-                  {errorMessage}
-                </Notification>
-              </div>
-            )}
-            {showDisableSuccessNotification && (
-              <div className="u-fixed-width">
-                <Notification
-                  severity="positive"
-                  onDismiss={() => {
-                    setShowDisableSuccessNotification(false);
-                  }}
-                >
-                  Signing key successfully deactivated
-                </Notification>
-              </div>
-            )}
-            <Row>
-              <Col size={6}>
-                <Filter
-                  state={signingKeysListFilterState}
-                  label="Signing keys"
-                  placeholder="Search keys"
-                />
-              </Col>
-              <Col size={6} className="u-align--right">
-                <Link
-                  className="p-button--positive"
-                  to={`/admin/${id}/signing-keys/create`}
-                >
-                  Create new signing key
-                </Link>
-              </Col>
-            </Row>
-            <div className="u-fixed-width u-flex-column u-flex-grow">
-              {isError && error && (
-                <Notification severity="negative">
-                  Error: {error.message}
-                </Notification>
-              )}
-              {isLoading ? (
-                <p>
-                  <Icon name="spinner" className="u-animation--spin" />
-                  &nbsp;Fetching signing keys...
-                </p>
-              ) : (
-                <div className="u-flex-column u-flex-grow">
-                  <SigningKeysTable
-                    setShowDisableSuccessNotification={
-                      setShowDisableSuccessNotification
-                    }
-                    enableTableActions={enableTableActions}
-                  />
-                </div>
-              )}
-            </div>
+    <>
+      <div className="u-fixed-width">
+        <h1 className="p-heading--4">Signing keys</h1>
+      </div>
+      <Row>
+        <Col size={6}>
+          <Filter
+            state={signingKeysListFilterState}
+            label="Signing keys"
+            placeholder="Search keys"
+          />
+        </Col>
+        <Col size={6} className="u-align--right">
+          <Link
+            className="p-button--positive"
+            to={`/admin/${id}/signing-keys/create`}
+          >
+            Create new signing key
+          </Link>
+        </Col>
+      </Row>
+      <div className="u-fixed-width u-flex-column u-flex-grow">
+        {isError && error && (
+          <Notification severity="negative">
+            Error: {error.message}
+          </Notification>
+        )}
+        {isLoading ? (
+          <p>
+            <Icon name="spinner" className="u-animation--spin" />
+            &nbsp;Fetching signing keys...
+          </p>
+        ) : (
+          <div className="u-flex-column u-flex-grow">
+            <SigningKeysTable
+              setShowDisableSuccessNotification={
+                setShowDisableSuccessNotification
+              }
+              enableTableActions={enableTableActions}
+            />
+          </div>
+        )}
+      </div>
+
+      <PortalEntry name="notification">
+        {showNotification && (
+          <div className="u-fixed-width">
+            <Notification
+              severity="positive"
+              onDismiss={() => {
+                setShowNotification(false);
+              }}
+            >
+              New signing key created
+            </Notification>
+          </div>
+        )}
+        {errorMessage && (
+          <div className="u-fixed-width">
+            <Notification
+              severity="negative"
+              onDismiss={() => {
+                setErrorMessage("");
+              }}
+            >
+              {errorMessage}
+            </Notification>
           </div>
-        </div>
-      </main>
-      <div
-        className={`l-aside__overlay ${
-          isClosedPanel(location.pathname, "create") ? "u-hide" : ""
-        }`}
-        onClick={() => {
-          navigate(`/admin/${id}/signing-keys`);
-          setNewSigningKey({ name: "" });
-          setErrorMessage("");
-        }}
-        onKeyDown={(e) => {
-          if (e.key === "Enter" || e.key === " ") {
+        )}
+        {showDisableSuccessNotification && (
+          <div className="u-fixed-width">
+            <Notification
+              severity="positive"
+              onDismiss={() => {
+                setShowDisableSuccessNotification(false);
+              }}
+            >
+              Signing key successfully deactivated
+            </Notification>
+          </div>
+        )}
+      </PortalEntry>
+
+      <PortalEntry name="aside">
+        <div
+          className={`l-aside__overlay ${
+            isClosedPanel(location.pathname, "create") ? "u-hide" : ""
+          }`}
+          onClick={() => {
             navigate(`/admin/${id}/signing-keys`);
             setNewSigningKey({ name: "" });
             setErrorMessage("");
-          }
-        }}
-        role="button"
-        tabIndex={0}
-        aria-label="Navigate to signing keys"
-      ></div>
-      <aside
-        className={`l-aside ${
-          isClosedPanel(location.pathname, "create") ? "is-collapsed" : ""
-        }`}
-      >
-        <CreateSigningKeyForm
-          setShowNotification={setShowNotification}
-          setErrorMessage={setErrorMessage}
-          refetch={refetch}
-        />
-      </aside>
-    </div>
+          }}
+          onKeyDown={(e) => {
+            if (e.key === "Enter" || e.key === " ") {
+              navigate(`/admin/${id}/signing-keys`);
+              setNewSigningKey({ name: "" });
+              setErrorMessage("");
+            }
+          }}
+          role="button"
+          tabIndex={0}
+          aria-label="Navigate to signing keys"
+        ></div>
+        <aside
+          className={`l-aside ${
+            isClosedPanel(location.pathname, "create") ? "is-collapsed" : ""
+          }`}
+        >
+          <CreateSigningKeyForm
+            setShowNotification={setShowNotification}
+            setErrorMessage={setErrorMessage}
+            refetch={refetch}
+          />
+        </aside>
+      </PortalEntry>
+    </>
   );
 }
 

From 754f3476a7434e31368b79e0b03bc75011ccf6af Mon Sep 17 00:00:00 2001
From: Eduard M <4310497+edisile@users.noreply.github.com>
Date: Thu, 9 Oct 2025 12:58:38 +0200
Subject: [PATCH 2/2] fix: test

---
 .../pages/SigningKeys/__tests__/SigningKeys.test.tsx         | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/static/js/publisher/pages/SigningKeys/__tests__/SigningKeys.test.tsx b/static/js/publisher/pages/SigningKeys/__tests__/SigningKeys.test.tsx
index afeb70968a..2b4b4faee8 100644
--- a/static/js/publisher/pages/SigningKeys/__tests__/SigningKeys.test.tsx
+++ b/static/js/publisher/pages/SigningKeys/__tests__/SigningKeys.test.tsx
@@ -14,6 +14,11 @@ vi.mock("react-router-dom", async (importOriginal) => ({
   useSearchParams: () => [new URLSearchParams({ filter: mockFilterQuery })],
 }));
 
+vi.mock("../../Portals/Portals", async (importOriginal) => ({
+  ...(await importOriginal()),
+  PortalEntry: ({ children }: { children: React.ReactNode }) => <>{children}</>,
+}));
+
 const queryClient = new QueryClient({
   defaultOptions: {
     queries: {