Fix lint issues

This commit is contained in:
Tuan Dang
2025-05-12 14:34:14 -07:00
parent bf833a57cd
commit 26d0ab1dc2
11 changed files with 65 additions and 34 deletions
@@ -1976,7 +1976,7 @@ interface CreatePkiSubscriber {
type: EventType.CREATE_PKI_SUBSCRIBER; type: EventType.CREATE_PKI_SUBSCRIBER;
metadata: { metadata: {
pkiSubscriberId: string; pkiSubscriberId: string;
caId: string; caId?: string;
name: string; name: string;
commonName: string; commonName: string;
ttl: string; ttl: string;
@@ -131,7 +131,7 @@ export const registerPkiSubscriberRouter = async (server: FastifyZodProvider) =>
type: EventType.CREATE_PKI_SUBSCRIBER, type: EventType.CREATE_PKI_SUBSCRIBER,
metadata: { metadata: {
pkiSubscriberId: subscriber.id, pkiSubscriberId: subscriber.id,
caId: subscriber.caId, caId: subscriber.caId ?? undefined,
name: subscriber.name, name: subscriber.name,
commonName: subscriber.commonName, commonName: subscriber.commonName,
ttl: subscriber.ttl, ttl: subscriber.ttl,
@@ -216,7 +216,7 @@ export const registerPkiSubscriberRouter = async (server: FastifyZodProvider) =>
type: EventType.UPDATE_PKI_SUBSCRIBER, type: EventType.UPDATE_PKI_SUBSCRIBER,
metadata: { metadata: {
pkiSubscriberId: subscriber.id, pkiSubscriberId: subscriber.id,
caId: subscriber.caId, caId: subscriber.caId ?? undefined,
name: subscriber.name, name: subscriber.name,
commonName: subscriber.commonName, commonName: subscriber.commonName,
ttl: subscriber.ttl, ttl: subscriber.ttl,
+3 -3
View File
@@ -283,9 +283,9 @@ export const ROUTE_PATHS = Object.freeze({
"/cert-manager/$projectId/ca/$caId", "/cert-manager/$projectId/ca/$caId",
"/_authenticate/_inject-org-details/_org-layout/cert-manager/$projectId/_cert-manager-layout/ca/$caId" "/_authenticate/_inject-org-details/_org-layout/cert-manager/$projectId/_cert-manager-layout/ca/$caId"
), ),
OverviewPage: setRoute( CertificatesPage: setRoute(
"/cert-manager/$projectId/overview", "/cert-manager/$projectId/certificates",
"/_authenticate/_inject-org-details/_org-layout/cert-manager/$projectId/_cert-manager-layout/overview" "/_authenticate/_inject-org-details/_org-layout/cert-manager/$projectId/_cert-manager-layout/certificates"
), ),
CertificateAuthoritiesPage: setRoute( CertificateAuthoritiesPage: setRoute(
"/cert-manager/$projectId/certificate-authorities", "/cert-manager/$projectId/certificate-authorities",
@@ -63,7 +63,7 @@ const Page = () => {
handlePopUpClose("deleteCa"); handlePopUpClose("deleteCa");
navigate({ navigate({
to: `/${ProjectType.CertificateManager}/$projectId/overview` as const, to: `/${ProjectType.CertificateManager}/$projectId/certificates` as const,
params: { params: {
projectId projectId
} }
@@ -57,7 +57,7 @@ export const PkiCollectionPage = () => {
}); });
handlePopUpClose("deletePkiCollection"); handlePopUpClose("deletePkiCollection");
navigate({ navigate({
to: `/${ProjectType.CertificateManager}/$projectId/overview` as const, to: `/${ProjectType.CertificateManager}/$projectId/certificates` as const,
params: { params: {
projectId projectId
} }
@@ -13,7 +13,7 @@ export const Route = createFileRoute(
{ {
label: "Certificate Collections", label: "Certificate Collections",
link: linkOptions({ link: linkOptions({
to: "/cert-manager/$projectId/overview", to: "/cert-manager/$projectId/certificates",
params: { params: {
projectId: params.projectId projectId: params.projectId
} }
@@ -1,9 +1,25 @@
import { createFileRoute } from "@tanstack/react-router"; import { createFileRoute, linkOptions } from "@tanstack/react-router";
import { PkiSubscriberDetailsByIDPage } from "./PkiSubscriberDetailsByIDPage"; import { PkiSubscriberDetailsByIDPage } from "./PkiSubscriberDetailsByIDPage";
export const Route = createFileRoute( export const Route = createFileRoute(
"/_authenticate/_inject-org-details/_org-layout/cert-manager/$projectId/_cert-manager-layout/subscribers/$subscriberName" "/_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
}
})
}
]
};
}
}); });
@@ -5,5 +5,15 @@ import { PkiSubscribersPage } from "./PkiSubscribersPage";
export const Route = createFileRoute( export const Route = createFileRoute(
"/_authenticate/_inject-org-details/_org-layout/cert-manager/$projectId/_cert-manager-layout/subscribers/" "/_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"
}
]
};
}
}); });
+1 -1
View File
@@ -31,7 +31,7 @@ export const Route = createFileRoute(
{ {
label: project.name, label: project.name,
link: linkOptions({ link: linkOptions({
to: "/cert-manager/$projectId/overview", to: "/cert-manager/$projectId/subscribers",
params: { projectId: project.id } params: { projectId: project.id }
}) })
} }
@@ -58,6 +58,15 @@ export const OrgAdminProjects = withPermission(
await orgAdminAccessProject.mutateAsync({ await orgAdminAccessProject.mutateAsync({
projectId projectId
}); });
if (type === ProjectType.CertificateManager) {
await navigate({
to: "/cert-manager/$projectId/subscribers" as const,
params: {
projectId
}
});
return;
}
await navigate({ await navigate({
to: `/${type}/$projectId/overview` as const, to: `/${type}/$projectId/overview` as const,
params: { params: {
@@ -1,37 +1,33 @@
import { faHome } from '@fortawesome/free-solid-svg-icons' import { faHome } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { import { createFileRoute, linkOptions, stripSearchParams } from "@tanstack/react-router";
createFileRoute, import { zodValidator } from "@tanstack/zod-adapter";
linkOptions, import { z } from "zod";
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({ const SettingsPageQueryParams = z.object({
selectedTab: z.string().catch(''), selectedTab: z.string().catch("")
}) });
export const Route = createFileRoute( export const Route = createFileRoute(
'/_authenticate/_inject-org-details/_org-layout/organization/settings/', "/_authenticate/_inject-org-details/_org-layout/organization/settings/"
)({ )({
component: SettingsPage, component: SettingsPage,
validateSearch: zodValidator(SettingsPageQueryParams), validateSearch: zodValidator(SettingsPageQueryParams),
search: { search: {
middlewares: [stripSearchParams({ selectedTab: '' })], middlewares: [stripSearchParams({ selectedTab: "" })]
}, },
context: () => ({ context: () => ({
breadcrumbs: [ breadcrumbs: [
{ {
label: 'Home', label: "Home",
icon: () => <FontAwesomeIcon icon={faHome} />, icon: () => <FontAwesomeIcon icon={faHome} />,
link: linkOptions({ to: '/' }), link: linkOptions({ to: "/" })
}, },
{ {
label: 'Settings', label: "Settings"
}, }
], ]
}), })
}) });