From 26d0ab1dc21bb3e6246e18e5309e03f02826f26b Mon Sep 17 00:00:00 2001 From: Tuan Dang Date: Mon, 12 May 2025 14:34:14 -0700 Subject: [PATCH] Fix lint issues --- .../ee/services/audit-log/audit-log-types.ts | 2 +- .../server/routes/v1/pki-subscriber-router.ts | 4 +- frontend/src/const/routes.ts | 6 +-- .../CertAuthDetailsByIDPage.tsx | 2 +- .../PkiCollectionDetailsByIDPage.tsx | 2 +- .../PkiCollectionDetailsByIDPage/routes.tsx | 2 +- .../PkiSubscriberDetailsByIDPage/route.tsx | 20 +++++++++- .../cert-manager/PkiSubscribersPage/route.tsx | 12 +++++- frontend/src/pages/cert-manager/layout.tsx | 2 +- .../OrgAdminProjects/OrgAdminProjects.tsx | 9 +++++ .../pages/organization/SettingsPage/route.tsx | 38 +++++++++---------- 11 files changed, 65 insertions(+), 34 deletions(-) diff --git a/backend/src/ee/services/audit-log/audit-log-types.ts b/backend/src/ee/services/audit-log/audit-log-types.ts index 1cb7d4554..03f11219e 100644 --- a/backend/src/ee/services/audit-log/audit-log-types.ts +++ b/backend/src/ee/services/audit-log/audit-log-types.ts @@ -1976,7 +1976,7 @@ interface CreatePkiSubscriber { type: EventType.CREATE_PKI_SUBSCRIBER; metadata: { pkiSubscriberId: string; - caId: string; + caId?: string; name: string; commonName: string; ttl: string; diff --git a/backend/src/server/routes/v1/pki-subscriber-router.ts b/backend/src/server/routes/v1/pki-subscriber-router.ts index 20e851efa..d04b8b4bb 100644 --- a/backend/src/server/routes/v1/pki-subscriber-router.ts +++ b/backend/src/server/routes/v1/pki-subscriber-router.ts @@ -131,7 +131,7 @@ export const registerPkiSubscriberRouter = async (server: FastifyZodProvider) => type: EventType.CREATE_PKI_SUBSCRIBER, metadata: { pkiSubscriberId: subscriber.id, - caId: subscriber.caId, + caId: subscriber.caId ?? undefined, name: subscriber.name, commonName: subscriber.commonName, ttl: subscriber.ttl, @@ -216,7 +216,7 @@ export const registerPkiSubscriberRouter = async (server: FastifyZodProvider) => type: EventType.UPDATE_PKI_SUBSCRIBER, metadata: { pkiSubscriberId: subscriber.id, - caId: subscriber.caId, + caId: subscriber.caId ?? undefined, name: subscriber.name, commonName: subscriber.commonName, ttl: subscriber.ttl, diff --git a/frontend/src/const/routes.ts b/frontend/src/const/routes.ts index dd963594e..bb7a4f181 100644 --- a/frontend/src/const/routes.ts +++ b/frontend/src/const/routes.ts @@ -283,9 +283,9 @@ export const ROUTE_PATHS = Object.freeze({ "/cert-manager/$projectId/ca/$caId", "/_authenticate/_inject-org-details/_org-layout/cert-manager/$projectId/_cert-manager-layout/ca/$caId" ), - OverviewPage: setRoute( - "/cert-manager/$projectId/overview", - "/_authenticate/_inject-org-details/_org-layout/cert-manager/$projectId/_cert-manager-layout/overview" + CertificatesPage: setRoute( + "/cert-manager/$projectId/certificates", + "/_authenticate/_inject-org-details/_org-layout/cert-manager/$projectId/_cert-manager-layout/certificates" ), CertificateAuthoritiesPage: setRoute( "/cert-manager/$projectId/certificate-authorities", diff --git a/frontend/src/pages/cert-manager/CertAuthDetailsByIDPage/CertAuthDetailsByIDPage.tsx b/frontend/src/pages/cert-manager/CertAuthDetailsByIDPage/CertAuthDetailsByIDPage.tsx index 9bb6c9096..df5680668 100644 --- a/frontend/src/pages/cert-manager/CertAuthDetailsByIDPage/CertAuthDetailsByIDPage.tsx +++ b/frontend/src/pages/cert-manager/CertAuthDetailsByIDPage/CertAuthDetailsByIDPage.tsx @@ -63,7 +63,7 @@ const Page = () => { handlePopUpClose("deleteCa"); navigate({ - to: `/${ProjectType.CertificateManager}/$projectId/overview` as const, + to: `/${ProjectType.CertificateManager}/$projectId/certificates` as const, params: { projectId } diff --git a/frontend/src/pages/cert-manager/PkiCollectionDetailsByIDPage/PkiCollectionDetailsByIDPage.tsx b/frontend/src/pages/cert-manager/PkiCollectionDetailsByIDPage/PkiCollectionDetailsByIDPage.tsx index 073cac6e8..e851e33d3 100644 --- a/frontend/src/pages/cert-manager/PkiCollectionDetailsByIDPage/PkiCollectionDetailsByIDPage.tsx +++ b/frontend/src/pages/cert-manager/PkiCollectionDetailsByIDPage/PkiCollectionDetailsByIDPage.tsx @@ -57,7 +57,7 @@ export const PkiCollectionPage = () => { }); handlePopUpClose("deletePkiCollection"); navigate({ - to: `/${ProjectType.CertificateManager}/$projectId/overview` as const, + to: `/${ProjectType.CertificateManager}/$projectId/certificates` as const, params: { projectId } diff --git a/frontend/src/pages/cert-manager/PkiCollectionDetailsByIDPage/routes.tsx b/frontend/src/pages/cert-manager/PkiCollectionDetailsByIDPage/routes.tsx index d59ebd265..e1ff5c1e7 100644 --- a/frontend/src/pages/cert-manager/PkiCollectionDetailsByIDPage/routes.tsx +++ b/frontend/src/pages/cert-manager/PkiCollectionDetailsByIDPage/routes.tsx @@ -13,7 +13,7 @@ export const Route = createFileRoute( { label: "Certificate Collections", link: linkOptions({ - to: "/cert-manager/$projectId/overview", + to: "/cert-manager/$projectId/certificates", params: { projectId: params.projectId } diff --git a/frontend/src/pages/cert-manager/PkiSubscriberDetailsByIDPage/route.tsx b/frontend/src/pages/cert-manager/PkiSubscriberDetailsByIDPage/route.tsx index f10ba23b6..bb902bc76 100644 --- a/frontend/src/pages/cert-manager/PkiSubscriberDetailsByIDPage/route.tsx +++ b/frontend/src/pages/cert-manager/PkiSubscriberDetailsByIDPage/route.tsx @@ -1,9 +1,25 @@ -import { createFileRoute } from "@tanstack/react-router"; +import { createFileRoute, linkOptions } from "@tanstack/react-router"; import { PkiSubscriberDetailsByIDPage } from "./PkiSubscriberDetailsByIDPage"; export const Route = createFileRoute( "/_authenticate/_inject-org-details/_org-layout/cert-manager/$projectId/_cert-manager-layout/subscribers/$subscriberName" )({ - component: PkiSubscriberDetailsByIDPage + component: PkiSubscriberDetailsByIDPage, + beforeLoad: ({ context, params }) => { + return { + breadcrumbs: [ + ...context.breadcrumbs, + { + label: "Subscribers", + link: linkOptions({ + to: "/cert-manager/$projectId/subscribers", + params: { + projectId: params.projectId + } + }) + } + ] + }; + } }); diff --git a/frontend/src/pages/cert-manager/PkiSubscribersPage/route.tsx b/frontend/src/pages/cert-manager/PkiSubscribersPage/route.tsx index d8d9fbadd..54e172c8f 100644 --- a/frontend/src/pages/cert-manager/PkiSubscribersPage/route.tsx +++ b/frontend/src/pages/cert-manager/PkiSubscribersPage/route.tsx @@ -5,5 +5,15 @@ import { PkiSubscribersPage } from "./PkiSubscribersPage"; export const Route = createFileRoute( "/_authenticate/_inject-org-details/_org-layout/cert-manager/$projectId/_cert-manager-layout/subscribers/" )({ - component: PkiSubscribersPage + component: PkiSubscribersPage, + beforeLoad: ({ context }) => { + return { + breadcrumbs: [ + ...context.breadcrumbs, + { + label: "Subscribers" + } + ] + }; + } }); diff --git a/frontend/src/pages/cert-manager/layout.tsx b/frontend/src/pages/cert-manager/layout.tsx index 54a9b06d3..1b52793f8 100644 --- a/frontend/src/pages/cert-manager/layout.tsx +++ b/frontend/src/pages/cert-manager/layout.tsx @@ -31,7 +31,7 @@ export const Route = createFileRoute( { label: project.name, link: linkOptions({ - to: "/cert-manager/$projectId/overview", + to: "/cert-manager/$projectId/subscribers", params: { projectId: project.id } }) } diff --git a/frontend/src/pages/organization/AdminPage/components/OrgAdminProjects/OrgAdminProjects.tsx b/frontend/src/pages/organization/AdminPage/components/OrgAdminProjects/OrgAdminProjects.tsx index 4e33e5688..75b21b742 100644 --- a/frontend/src/pages/organization/AdminPage/components/OrgAdminProjects/OrgAdminProjects.tsx +++ b/frontend/src/pages/organization/AdminPage/components/OrgAdminProjects/OrgAdminProjects.tsx @@ -58,6 +58,15 @@ export const OrgAdminProjects = withPermission( await orgAdminAccessProject.mutateAsync({ projectId }); + if (type === ProjectType.CertificateManager) { + await navigate({ + to: "/cert-manager/$projectId/subscribers" as const, + params: { + projectId + } + }); + return; + } await navigate({ to: `/${type}/$projectId/overview` as const, params: { diff --git a/frontend/src/pages/organization/SettingsPage/route.tsx b/frontend/src/pages/organization/SettingsPage/route.tsx index e7fdb706a..3f7beb4e8 100644 --- a/frontend/src/pages/organization/SettingsPage/route.tsx +++ b/frontend/src/pages/organization/SettingsPage/route.tsx @@ -1,37 +1,33 @@ -import { faHome } from '@fortawesome/free-solid-svg-icons' -import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' -import { - createFileRoute, - linkOptions, - stripSearchParams, -} from '@tanstack/react-router' -import { zodValidator } from '@tanstack/zod-adapter' -import { z } from 'zod' +import { faHome } from "@fortawesome/free-solid-svg-icons"; +import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import { createFileRoute, linkOptions, stripSearchParams } from "@tanstack/react-router"; +import { zodValidator } from "@tanstack/zod-adapter"; +import { z } from "zod"; -import { SettingsPage } from './SettingsPage' +import { SettingsPage } from "./SettingsPage"; const SettingsPageQueryParams = z.object({ - selectedTab: z.string().catch(''), -}) + selectedTab: z.string().catch("") +}); export const Route = createFileRoute( - '/_authenticate/_inject-org-details/_org-layout/organization/settings/', + "/_authenticate/_inject-org-details/_org-layout/organization/settings/" )({ component: SettingsPage, validateSearch: zodValidator(SettingsPageQueryParams), search: { - middlewares: [stripSearchParams({ selectedTab: '' })], + middlewares: [stripSearchParams({ selectedTab: "" })] }, context: () => ({ breadcrumbs: [ { - label: 'Home', + label: "Home", icon: () => , - link: linkOptions({ to: '/' }), + link: linkOptions({ to: "/" }) }, { - label: 'Settings', - }, - ], - }), -}) + label: "Settings" + } + ] + }) +});