awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-09 09:28:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4904 from Infisical/fix/suborgs-routing

Browse Source 
[ENG-4124] fix: fixed routing for sub-orgs
This commit is contained in:
Akhil Mohan
2025-11-21 22:13:20 +05:30
committed by GitHub
parent 7e017b63fe fcb949f4c3
commit d841094027
400 changed files with 5090 additions and 4274 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/ee/services/access-approval-request/access-approval-request-service.ts
+3 -3
View File
@@ -243,7 +243,7 @@ export const accessApprovalRequestServiceFactory = ({
); );
const requesterFullName = `${requestedByUser.firstName} ${requestedByUser.lastName}`; const requesterFullName = `${requestedByUser.firstName} ${requestedByUser.lastName}`;
const projectPath = `/projects/secret-management/${project.id}`; const projectPath = `/organizations/${project.orgId}/projects/secret-management/${project.id}`;
const approvalPath = `${projectPath}/approval`; const approvalPath = `${projectPath}/approval`;
const approvalUrl = `${cfg.SITE_URL}${approvalPath}`; const approvalUrl = `${cfg.SITE_URL}${approvalPath}`;
@@ -399,7 +399,7 @@ export const accessApprovalRequestServiceFactory = ({
const requesterFullName = `${requestedByUser.firstName} ${requestedByUser.lastName}`; const requesterFullName = `${requestedByUser.firstName} ${requestedByUser.lastName}`;
const editorFullName = `${editedByUser.firstName} ${editedByUser.lastName}`; const editorFullName = `${editedByUser.firstName} ${editedByUser.lastName}`;
const projectPath = `/projects/secret-management/${project.id}`; const projectPath = `/organizations/${project.orgId}/projects/secret-management/${project.id}`;
const approvalPath = `${projectPath}/approval`; const approvalPath = `${projectPath}/approval`;
const approvalUrl = `${cfg.SITE_URL}${approvalPath}`; const approvalUrl = `${cfg.SITE_URL}${approvalPath}`;
@@ -766,7 +766,7 @@ export const accessApprovalRequestServiceFactory = ({
.map((appUser) => appUser.email) .map((appUser) => appUser.email)
.filter((email): email is string => !!email); .filter((email): email is string => !!email);
const approvalPath = `/projects/secret-management/${project.id}/approval`; const approvalPath = `/organizations/${project.orgId}/projects/secret-management/${project.id}/approval`;
const approvalUrl = `${cfg.SITE_URL}${approvalPath}`; const approvalUrl = `${cfg.SITE_URL}${approvalPath}`;
await notificationService.createUserNotifications( await notificationService.createUserNotifications(
backend/src/ee/services/license/license-service.ts
+3 -3
View File
@@ -450,8 +450,8 @@ export const licenseServiceFactory = ({
} = await licenseServerCloudApi.request.post( } = await licenseServerCloudApi.request.post(
`/api/license-server/v1/customers/${organization.customerId}/billing-details/payment-methods`, `/api/license-server/v1/customers/${organization.customerId}/billing-details/payment-methods`,
{ {
success_url: `${envConfig.SITE_URL}/organization/billing`, success_url: `${envConfig.SITE_URL}/organizations/${orgId}/billing`,
cancel_url: `${envConfig.SITE_URL}/organization/billing` cancel_url: `${envConfig.SITE_URL}/organizations/${orgId}/billing`
} }
); );
@@ -464,7 +464,7 @@ export const licenseServiceFactory = ({
} = await licenseServerCloudApi.request.post( } = await licenseServerCloudApi.request.post(
`/api/license-server/v1/customers/${organization.customerId}/billing-details/billing-portal`, `/api/license-server/v1/customers/${organization.customerId}/billing-details/billing-portal`,
{ {
return_url: `${envConfig.SITE_URL}/organization/billing` return_url: `${envConfig.SITE_URL}/organizations/${orgId}/billing`
} }
); );
backend/src/ee/services/secret-approval-request/secret-approval-request-fns.ts
+2 -2
View File
@@ -37,7 +37,7 @@ export const sendApprovalEmailsFn = async ({
type: NotificationType.SECRET_CHANGE_REQUEST, type: NotificationType.SECRET_CHANGE_REQUEST,
title: "Secret Change Request", title: "Secret Change Request",
body: `You have a new secret change request pending your review for the project **${project.name}** in the organization **${project.organization.name}**.`, body: `You have a new secret change request pending your review for the project **${project.name}** in the organization **${project.organization.name}**.`,
link: `/projects/secret-management/${project.id}/approval` link: `/organizations/${project.orgId}/projects/secret-management/${project.id}/approval`
})) }))
); );
@@ -51,7 +51,7 @@ export const sendApprovalEmailsFn = async ({
firstName: reviewerUser.firstName, firstName: reviewerUser.firstName,
projectName: project.name, projectName: project.name,
organizationName: project.organization.name, organizationName: project.organization.name,
approvalUrl: `${cfg.SITE_URL}/projects/secret-management/${project.id}/approval}` approvalUrl: `${cfg.SITE_URL}/organizations/${project.orgId}/projects/secret-management/${project.id}/approval}`
}, },
template: SmtpTemplates.SecretApprovalRequestNeedsReview template: SmtpTemplates.SecretApprovalRequestNeedsReview
}); });
backend/src/ee/services/secret-approval-request/secret-approval-request-service.ts
+3 -3
View File
@@ -1037,7 +1037,7 @@ export const secretApprovalRequestServiceFactory = ({
bypassReason, bypassReason,
secretPath: policy.secretPath, secretPath: policy.secretPath,
environment: env.name, environment: env.name,
approvalUrl: `${cfg.SITE_URL}/projects/secret-management/${project.id}/approval` approvalUrl: `${cfg.SITE_URL}/organizations/${project.orgId}/projects/secret-management/${project.id}/approval`
}, },
template: SmtpTemplates.AccessSecretRequestBypassed template: SmtpTemplates.AccessSecretRequestBypassed
}); });
@@ -1416,7 +1416,7 @@ export const secretApprovalRequestServiceFactory = ({
const env = await projectEnvDAL.findOne({ id: policy.envId }); const env = await projectEnvDAL.findOne({ id: policy.envId });
const user = await userDAL.findById(actorId); const user = await userDAL.findById(actorId);
const projectPath = `/projects/secret-management/${projectId}`; const projectPath = `/organizations/${actorOrgId}/projects/secret-management/${projectId}`;
const approvalPath = `${projectPath}/approval`; const approvalPath = `${projectPath}/approval`;
const cfg = getConfig(); const cfg = getConfig();
const approvalUrl = `${cfg.SITE_URL}${approvalPath}`; const approvalUrl = `${cfg.SITE_URL}${approvalPath}`;
@@ -1792,7 +1792,7 @@ export const secretApprovalRequestServiceFactory = ({
const user = await userDAL.findById(actorId); const user = await userDAL.findById(actorId);
const env = await projectEnvDAL.findOne({ id: policy.envId }); const env = await projectEnvDAL.findOne({ id: policy.envId });
const projectPath = `/projects/secret-management/${project.id}`; const projectPath = `/organizations/${actorOrgId}/projects/secret-management/${project.id}`;
const approvalPath = `${projectPath}/approval`; const approvalPath = `${projectPath}/approval`;
const cfg = getConfig(); const cfg = getConfig();
const approvalUrl = `${cfg.SITE_URL}${approvalPath}`; const approvalUrl = `${cfg.SITE_URL}${approvalPath}`;
backend/src/ee/services/secret-rotation-v2/secret-rotation-v2-queue.ts
+1 -1
View File
@@ -156,7 +156,7 @@ export const secretRotationV2QueueServiceFactory = async ({
const rotationType = SECRET_ROTATION_NAME_MAP[type as SecretRotation]; const rotationType = SECRET_ROTATION_NAME_MAP[type as SecretRotation];
const rotationPath = `/projects/secret-management/${projectId}/secrets/${environment.slug}`; const rotationPath = `/organizations/${project.orgId}/projects/secret-management/${projectId}/secrets/${environment.slug}`;
await notificationService.createUserNotifications( await notificationService.createUserNotifications(
projectAdmins.map((admin) => ({ projectAdmins.map((admin) => ({
backend/src/ee/services/secret-scanning-v2/secret-scanning-v2-queue.ts
+2 -2
View File
@@ -637,7 +637,7 @@ export const secretScanningV2QueueServiceFactory = async ({
numberOfSecrets: payload.numberOfSecrets, numberOfSecrets: payload.numberOfSecrets,
isDiffScan: payload.isDiffScan, isDiffScan: payload.isDiffScan,
url: encodeURI( url: encodeURI(
`${appCfg.SITE_URL}/projects/secret-scanning/${projectId}/findings?search=scanId:${payload.scanId}` `${appCfg.SITE_URL}/organizations/${project.orgId}/projects/secret-scanning/${projectId}/findings?search=scanId:${payload.scanId}`
), ),
timestamp timestamp
} }
@@ -648,7 +648,7 @@ export const secretScanningV2QueueServiceFactory = async ({
timestamp, timestamp,
errorMessage: payload.errorMessage, errorMessage: payload.errorMessage,
url: encodeURI( url: encodeURI(
`${appCfg.SITE_URL}/projects/secret-scanning/${projectId}/data-sources/${dataSource.type}/${dataSource.id}` `${appCfg.SITE_URL}/organizations/${project.orgId}/projects/secret-scanning/${projectId}/data-sources/${dataSource.type}/${dataSource.id}`
) )
} }
}); });
backend/src/services/auth/auth-login-service.ts
+2 -1
View File
@@ -663,7 +663,8 @@ export const authLoginServiceFactory = ({
timestamp: new Date().toISOString(), timestamp: new Date().toISOString(),
ip: ipAddress, ip: ipAddress,
userAgent, userAgent,
siteUrl: removeTrailingSlash(cfg.SITE_URL || "https://app.infisical.com") siteUrl: removeTrailingSlash(cfg.SITE_URL || "https://app.infisical.com"),
orgId: organizationId
}, },
template: SmtpTemplates.OrgAdminBreakglassAccess template: SmtpTemplates.OrgAdminBreakglassAccess
}); });
backend/src/services/membership-user/org/org-membership-user-factory.ts
+1 -1
View File
@@ -129,7 +129,7 @@ export const newOrgMembershipUserFactory = ({
recipients: emails as string[], recipients: emails as string[],
substitutions: { substitutions: {
subOrganizationName: orgDetails.slug, subOrganizationName: orgDetails.slug,
callback_url: `${appCfg.SITE_URL}/organization/projects?subOrganization=${orgDetails.slug}` callback_url: `${appCfg.SITE_URL}/organizations/${dto.permission.orgId}/projects?subOrganization=${orgDetails.slug}`
} }
}); });
} else { } else {
backend/src/services/microsoft-teams/microsoft-teams-fns.ts
+4 -3
View File
@@ -357,7 +357,7 @@ export const isBotInstalledInTenant = async (
} }
}; };
export const buildTeamsPayload = (notification: TNotification) => { export const buildTeamsPayload = (orgId: string, notification: TNotification) => {
const appCfg = getConfig(); const appCfg = getConfig();
switch (notification.type) { switch (notification.type) {
@@ -402,7 +402,7 @@ export const buildTeamsPayload = (notification: TNotification) => {
{ {
type: "Action.OpenUrl", type: "Action.OpenUrl",
title: "View request in Infisical", title: "View request in Infisical",
url: `${appCfg.SITE_URL}/projects/secret-management/${payload.projectId}/approval?requestId=${payload.requestId}` url: `${appCfg.SITE_URL}/organizations/${orgId}/projects/secret-management/${payload.projectId}/approval?requestId=${payload.requestId}`
} }
] ]
}; };
@@ -590,10 +590,11 @@ export class TeamsBot extends TeamsActivityHandler {
tenantId: string, tenantId: string,
channelId: string, channelId: string,
teamId: string, teamId: string,
orgId: string,
notification: TNotification notification: TNotification
) { ) {
try { try {
const { adaptiveCard } = buildTeamsPayload(notification); const { adaptiveCard } = buildTeamsPayload(orgId, notification);
const adaptiveCardActivity = { const adaptiveCardActivity = {
type: "message", type: "message",
backend/src/services/microsoft-teams/microsoft-teams-service.ts
+1 -1
View File
@@ -759,7 +759,7 @@ export const microsoftTeamsServiceFactory = ({
}); });
for await (const channelId of target.channelIds) { for await (const channelId of target.channelIds) {
await teamsBot.sendMessageToChannel(botAccessToken, tenantId, channelId, target.teamId, notification); await teamsBot.sendMessageToChannel(botAccessToken, tenantId, channelId, target.teamId, orgId, notification);
} }
}; };
backend/src/services/project/project-service.ts
+1 -1
View File
@@ -1984,7 +1984,7 @@ export const projectServiceFactory = ({
projectTypeUrl = "cert-management"; projectTypeUrl = "cert-management";
} }
const callbackPath = `/projects/${projectTypeUrl}/${project.id}/access-management?selectedTab=members&requesterEmail=${userDetails.email}`; const callbackPath = `/organizations/${project.orgId}/projects/${projectTypeUrl}/${project.id}/access-management?selectedTab=members&requesterEmail=${userDetails.email}`;
await notificationService.createUserNotifications( await notificationService.createUserNotifications(
projectMembers projectMembers
backend/src/services/secret-sharing/secret-sharing-service.ts
+1 -1
View File
@@ -391,7 +391,7 @@ export const secretSharingServiceFactory = ({
substitutions: { substitutions: {
name: secretRequest.name, name: secretRequest.name,
respondentUsername, respondentUsername,
secretRequestUrl: `${appCfg.SITE_URL}/organization/secret-sharing?selectedTab=request-secret` secretRequestUrl: `${appCfg.SITE_URL}/organizations/${secretRequest.orgId}/secret-sharing?selectedTab=request-secret`
}, },
template: SmtpTemplates.SecretRequestCompleted template: SmtpTemplates.SecretRequestCompleted
}); });
backend/src/services/secret-sync/secret-sync-queue.ts
+1 -1
View File
@@ -932,7 +932,7 @@ export const secretSyncQueueFactory = ({
break; break;
} }
const baseProjectPath = `/projects/secret-management/${projectId}`; const baseProjectPath = `/organizations/${project.orgId}/projects/secret-management/${projectId}`;
const overviewPath = `${baseProjectPath}/overview`; const overviewPath = `${baseProjectPath}/overview`;
const syncPath = `${baseProjectPath}/integrations/secret-syncs/${destination}/${secretSync.id}`; const syncPath = `${baseProjectPath}/integrations/secret-syncs/${destination}/${secretSync.id}`;
backend/src/services/secret/secret-queue.ts
+1 -1
View File
@@ -742,7 +742,7 @@ export const secretQueueFactory = ({
environment: jobPayload.environmentName, environment: jobPayload.environmentName,
count: jobPayload.count, count: jobPayload.count,
projectName: project.name, projectName: project.name,
integrationUrl: `${appCfg.SITE_URL}/projects/secret-management/${project.id}/integrations?selectedTab=native-integrations` integrationUrl: `${appCfg.SITE_URL}/organizations/${project.orgId}/projects/secret-management/${project.id}/integrations?selectedTab=native-integrations`
} }
}); });
} }
backend/src/services/service-token/service-token-dal.ts
+29 -22
View File
@@ -30,28 +30,35 @@ export const serviceTokenDALFactory = (db: TDbClient) => {
const findExpiringTokens = async (tx?: Knex, batchSize = 500, offset = 0) => { const findExpiringTokens = async (tx?: Knex, batchSize = 500, offset = 0) => {
try { try {
const batch: { name: string; projectName: string; createdByEmail: string; id: string; projectId: string }[] = const batch: {
await (tx || db.replicaNode())(TableName.ServiceToken) name: string;
.leftJoin<TUsers>( projectName: string;
TableName.Users, createdByEmail: string;
`${TableName.Users}.id`, id: string;
db.raw(`${TableName.ServiceToken}."createdBy"::uuid`) projectId: string;
) orgId: string;
.join(TableName.Project, `${TableName.Project}.id`, `${TableName.ServiceToken}.projectId`) }[] = await (tx || db.replicaNode())(TableName.ServiceToken)
.whereRaw( .leftJoin<TUsers>(
`${TableName.ServiceToken}."expiresAt" < NOW() + INTERVAL '1 day' AND ${TableName.ServiceToken}."expiryNotificationSent" = false` TableName.Users,
) `${TableName.Users}.id`,
.whereNotNull(`${TableName.Users}.email`) db.raw(`${TableName.ServiceToken}."createdBy"::uuid`)
.select( )
db.ref("id").withSchema(TableName.ServiceToken), .join(TableName.Project, `${TableName.Project}.id`, `${TableName.ServiceToken}.projectId`)
db.ref("name").withSchema(TableName.ServiceToken), .whereRaw(
db.ref("projectId").withSchema(TableName.ServiceToken), `${TableName.ServiceToken}."expiresAt" < NOW() + INTERVAL '1 day' AND ${TableName.ServiceToken}."expiryNotificationSent" = false`
db.ref("createdBy").withSchema(TableName.ServiceToken), )
db.ref("email").withSchema(TableName.Users).as("createdByEmail"), .whereNotNull(`${TableName.Users}.email`)
db.ref("name").withSchema(TableName.Project).as("projectName") .select(
) db.ref("id").withSchema(TableName.ServiceToken),
.limit(batchSize) db.ref("name").withSchema(TableName.ServiceToken),
.offset(offset); db.ref("projectId").withSchema(TableName.ServiceToken),
db.ref("createdBy").withSchema(TableName.ServiceToken),
db.ref("email").withSchema(TableName.Users).as("createdByEmail"),
db.ref("name").withSchema(TableName.Project).as("projectName"),
db.ref("orgId").withSchema(TableName.Project).as("orgId")
)
.limit(batchSize)
.offset(offset);
return batch; return batch;
} catch (err) { } catch (err) {
backend/src/services/service-token/service-token-service.ts
+1 -1
View File
@@ -225,7 +225,7 @@ export const serviceTokenServiceFactory = ({
substitutions: { substitutions: {
tokenName: token.name, tokenName: token.name,
projectName: token.projectName, projectName: token.projectName,
url: `${appCfg.SITE_URL}/projects/secret-management/${token.projectId}/access-management?selectedTab=service-tokens` url: `${appCfg.SITE_URL}/organizations/${token.orgId}/projects/secret-management/${token.projectId}/access-management?selectedTab=service-tokens`
} }
}); });
await serviceTokenDAL.update({ id: token.id }, { expiryNotificationSent: true }); await serviceTokenDAL.update({ id: token.id }, { expiryNotificationSent: true });
backend/src/services/smtp/emails/OrgAdminBreakglassAccessTemplate.tsx
+5 -2
View File
@@ -7,6 +7,7 @@ import { BaseLink } from "./BaseLink";
interface OrgAdminBreakglassAccessTemplateProps extends Omit<BaseEmailWrapperProps, "title" | "preview" | "children"> { interface OrgAdminBreakglassAccessTemplateProps extends Omit<BaseEmailWrapperProps, "title" | "preview" | "children"> {
email: string; email: string;
timestamp: string; timestamp: string;
orgId: string;
ip: string; ip: string;
userAgent: string; userAgent: string;
} }
@@ -15,6 +16,7 @@ export const OrgAdminBreakglassAccessTemplate = ({
email, email,
siteUrl, siteUrl,
timestamp, timestamp,
orgId,
ip, ip,
userAgent userAgent
}: OrgAdminBreakglassAccessTemplateProps) => { }: OrgAdminBreakglassAccessTemplateProps) => {
@@ -36,7 +38,7 @@ export const OrgAdminBreakglassAccessTemplate = ({
<Text className="text-[14px] mt-[4px]">{userAgent}</Text> <Text className="text-[14px] mt-[4px]">{userAgent}</Text>
<Text className="text-[14px]"> <Text className="text-[14px]">
If you'd like to disable Admin SSO Bypass, please visit{" "} If you'd like to disable Admin SSO Bypass, please visit{" "}
<BaseLink href={`${siteUrl}/organization/settings`}>Organization Security Settings</BaseLink>. <BaseLink href={`${siteUrl}/organizations/${orgId}/settings`}>Organization Security Settings</BaseLink>.
</Text> </Text>
</Section> </Section>
</BaseEmailWrapper> </BaseEmailWrapper>
@@ -51,5 +53,6 @@ OrgAdminBreakglassAccessTemplate.PreviewProps = {
"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.3.1 Safari/605.1.15", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/18.3.1 Safari/605.1.15",
timestamp: "Tue Apr 29 2025 23:03:27 GMT+0000 (Coordinated Universal Time)", timestamp: "Tue Apr 29 2025 23:03:27 GMT+0000 (Coordinated Universal Time)",
siteUrl: "https://infisical.com", siteUrl: "https://infisical.com",
email: "[email protected]" email: "[email protected]",
orgId: "123"
} as OrgAdminBreakglassAccessTemplateProps; } as OrgAdminBreakglassAccessTemplateProps;
frontend/src/components/auth/TeamInviteStep.tsx
+7 -2
View File
@@ -20,9 +20,14 @@ export default function TeamInviteStep(): JSX.Element {
const { mutateAsync } = useAddUsersToOrg(); const { mutateAsync } = useAddUsersToOrg();
const { handlePopUpToggle, popUp, handlePopUpOpen } = usePopUp(["setUpEmail"] as const); const { handlePopUpToggle, popUp, handlePopUpOpen } = usePopUp(["setUpEmail"] as const);
const orgId = String(localStorage.getItem("orgData.id"));
// Redirect user to the getting started page // Redirect user to the getting started page
const redirectToHome = async () => { const redirectToHome = async () => {
navigate({ to: "/organization/projects" as const }); navigate({
to: orgId ? ("/organizations/$orgId/projects" as const) : "/",
params: { orgId }
});
}; };
const inviteUsers = async ({ emails: inviteEmails }: { emails: string }) => { const inviteUsers = async ({ emails: inviteEmails }: { emails: string }) => {
@@ -32,7 +37,7 @@ export default function TeamInviteStep(): JSX.Element {
.map(async (email) => { .map(async (email) => {
mutateAsync({ mutateAsync({
inviteeEmails: [email], inviteeEmails: [email],
organizationId: String(localStorage.getItem("orgData.id")), organizationId: orgId,
organizationRoleSlug: "member" organizationRoleSlug: "member"
}); });
}); });
frontend/src/components/navigation/NavHeader.tsx
+8 -6
View File
@@ -70,7 +70,8 @@ export default function NavHeader({
{currentOrg?.name?.charAt(0)} {currentOrg?.name?.charAt(0)}
</div> </div>
<Link <Link
to="/organization/projects" to="/organizations/$orgId/projects"
params={{ orgId: currentOrg.id }}
className="truncate pl-0.5 text-sm font-medium text-primary/80 hover:text-primary" className="truncate pl-0.5 text-sm font-medium text-primary/80 hover:text-primary"
> >
{currentOrg?.name} {currentOrg?.name}
@@ -90,8 +91,8 @@ export default function NavHeader({
<FontAwesomeIcon icon={faAngleRight} className="mr-3 ml-3 text-sm text-gray-400" /> <FontAwesomeIcon icon={faAngleRight} className="mr-3 ml-3 text-sm text-gray-400" />
{pageName === "Secrets" ? ( {pageName === "Secrets" ? (
<Link <Link
to="/projects/secret-management/$projectId/overview" to="/organizations/$orgId/projects/secret-management/$projectId/overview"
params={{ projectId: currentProject.id }} params={{ orgId: currentOrg?.id || "", projectId: currentProject.id }}
className="text-sm font-medium text-primary/80 hover:text-primary" className="text-sm font-medium text-primary/80 hover:text-primary"
> >
{pageName} {pageName}
@@ -126,8 +127,8 @@ export default function NavHeader({
<div className="flex items-center space-x-3"> <div className="flex items-center space-x-3">
<FontAwesomeIcon icon={faAngleRight} className="mr-1.5 ml-3 text-xs text-gray-400" /> <FontAwesomeIcon icon={faAngleRight} className="mr-1.5 ml-3 text-xs text-gray-400" />
<Link <Link
to="/projects/secret-management/$projectId/secrets/$envSlug" to="/organizations/$orgId/projects/secret-management/$projectId/secrets/$envSlug"
params={{ projectId: currentProject.id, envSlug: routerEnvSlug }} params={{ orgId: currentOrg.id, projectId: currentProject.id, envSlug: routerEnvSlug }}
className="text-sm font-medium text-primary/80 hover:text-primary" className="text-sm font-medium text-primary/80 hover:text-primary"
> >
{userAvailableEnvs?.find(({ slug }) => slug === currentEnv)?.name} {userAvailableEnvs?.find(({ slug }) => slug === currentEnv)?.name}
@@ -188,8 +189,9 @@ export default function NavHeader({
</div> </div>
) : ( ) : (
<Link <Link
to="/projects/secret-management/$projectId/secrets/$envSlug" to="/organizations/$orgId/projects/secret-management/$projectId/secrets/$envSlug"
params={{ params={{
orgId: currentOrg?.id || "",
projectId: currentProject.id, projectId: currentProject.id,
envSlug: routerEnvSlug || "" envSlug: routerEnvSlug || ""
}} }}
frontend/src/components/navigation/SecretDashboardPathBreadcrumb.tsx
+4 -1
View File
@@ -3,6 +3,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { Link } from "@tanstack/react-router"; import { Link } from "@tanstack/react-router";
import { twMerge } from "tailwind-merge"; import { twMerge } from "tailwind-merge";
import { useOrganization } from "@app/context";
import { useTimedReset } from "@app/hooks"; import { useTimedReset } from "@app/hooks";
import { createNotification } from "../notifications"; import { createNotification } from "../notifications";
@@ -23,6 +24,7 @@ export const SecretDashboardPathBreadcrumb = ({
projectId, projectId,
disableCopy disableCopy
}: Props) => { }: Props) => {
const { currentOrg } = useOrganization();
const [, isCopying, setIsCopying] = useTimedReset({ const [, isCopying, setIsCopying] = useTimedReset({
initialState: false initialState: false
}); });
@@ -69,8 +71,9 @@ export const SecretDashboardPathBreadcrumb = ({
</div> </div>
) : ( ) : (
<Link <Link
to="/projects/secret-management/$projectId/secrets/$envSlug" to="/organizations/$orgId/projects/secret-management/$projectId/secrets/$envSlug"
params={{ params={{
orgId: currentOrg.id,
projectId, projectId,
envSlug: environmentSlug envSlug: environmentSlug
}} }}
frontend/src/components/organization/CreateOrgModal/CreateOrgModal.tsx
+2 -1
View File
@@ -57,7 +57,8 @@ export const CreateOrgModal: FC<CreateOrgModalProps> = ({ isOpen, onClose }) =>
}); });
navigate({ navigate({
to: "/organization/projects" to: "/organizations/$orgId/projects",
params: { orgId: organization.id }
}); });
localStorage.setItem("orgData.id", organization.id); localStorage.setItem("orgData.id", organization.id);
frontend/src/components/projects/NewProjectModal.tsx
+1 -1
View File
@@ -157,7 +157,7 @@ const NewProjectForm = ({ onOpenChange }: NewProjectFormProps) => {
onOpenChange(false); onOpenChange(false);
navigate({ navigate({
to: getProjectHomePage(project.type, project.environments), to: getProjectHomePage(project.type, project.environments),
params: { projectId: project.id } params: { projectId: project.id, orgId: currentOrg.id }
}); });
}; };
const onSubmit = handleSubmit((data) => { const onSubmit = handleSubmit((data) => {
frontend/src/const/routes.ts
+162 -162
View File
@@ -25,343 +25,343 @@ export const ROUTE_PATHS = Object.freeze({
Organization: { Organization: {
Settings: { Settings: {
OauthCallbackPage: setRoute( OauthCallbackPage: setRoute(
"/organization/settings/oauth/callback", "/organizations/$orgId/settings/oauth/callback",
"/_authenticate/_inject-org-details/_org-layout/organization/settings/oauth/callback" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/settings/oauth/callback"
) )
}, },
SecretSharing: setRoute( SecretSharing: setRoute(
"/organization/secret-sharing", "/organizations/$orgId/secret-sharing",
"/_authenticate/_inject-org-details/_org-layout/organization/secret-sharing/" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/secret-sharing/"
), ),
SettingsPage: setRoute( SettingsPage: setRoute(
"/organization/settings", "/organizations/$orgId/settings",
"/_authenticate/_inject-org-details/_org-layout/organization/settings/" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/settings/"
), ),
GroupDetailsByIDPage: setRoute( GroupDetailsByIDPage: setRoute(
"/organization/groups/$groupId", "/organizations/$orgId/groups/$groupId",
"/_authenticate/_inject-org-details/_org-layout/organization/groups/$groupId" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/groups/$groupId"
), ),
IdentityDetailsByIDPage: setRoute( IdentityDetailsByIDPage: setRoute(
"/organization/identities/$identityId", "/organizations/$orgId/identities/$identityId",
"/_authenticate/_inject-org-details/_org-layout/organization/identities/$identityId" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/identities/$identityId"
), ),
UserDetailsByIDPage: setRoute( UserDetailsByIDPage: setRoute(
"/organization/members/$membershipId", "/organizations/$orgId/members/$membershipId",
"/_authenticate/_inject-org-details/_org-layout/organization/members/$membershipId" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/members/$membershipId"
), ),
AccessControlPage: setRoute( AccessControlPage: setRoute(
"/organization/access-management", "/organizations/$orgId/access-management",
"/_authenticate/_inject-org-details/_org-layout/organization/access-management" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/access-management"
), ),
RoleByIDPage: setRoute( RoleByIDPage: setRoute(
"/organization/roles/$roleId", "/organizations/$orgId/roles/$roleId",
"/_authenticate/_inject-org-details/_org-layout/organization/roles/$roleId" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/roles/$roleId"
), ),
AppConnections: { AppConnections: {
OauthCallbackPage: setRoute( OauthCallbackPage: setRoute(
"/organization/app-connections/$appConnection/oauth/callback", "/organizations/$orgId/app-connections/$appConnection/oauth/callback",
"/_authenticate/_inject-org-details/_org-layout/organization/app-connections/$appConnection/oauth/callback" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/app-connections/$appConnection/oauth/callback"
) )
}, },
NetworkingPage: setRoute( NetworkingPage: setRoute(
"/organization/networking", "/organizations/$orgId/networking",
"/_authenticate/_inject-org-details/_org-layout/organization/networking" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/networking"
) )
}, },
SecretManager: { SecretManager: {
ApprovalPage: setRoute( ApprovalPage: setRoute(
"/projects/secret-management/$projectId/approval", "/organizations/$orgId/projects/secret-management/$projectId/approval",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/approval" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/approval"
), ),
SecretDashboardPage: setRoute( SecretDashboardPage: setRoute(
"/projects/secret-management/$projectId/secrets/$envSlug", "/organizations/$orgId/projects/secret-management/$projectId/secrets/$envSlug",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/secrets/$envSlug" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/secrets/$envSlug"
), ),
RollbackPreviewPage: setRoute( RollbackPreviewPage: setRoute(
"/projects/secret-management/$projectId/commits/$environment/$folderId/$commitId/restore", "/organizations/$orgId/projects/secret-management/$projectId/commits/$environment/$folderId/$commitId/restore",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/commits/$environment/$folderId/$commitId/restore" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/commits/$environment/$folderId/$commitId/restore"
), ),
CommitDetailsPage: setRoute( CommitDetailsPage: setRoute(
"/projects/secret-management/$projectId/commits/$environment/$folderId/$commitId", "/organizations/$orgId/projects/secret-management/$projectId/commits/$environment/$folderId/$commitId",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/commits/$environment/$folderId/$commitId" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/commits/$environment/$folderId/$commitId"
), ),
CommitsPage: setRoute( CommitsPage: setRoute(
"/projects/secret-management/$projectId/commits/$environment/$folderId", "/organizations/$orgId/projects/secret-management/$projectId/commits/$environment/$folderId",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/commits/$environment/$folderId" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/commits/$environment/$folderId"
), ),
OverviewPage: setRoute( OverviewPage: setRoute(
"/projects/secret-management/$projectId/overview", "/organizations/$orgId/projects/secret-management/$projectId/overview",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/overview" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/overview"
), ),
IntegrationsListPage: setRoute( IntegrationsListPage: setRoute(
"/projects/secret-management/$projectId/integrations", "/organizations/$orgId/projects/secret-management/$projectId/integrations",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/"
), ),
IntegrationDetailsByIDPage: setRoute( IntegrationDetailsByIDPage: setRoute(
"/projects/secret-management/$projectId/integrations/$integrationId", "/organizations/$orgId/projects/secret-management/$projectId/integrations/$integrationId",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/$integrationId" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/$integrationId"
), ),
SecretSyncDetailsByIDPage: setRoute( SecretSyncDetailsByIDPage: setRoute(
"/projects/secret-management/$projectId/integrations/secret-syncs/$destination/$syncId", "/organizations/$orgId/projects/secret-management/$projectId/integrations/secret-syncs/$destination/$syncId",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/secret-syncs/$destination/$syncId" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/secret-syncs/$destination/$syncId"
), ),
Integratons: { Integratons: {
SelectIntegrationAuth: setRoute( SelectIntegrationAuth: setRoute(
"/projects/secret-management/$projectId/integrations/select-integration-auth", "/organizations/$orgId/projects/secret-management/$projectId/integrations/select-integration-auth",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/select-integration-auth" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/select-integration-auth"
), ),
HerokuOauthCallbackPage: setRoute( HerokuOauthCallbackPage: setRoute(
"/projects/secret-management/$projectId/integrations/heroku/oauth2/callback", "/organizations/$orgId/projects/secret-management/$projectId/integrations/heroku/oauth2/callback",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/heroku/oauth2/callback" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/heroku/oauth2/callback"
), ),
HerokuConfigurePage: setRoute( HerokuConfigurePage: setRoute(
"/projects/secret-management/$projectId/integrations/heroku/create", "/organizations/$orgId/projects/secret-management/$projectId/integrations/heroku/create",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/heroku/create" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/heroku/create"
), ),
AwsParameterStoreConfigurePage: setRoute( AwsParameterStoreConfigurePage: setRoute(
"/projects/secret-management/$projectId/integrations/aws-parameter-store/create", "/organizations/$orgId/projects/secret-management/$projectId/integrations/aws-parameter-store/create",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/aws-parameter-store/create" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/aws-parameter-store/create"
), ),
AwsSecretManagerConfigurePage: setRoute( AwsSecretManagerConfigurePage: setRoute(
"/projects/secret-management/$projectId/integrations/aws-secret-manager/create", "/organizations/$orgId/projects/secret-management/$projectId/integrations/aws-secret-manager/create",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/aws-secret-manager/create" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/aws-secret-manager/create"
), ),
AzureAppConfigurationsOauthCallbackPage: setRoute( AzureAppConfigurationsOauthCallbackPage: setRoute(
"/projects/secret-management/$projectId/integrations/azure-app-configuration/oauth2/callback", "/organizations/$orgId/projects/secret-management/$projectId/integrations/azure-app-configuration/oauth2/callback",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/azure-app-configuration/oauth2/callback" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/azure-app-configuration/oauth2/callback"
), ),
AzureAppConfigurationsConfigurePage: setRoute( AzureAppConfigurationsConfigurePage: setRoute(
"/projects/secret-management/$projectId/integrations/azure-app-configuration/create", "/organizations/$orgId/projects/secret-management/$projectId/integrations/azure-app-configuration/create",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/azure-app-configuration/create" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/azure-app-configuration/create"
), ),
AzureDevopsConfigurePage: setRoute( AzureDevopsConfigurePage: setRoute(
"/projects/secret-management/$projectId/integrations/azure-devops/create", "/organizations/$orgId/projects/secret-management/$projectId/integrations/azure-devops/create",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/azure-devops/create" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/azure-devops/create"
), ),
AzureKeyVaultAuthorizePage: setRoute( AzureKeyVaultAuthorizePage: setRoute(
"/projects/secret-management/$projectId/integrations/azure-key-vault/authorize", "/organizations/$orgId/projects/secret-management/$projectId/integrations/azure-key-vault/authorize",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/azure-key-vault/authorize" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/azure-key-vault/authorize"
), ),
AzureKeyVaultOauthCallbackPage: setRoute( AzureKeyVaultOauthCallbackPage: setRoute(
"/projects/secret-management/$projectId/integrations/azure-key-vault/oauth2/callback", "/organizations/$orgId/projects/secret-management/$projectId/integrations/azure-key-vault/oauth2/callback",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/azure-key-vault/oauth2/callback" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/azure-key-vault/oauth2/callback"
), ),
AzureKeyVaultConfigurePage: setRoute( AzureKeyVaultConfigurePage: setRoute(
"/projects/secret-management/$projectId/integrations/azure-key-vault/create", "/organizations/$orgId/projects/secret-management/$projectId/integrations/azure-key-vault/create",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/azure-key-vault/create" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/azure-key-vault/create"
), ),
BitbucketOauthCallbackPage: setRoute( BitbucketOauthCallbackPage: setRoute(
"/projects/secret-management/$projectId/integrations/bitbucket/oauth2/callback", "/organizations/$orgId/projects/secret-management/$projectId/integrations/bitbucket/oauth2/callback",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/bitbucket/oauth2/callback" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/bitbucket/oauth2/callback"
), ),
BitbucketConfigurePage: setRoute( BitbucketConfigurePage: setRoute(
"/projects/secret-management/$projectId/integrations/bitbucket/create", "/organizations/$orgId/projects/secret-management/$projectId/integrations/bitbucket/create",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/bitbucket/create" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/bitbucket/create"
), ),
ChecklyConfigurePage: setRoute( ChecklyConfigurePage: setRoute(
"/projects/secret-management/$projectId/integrations/checkly/create", "/organizations/$orgId/projects/secret-management/$projectId/integrations/checkly/create",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/checkly/create" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/checkly/create"
), ),
CircleConfigurePage: setRoute( CircleConfigurePage: setRoute(
"/projects/secret-management/$projectId/integrations/circleci/create", "/organizations/$orgId/projects/secret-management/$projectId/integrations/circleci/create",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/circleci/create" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/circleci/create"
), ),
CloudflarePagesConfigurePage: setRoute( CloudflarePagesConfigurePage: setRoute(
"/projects/secret-management/$projectId/integrations/cloudflare-pages/create", "/organizations/$orgId/projects/secret-management/$projectId/integrations/cloudflare-pages/create",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/cloudflare-pages/create" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/cloudflare-pages/create"
), ),
DigitalOceanAppPlatformConfigurePage: setRoute( DigitalOceanAppPlatformConfigurePage: setRoute(
"/projects/secret-management/$projectId/integrations/digital-ocean-app-platform/create", "/organizations/$orgId/projects/secret-management/$projectId/integrations/digital-ocean-app-platform/create",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/digital-ocean-app-platform/create" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/digital-ocean-app-platform/create"
), ),
CloudflareWorkersConfigurePage: setRoute( CloudflareWorkersConfigurePage: setRoute(
"/projects/secret-management/$projectId/integrations/cloudflare-workers/create", "/organizations/$orgId/projects/secret-management/$projectId/integrations/cloudflare-workers/create",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/cloudflare-workers/create" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/cloudflare-workers/create"
), ),
CodefreshConfigurePage: setRoute( CodefreshConfigurePage: setRoute(
"/projects/secret-management/$projectId/integrations/codefresh/create", "/organizations/$orgId/projects/secret-management/$projectId/integrations/codefresh/create",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/codefresh/create" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/codefresh/create"
), ),
GcpSecretManagerConfigurePage: setRoute( GcpSecretManagerConfigurePage: setRoute(
"/projects/secret-management/$projectId/integrations/gcp-secret-manager/create", "/organizations/$orgId/projects/secret-management/$projectId/integrations/gcp-secret-manager/create",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/gcp-secret-manager/create" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/gcp-secret-manager/create"
), ),
GcpSecretManagerOauthCallbackPage: setRoute( GcpSecretManagerOauthCallbackPage: setRoute(
"/projects/secret-management/$projectId/integrations/gcp-secret-manager/oauth2/callback", "/organizations/$orgId/projects/secret-management/$projectId/integrations/gcp-secret-manager/oauth2/callback",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/gcp-secret-manager/oauth2/callback" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/gcp-secret-manager/oauth2/callback"
), ),
GithubConfigurePage: setRoute( GithubConfigurePage: setRoute(
"/projects/secret-management/$projectId/integrations/github/create", "/organizations/$orgId/projects/secret-management/$projectId/integrations/github/create",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/github/create" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/github/create"
), ),
GithubOauthCallbackPage: setRoute( GithubOauthCallbackPage: setRoute(
"/projects/secret-management/$projectId/integrations/github/oauth2/callback", "/organizations/$orgId/projects/secret-management/$projectId/integrations/github/oauth2/callback",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/github/oauth2/callback" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/github/oauth2/callback"
), ),
GitlabConfigurePage: setRoute( GitlabConfigurePage: setRoute(
"/projects/secret-management/$projectId/integrations/gitlab/create", "/organizations/$orgId/projects/secret-management/$projectId/integrations/gitlab/create",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/gitlab/create" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/gitlab/create"
), ),
GitlabOauthCallbackPage: setRoute( GitlabOauthCallbackPage: setRoute(
"/projects/secret-management/$projectId/integrations/gitlab/oauth2/callback", "/organizations/$orgId/projects/secret-management/$projectId/integrations/gitlab/oauth2/callback",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/gitlab/oauth2/callback" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/gitlab/oauth2/callback"
), ),
VercelOauthCallbackPage: setRoute( VercelOauthCallbackPage: setRoute(
"/projects/secret-management/$projectId/integrations/vercel/oauth2/callback", "/organizations/$orgId/projects/secret-management/$projectId/integrations/vercel/oauth2/callback",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/vercel/oauth2/callback" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/vercel/oauth2/callback"
), ),
VercelConfigurePage: setRoute( VercelConfigurePage: setRoute(
"/projects/secret-management/$projectId/integrations/vercel/create", "/organizations/$orgId/projects/secret-management/$projectId/integrations/vercel/create",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/vercel/create" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/vercel/create"
), ),
FlyioConfigurePage: setRoute( FlyioConfigurePage: setRoute(
"/projects/secret-management/$projectId/integrations/flyio/create", "/organizations/$orgId/projects/secret-management/$projectId/integrations/flyio/create",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/flyio/create" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/flyio/create"
), ),
HashicorpVaultConfigurePage: setRoute( HashicorpVaultConfigurePage: setRoute(
"/projects/secret-management/$projectId/integrations/hashicorp-vault/create", "/organizations/$orgId/projects/secret-management/$projectId/integrations/hashicorp-vault/create",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/hashicorp-vault/create" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/hashicorp-vault/create"
), ),
HasuraCloudConfigurePage: setRoute( HasuraCloudConfigurePage: setRoute(
"/projects/secret-management/$projectId/integrations/hasura-cloud/create", "/organizations/$orgId/projects/secret-management/$projectId/integrations/hasura-cloud/create",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/hasura-cloud/create" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/hasura-cloud/create"
), ),
LaravelForgeConfigurePage: setRoute( LaravelForgeConfigurePage: setRoute(
"/projects/secret-management/$projectId/integrations/laravel-forge/create", "/organizations/$orgId/projects/secret-management/$projectId/integrations/laravel-forge/create",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/laravel-forge/create" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/laravel-forge/create"
), ),
NorthflankConfigurePage: setRoute( NorthflankConfigurePage: setRoute(
"/projects/secret-management/$projectId/integrations/northflank/create", "/organizations/$orgId/projects/secret-management/$projectId/integrations/northflank/create",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/northflank/create" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/northflank/create"
), ),
RailwayConfigurePage: setRoute( RailwayConfigurePage: setRoute(
"/projects/secret-management/$projectId/integrations/railway/create", "/organizations/$orgId/projects/secret-management/$projectId/integrations/railway/create",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/railway/create" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/railway/create"
), ),
RenderConfigurePage: setRoute( RenderConfigurePage: setRoute(
"/projects/secret-management/$projectId/integrations/render/create", "/organizations/$orgId/projects/secret-management/$projectId/integrations/render/create",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/render/create" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/render/create"
), ),
RundeckConfigurePage: setRoute( RundeckConfigurePage: setRoute(
"/projects/secret-management/$projectId/integrations/rundeck/create", "/organizations/$orgId/projects/secret-management/$projectId/integrations/rundeck/create",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/rundeck/create" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/rundeck/create"
), ),
WindmillConfigurePage: setRoute( WindmillConfigurePage: setRoute(
"/projects/secret-management/$projectId/integrations/windmill/create", "/organizations/$orgId/projects/secret-management/$projectId/integrations/windmill/create",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/windmill/create" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/windmill/create"
), ),
TravisCIConfigurePage: setRoute( TravisCIConfigurePage: setRoute(
"/projects/secret-management/$projectId/integrations/travisci/create", "/organizations/$orgId/projects/secret-management/$projectId/integrations/travisci/create",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/travisci/create" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/travisci/create"
), ),
TerraformCloudConfigurePage: setRoute( TerraformCloudConfigurePage: setRoute(
"/projects/secret-management/$projectId/integrations/terraform-cloud/create", "/organizations/$orgId/projects/secret-management/$projectId/integrations/terraform-cloud/create",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/terraform-cloud/create" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/terraform-cloud/create"
), ),
TeamcityConfigurePage: setRoute( TeamcityConfigurePage: setRoute(
"/projects/secret-management/$projectId/integrations/teamcity/create", "/organizations/$orgId/projects/secret-management/$projectId/integrations/teamcity/create",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/teamcity/create" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/teamcity/create"
), ),
SupabaseConfigurePage: setRoute( SupabaseConfigurePage: setRoute(
"/projects/secret-management/$projectId/integrations/supabase/create", "/organizations/$orgId/projects/secret-management/$projectId/integrations/supabase/create",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/supabase/create" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/supabase/create"
), ),
OctopusDeployCloudConfigurePage: setRoute( OctopusDeployCloudConfigurePage: setRoute(
"/projects/secret-management/$projectId/integrations/octopus-deploy/create", "/organizations/$orgId/projects/secret-management/$projectId/integrations/octopus-deploy/create",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/octopus-deploy/create" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/octopus-deploy/create"
), ),
DatabricksConfigurePage: setRoute( DatabricksConfigurePage: setRoute(
"/projects/secret-management/$projectId/integrations/databricks/create", "/organizations/$orgId/projects/secret-management/$projectId/integrations/databricks/create",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/databricks/create" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/databricks/create"
), ),
QoveryConfigurePage: setRoute( QoveryConfigurePage: setRoute(
"/projects/secret-management/$projectId/integrations/qovery/create", "/organizations/$orgId/projects/secret-management/$projectId/integrations/qovery/create",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/qovery/create" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/qovery/create"
), ),
Cloud66ConfigurePage: setRoute( Cloud66ConfigurePage: setRoute(
"/projects/secret-management/$projectId/integrations/cloud-66/create", "/organizations/$orgId/projects/secret-management/$projectId/integrations/cloud-66/create",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/cloud-66/create" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/cloud-66/create"
), ),
NetlifyConfigurePage: setRoute( NetlifyConfigurePage: setRoute(
"/projects/secret-management/$projectId/integrations/netlify/create", "/organizations/$orgId/projects/secret-management/$projectId/integrations/netlify/create",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/netlify/create" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/netlify/create"
), ),
NetlifyOuathCallbackPage: setRoute( NetlifyOuathCallbackPage: setRoute(
"/projects/secret-management/$projectId/integrations/netlify/oauth2/callback", "/organizations/$orgId/projects/secret-management/$projectId/integrations/netlify/oauth2/callback",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/netlify/oauth2/callback" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-management/$projectId/_secret-manager-layout/integrations/netlify/oauth2/callback"
) )
} }
}, },
CertManager: { CertManager: {
CertAuthDetailsByIDPage: setRoute( CertAuthDetailsByIDPage: setRoute(
"/projects/cert-management/$projectId/ca/$caName", "/organizations/$orgId/projects/cert-management/$projectId/ca/$caName",
"/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/ca/$caName" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/ca/$caName"
), ),
SubscribersPage: setRoute( SubscribersPage: setRoute(
"/projects/cert-management/$projectId/subscribers", "/organizations/$orgId/projects/cert-management/$projectId/subscribers",
"/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/subscribers" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/subscribers"
), ),
CertificateAuthoritiesPage: setRoute( CertificateAuthoritiesPage: setRoute(
"/projects/cert-management/$projectId/certificate-authorities", "/organizations/$orgId/projects/cert-management/$projectId/certificate-authorities",
"/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/certificate-authorities" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/certificate-authorities"
), ),
AlertingPage: setRoute( AlertingPage: setRoute(
"/projects/cert-management/$projectId/alerting", "/organizations/$orgId/projects/cert-management/$projectId/alerting",
"/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/alerting" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/alerting"
), ),
PkiCollectionDetailsByIDPage: setRoute( PkiCollectionDetailsByIDPage: setRoute(
"/projects/cert-management/$projectId/pki-collections/$collectionId", "/organizations/$orgId/projects/cert-management/$projectId/pki-collections/$collectionId",
"/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/pki-collections/$collectionId" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/pki-collections/$collectionId"
), ),
PkiSubscriberDetailsByIDPage: setRoute( PkiSubscriberDetailsByIDPage: setRoute(
"/projects/cert-management/$projectId/subscribers/$subscriberName", "/organizations/$orgId/projects/cert-management/$projectId/subscribers/$subscriberName",
"/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/subscribers/$subscriberName" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/subscribers/$subscriberName"
), ),
IntegrationsListPage: setRoute( IntegrationsListPage: setRoute(
"/projects/cert-management/$projectId/integrations", "/organizations/$orgId/projects/cert-management/$projectId/integrations",
"/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/integrations/" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/integrations/"
), ),
PkiSyncDetailsByIDPage: setRoute( PkiSyncDetailsByIDPage: setRoute(
"/projects/cert-management/$projectId/integrations/$syncId", "/organizations/$orgId/projects/cert-management/$projectId/integrations/$syncId",
"/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/integrations/$syncId" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/integrations/$syncId"
) )
}, },
Ssh: { Ssh: {
SshCaByIDPage: setRoute( SshCaByIDPage: setRoute(
"/projects/ssh/$projectId/ca/$caId", "/organizations/$orgId/projects/ssh/$projectId/ca/$caId",
"/_authenticate/_inject-org-details/_org-layout/projects/ssh/$projectId/_ssh-layout/ca/$caId" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/ssh/$projectId/_ssh-layout/ca/$caId"
), ),
SshHostGroupDetailsByIDPage: setRoute( SshHostGroupDetailsByIDPage: setRoute(
"/projects/ssh/$projectId/ssh-host-groups/$sshHostGroupId", "/organizations/$orgId/projects/ssh/$projectId/ssh-host-groups/$sshHostGroupId",
"/_authenticate/_inject-org-details/_org-layout/projects/ssh/$projectId/_ssh-layout/ssh-host-groups/$sshHostGroupId" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/ssh/$projectId/_ssh-layout/ssh-host-groups/$sshHostGroupId"
) )
}, },
SecretScanning: { SecretScanning: {
DataSourceByIdPage: setRoute( DataSourceByIdPage: setRoute(
"/projects/secret-scanning/$projectId/data-sources/$type/$dataSourceId", "/organizations/$orgId/projects/secret-scanning/$projectId/data-sources/$type/$dataSourceId",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-scanning/$projectId/_secret-scanning-layout/data-sources/$type/$dataSourceId" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-scanning/$projectId/_secret-scanning-layout/data-sources/$type/$dataSourceId"
), ),
FindingsPage: setRoute( FindingsPage: setRoute(
"/projects/secret-scanning/$projectId/findings", "/organizations/$orgId/projects/secret-scanning/$projectId/findings",
"/_authenticate/_inject-org-details/_org-layout/projects/secret-scanning/$projectId/_secret-scanning-layout/findings" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/secret-scanning/$projectId/_secret-scanning-layout/findings"
) )
}, },
Pam: { Pam: {
AccountsPage: setRoute( AccountsPage: setRoute(
"/projects/pam/$projectId/accounts", "/organizations/$orgId/projects/pam/$projectId/accounts",
"/_authenticate/_inject-org-details/_org-layout/projects/pam/$projectId/_pam-layout/accounts" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/pam/$projectId/_pam-layout/accounts"
), ),
ResourcesPage: setRoute( ResourcesPage: setRoute(
"/projects/pam/$projectId/resources", "/organizations/$orgId/projects/pam/$projectId/resources",
"/_authenticate/_inject-org-details/_org-layout/projects/pam/$projectId/_pam-layout/resources" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/pam/$projectId/_pam-layout/resources"
), ),
SessionsPage: setRoute( SessionsPage: setRoute(
"/projects/pam/$projectId/sessions", "/organizations/$orgId/projects/pam/$projectId/sessions",
"/_authenticate/_inject-org-details/_org-layout/projects/pam/$projectId/_pam-layout/sessions/" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/pam/$projectId/_pam-layout/sessions/"
), ),
PamSessionByIDPage: setRoute( PamSessionByIDPage: setRoute(
"/projects/pam/$projectId/sessions/$sessionId", "/organizations/$orgId/projects/pam/$projectId/sessions/$sessionId",
"/_authenticate/_inject-org-details/_org-layout/projects/pam/$projectId/_pam-layout/sessions/$sessionId" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/pam/$projectId/_pam-layout/sessions/$sessionId"
) )
}, },
Public: { Public: {
frontend/src/helpers/project.ts
+8 -8
View File
@@ -64,11 +64,11 @@ export const initProjectHelper = async ({ projectName }: { projectName: string }
export const getProjectBaseURL = (type: ProjectType) => { export const getProjectBaseURL = (type: ProjectType) => {
switch (type) { switch (type) {
case ProjectType.SecretManager: case ProjectType.SecretManager:
return "/projects/secret-management/$projectId"; return "/organizations/$orgId/projects/secret-management/$projectId";
case ProjectType.CertificateManager: case ProjectType.CertificateManager:
return "/projects/cert-management/$projectId"; return "/organizations/$orgId/projects/cert-management/$projectId";
default: default:
return `/projects/${type}/$projectId` as const; return `/organizations/$orgId/projects/${type}/$projectId` as const;
} }
}; };
@@ -77,15 +77,15 @@ export const getProjectBaseURL = (type: ProjectType) => {
export const getProjectHomePage = (type: ProjectType, environments: ProjectEnv[]) => { export const getProjectHomePage = (type: ProjectType, environments: ProjectEnv[]) => {
switch (type) { switch (type) {
case ProjectType.SecretManager: case ProjectType.SecretManager:
return "/projects/secret-management/$projectId/overview" as const; return "/organizations/$orgId/projects/secret-management/$projectId/overview" as const;
case ProjectType.CertificateManager: case ProjectType.CertificateManager:
return "/projects/cert-management/$projectId/policies" as const; return "/organizations/$orgId/projects/cert-management/$projectId/policies" as const;
case ProjectType.SecretScanning: case ProjectType.SecretScanning:
return `/projects/${type}/$projectId/data-sources` as const; return `/organizations/$orgId/projects/${type}/$projectId/data-sources` as const;
case ProjectType.PAM: case ProjectType.PAM:
return `/projects/${type}/$projectId/accounts` as const; return `/organizations/$orgId/projects/${type}/$projectId/accounts` as const;
default: default:
return `/projects/${type}/$projectId/overview` as const; return `/organizations/$orgId/projects/${type}/$projectId/overview` as const;
} }
}; };
frontend/src/hooks/api/users/queries.tsx
+1 -1
View File
@@ -338,7 +338,7 @@ export const clearSession = (keepQueryClient?: boolean) => {
sessionStorage.removeItem(SessionStorageKeys.CLI_TERMINAL_TOKEN); sessionStorage.removeItem(SessionStorageKeys.CLI_TERMINAL_TOKEN);
if (!keepQueryClient) { if (!keepQueryClient) {
qc.clear(); // Clear React Query cache qc.invalidateQueries();
} }
}; };
frontend/src/layouts/AdminLayout/AdminNavBar.tsx
+3 -1
View File
@@ -14,6 +14,7 @@ import { Link, useMatchRoute } from "@tanstack/react-router";
import { motion } from "framer-motion"; import { motion } from "framer-motion";
import { Tab, TabList, Tabs, Tooltip } from "@app/components/v2"; import { Tab, TabList, Tabs, Tooltip } from "@app/components/v2";
import { useOrganization } from "@app/context";
const generalTabs = [ const generalTabs = [
{ {
@@ -60,6 +61,7 @@ const generalTabs = [
export const AdminNavBar = () => { export const AdminNavBar = () => {
const matchRoute = useMatchRoute(); const matchRoute = useMatchRoute();
const { currentOrg } = useOrganization();
return ( return (
<div className="border-b border-mineshaft-600 bg-mineshaft-900"> <div className="border-b border-mineshaft-600 bg-mineshaft-900">
@@ -74,7 +76,7 @@ export const AdminNavBar = () => {
<Tabs value="selected"> <Tabs value="selected">
<TabList className="border-b-0"> <TabList className="border-b-0">
<Tooltip position="bottom" content="Back to organization"> <Tooltip position="bottom" content="Back to organization">
<Link to="/organization/projects"> <Link to="/organizations/$orgId/projects" params={{ orgId: currentOrg.id }}>
<Tab value="back"> <Tab value="back">
<FontAwesomeIcon icon={faArrowLeft} /> <FontAwesomeIcon icon={faArrowLeft} />
</Tab> </Tab>
frontend/src/layouts/KmsLayout/KmsLayout.tsx
+12 -6
View File
@@ -2,12 +2,13 @@ import { Link, Outlet, useLocation } from "@tanstack/react-router";
import { motion } from "framer-motion"; import { motion } from "framer-motion";
import { Tab, TabList, Tabs } from "@app/components/v2"; import { Tab, TabList, Tabs } from "@app/components/v2";
import { useProject, useProjectPermission } from "@app/context"; import { useOrganization, useProject, useProjectPermission } from "@app/context";
import { AssumePrivilegeModeBanner } from "../ProjectLayout/components/AssumePrivilegeModeBanner"; import { AssumePrivilegeModeBanner } from "../ProjectLayout/components/AssumePrivilegeModeBanner";
export const KmsLayout = () => { export const KmsLayout = () => {
const { currentProject } = useProject(); const { currentProject } = useProject();
const { currentOrg } = useOrganization();
const { assumedPrivilegeDetails } = useProjectPermission(); const { assumedPrivilegeDetails } = useProjectPermission();
const location = useLocation(); const location = useLocation();
@@ -27,24 +28,27 @@ export const KmsLayout = () => {
<Tabs value="selected"> <Tabs value="selected">
<TabList className="border-b-0"> <TabList className="border-b-0">
<Link <Link
to="/projects/kms/$projectId/overview" to="/organizations/$orgId/projects/kms/$projectId/overview"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
{({ isActive }) => <Tab value={isActive ? "selected" : ""}>Overview</Tab>} {({ isActive }) => <Tab value={isActive ? "selected" : ""}>Overview</Tab>}
</Link> </Link>
<Link <Link
to="/projects/kms/$projectId/kmip" to="/organizations/$orgId/projects/kms/$projectId/kmip"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
{({ isActive }) => <Tab value={isActive ? "selected" : ""}>KMIP</Tab>} {({ isActive }) => <Tab value={isActive ? "selected" : ""}>KMIP</Tab>}
</Link> </Link>
<Link <Link
to="/projects/kms/$projectId/access-management" to="/organizations/$orgId/projects/kms/$projectId/access-management"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
@@ -62,16 +66,18 @@ export const KmsLayout = () => {
)} )}
</Link> </Link>
<Link <Link
to="/projects/kms/$projectId/audit-logs" to="/organizations/$orgId/projects/kms/$projectId/audit-logs"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
{({ isActive }) => <Tab value={isActive ? "selected" : ""}>Audit Logs</Tab>} {({ isActive }) => <Tab value={isActive ? "selected" : ""}>Audit Logs</Tab>}
</Link> </Link>
<Link <Link
to="/projects/kms/$projectId/settings" to="/organizations/$orgId/projects/kms/$projectId/settings"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
frontend/src/layouts/OrganizationLayout/components/NavBar/Navbar.tsx
+21 -15
View File
@@ -249,7 +249,7 @@ export const Navbar = () => {
const isServerAdminPanel = location.pathname.startsWith("/admin"); const isServerAdminPanel = location.pathname.startsWith("/admin");
const isOrgScope = location.pathname.startsWith("/organization"); // TODO: scott/akhil is this adequate? const isProjectScope = location.pathname.startsWith(`/organizations/${currentOrg.id}/projects`);
const handleOrgNav = async (org: Organization) => { const handleOrgNav = async (org: Organization) => {
if (currentOrg?.id === org.id) return; if (currentOrg?.id === org.id) return;
@@ -282,7 +282,7 @@ export const Navbar = () => {
<div className="z-10 flex min-h-12 items-center bg-mineshaft-900 px-4 pt-1"> <div className="z-10 flex min-h-12 items-center bg-mineshaft-900 px-4 pt-1">
<div className="mr-auto flex items-center overflow-hidden"> <div className="mr-auto flex items-center overflow-hidden">
<div className="shrink-0"> <div className="shrink-0">
<Link to="/organization/projects"> <Link to="/organizations/$orgId/projects" params={{ orgId: currentOrg.id }}>
<img alt="infisical logo" src="/images/logotransparent.png" className="h-4" /> <img alt="infisical logo" src="/images/logotransparent.png" className="h-4" />
</Link> </Link>
</div> </div>
@@ -314,7 +314,7 @@ export const Navbar = () => {
// TODO(scott): either add badge size/style variant or create designated component for namespace/org nav bar // TODO(scott): either add badge size/style variant or create designated component for namespace/org nav bar
className={twMerge( className={twMerge(
"gap-x-1.5 text-sm", "gap-x-1.5 text-sm",
(!isOrgScope || isSubOrganization) && (isProjectScope || isSubOrganization) &&
"bg-transparent text-mineshaft-200 hover:!bg-transparent hover:underline [&>svg]:!text-org" "bg-transparent text-mineshaft-200 hover:!bg-transparent hover:underline [&>svg]:!text-org"
)} )}
> >
@@ -322,8 +322,8 @@ export const Navbar = () => {
type="button" type="button"
onClick={async () => { onClick={async () => {
navigate({ navigate({
to: "/organization/projects", to: "/organizations/$orgId/projects",
search: (search) => ({ ...search, subOrganization: undefined }) params: { orgId: currentOrg.id }
}); });
if (isSubOrganization) { if (isSubOrganization) {
await router.invalidate({ sync: true }).catch(() => null); await router.invalidate({ sync: true }).catch(() => null);
@@ -407,8 +407,8 @@ export const Navbar = () => {
<DropdownMenuItem <DropdownMenuItem
onClick={async () => { onClick={async () => {
navigate({ navigate({
to: "/organization/projects", to: "/organizations/$orgId/projects",
search: (prev) => ({ ...prev, subOrganization: subOrg.name }) params: { orgId: subOrg.id }
}); });
await router.invalidate({ sync: true }).catch(() => null); await router.invalidate({ sync: true }).catch(() => null);
}} }}
@@ -477,11 +477,11 @@ export const Navbar = () => {
// TODO(scott): either add badge size/style variant or create designated component for namespace/org nav bar // TODO(scott): either add badge size/style variant or create designated component for namespace/org nav bar
className={twMerge( className={twMerge(
"gap-x-1.5 text-sm", "gap-x-1.5 text-sm",
!isOrgScope && isProjectScope &&
"min-w-6 bg-transparent text-mineshaft-200 hover:!bg-transparent hover:underline [&>svg]:!text-sub-org" "min-w-6 bg-transparent text-mineshaft-200 hover:!bg-transparent hover:underline [&>svg]:!text-sub-org"
)} )}
> >
<Link to="/organization/projects"> <Link to="/organizations/$orgId/projects" params={{ orgId: currentOrg.id }}>
<SubOrgIcon className="size-[12px]" /> <SubOrgIcon className="size-[12px]" />
<span>{currentOrg.subOrganization.name}</span> <span>{currentOrg.subOrganization.name}</span>
</Link> </Link>
@@ -511,8 +511,8 @@ export const Navbar = () => {
<DropdownMenuItem <DropdownMenuItem
onClick={async () => { onClick={async () => {
navigate({ navigate({
to: "/organization/projects", to: "/organizations/$orgId/projects",
search: (prev) => ({ ...prev, subOrganization: subOrg.name }) params: { orgId: subOrg.id }
}); });
await router.invalidate({ sync: true }).catch(() => null); await router.invalidate({ sync: true }).catch(() => null);
}} }}
@@ -541,7 +541,7 @@ export const Navbar = () => {
</DropdownMenu> </DropdownMenu>
</> </>
)} )}
{!isOrgScope && ( {isProjectScope && (
<> <>
<p className="pr-3 pl-1 text-lg text-mineshaft-400/70">/</p> <p className="pr-3 pl-1 text-lg text-mineshaft-400/70">/</p>
{breadcrumbs ? ( {breadcrumbs ? (
@@ -593,7 +593,8 @@ export const Navbar = () => {
isAllowed ? ( isAllowed ? (
<Link <Link
className="mr-2 flex h-[34px] items-center rounded-md border border-mineshaft-500 px-2.5 py-1.5 text-sm whitespace-nowrap text-mineshaft-200 hover:bg-mineshaft-600" className="mr-2 flex h-[34px] items-center rounded-md border border-mineshaft-500 px-2.5 py-1.5 text-sm whitespace-nowrap text-mineshaft-200 hover:bg-mineshaft-600"
to="/organization/access-management" to="/organizations/$orgId/access-management"
params={{ orgId: currentOrg.id }}
search={{ search={{
selectedTab: "members", selectedTab: "members",
action: "invite-members" action: "invite-members"
@@ -696,7 +697,8 @@ export const Navbar = () => {
{(isAllowed) => {(isAllowed) =>
isAllowed ? ( isAllowed ? (
<Link <Link
to="/organization/access-management" to="/organizations/$orgId/access-management"
params={{ orgId: currentOrg.id }}
search={{ search={{
selectedTab: "members", selectedTab: "members",
action: "invite-members" action: "invite-members"
@@ -778,7 +780,11 @@ export const Navbar = () => {
</div> </div>
<div className="mt-4"> <div className="mt-4">
<div className="flex space-x-3"> <div className="flex space-x-3">
<Link to="/organization/billing" className="inline-flex"> <Link
to="/organizations/$orgId/billing"
params={{ orgId: currentOrg.id }}
className="inline-flex"
>
<Button <Button
colorSchema="primary" colorSchema="primary"
variant="solid" variant="solid"
frontend/src/layouts/OrganizationLayout/components/NavBar/NewSubOrganizationForm.tsx
+2 -2
View File
@@ -47,8 +47,8 @@ export const NewSubOrganizationForm = ({ onClose }: ContentProps) => {
onClose(); onClose();
navigate({ navigate({
to: "/organization/projects", to: "/organizations/$orgId/projects",
search: (prev) => ({ ...prev, subOrganization: organization.name }) params: { orgId: organization.id }
}); });
await router.invalidate({ sync: true }).catch(() => null); await router.invalidate({ sync: true }).catch(() => null);
}; };
frontend/src/layouts/OrganizationLayout/components/OrgNavBar/OrgNavBar.tsx
+16 -12
View File
@@ -11,7 +11,7 @@ type Props = {
}; };
export const OrgNavBar = ({ isHidden }: Props) => { export const OrgNavBar = ({ isHidden }: Props) => {
const { isRootOrganization } = useOrganization(); const { isRootOrganization, currentOrg } = useOrganization();
const { popUp, handlePopUpToggle } = usePopUp(["createOrg"] as const); const { popUp, handlePopUpToggle } = usePopUp(["createOrg"] as const);
const { pathname } = useLocation(); const { pathname } = useLocation();
@@ -32,43 +32,47 @@ export const OrgNavBar = ({ isHidden }: Props) => {
<nav className="w-full"> <nav className="w-full">
<Tabs value="selected"> <Tabs value="selected">
<TabList className="border-b-0"> <TabList className="border-b-0">
<Link to="/organization/projects"> <Link to="/organizations/$orgId/projects" params={{ orgId: currentOrg.id }}>
{({ isActive }) => ( {({ isActive }) => (
<Tab variant={variant} value={isActive ? "selected" : ""}> <Tab variant={variant} value={isActive ? "selected" : ""}>
Overview Overview
</Tab> </Tab>
)} )}
</Link> </Link>
<Link to="/organization/app-connections"> <Link
to="/organizations/$orgId/app-connections"
params={{ orgId: currentOrg.id }}
>
{({ isActive }) => ( {({ isActive }) => (
<Tab variant={variant} value={isActive ? "selected" : ""}> <Tab variant={variant} value={isActive ? "selected" : ""}>
App Connections App Connections
</Tab> </Tab>
)} )}
</Link> </Link>
<Link to="/organization/networking"> <Link to="/organizations/$orgId/networking" params={{ orgId: currentOrg.id }}>
{({ isActive }) => ( {({ isActive }) => (
<Tab variant={variant} value={isActive ? "selected" : ""}> <Tab variant={variant} value={isActive ? "selected" : ""}>
Networking Networking
</Tab> </Tab>
)} )}
</Link> </Link>
<Link to="/organization/secret-sharing"> <Link to="/organizations/$orgId/secret-sharing" params={{ orgId: currentOrg.id }}>
{({ isActive }) => ( {({ isActive }) => (
<Tab value={isActive ? "selected" : ""} variant={variant}> <Tab value={isActive ? "selected" : ""} variant={variant}>
Secret Sharing Secret Sharing
</Tab> </Tab>
)} )}
</Link> </Link>
<Link to="/organization/access-management"> <Link
to="/organizations/$orgId/access-management"
params={{ orgId: currentOrg.id }}
>
{({ isActive }) => ( {({ isActive }) => (
<Tab <Tab
variant={variant} variant={variant}
value={ value={
isActive || isActive ||
pathname.match( pathname.match(/organizations\/[^/]+\/(members|identities|groups|roles)/)
/organization\/members|organization\/identities|organization\/groups|organization\/roles/
)
? "selected" ? "selected"
: "" : ""
} }
@@ -77,7 +81,7 @@ export const OrgNavBar = ({ isHidden }: Props) => {
</Tab> </Tab>
)} )}
</Link> </Link>
<Link to="/organization/audit-logs"> <Link to="/organizations/$orgId/audit-logs" params={{ orgId: currentOrg.id }}>
{({ isActive }) => ( {({ isActive }) => (
<Tab variant={variant} value={isActive ? "selected" : ""}> <Tab variant={variant} value={isActive ? "selected" : ""}>
Audit Logs Audit Logs
@@ -85,7 +89,7 @@ export const OrgNavBar = ({ isHidden }: Props) => {
)} )}
</Link> </Link>
{isRootOrganization && ( {isRootOrganization && (
<Link to="/organization/billing"> <Link to="/organizations/$orgId/billing" params={{ orgId: currentOrg.id }}>
{({ isActive }) => ( {({ isActive }) => (
<Tab variant={variant} value={isActive ? "selected" : ""}> <Tab variant={variant} value={isActive ? "selected" : ""}>
Usage & Billing Usage & Billing
@@ -93,7 +97,7 @@ export const OrgNavBar = ({ isHidden }: Props) => {
)} )}
</Link> </Link>
)} )}
<Link to="/organization/settings"> <Link to="/organizations/$orgId/settings" params={{ orgId: currentOrg.id }}>
{({ isActive }) => ( {({ isActive }) => (
<Tab variant={variant} value={isActive ? "selected" : ""}> <Tab variant={variant} value={isActive ? "selected" : ""}>
Settings Settings
frontend/src/layouts/PamLayout/PamLayout.tsx
+14 -7
View File
@@ -4,13 +4,14 @@ import { motion } from "framer-motion";
import { UpgradePlanModal } from "@app/components/license/UpgradePlanModal"; import { UpgradePlanModal } from "@app/components/license/UpgradePlanModal";
import { Tab, TabList, Tabs } from "@app/components/v2"; import { Tab, TabList, Tabs } from "@app/components/v2";
import { useProject, useProjectPermission, useSubscription } from "@app/context"; import { useOrganization, useProject, useProjectPermission, useSubscription } from "@app/context";
import { usePopUp } from "@app/hooks"; import { usePopUp } from "@app/hooks";
import { AssumePrivilegeModeBanner } from "../ProjectLayout/components/AssumePrivilegeModeBanner"; import { AssumePrivilegeModeBanner } from "../ProjectLayout/components/AssumePrivilegeModeBanner";
export const PamLayout = () => { export const PamLayout = () => {
const { currentProject } = useProject(); const { currentProject } = useProject();
const { currentOrg } = useOrganization();
const { subscription } = useSubscription(); const { subscription } = useSubscription();
const { assumedPrivilegeDetails } = useProjectPermission(); const { assumedPrivilegeDetails } = useProjectPermission();
const location = useLocation(); const location = useLocation();
@@ -42,32 +43,36 @@ export const PamLayout = () => {
<Tabs value="selected"> <Tabs value="selected">
<TabList className="border-b-0"> <TabList className="border-b-0">
<Link <Link
to="/projects/pam/$projectId/accounts" to="/organizations/$orgId/projects/pam/$projectId/accounts"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
{({ isActive }) => <Tab value={isActive ? "selected" : ""}>Accounts</Tab>} {({ isActive }) => <Tab value={isActive ? "selected" : ""}>Accounts</Tab>}
</Link> </Link>
<Link <Link
to="/projects/pam/$projectId/resources" to="/organizations/$orgId/projects/pam/$projectId/resources"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
{({ isActive }) => <Tab value={isActive ? "selected" : ""}>Resources</Tab>} {({ isActive }) => <Tab value={isActive ? "selected" : ""}>Resources</Tab>}
</Link> </Link>
<Link <Link
to="/projects/pam/$projectId/sessions" to="/organizations/$orgId/projects/pam/$projectId/sessions"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
{({ isActive }) => <Tab value={isActive ? "selected" : ""}>Sessions</Tab>} {({ isActive }) => <Tab value={isActive ? "selected" : ""}>Sessions</Tab>}
</Link> </Link>
<Link <Link
to="/projects/pam/$projectId/access-management" to="/organizations/$orgId/projects/pam/$projectId/access-management"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
@@ -85,16 +90,18 @@ export const PamLayout = () => {
)} )}
</Link> </Link>
<Link <Link
to="/projects/pam/$projectId/audit-logs" to="/organizations/$orgId/projects/pam/$projectId/audit-logs"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
{({ isActive }) => <Tab value={isActive ? "selected" : ""}>Audit Logs</Tab>} {({ isActive }) => <Tab value={isActive ? "selected" : ""}>Audit Logs</Tab>}
</Link> </Link>
<Link <Link
to="/projects/pam/$projectId/settings" to="/organizations/$orgId/projects/pam/$projectId/settings"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
frontend/src/layouts/PkiManagerLayout/PkiManagerLayout.tsx
+22 -11
View File
@@ -2,7 +2,7 @@ import { Link, Outlet, useLocation } from "@tanstack/react-router";
import { motion } from "framer-motion"; import { motion } from "framer-motion";
import { Tab, TabList, Tabs } from "@app/components/v2"; import { Tab, TabList, Tabs } from "@app/components/v2";
import { useProject, useProjectPermission, useSubscription } from "@app/context"; import { useOrganization, useProject, useProjectPermission, useSubscription } from "@app/context";
import { import {
useListWorkspaceCertificateTemplates, useListWorkspaceCertificateTemplates,
useListWorkspacePkiSubscribers useListWorkspacePkiSubscribers
@@ -11,6 +11,7 @@ import {
import { AssumePrivilegeModeBanner } from "../ProjectLayout/components/AssumePrivilegeModeBanner"; import { AssumePrivilegeModeBanner } from "../ProjectLayout/components/AssumePrivilegeModeBanner";
export const PkiManagerLayout = () => { export const PkiManagerLayout = () => {
const { currentOrg } = useOrganization();
const { currentProject } = useProject(); const { currentProject } = useProject();
const { assumedPrivilegeDetails } = useProjectPermission(); const { assumedPrivilegeDetails } = useProjectPermission();
const { subscription } = useSubscription(); const { subscription } = useSubscription();
@@ -42,16 +43,18 @@ export const PkiManagerLayout = () => {
<Tabs value="selected"> <Tabs value="selected">
<TabList className="border-b-0"> <TabList className="border-b-0">
<Link <Link
to="/projects/cert-management/$projectId/policies" to="/organizations/$orgId/projects/cert-management/$projectId/policies"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
{({ isActive }) => <Tab value={isActive ? "selected" : ""}>Certificates</Tab>} {({ isActive }) => <Tab value={isActive ? "selected" : ""}>Certificates</Tab>}
</Link> </Link>
<Link <Link
to="/projects/cert-management/$projectId/certificate-authorities" to="/organizations/$orgId/projects/cert-management/$projectId/certificate-authorities"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
@@ -62,24 +65,27 @@ export const PkiManagerLayout = () => {
)} )}
</Link> </Link>
<Link <Link
to="/projects/cert-management/$projectId/alerting" to="/organizations/$orgId/projects/cert-management/$projectId/alerting"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
{({ isActive }) => <Tab value={isActive ? "selected" : ""}>Alerting</Tab>} {({ isActive }) => <Tab value={isActive ? "selected" : ""}>Alerting</Tab>}
</Link> </Link>
<Link <Link
to="/projects/cert-management/$projectId/integrations" to="/organizations/$orgId/projects/cert-management/$projectId/integrations"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
{({ isActive }) => <Tab value={isActive ? "selected" : ""}>Integrations</Tab>} {({ isActive }) => <Tab value={isActive ? "selected" : ""}>Integrations</Tab>}
</Link> </Link>
<Link <Link
to="/projects/cert-management/$projectId/app-connections" to="/organizations/$orgId/projects/cert-management/$projectId/app-connections"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
@@ -89,8 +95,9 @@ export const PkiManagerLayout = () => {
<> <>
{(subscription.pkiLegacyTemplates || hasExistingSubscribers) && ( {(subscription.pkiLegacyTemplates || hasExistingSubscribers) && (
<Link <Link
to="/projects/cert-management/$projectId/subscribers" to="/organizations/$orgId/projects/cert-management/$projectId/subscribers"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
@@ -101,8 +108,9 @@ export const PkiManagerLayout = () => {
)} )}
{(subscription.pkiLegacyTemplates || hasExistingTemplates) && ( {(subscription.pkiLegacyTemplates || hasExistingTemplates) && (
<Link <Link
to="/projects/cert-management/$projectId/certificate-templates" to="/organizations/$orgId/projects/cert-management/$projectId/certificate-templates"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
@@ -116,8 +124,9 @@ export const PkiManagerLayout = () => {
</> </>
)} )}
<Link <Link
to="/projects/cert-management/$projectId/access-management" to="/organizations/$orgId/projects/cert-management/$projectId/access-management"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
@@ -135,16 +144,18 @@ export const PkiManagerLayout = () => {
)} )}
</Link> </Link>
<Link <Link
to="/projects/cert-management/$projectId/audit-logs" to="/organizations/$orgId/projects/cert-management/$projectId/audit-logs"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
{({ isActive }) => <Tab value={isActive ? "selected" : ""}>Audit Logs</Tab>} {({ isActive }) => <Tab value={isActive ? "selected" : ""}>Audit Logs</Tab>}
</Link> </Link>
<Link <Link
to="/projects/cert-management/$projectId/settings" to="/organizations/$orgId/projects/cert-management/$projectId/settings"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
frontend/src/layouts/ProjectLayout/components/AssumePrivilegeModeBanner/AssumePrivilegeModeBanner.tsx
+3 -1
View File
@@ -38,7 +38,9 @@ export const AssumePrivilegeModeBanner = () => {
{ {
onSuccess: () => { onSuccess: () => {
const url = `${getProjectHomePage(currentProject.type, currentProject.environments)}${isSubOrganization ? `?subOrganization=${currentOrg.slug}` : ""}`; const url = `${getProjectHomePage(currentProject.type, currentProject.environments)}${isSubOrganization ? `?subOrganization=${currentOrg.slug}` : ""}`;
window.location.href = url.replace("$projectId", currentProject.id); window.location.assign(
url.replace("$orgId", currentOrg.id).replace("$projectId", currentProject.id)
);
} }
} }
); );
frontend/src/layouts/ProjectLayout/components/ProjectSelect/ProjectSelect.tsx
+5 -3
View File
@@ -97,7 +97,8 @@ export const ProjectSelect = () => {
<Link <Link
to={getProjectHomePage(currentWorkspace.type, currentWorkspace.environments)} to={getProjectHomePage(currentWorkspace.type, currentWorkspace.environments)}
params={{ params={{
projectId: currentWorkspace.id projectId: currentWorkspace.id,
orgId: currentWorkspace.orgId
}} }}
className="group flex cursor-pointer items-center gap-x-1.5 overflow-hidden hover:text-white" className="group flex cursor-pointer items-center gap-x-1.5 overflow-hidden hover:text-white"
> >
@@ -154,14 +155,15 @@ export const ProjectSelect = () => {
const url = linkOptions({ const url = linkOptions({
to: getProjectHomePage(workspace.type, workspace.environments), to: getProjectHomePage(workspace.type, workspace.environments),
params: { params: {
projectId: workspace.id projectId: workspace.id,
orgId: workspace.orgId
}, },
search: { search: {
subOrganization: currentOrg?.subOrganization?.name subOrganization: currentOrg?.subOrganization?.name
} }
}); });
const urlInstance = new URL( const urlInstance = new URL(
`${window.location.origin}/${url.to.replaceAll("$projectId", workspace.id)}` `${window.location.origin}${url.to.replaceAll("$orgId", url.params.orgId).replaceAll("$projectId", url.params.projectId)}`
); );
if (currentOrg?.subOrganization) { if (currentOrg?.subOrganization) {
urlInstance.searchParams.set( urlInstance.searchParams.set(
frontend/src/layouts/SecretManagerLayout/SecretManagerLayout.tsx
+18 -9
View File
@@ -3,7 +3,7 @@ import { motion } from "framer-motion";
import { Tab, TabList, Tabs } from "@app/components/v2"; import { Tab, TabList, Tabs } from "@app/components/v2";
import { Badge } from "@app/components/v3"; import { Badge } from "@app/components/v3";
import { useProject, useProjectPermission } from "@app/context"; import { useOrganization, useProject, useProjectPermission } from "@app/context";
import { import {
useGetAccessRequestsCount, useGetAccessRequestsCount,
useGetSecretApprovalRequestCount, useGetSecretApprovalRequestCount,
@@ -15,6 +15,7 @@ import { AssumePrivilegeModeBanner } from "../ProjectLayout/components/AssumePri
export const SecretManagerLayout = () => { export const SecretManagerLayout = () => {
const { currentProject, projectId } = useProject(); const { currentProject, projectId } = useProject();
const { assumedPrivilegeDetails } = useProjectPermission(); const { assumedPrivilegeDetails } = useProjectPermission();
const { currentOrg } = useOrganization();
const location = useLocation(); const location = useLocation();
const projectSlug = currentProject?.slug || ""; const projectSlug = currentProject?.slug || "";
@@ -52,8 +53,9 @@ export const SecretManagerLayout = () => {
<Tabs value="selected"> <Tabs value="selected">
<TabList className="border-b-0"> <TabList className="border-b-0">
<Link <Link
to="/projects/secret-management/$projectId/overview" to="/organizations/$orgId/projects/secret-management/$projectId/overview"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id, projectId: currentProject.id,
...(currentProject.environments.length ...(currentProject.environments.length
? { envSlug: currentProject.environments[0]?.slug } ? { envSlug: currentProject.environments[0]?.slug }
@@ -73,8 +75,9 @@ export const SecretManagerLayout = () => {
)} )}
</Link> </Link>
<Link <Link
to="/projects/secret-management/$projectId/approval" to="/organizations/$orgId/projects/secret-management/$projectId/approval"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
@@ -92,8 +95,9 @@ export const SecretManagerLayout = () => {
)} )}
</Link> </Link>
<Link <Link
to="/projects/secret-management/$projectId/integrations" to="/organizations/$orgId/projects/secret-management/$projectId/integrations"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
@@ -101,8 +105,9 @@ export const SecretManagerLayout = () => {
</Link> </Link>
{Boolean(secretRotations?.length) && ( {Boolean(secretRotations?.length) && (
<Link <Link
to="/projects/secret-management/$projectId/secret-rotation" to="/organizations/$orgId/projects/secret-management/$projectId/secret-rotation"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
@@ -112,16 +117,18 @@ export const SecretManagerLayout = () => {
</Link> </Link>
)} )}
<Link <Link
to="/projects/secret-management/$projectId/app-connections" to="/organizations/$orgId/projects/secret-management/$projectId/app-connections"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
{({ isActive }) => <Tab value={isActive ? "selected" : ""}>App Connections</Tab>} {({ isActive }) => <Tab value={isActive ? "selected" : ""}>App Connections</Tab>}
</Link> </Link>
<Link <Link
to="/projects/secret-management/$projectId/access-management" to="/organizations/$orgId/projects/secret-management/$projectId/access-management"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
@@ -139,16 +146,18 @@ export const SecretManagerLayout = () => {
)} )}
</Link> </Link>
<Link <Link
to="/projects/secret-management/$projectId/audit-logs" to="/organizations/$orgId/projects/secret-management/$projectId/audit-logs"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
{({ isActive }) => <Tab value={isActive ? "selected" : ""}>Audit Logs</Tab>} {({ isActive }) => <Tab value={isActive ? "selected" : ""}>Audit Logs</Tab>}
</Link> </Link>
<Link <Link
to="/projects/secret-management/$projectId/settings" to="/organizations/$orgId/projects/secret-management/$projectId/settings"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
frontend/src/layouts/SecretScanningLayout/SecretScanningLayout.tsx
+14 -6
View File
@@ -5,6 +5,7 @@ import { Tab, TabList, Tabs } from "@app/components/v2";
import { Badge } from "@app/components/v3"; import { Badge } from "@app/components/v3";
import { import {
ProjectPermissionSub, ProjectPermissionSub,
useOrganization,
useProject, useProject,
useProjectPermission, useProjectPermission,
useSubscription useSubscription
@@ -15,6 +16,7 @@ import { useGetSecretScanningUnresolvedFindingCount } from "@app/hooks/api/secre
import { AssumePrivilegeModeBanner } from "../ProjectLayout/components/AssumePrivilegeModeBanner"; import { AssumePrivilegeModeBanner } from "../ProjectLayout/components/AssumePrivilegeModeBanner";
export const SecretScanningLayout = () => { export const SecretScanningLayout = () => {
const { currentOrg } = useOrganization();
const { currentProject } = useProject(); const { currentProject } = useProject();
const { assumedPrivilegeDetails } = useProjectPermission(); const { assumedPrivilegeDetails } = useProjectPermission();
@@ -50,16 +52,18 @@ export const SecretScanningLayout = () => {
<Tabs value="selected"> <Tabs value="selected">
<TabList className="border-b-0"> <TabList className="border-b-0">
<Link <Link
to="/projects/secret-scanning/$projectId/data-sources" to="/organizations/$orgId/projects/secret-scanning/$projectId/data-sources"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
{({ isActive }) => <Tab value={isActive ? "selected" : ""}>Data Sources</Tab>} {({ isActive }) => <Tab value={isActive ? "selected" : ""}>Data Sources</Tab>}
</Link> </Link>
<Link <Link
to="/projects/secret-scanning/$projectId/findings" to="/organizations/$orgId/projects/secret-scanning/$projectId/findings"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
@@ -75,16 +79,18 @@ export const SecretScanningLayout = () => {
)} )}
</Link> </Link>
<Link <Link
to="/projects/secret-scanning/$projectId/app-connections" to="/organizations/$orgId/projects/secret-scanning/$projectId/app-connections"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
{({ isActive }) => <Tab value={isActive ? "selected" : ""}>App Connections</Tab>} {({ isActive }) => <Tab value={isActive ? "selected" : ""}>App Connections</Tab>}
</Link> </Link>
<Link <Link
to="/projects/secret-scanning/$projectId/access-management" to="/organizations/$orgId/projects/secret-scanning/$projectId/access-management"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
@@ -102,16 +108,18 @@ export const SecretScanningLayout = () => {
)} )}
</Link> </Link>
<Link <Link
to="/projects/secret-scanning/$projectId/audit-logs" to="/organizations/$orgId/projects/secret-scanning/$projectId/audit-logs"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
{({ isActive }) => <Tab value={isActive ? "selected" : ""}>Audit Logs</Tab>} {({ isActive }) => <Tab value={isActive ? "selected" : ""}>Audit Logs</Tab>}
</Link> </Link>
<Link <Link
to="/projects/secret-scanning/$projectId/settings" to="/organizations/$orgId/projects/secret-scanning/$projectId/settings"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
frontend/src/layouts/SshLayout/SshLayout.tsx
+12 -5
View File
@@ -6,6 +6,7 @@ import { Tab, TabList, Tabs } from "@app/components/v2";
import { import {
ProjectPermissionActions, ProjectPermissionActions,
ProjectPermissionSub, ProjectPermissionSub,
useOrganization,
useProject, useProject,
useProjectPermission useProjectPermission
} from "@app/context"; } from "@app/context";
@@ -13,6 +14,7 @@ import {
import { AssumePrivilegeModeBanner } from "../ProjectLayout/components/AssumePrivilegeModeBanner"; import { AssumePrivilegeModeBanner } from "../ProjectLayout/components/AssumePrivilegeModeBanner";
export const SshLayout = () => { export const SshLayout = () => {
const { currentOrg } = useOrganization();
const { currentProject } = useProject(); const { currentProject } = useProject();
const { assumedPrivilegeDetails } = useProjectPermission(); const { assumedPrivilegeDetails } = useProjectPermission();
const location = useLocation(); const location = useLocation();
@@ -32,8 +34,9 @@ export const SshLayout = () => {
<Tabs value="selected"> <Tabs value="selected">
<TabList className="border-b-0"> <TabList className="border-b-0">
<Link <Link
to="/projects/ssh/$projectId/overview" to="/organizations/$orgId/projects/ssh/$projectId/overview"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
@@ -54,8 +57,9 @@ export const SshLayout = () => {
{(isAllowed) => {(isAllowed) =>
isAllowed && ( isAllowed && (
<Link <Link
to="/projects/ssh/$projectId/cas" to="/organizations/$orgId/projects/ssh/$projectId/cas"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
@@ -71,8 +75,9 @@ export const SshLayout = () => {
} }
</ProjectPermissionCan> </ProjectPermissionCan>
<Link <Link
to="/projects/ssh/$projectId/access-management" to="/organizations/$orgId/projects/ssh/$projectId/access-management"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
@@ -90,16 +95,18 @@ export const SshLayout = () => {
)} )}
</Link> </Link>
<Link <Link
to="/projects/ssh/$projectId/audit-logs" to="/organizations/$orgId/projects/ssh/$projectId/audit-logs"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
{({ isActive }) => <Tab value={isActive ? "selected" : ""}>Audit Logs</Tab>} {({ isActive }) => <Tab value={isActive ? "selected" : ""}>Audit Logs</Tab>}
</Link> </Link>
<Link <Link
to="/projects/ssh/$projectId/settings" to="/organizations/$orgId/projects/ssh/$projectId/settings"
params={{ params={{
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}} }}
> >
frontend/src/pages/admin/layout.tsx
+2 -1
View File
@@ -7,7 +7,8 @@ export const Route = createFileRoute("/_authenticate/_inject-org-details/admin/_
beforeLoad: ({ context }) => { beforeLoad: ({ context }) => {
if (!context.user.superAdmin) { if (!context.user.superAdmin) {
throw redirect({ throw redirect({
to: "/organization/projects" to: "/organizations/$orgId/projects",
params: { orgId: context.organizationId }
}); });
} }
} }
frontend/src/pages/auth/LoginPage/Login.utils.tsx
+9 -3
View File
@@ -12,7 +12,10 @@ export const navigateUserToOrg = async (navigate: NavigateFn, organizationId?: s
if (organizationId) { if (organizationId) {
localStorage.setItem("orgData.id", organizationId); localStorage.setItem("orgData.id", organizationId);
navigate({ to: "/organization/projects" }); navigate({
to: "/organizations/$orgId/projects",
params: { orgId: organizationId }
});
return; return;
} }
@@ -20,11 +23,14 @@ export const navigateUserToOrg = async (navigate: NavigateFn, organizationId?: s
// user is part of at least 1 non-auth enforced org // user is part of at least 1 non-auth enforced org
const userOrg = nonAuthEnforcedOrgs[0] && nonAuthEnforcedOrgs[0].id; const userOrg = nonAuthEnforcedOrgs[0] && nonAuthEnforcedOrgs[0].id;
localStorage.setItem("orgData.id", userOrg); localStorage.setItem("orgData.id", userOrg);
navigate({ to: "/organization/projects" }); navigate({
to: "/organizations/$orgId/projects",
params: { orgId: userOrg }
});
} else { } else {
// user is not part of any non-auth enforced orgs // user is not part of any non-auth enforced orgs
localStorage.removeItem("orgData.id"); localStorage.removeItem("orgData.id");
navigate({ to: "/organization/none" }); navigate({ to: "/organizations/none" });
} }
}; };
frontend/src/pages/auth/SelectOrgPage/SelectOrgSection.tsx
+1 -1
View File
@@ -222,7 +222,7 @@ export const SelectOrganizationSection = () => {
// Case: User has no organizations. // Case: User has no organizations.
// This can happen if the user was previously a member, but the organization was deleted or the user was removed. // This can happen if the user was previously a member, but the organization was deleted or the user was removed.
if (organizations.data.length === 0) { if (organizations.data.length === 0) {
navigate({ to: "/organization/none" }); navigate({ to: "/organizations/none" });
} else if (organizations.data.length === 1) { } else if (organizations.data.length === 1) {
if (callbackPort) { if (callbackPort) {
handleCliRedirect(); handleCliRedirect();
frontend/src/pages/auth/SignUpInvitePage/SignUpInvitePage.tsx
+2 -1
View File
@@ -122,7 +122,8 @@ export const SignupInvitePage = () => {
localStorage.setItem("orgData.id", orgId); localStorage.setItem("orgData.id", orgId);
navigate({ navigate({
to: "/organization/projects" to: "/organizations/$orgId/projects",
params: { orgId }
}); });
}; };
frontend/src/pages/auth/SignUpPage/SignUpPage.tsx
+1 -1
View File
@@ -72,7 +72,7 @@ export const SignUpPage = () => {
if (!serverDetails?.emailConfigured && step === 4) { if (!serverDetails?.emailConfigured && step === 4) {
navigate({ navigate({
to: "/organization/projects" to: "/"
}); });
} }
})(); })();
frontend/src/pages/auth/SignUpSsoPage/components/UserInfoSSOStep/UserInfoSSOStep.tsx
+2 -1
View File
@@ -129,7 +129,8 @@ export const UserInfoSSOStep = ({
localStorage.setItem("orgData.id", orgId); localStorage.setItem("orgData.id", orgId);
navigate({ navigate({
to: "/organization/projects" to: "/organizations/$orgId/projects",
params: { orgId }
}); });
} catch (error) { } catch (error) {
setIsLoading(false); setIsLoading(false);
frontend/src/pages/cert-manager/AlertingPage/components/PkiCollectionModal.tsx
+4 -2
View File
@@ -6,7 +6,7 @@ import { z } from "zod";
import { createNotification } from "@app/components/notifications"; import { createNotification } from "@app/components/notifications";
import { Button, FormControl, Input, Modal, ModalContent } from "@app/components/v2"; import { Button, FormControl, Input, Modal, ModalContent } from "@app/components/v2";
import { useProject } from "@app/context"; import { useOrganization, useProject } from "@app/context";
import { import {
useCreatePkiCollection, useCreatePkiCollection,
useGetPkiCollectionById, useGetPkiCollectionById,
@@ -28,6 +28,7 @@ type Props = {
export const PkiCollectionModal = ({ popUp, handlePopUpToggle }: Props) => { export const PkiCollectionModal = ({ popUp, handlePopUpToggle }: Props) => {
const navigate = useNavigate(); const navigate = useNavigate();
const { currentOrg } = useOrganization();
const { currentProject } = useProject(); const { currentProject } = useProject();
const projectId = currentProject?.id || ""; const projectId = currentProject?.id || "";
@@ -81,8 +82,9 @@ export const PkiCollectionModal = ({ popUp, handlePopUpToggle }: Props) => {
}); });
navigate({ navigate({
to: "/projects/cert-management/$projectId/pki-collections/$collectionId", to: "/organizations/$orgId/projects/cert-management/$projectId/pki-collections/$collectionId",
params: { params: {
orgId: currentOrg.id,
projectId, projectId,
collectionId collectionId
} }
frontend/src/pages/cert-manager/AlertingPage/components/PkiCollectionTable.tsx
+9 -2
View File
@@ -19,7 +19,12 @@ import {
THead, THead,
Tr Tr
} from "@app/components/v2"; } from "@app/components/v2";
import { ProjectPermissionActions, ProjectPermissionSub, useProject } from "@app/context"; import {
ProjectPermissionActions,
ProjectPermissionSub,
useOrganization,
useProject
} from "@app/context";
import { useListWorkspacePkiCollections } from "@app/hooks/api"; import { useListWorkspacePkiCollections } from "@app/hooks/api";
import { UsePopUpState } from "@app/hooks/usePopUp"; import { UsePopUpState } from "@app/hooks/usePopUp";
@@ -31,6 +36,7 @@ type Props = {
}; };
export const PkiCollectionTable = ({ handlePopUpOpen }: Props) => { export const PkiCollectionTable = ({ handlePopUpOpen }: Props) => {
const { currentOrg } = useOrganization();
const navigate = useNavigate(); const navigate = useNavigate();
const { currentProject } = useProject(); const { currentProject } = useProject();
const projectId = currentProject?.id || ""; const projectId = currentProject?.id || "";
@@ -60,8 +66,9 @@ export const PkiCollectionTable = ({ handlePopUpOpen }: Props) => {
key={`pki-collection-${pkiCollection.id}`} key={`pki-collection-${pkiCollection.id}`}
onClick={() => onClick={() =>
navigate({ navigate({
to: "/projects/cert-management/$projectId/pki-collections/$collectionId", to: "/organizations/$orgId/projects/cert-management/$projectId/pki-collections/$collectionId",
params: { params: {
orgId: currentOrg.id,
projectId, projectId,
collectionId: pkiCollection.id collectionId: pkiCollection.id
} }
frontend/src/pages/cert-manager/AlertingPage/route.tsx
+1 -1
View File
@@ -3,7 +3,7 @@ import { createFileRoute } from "@tanstack/react-router";
import { AlertingPage } from "./AlertingPage"; import { AlertingPage } from "./AlertingPage";
export const Route = createFileRoute( export const Route = createFileRoute(
"/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/alerting" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/alerting"
)({ )({
component: AlertingPage, component: AlertingPage,
beforeLoad: ({ context }) => { beforeLoad: ({ context }) => {
frontend/src/pages/cert-manager/CertAuthDetailsByIDPage/CertAuthDetailsByIDPage.tsx
+11 -3
View File
@@ -17,7 +17,12 @@ import {
Tooltip Tooltip
} from "@app/components/v2"; } from "@app/components/v2";
import { ROUTE_PATHS } from "@app/const/routes"; import { ROUTE_PATHS } from "@app/const/routes";
import { ProjectPermissionActions, ProjectPermissionSub, useProject } from "@app/context"; import {
ProjectPermissionActions,
ProjectPermissionSub,
useOrganization,
useProject
} from "@app/context";
import { CaType, useDeleteCa, useGetCa } from "@app/hooks/api"; import { CaType, useDeleteCa, useGetCa } from "@app/hooks/api";
import { TInternalCertificateAuthority } from "@app/hooks/api/ca/types"; import { TInternalCertificateAuthority } from "@app/hooks/api/ca/types";
import { ProjectType } from "@app/hooks/api/projects/types"; import { ProjectType } from "@app/hooks/api/projects/types";
@@ -34,6 +39,7 @@ import {
const Page = () => { const Page = () => {
const { currentProject } = useProject(); const { currentProject } = useProject();
const { currentOrg } = useOrganization();
const navigate = useNavigate(); const navigate = useNavigate();
const params = useParams({ const params = useParams({
from: ROUTE_PATHS.CertManager.CertAuthDetailsByIDPage.id from: ROUTE_PATHS.CertManager.CertAuthDetailsByIDPage.id
@@ -72,8 +78,9 @@ const Page = () => {
handlePopUpClose("deleteCa"); handlePopUpClose("deleteCa");
navigate({ navigate({
to: "/projects/cert-management/$projectId/certificate-authorities", to: "/organizations/$orgId/projects/cert-management/$projectId/certificate-authorities",
params: { params: {
orgId: currentOrg.id,
projectId projectId
} }
}); });
@@ -84,8 +91,9 @@ const Page = () => {
{data && ( {data && (
<div className="mx-auto mb-6 w-full max-w-8xl"> <div className="mx-auto mb-6 w-full max-w-8xl">
<Link <Link
to="/projects/cert-management/$projectId/certificate-authorities" to="/organizations/$orgId/projects/cert-management/$projectId/certificate-authorities"
params={{ params={{
orgId: currentOrg.id,
projectId projectId
}} }}
className="mb-4 flex items-center gap-x-2 text-sm text-mineshaft-400" className="mb-4 flex items-center gap-x-2 text-sm text-mineshaft-400"
frontend/src/pages/cert-manager/CertAuthDetailsByIDPage/route.tsx
+3 -2
View File
@@ -3,7 +3,7 @@ import { createFileRoute, linkOptions } from "@tanstack/react-router";
import { CertAuthDetailsByIDPage } from "./CertAuthDetailsByIDPage"; import { CertAuthDetailsByIDPage } from "./CertAuthDetailsByIDPage";
export const Route = createFileRoute( export const Route = createFileRoute(
"/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/ca/$caName" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/ca/$caName"
)({ )({
component: CertAuthDetailsByIDPage, component: CertAuthDetailsByIDPage,
beforeLoad: ({ context, params }) => { beforeLoad: ({ context, params }) => {
@@ -13,8 +13,9 @@ export const Route = createFileRoute(
{ {
label: "Certificate Authorities", label: "Certificate Authorities",
link: linkOptions({ link: linkOptions({
to: "/projects/cert-management/$projectId/certificate-authorities", to: "/organizations/$orgId/projects/cert-management/$projectId/certificate-authorities",
params: { params: {
orgId: params.orgId,
projectId: params.projectId projectId: params.projectId
} }
}) })
frontend/src/pages/cert-manager/CertificateAuthoritiesPage/components/CaTable.tsx
+9 -2
View File
@@ -22,7 +22,12 @@ import {
Tr Tr
} from "@app/components/v2"; } from "@app/components/v2";
import { Badge } from "@app/components/v3"; import { Badge } from "@app/components/v3";
import { ProjectPermissionActions, ProjectPermissionSub, useProject } from "@app/context"; import {
ProjectPermissionActions,
ProjectPermissionSub,
useOrganization,
useProject
} from "@app/context";
import { CaStatus, CaType, useListCasByTypeAndProjectId } from "@app/hooks/api"; import { CaStatus, CaType, useListCasByTypeAndProjectId } from "@app/hooks/api";
import { import {
caStatusToNameMap, caStatusToNameMap,
@@ -46,6 +51,7 @@ type Props = {
export const CaTable = ({ handlePopUpOpen }: Props) => { export const CaTable = ({ handlePopUpOpen }: Props) => {
const navigate = useNavigate(); const navigate = useNavigate();
const { currentOrg } = useOrganization();
const { currentProject } = useProject(); const { currentProject } = useProject();
const { data, isPending } = useListCasByTypeAndProjectId(CaType.INTERNAL, currentProject.id); const { data, isPending } = useListCasByTypeAndProjectId(CaType.INTERNAL, currentProject.id);
const cas = data as TInternalCertificateAuthority[]; const cas = data as TInternalCertificateAuthority[];
@@ -75,8 +81,9 @@ export const CaTable = ({ handlePopUpOpen }: Props) => {
key={`ca-${ca.id}`} key={`ca-${ca.id}`}
onClick={() => onClick={() =>
navigate({ navigate({
to: "/projects/cert-management/$projectId/ca/$caName", to: "/organizations/$orgId/projects/cert-management/$projectId/ca/$caName",
params: { params: {
orgId: currentOrg.id,
projectId: currentProject.id, projectId: currentProject.id,
caName: ca.name caName: ca.name
} }
frontend/src/pages/cert-manager/CertificateAuthoritiesPage/route.tsx
+1 -1
View File
@@ -3,7 +3,7 @@ import { createFileRoute } from "@tanstack/react-router";
import { CertificateAuthoritiesPage } from "./CertificateAuthoritiesPage"; import { CertificateAuthoritiesPage } from "./CertificateAuthoritiesPage";
export const Route = createFileRoute( export const Route = createFileRoute(
"/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/certificate-authorities" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/certificate-authorities"
)({ )({
component: CertificateAuthoritiesPage, component: CertificateAuthoritiesPage,
beforeLoad: ({ context }) => { beforeLoad: ({ context }) => {
frontend/src/pages/cert-manager/CertificatesPage/components/CertificateManagePkiSyncsModal.tsx
+3 -1
View File
@@ -20,7 +20,7 @@ import {
Tr Tr
} from "@app/components/v2"; } from "@app/components/v2";
import { ROUTE_PATHS } from "@app/const/routes"; import { ROUTE_PATHS } from "@app/const/routes";
import { useProject } from "@app/context"; import { useOrganization, useProject } from "@app/context";
import { import {
PkiSync, PkiSync,
useAddCertificatesToPkiSync, useAddCertificatesToPkiSync,
@@ -49,6 +49,7 @@ export const CertificateManagePkiSyncsModal = ({ popUp, handlePopUpToggle }: Pro
const [currentPage, setCurrentPage] = useState(1); const [currentPage, setCurrentPage] = useState(1);
const [searchTerm, setSearchTerm] = useState(""); const [searchTerm, setSearchTerm] = useState("");
const { currentOrg } = useOrganization();
const { currentProject } = useProject(); const { currentProject } = useProject();
const navigate = useNavigate(); const navigate = useNavigate();
const { certificateId, commonName } = popUp.data || {}; const { certificateId, commonName } = popUp.data || {};
@@ -92,6 +93,7 @@ export const CertificateManagePkiSyncsModal = ({ popUp, handlePopUpToggle }: Pro
navigate({ navigate({
to: ROUTE_PATHS.CertManager.IntegrationsListPage.path, to: ROUTE_PATHS.CertManager.IntegrationsListPage.path,
params: { params: {
orgId: currentOrg.id,
projectId: currentProject.id projectId: currentProject.id
}, },
search: { search: {
frontend/src/pages/cert-manager/IntegrationsListPage/IntegrationsListPage.tsx
+4 -2
View File
@@ -5,7 +5,7 @@ import { useNavigate, useSearch } from "@tanstack/react-router";
import { ProjectPermissionCan } from "@app/components/permissions"; import { ProjectPermissionCan } from "@app/components/permissions";
import { PageHeader, Tab, TabList, TabPanel, Tabs } from "@app/components/v2"; import { PageHeader, Tab, TabList, TabPanel, Tabs } from "@app/components/v2";
import { ROUTE_PATHS } from "@app/const/routes"; import { ROUTE_PATHS } from "@app/const/routes";
import { ProjectPermissionSub, useProject } from "@app/context"; import { ProjectPermissionSub, useOrganization, useProject } from "@app/context";
import { ProjectPermissionPkiSyncActions } from "@app/context/ProjectPermissionContext/types"; import { ProjectPermissionPkiSyncActions } from "@app/context/ProjectPermissionContext/types";
import { ProjectType } from "@app/hooks/api/projects/types"; import { ProjectType } from "@app/hooks/api/projects/types";
import { IntegrationsListPageTabs } from "@app/types/integrations"; import { IntegrationsListPageTabs } from "@app/types/integrations";
@@ -14,6 +14,7 @@ import { PkiSyncsTab } from "./components";
export const IntegrationsListPage = () => { export const IntegrationsListPage = () => {
const navigate = useNavigate(); const navigate = useNavigate();
const { currentOrg } = useOrganization();
const { currentProject } = useProject(); const { currentProject } = useProject();
const { t } = useTranslation(); const { t } = useTranslation();
@@ -30,7 +31,8 @@ export const IntegrationsListPage = () => {
selectedTab: tab as IntegrationsListPageTabs selectedTab: tab as IntegrationsListPageTabs
}, },
params: { params: {
projectId: currentProject?.id projectId: currentProject?.id,
orgId: currentOrg.id
} }
}); });
}; };
frontend/src/pages/cert-manager/IntegrationsListPage/components/PkiSyncsTab/PkiSyncTable/PkiSyncRow.tsx
+4 -2
View File
@@ -39,7 +39,7 @@ import {
} from "@app/components/v2"; } from "@app/components/v2";
import { Badge } from "@app/components/v3"; import { Badge } from "@app/components/v3";
import { ROUTE_PATHS } from "@app/const/routes"; import { ROUTE_PATHS } from "@app/const/routes";
import { ProjectPermissionSub } from "@app/context"; import { ProjectPermissionSub, useOrganization } from "@app/context";
import { ProjectPermissionPkiSyncActions } from "@app/context/ProjectPermissionContext/types"; import { ProjectPermissionPkiSyncActions } from "@app/context/ProjectPermissionContext/types";
import { PKI_SYNC_MAP } from "@app/helpers/pkiSyncs"; import { PKI_SYNC_MAP } from "@app/helpers/pkiSyncs";
import { useToggle } from "@app/hooks"; import { useToggle } from "@app/hooks";
@@ -82,6 +82,7 @@ export const PkiSyncRow = ({
const { syncOption } = usePkiSyncOption(destination); const { syncOption } = usePkiSyncOption(destination);
const { currentOrg } = useOrganization();
const [isIdCopied, setIsIdCopied] = useToggle(false); const [isIdCopied, setIsIdCopied] = useToggle(false);
const handleCopyId = useCallback(() => { const handleCopyId = useCallback(() => {
@@ -127,7 +128,8 @@ export const PkiSyncRow = ({
to: ROUTE_PATHS.CertManager.PkiSyncDetailsByIDPage.path, to: ROUTE_PATHS.CertManager.PkiSyncDetailsByIDPage.path,
params: { params: {
syncId: id, syncId: id,
projectId projectId,
orgId: currentOrg.id
} }
}); });
}} }}
frontend/src/pages/cert-manager/IntegrationsListPage/components/PkiSyncsTab/PkiSyncsTab.tsx
+8 -6
View File
@@ -8,7 +8,7 @@ import { CreatePkiSyncModal } from "@app/components/pki-syncs";
import { Button, Spinner } from "@app/components/v2"; import { Button, Spinner } from "@app/components/v2";
import { DocumentationLinkBadge } from "@app/components/v3"; import { DocumentationLinkBadge } from "@app/components/v3";
import { ROUTE_PATHS } from "@app/const/routes"; import { ROUTE_PATHS } from "@app/const/routes";
import { ProjectPermissionSub, useProject } from "@app/context"; import { ProjectPermissionSub, useOrganization, useProject } from "@app/context";
import { ProjectPermissionPkiSyncActions } from "@app/context/ProjectPermissionContext/types"; import { ProjectPermissionPkiSyncActions } from "@app/context/ProjectPermissionContext/types";
import { usePopUp } from "@app/hooks"; import { usePopUp } from "@app/hooks";
import { useListPkiSyncs } from "@app/hooks/api/pkiSyncs"; import { useListPkiSyncs } from "@app/hooks/api/pkiSyncs";
@@ -26,18 +26,19 @@ export const PkiSyncsTab = () => {
const navigate = useNavigate(); const navigate = useNavigate();
const { currentProject } = useProject(); const { currentProject } = useProject();
const { currentOrg } = useOrganization();
const memoizedSearch = useMemo(() => search, [search]); const memoizedSearch = useMemo(() => search, [search]);
const navigateToBase = useCallback(() => { const navigateToBase = useCallback(() => {
navigate({ navigate({
to: ROUTE_PATHS.CertManager.IntegrationsListPage.path, to: ROUTE_PATHS.CertManager.IntegrationsListPage.path,
params: { params: {
projectId: currentProject?.id projectId: currentProject?.id,
orgId: currentOrg.id
}, },
search: memoizedSearch search: memoizedSearch
}); });
}, [navigate, currentProject?.id, memoizedSearch]); }, [navigate, currentProject?.id, currentOrg.id, memoizedSearch]);
useEffect(() => { useEffect(() => {
if (!addSync) return; if (!addSync) return;
@@ -59,7 +60,7 @@ export const PkiSyncsTab = () => {
handlePopUpOpen("addSync", { destination: parsedData.destination, initialData }); handlePopUpOpen("addSync", { destination: parsedData.destination, initialData });
navigate({ navigate({
to: ROUTE_PATHS.CertManager.IntegrationsListPage.path, to: ROUTE_PATHS.CertManager.IntegrationsListPage.path,
params: { projectId: currentProject?.id }, params: { projectId: currentProject?.id, orgId: currentOrg.id },
search: { selectedTab: IntegrationsListPageTabs.PkiSyncs }, search: { selectedTab: IntegrationsListPageTabs.PkiSyncs },
replace: true replace: true
}); });
@@ -79,7 +80,8 @@ export const PkiSyncsTab = () => {
connectionId, connectionId,
connectionName, connectionName,
navigate, navigate,
currentProject?.id currentProject?.id,
currentOrg.id
]); ]);
const { data: pkiSyncs = [], isPending: isPkiSyncsPending } = useListPkiSyncs( const { data: pkiSyncs = [], isPending: isPkiSyncsPending } = useListPkiSyncs(
frontend/src/pages/cert-manager/IntegrationsListPage/route.tsx
+1 -1
View File
@@ -15,7 +15,7 @@ const IntegrationsListPageQuerySchema = z.object({
}); });
export const Route = createFileRoute( export const Route = createFileRoute(
"/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/integrations/" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/integrations/"
)({ )({
component: IntegrationsListPage, component: IntegrationsListPage,
validateSearch: zodValidator(IntegrationsListPageQuerySchema), validateSearch: zodValidator(IntegrationsListPageQuerySchema),
frontend/src/pages/cert-manager/PkiCollectionDetailsByIDPage/PkiCollectionDetailsByIDPage.tsx
+11 -3
View File
@@ -18,7 +18,12 @@ import {
Tooltip Tooltip
} from "@app/components/v2"; } from "@app/components/v2";
import { ROUTE_PATHS } from "@app/const/routes"; import { ROUTE_PATHS } from "@app/const/routes";
import { ProjectPermissionActions, ProjectPermissionSub, useProject } from "@app/context"; import {
ProjectPermissionActions,
ProjectPermissionSub,
useOrganization,
useProject
} from "@app/context";
import { useDeletePkiCollection, useGetPkiCollectionById } from "@app/hooks/api"; import { useDeletePkiCollection, useGetPkiCollectionById } from "@app/hooks/api";
import { PkiItemType } from "@app/hooks/api/pkiCollections/constants"; import { PkiItemType } from "@app/hooks/api/pkiCollections/constants";
import { ProjectType } from "@app/hooks/api/projects/types"; import { ProjectType } from "@app/hooks/api/projects/types";
@@ -34,6 +39,7 @@ export const PkiCollectionPage = () => {
}); });
const collectionId = params.collectionId as string; const collectionId = params.collectionId as string;
const { currentProject } = useProject(); const { currentProject } = useProject();
const { currentOrg } = useOrganization();
const projectId = currentProject?.id || ""; const projectId = currentProject?.id || "";
const { data } = useGetPkiCollectionById(collectionId); const { data } = useGetPkiCollectionById(collectionId);
@@ -58,8 +64,9 @@ export const PkiCollectionPage = () => {
}); });
handlePopUpClose("deletePkiCollection"); handlePopUpClose("deletePkiCollection");
navigate({ navigate({
to: "/projects/cert-management/$projectId/policies", to: "/organizations/$orgId/projects/cert-management/$projectId/policies",
params: { params: {
orgId: currentOrg.id,
projectId: params.projectId projectId: params.projectId
} }
}); });
@@ -70,8 +77,9 @@ export const PkiCollectionPage = () => {
{data && ( {data && (
<div className="mx-auto mb-6 w-full max-w-8xl"> <div className="mx-auto mb-6 w-full max-w-8xl">
<Link <Link
to="/projects/cert-management/$projectId/policies" to="/organizations/$orgId/projects/cert-management/$projectId/policies"
params={{ params={{
orgId: currentOrg.id,
projectId: params.projectId projectId: params.projectId
}} }}
className="mb-4 flex items-center gap-x-2 text-sm text-mineshaft-400" className="mb-4 flex items-center gap-x-2 text-sm text-mineshaft-400"
frontend/src/pages/cert-manager/PkiCollectionDetailsByIDPage/routes.tsx
+3 -2
View File
@@ -3,7 +3,7 @@ import { createFileRoute, linkOptions } from "@tanstack/react-router";
import { PkiCollectionDetailsByIDPage } from "./PkiCollectionDetailsByIDPage"; import { PkiCollectionDetailsByIDPage } from "./PkiCollectionDetailsByIDPage";
export const Route = createFileRoute( export const Route = createFileRoute(
"/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/pki-collections/$collectionId" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/pki-collections/$collectionId"
)({ )({
component: PkiCollectionDetailsByIDPage, component: PkiCollectionDetailsByIDPage,
beforeLoad: ({ context, params }) => { beforeLoad: ({ context, params }) => {
@@ -13,8 +13,9 @@ export const Route = createFileRoute(
{ {
label: "Certificate Collections", label: "Certificate Collections",
link: linkOptions({ link: linkOptions({
to: "/projects/cert-management/$projectId/policies", to: "/organizations/$orgId/projects/cert-management/$projectId/policies",
params: { params: {
orgId: params.orgId,
projectId: params.projectId projectId: params.projectId
} }
}) })
frontend/src/pages/cert-manager/PkiSubscriberDetailsByIDPage/PkiSubscriberDetailsByIDPage.tsx
+6 -2
View File
@@ -21,6 +21,7 @@ import { ROUTE_PATHS } from "@app/const/routes";
import { import {
ProjectPermissionPkiSubscriberActions, ProjectPermissionPkiSubscriberActions,
ProjectPermissionSub, ProjectPermissionSub,
useOrganization,
useProject useProject
} from "@app/context"; } from "@app/context";
import { useDeletePkiSubscriber, useGetPkiSubscriber } from "@app/hooks/api"; import { useDeletePkiSubscriber, useGetPkiSubscriber } from "@app/hooks/api";
@@ -32,6 +33,7 @@ import { PkiSubscriberCertificatesSection, PkiSubscriberDetailsSection } from ".
const Page = () => { const Page = () => {
const navigate = useNavigate(); const navigate = useNavigate();
const { currentOrg } = useOrganization();
const { currentProject } = useProject(); const { currentProject } = useProject();
const projectId = currentProject.id; const projectId = currentProject.id;
const subscriberName = useParams({ const subscriberName = useParams({
@@ -62,8 +64,9 @@ const Page = () => {
handlePopUpClose("deletePkiSubscriber"); handlePopUpClose("deletePkiSubscriber");
navigate({ navigate({
to: "/projects/cert-management/$projectId/subscribers", to: "/organizations/$orgId/projects/cert-management/$projectId/subscribers",
params: { params: {
orgId: currentOrg.id,
projectId projectId
} }
}); });
@@ -74,8 +77,9 @@ const Page = () => {
{data && ( {data && (
<div className="mx-auto mb-6 w-full max-w-8xl"> <div className="mx-auto mb-6 w-full max-w-8xl">
<Link <Link
to="/projects/cert-management/$projectId/subscribers" to="/organizations/$orgId/projects/cert-management/$projectId/subscribers"
params={{ params={{
orgId: currentOrg.id,
projectId projectId
}} }}
className="mb-4 flex items-center gap-x-2 text-sm text-mineshaft-400" className="mb-4 flex items-center gap-x-2 text-sm text-mineshaft-400"
frontend/src/pages/cert-manager/PkiSubscriberDetailsByIDPage/route.tsx
+3 -2
View File
@@ -3,7 +3,7 @@ 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/projects/cert-management/$projectId/_cert-manager-layout/subscribers/$subscriberName" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/subscribers/$subscriberName"
)({ )({
component: PkiSubscriberDetailsByIDPage, component: PkiSubscriberDetailsByIDPage,
beforeLoad: ({ context, params }) => { beforeLoad: ({ context, params }) => {
@@ -13,8 +13,9 @@ export const Route = createFileRoute(
{ {
label: "Subscribers", label: "Subscribers",
link: linkOptions({ link: linkOptions({
to: "/projects/cert-management/$projectId/subscribers", to: "/organizations/$orgId/projects/cert-management/$projectId/subscribers",
params: { params: {
orgId: params.orgId,
projectId: params.projectId projectId: params.projectId
} }
}) })
frontend/src/pages/cert-manager/PkiSubscribersPage/components/PkiSubscribersTable.tsx
+4 -1
View File
@@ -30,6 +30,7 @@ import { Badge } from "@app/components/v3";
import { import {
ProjectPermissionPkiSubscriberActions, ProjectPermissionPkiSubscriberActions,
ProjectPermissionSub, ProjectPermissionSub,
useOrganization,
useProject useProject
} from "@app/context"; } from "@app/context";
import { useListWorkspacePkiSubscribers } from "@app/hooks/api"; import { useListWorkspacePkiSubscribers } from "@app/hooks/api";
@@ -49,6 +50,7 @@ type Props = {
export const PkiSubscribersTable = ({ handlePopUpOpen }: Props) => { export const PkiSubscribersTable = ({ handlePopUpOpen }: Props) => {
const navigate = useNavigate(); const navigate = useNavigate();
const { currentOrg } = useOrganization();
const { currentProject } = useProject(); const { currentProject } = useProject();
const { data, isPending } = useListWorkspacePkiSubscribers(currentProject?.id || ""); const { data, isPending } = useListWorkspacePkiSubscribers(currentProject?.id || "");
return ( return (
@@ -75,8 +77,9 @@ export const PkiSubscribersTable = ({ handlePopUpOpen }: Props) => {
key={`pki-subscriber-${subscriber.id}`} key={`pki-subscriber-${subscriber.id}`}
onClick={() => onClick={() =>
navigate({ navigate({
to: "/projects/cert-management/$projectId/subscribers/$subscriberName", to: "/organizations/$orgId/projects/cert-management/$projectId/subscribers/$subscriberName",
params: { params: {
orgId: currentOrg.id,
projectId: currentProject.id, projectId: currentProject.id,
subscriberName: subscriber.name subscriberName: subscriber.name
} }
frontend/src/pages/cert-manager/PkiSubscribersPage/route.tsx
+1 -1
View File
@@ -3,7 +3,7 @@ import { createFileRoute } from "@tanstack/react-router";
import { PkiSubscribersPage } from "./PkiSubscribersPage"; import { PkiSubscribersPage } from "./PkiSubscribersPage";
export const Route = createFileRoute( export const Route = createFileRoute(
"/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/subscribers/" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/subscribers/"
)({ )({
component: PkiSubscribersPage, component: PkiSubscribersPage,
beforeLoad: ({ context }) => { beforeLoad: ({ context }) => {
frontend/src/pages/cert-manager/PkiSyncDetailsByIDPage/PkiSyncDetailsByIDPage.tsx
+3 -2
View File
@@ -27,7 +27,7 @@ import {
const PageContent = () => { const PageContent = () => {
const navigate = useNavigate(); const navigate = useNavigate();
const { syncId, projectId } = useParams({ const { syncId, projectId, orgId } = useParams({
from: ROUTE_PATHS.CertManager.PkiSyncDetailsByIDPage.id from: ROUTE_PATHS.CertManager.PkiSyncDetailsByIDPage.id
}); });
@@ -79,7 +79,8 @@ const PageContent = () => {
navigate({ navigate({
to: ROUTE_PATHS.CertManager.IntegrationsListPage.path, to: ROUTE_PATHS.CertManager.IntegrationsListPage.path,
params: { params: {
projectId projectId,
orgId
}, },
search: { search: {
selectedTab: IntegrationsListPageTabs.PkiSyncs selectedTab: IntegrationsListPageTabs.PkiSyncs
frontend/src/pages/cert-manager/PkiSyncDetailsByIDPage/components/PkiSyncActionTriggers.tsx
+4 -2
View File
@@ -36,7 +36,7 @@ import {
} from "@app/components/v2"; } from "@app/components/v2";
import { Badge } from "@app/components/v3"; import { Badge } from "@app/components/v3";
import { ROUTE_PATHS } from "@app/const/routes"; import { ROUTE_PATHS } from "@app/const/routes";
import { ProjectPermissionSub } from "@app/context"; import { ProjectPermissionSub, useOrganization } from "@app/context";
import { ProjectPermissionPkiSyncActions } from "@app/context/ProjectPermissionContext/types"; import { ProjectPermissionPkiSyncActions } from "@app/context/ProjectPermissionContext/types";
import { PKI_SYNC_MAP } from "@app/helpers/pkiSyncs"; import { PKI_SYNC_MAP } from "@app/helpers/pkiSyncs";
import { usePopUp, useToggle } from "@app/hooks"; import { usePopUp, useToggle } from "@app/hooks";
@@ -69,6 +69,7 @@ export const PkiSyncActionTriggers = ({ pkiSync }: Props) => {
const updatePkiSyncMutation = useUpdatePkiSync(); const updatePkiSyncMutation = useUpdatePkiSync();
const { syncOption } = usePkiSyncOption(destination); const { syncOption } = usePkiSyncOption(destination);
const { currentOrg } = useOrganization();
const destinationName = PKI_SYNC_MAP[destination].name; const destinationName = PKI_SYNC_MAP[destination].name;
@@ -287,7 +288,8 @@ export const PkiSyncActionTriggers = ({ pkiSync }: Props) => {
navigate({ navigate({
to: ROUTE_PATHS.CertManager.IntegrationsListPage.path, to: ROUTE_PATHS.CertManager.IntegrationsListPage.path,
params: { params: {
projectId projectId,
orgId: currentOrg.id
}, },
search: { search: {
selectedTab: IntegrationsListPageTabs.PkiSyncs selectedTab: IntegrationsListPageTabs.PkiSyncs
frontend/src/pages/cert-manager/PkiSyncDetailsByIDPage/components/PkiSyncAuditLogsSection.tsx
+8 -3
View File
@@ -2,7 +2,7 @@ import { faFingerprint } from "@fortawesome/free-solid-svg-icons";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { Link } from "@tanstack/react-router"; import { Link } from "@tanstack/react-router";
import { useProject, useSubscription } from "@app/context"; import { useOrganization, useProject, useSubscription } from "@app/context";
import { EventType } from "@app/hooks/api/auditLogs/enums"; import { EventType } from "@app/hooks/api/auditLogs/enums";
import { TPkiSync } from "@app/hooks/api/pkiSyncs"; import { TPkiSync } from "@app/hooks/api/pkiSyncs";
import { LogsSection } from "@app/pages/organization/AuditLogsPage/components/LogsSection"; import { LogsSection } from "@app/pages/organization/AuditLogsPage/components/LogsSection";
@@ -20,7 +20,7 @@ type Props = {
export const PkiSyncAuditLogsSection = ({ pkiSync }: Props) => { export const PkiSyncAuditLogsSection = ({ pkiSync }: Props) => {
const { subscription } = useSubscription(); const { subscription } = useSubscription();
const { currentProject } = useProject(); const { currentProject } = useProject();
const { currentOrg } = useOrganization();
const auditLogsRetentionDays = subscription?.auditLogsRetentionDays ?? 30; const auditLogsRetentionDays = subscription?.auditLogsRetentionDays ?? 30;
return ( return (
@@ -53,7 +53,12 @@ export const PkiSyncAuditLogsSection = ({ pkiSync }: Props) => {
<p> <p>
Please{" "} Please{" "}
{subscription && subscription.slug !== null ? ( {subscription && subscription.slug !== null ? (
<Link to="/organization/billing" target="_blank" rel="noopener noreferrer"> <Link
to="/organizations/$orgId/billing"
params={{ orgId: currentOrg.id }}
target="_blank"
rel="noopener noreferrer"
>
<span className="cursor-pointer underline transition-all hover:text-white"> <span className="cursor-pointer underline transition-all hover:text-white">
upgrade your subscription upgrade your subscription
</span> </span>
frontend/src/pages/cert-manager/PkiSyncDetailsByIDPage/route.tsx
+2 -2
View File
@@ -5,7 +5,7 @@ import { IntegrationsListPageTabs } from "@app/types/integrations";
import { PkiSyncDetailsByIDPage } from "./index"; import { PkiSyncDetailsByIDPage } from "./index";
export const Route = createFileRoute( export const Route = createFileRoute(
"/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/integrations/$syncId" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/integrations/$syncId"
)({ )({
component: PkiSyncDetailsByIDPage, component: PkiSyncDetailsByIDPage,
beforeLoad: ({ context, params }) => { beforeLoad: ({ context, params }) => {
@@ -15,7 +15,7 @@ export const Route = createFileRoute(
{ {
label: "Integrations", label: "Integrations",
link: linkOptions({ link: linkOptions({
to: "/projects/cert-management/$projectId/integrations", to: "/organizations/$orgId/projects/cert-management/$projectId/integrations",
params, params,
search: { search: {
selectedTab: IntegrationsListPageTabs.PkiSyncs selectedTab: IntegrationsListPageTabs.PkiSyncs
frontend/src/pages/cert-manager/PkiTemplateListPage/route.tsx
+1 -1
View File
@@ -3,7 +3,7 @@ import { createFileRoute } from "@tanstack/react-router";
import { PkiTemplateListPage } from "./PkiTemplateListPage"; import { PkiTemplateListPage } from "./PkiTemplateListPage";
export const Route = createFileRoute( export const Route = createFileRoute(
"/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/certificate-templates/" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/certificate-templates/"
)({ )({
component: PkiTemplateListPage, component: PkiTemplateListPage,
beforeLoad: ({ context }) => { beforeLoad: ({ context }) => {
frontend/src/pages/cert-manager/PoliciesPage/route.tsx
+1 -1
View File
@@ -3,7 +3,7 @@ import { createFileRoute } from "@tanstack/react-router";
import { PoliciesPage } from "./PoliciesPage"; import { PoliciesPage } from "./PoliciesPage";
export const Route = createFileRoute( export const Route = createFileRoute(
"/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/policies" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/policies"
)({ )({
component: PoliciesPage, component: PoliciesPage,
beforeLoad: ({ context }) => { beforeLoad: ({ context }) => {
frontend/src/pages/cert-manager/SettingsPage/route.tsx
+1 -1
View File
@@ -3,7 +3,7 @@ import { createFileRoute } from "@tanstack/react-router";
import { SettingsPage } from "./SettingsPage"; import { SettingsPage } from "./SettingsPage";
export const Route = createFileRoute( export const Route = createFileRoute(
"/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/settings" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout/settings"
)({ )({
component: SettingsPage, component: SettingsPage,
beforeLoad: ({ context }) => { beforeLoad: ({ context }) => {
frontend/src/pages/cert-manager/layout.tsx
+1 -1
View File
@@ -8,7 +8,7 @@ import { PkiManagerLayout } from "@app/layouts/PkiManagerLayout";
import { ProjectSelect } from "@app/layouts/ProjectLayout/components/ProjectSelect"; import { ProjectSelect } from "@app/layouts/ProjectLayout/components/ProjectSelect";
export const Route = createFileRoute( export const Route = createFileRoute(
"/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/cert-management/$projectId/_cert-manager-layout"
)({ )({
component: PkiManagerLayout, component: PkiManagerLayout,
beforeLoad: async ({ params, context }) => { beforeLoad: async ({ params, context }) => {
frontend/src/pages/kms/KmipPage/route.tsx
+1 -1
View File
@@ -3,7 +3,7 @@ import { createFileRoute } from "@tanstack/react-router";
import { KmipPage } from "./KmipPage"; import { KmipPage } from "./KmipPage";
export const Route = createFileRoute( export const Route = createFileRoute(
"/_authenticate/_inject-org-details/_org-layout/projects/kms/$projectId/_kms-layout/kmip" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/kms/$projectId/_kms-layout/kmip"
)({ )({
component: KmipPage, component: KmipPage,
beforeLoad: ({ context }) => { beforeLoad: ({ context }) => {
frontend/src/pages/kms/OverviewPage/route.tsx
+1 -1
View File
@@ -3,7 +3,7 @@ import { createFileRoute } from "@tanstack/react-router";
import { OverviewPage } from "./OverviewPage"; import { OverviewPage } from "./OverviewPage";
export const Route = createFileRoute( export const Route = createFileRoute(
"/_authenticate/_inject-org-details/_org-layout/projects/kms/$projectId/_kms-layout/overview" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/kms/$projectId/_kms-layout/overview"
)({ )({
component: OverviewPage, component: OverviewPage,
beforeLoad: ({ context }) => { beforeLoad: ({ context }) => {
frontend/src/pages/kms/SettingsPage/route.tsx
+1 -1
View File
@@ -3,7 +3,7 @@ import { createFileRoute } from "@tanstack/react-router";
import { SettingsPage } from "./SettingsPage"; import { SettingsPage } from "./SettingsPage";
export const Route = createFileRoute( export const Route = createFileRoute(
"/_authenticate/_inject-org-details/_org-layout/projects/kms/$projectId/_kms-layout/settings" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/kms/$projectId/_kms-layout/settings"
)({ )({
component: SettingsPage, component: SettingsPage,
beforeLoad: ({ context }) => { beforeLoad: ({ context }) => {
frontend/src/pages/kms/layout.tsx
+1 -1
View File
@@ -8,7 +8,7 @@ import { KmsLayout } from "@app/layouts/KmsLayout";
import { ProjectSelect } from "@app/layouts/ProjectLayout/components/ProjectSelect"; import { ProjectSelect } from "@app/layouts/ProjectLayout/components/ProjectSelect";
export const Route = createFileRoute( export const Route = createFileRoute(
"/_authenticate/_inject-org-details/_org-layout/projects/kms/$projectId/_kms-layout" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects/kms/$projectId/_kms-layout"
)({ )({
component: KmsLayout, component: KmsLayout,
beforeLoad: async ({ params, context }) => { beforeLoad: async ({ params, context }) => {
frontend/src/pages/middlewares/authenticate.tsx
+1 -1
View File
@@ -44,7 +44,7 @@ export const Route = createFileRoute("/_authenticate")({
if ( if (
!data.organizationId && !data.organizationId &&
location.pathname !== ROUTE_PATHS.Auth.PasswordSetupPage.path && location.pathname !== ROUTE_PATHS.Auth.PasswordSetupPage.path &&
location.pathname !== "/organization/none" location.pathname !== "/organizations/none"
) { ) {
throw redirect({ to: "/login/select-organization" }); throw redirect({ to: "/login/select-organization" });
} }
frontend/src/pages/middlewares/inject-org-details.tsx
+9 -2
View File
@@ -6,8 +6,15 @@ import { fetchOrgSubscription, subscriptionQueryKeys } from "@app/hooks/api/subs
// Route context to fill in organization's data like details, subscription etc // Route context to fill in organization's data like details, subscription etc
export const Route = createFileRoute("/_authenticate/_inject-org-details")({ export const Route = createFileRoute("/_authenticate/_inject-org-details")({
beforeLoad: async ({ context }) => { beforeLoad: async ({ context, params }) => {
const organizationId = context.organizationId!; let organizationId: string;
if ((params as { orgId?: string })?.orgId) {
organizationId = (params as { orgId: string }).orgId;
} else {
organizationId = context.organizationId!;
}
await context.queryClient.ensureQueryData({ await context.queryClient.ensureQueryData({
queryKey: organizationKeys.getOrgById(organizationId), queryKey: organizationKeys.getOrgById(organizationId),
queryFn: () => fetchOrganizationById(organizationId) queryFn: () => fetchOrganizationById(organizationId)
frontend/src/pages/middlewares/restrict-login-signup.tsx
+2 -1
View File
@@ -118,7 +118,8 @@ export const Route = createFileRoute("/_restrict-login-signup")({
throw redirect({ to: "/login/select-organization" }); throw redirect({ to: "/login/select-organization" });
} }
throw redirect({ throw redirect({
to: "/organization/projects" to: "/organizations/$orgId/projects",
params: { orgId: data.organizationId }
}); });
}, },
component: AuthConsentWrapper component: AuthConsentWrapper
frontend/src/pages/organization/AccessManagementPage/components/OrgGroupsTab/components/OrgGroupsSection/OrgGroupsTable.tsx
+4 -2
View File
@@ -235,8 +235,9 @@ export const OrgGroupsTable = ({ handlePopUpOpen }: Props) => {
<Tr <Tr
onClick={() => onClick={() =>
navigate({ navigate({
to: "/organization/groups/$groupId", to: "/organizations/$orgId/groups/$groupId",
params: { params: {
orgId,
groupId: id groupId: id
} }
}) })
@@ -334,8 +335,9 @@ export const OrgGroupsTable = ({ handlePopUpOpen }: Props) => {
icon={<FontAwesomeIcon icon={faUserGroup} />} icon={<FontAwesomeIcon icon={faUserGroup} />}
onClick={() => onClick={() =>
navigate({ navigate({
to: "/organization/groups/$groupId", to: "/organizations/$orgId/groups/$groupId",
params: { params: {
orgId,
groupId: id groupId: id
} }
}) })
frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityTable.tsx
+6 -4
View File
@@ -301,9 +301,10 @@ export const IdentityTable = ({ handlePopUpOpen }: Props) => {
key={`identity-${id}`} key={`identity-${id}`}
onClick={() => onClick={() =>
navigate({ navigate({
to: "/organization/identities/$identityId", to: "/organizations/$orgId/identities/$identityId",
params: { params: {
identityId: id identityId: id,
orgId
} }
}) })
} }
@@ -397,9 +398,10 @@ export const IdentityTable = ({ handlePopUpOpen }: Props) => {
onClick={(e) => { onClick={(e) => {
e.stopPropagation(); e.stopPropagation();
navigate({ navigate({
to: "/organization/identities/$identityId", to: "/organizations/$orgId/identities/$identityId",
params: { params: {
identityId: id identityId: id,
orgId
} }
}); });
}} }}
frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/MachineAuthTemplateUsagesModal.tsx
+3 -2
View File
@@ -61,9 +61,10 @@ export const MachineAuthTemplateUsagesModal = ({
key={`usage-${usage.identityId}`} key={`usage-${usage.identityId}`}
onClick={() => onClick={() =>
navigate({ navigate({
to: "/organization/identities/$identityId", to: "/organizations/$orgId/identities/$identityId",
params: { params: {
identityId: usage.identityId identityId: usage.identityId,
orgId: organizationId
} }
}) })
} }
frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/OrgIdentityLinkForm.tsx
+3 -2
View File
@@ -64,9 +64,10 @@ export const OrgIdentityLinkForm = ({ onClose }: Props) => {
type: "success" type: "success"
}); });
navigate({ navigate({
to: "/organization/identities/$identityId", to: "/organizations/$orgId/identities/$identityId",
params: { params: {
identityId: identity.id identityId: identity.id,
orgId: currentOrg.id
} }
}); });
}; };
frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/OrgIdentityModal.tsx
+3 -2
View File
@@ -155,9 +155,10 @@ export const OrgIdentityModal = ({ popUp, handlePopUpToggle }: Props) => {
handlePopUpToggle("identity", false); handlePopUpToggle("identity", false);
navigate({ navigate({
to: "/organization/identities/$identityId", to: "/organizations/$orgId/identities/$identityId",
params: { params: {
identityId: createdId identityId: createdId,
orgId
} }
}); });
} }
frontend/src/pages/organization/AccessManagementPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx
+6 -4
View File
@@ -481,9 +481,10 @@ export const OrgMembersTable = ({
className="h-10 w-full cursor-pointer transition-colors duration-100 hover:bg-mineshaft-700" className="h-10 w-full cursor-pointer transition-colors duration-100 hover:bg-mineshaft-700"
onClick={() => onClick={() =>
navigate({ navigate({
to: "/organization/members/$membershipId" as const, to: "/organizations/$orgId/members/$membershipId" as const,
params: { params: {
membershipId: orgMembershipId membershipId: orgMembershipId,
orgId
} }
}) })
} }
@@ -619,9 +620,10 @@ export const OrgMembersTable = ({
onClick={(e) => { onClick={(e) => {
e.stopPropagation(); e.stopPropagation();
navigate({ navigate({
to: "/organization/members/$membershipId" as const, to: "/organizations/$orgId/members/$membershipId" as const,
params: { params: {
membershipId: orgMembershipId membershipId: orgMembershipId,
orgId
} }
}); });
}} }}
frontend/src/pages/organization/AccessManagementPage/components/OrgRoleTabSection/OrgRoleTable.tsx
+6 -4
View File
@@ -280,9 +280,10 @@ export const OrgRoleTable = () => {
className="h-10 cursor-pointer transition-colors duration-100 hover:bg-mineshaft-700" className="h-10 cursor-pointer transition-colors duration-100 hover:bg-mineshaft-700"
onClick={() => onClick={() =>
navigate({ navigate({
to: "/organization/roles/$roleId", to: "/organizations/$orgId/roles/$roleId",
params: { params: {
roleId: id roleId: id,
orgId
} }
}) })
} }
@@ -339,9 +340,10 @@ export const OrgRoleTable = () => {
onClick={(e) => { onClick={(e) => {
e.stopPropagation(); e.stopPropagation();
navigate({ navigate({
to: "/organization/roles/$roleId", to: "/organizations/$orgId/roles/$roleId",
params: { params: {
roleId: id roleId: id,
orgId
} }
}); });
}} }}
frontend/src/pages/organization/AccessManagementPage/route.tsx
+1 -1
View File
@@ -12,7 +12,7 @@ const AccessControlPageQuerySchema = z.object({
}); });
export const Route = createFileRoute( export const Route = createFileRoute(
"/_authenticate/_inject-org-details/_org-layout/organization/access-management" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/access-management"
)({ )({
component: AccessManagementPage, component: AccessManagementPage,
validateSearch: zodValidator(AccessControlPageQuerySchema), validateSearch: zodValidator(AccessControlPageQuerySchema),
frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionRow.tsx
+3 -1
View File
@@ -29,7 +29,7 @@ import {
Tr Tr
} from "@app/components/v2"; } from "@app/components/v2";
import { Badge } from "@app/components/v3"; import { Badge } from "@app/components/v3";
import { OrgPermissionSubjects, ProjectPermissionSub } from "@app/context"; import { OrgPermissionSubjects, ProjectPermissionSub, useOrganization } from "@app/context";
import { OrgPermissionAppConnectionActions } from "@app/context/OrgPermissionContext/types"; import { OrgPermissionAppConnectionActions } from "@app/context/OrgPermissionContext/types";
import { ProjectPermissionAppConnectionActions } from "@app/context/ProjectPermissionContext/types"; import { ProjectPermissionAppConnectionActions } from "@app/context/ProjectPermissionContext/types";
import { APP_CONNECTION_MAP, getAppConnectionMethodDetails } from "@app/helpers/appConnections"; import { APP_CONNECTION_MAP, getAppConnectionMethodDetails } from "@app/helpers/appConnections";
@@ -52,6 +52,7 @@ export const AppConnectionRow = ({
onEditDetails, onEditDetails,
isProjectView isProjectView
}: Props) => { }: Props) => {
const { currentOrg } = useOrganization();
const { id, name, method, app, description, isPlatformManagedCredentials, project } = const { id, name, method, app, description, isPlatformManagedCredentials, project } =
appConnection; appConnection;
@@ -127,6 +128,7 @@ export const AppConnectionRow = ({
// @ts-expect-error app-connections aren't in kms/ssh // @ts-expect-error app-connections aren't in kms/ssh
to={`${getProjectBaseURL(project.type)}/app-connections`} to={`${getProjectBaseURL(project.type)}/app-connections`}
params={{ params={{
orgId: currentOrg?.id || "",
projectId: project.id projectId: project.id
}} }}
className="underline" className="underline"
frontend/src/pages/organization/AppConnections/AppConnectionsPage/route.tsx
+1 -1
View File
@@ -4,7 +4,7 @@ import { z } from "zod";
import { AppConnectionsPage } from "./AppConnectionsPage"; import { AppConnectionsPage } from "./AppConnectionsPage";
export const Route = createFileRoute( export const Route = createFileRoute(
"/_authenticate/_inject-org-details/_org-layout/organization/app-connections/" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/app-connections/"
)({ )({
component: AppConnectionsPage, component: AppConnectionsPage,
validateSearch: z.object({ validateSearch: z.object({
frontend/src/pages/organization/AppConnections/OauthCallbackPage/route.tsx
+1 -1
View File
@@ -11,7 +11,7 @@ const GitHubOAuthCallbackPageQueryParamsSchema = z.object({
}); });
export const Route = createFileRoute( export const Route = createFileRoute(
"/_authenticate/_inject-org-details/_org-layout/organization/app-connections/$appConnection/oauth/callback" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/app-connections/$appConnection/oauth/callback"
)({ )({
component: OAuthCallbackPage, component: OAuthCallbackPage,
validateSearch: zodValidator(GitHubOAuthCallbackPageQueryParamsSchema), validateSearch: zodValidator(GitHubOAuthCallbackPageQueryParamsSchema),
frontend/src/pages/organization/AuditLogsPage/route.tsx
+1 -1
View File
@@ -3,7 +3,7 @@ import { createFileRoute } from "@tanstack/react-router";
import { AuditLogsPage } from "./AuditLogsPage"; import { AuditLogsPage } from "./AuditLogsPage";
export const Route = createFileRoute( export const Route = createFileRoute(
"/_authenticate/_inject-org-details/_org-layout/organization/audit-logs" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/audit-logs"
)({ )({
component: AuditLogsPage, component: AuditLogsPage,
context: () => ({ context: () => ({
frontend/src/pages/organization/BillingPage/route.tsx
+4 -3
View File
@@ -3,13 +3,14 @@ import { createFileRoute, redirect } from "@tanstack/react-router";
import { BillingPage } from "./BillingPage"; import { BillingPage } from "./BillingPage";
export const Route = createFileRoute( export const Route = createFileRoute(
"/_authenticate/_inject-org-details/_org-layout/organization/billing" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/billing"
)({ )({
component: BillingPage, component: BillingPage,
beforeLoad: ({ search }) => { beforeLoad: ({ search, params }) => {
if (search.subOrganization) { if (search.subOrganization) {
throw redirect({ throw redirect({
to: "/organization/projects", to: "/organizations/$orgId/projects",
params: { orgId: params.orgId },
search search
}); });
} }
frontend/src/pages/organization/GroupDetailsByIDPage/GroupDetailsByIDPage.tsx
+5 -3
View File
@@ -45,7 +45,7 @@ const Page = () => {
const { data, isPending } = useGetGroupById(groupId); const { data, isPending } = useGetGroupById(groupId);
const { isSubOrganization } = useOrganization(); const { isSubOrganization, currentOrg } = useOrganization();
const { mutateAsync: deleteMutateAsync } = useDeleteGroup(); const { mutateAsync: deleteMutateAsync } = useDeleteGroup();
@@ -63,7 +63,8 @@ const Page = () => {
type: "success" type: "success"
}); });
navigate({ navigate({
to: "/organization/access-management" as const, to: "/organizations/$orgId/access-management" as const,
params: { orgId: currentOrg.id },
search: { search: {
selectedTab: TabSections.Groups selectedTab: TabSections.Groups
} }
@@ -79,7 +80,8 @@ const Page = () => {
{data && ( {data && (
<div className="mx-auto w-full max-w-8xl"> <div className="mx-auto w-full max-w-8xl">
<Link <Link
to="/organization/access-management" to="/organizations/$orgId/access-management"
params={{ orgId: currentOrg.id }}
search={{ search={{
selectedTab: TabSections.Groups selectedTab: TabSections.Groups
}} }}
frontend/src/pages/organization/GroupDetailsByIDPage/route.tsx
+6 -3
View File
@@ -3,14 +3,17 @@ import { createFileRoute, linkOptions } from "@tanstack/react-router";
import { GroupDetailsByIDPage } from "./GroupDetailsByIDPage"; import { GroupDetailsByIDPage } from "./GroupDetailsByIDPage";
export const Route = createFileRoute( export const Route = createFileRoute(
"/_authenticate/_inject-org-details/_org-layout/organization/groups/$groupId" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/groups/$groupId"
)({ )({
component: GroupDetailsByIDPage, component: GroupDetailsByIDPage,
context: () => ({ context: ({ params }) => ({
breadcrumbs: [ breadcrumbs: [
{ {
label: "Access Control", label: "Access Control",
link: linkOptions({ to: "/organization/access-management" }) link: linkOptions({
to: "/organizations/$orgId/access-management" as const,
params
})
}, },
{ {
label: "groups" label: "groups"
frontend/src/pages/organization/IdentityDetailsByIDPage/IdentityDetailsByIDPage.tsx
+4 -2
View File
@@ -61,7 +61,8 @@ const Page = () => {
handlePopUpClose("deleteIdentity"); handlePopUpClose("deleteIdentity");
navigate({ navigate({
to: "/organization/access-management", to: "/organizations/$orgId/access-management" as const,
params: { orgId },
search: { search: {
selectedTab: OrgAccessControlTabSections.Identities selectedTab: OrgAccessControlTabSections.Identities
} }
@@ -73,7 +74,8 @@ const Page = () => {
{data && ( {data && (
<div className="mx-auto w-full max-w-8xl"> <div className="mx-auto w-full max-w-8xl">
<Link <Link
to="/organization/access-management" to="/organizations/$orgId/access-management"
params={{ orgId }}
search={{ search={{
selectedTab: OrgAccessControlTabSections.Identities selectedTab: OrgAccessControlTabSections.Identities
}} }}
frontend/src/pages/organization/IdentityDetailsByIDPage/components/IdentityProjectsSection/IdentityProjectRow.tsx
+3
View File
@@ -6,6 +6,7 @@ import { format } from "date-fns";
import { createNotification } from "@app/components/notifications"; import { createNotification } from "@app/components/notifications";
import { IconButton, Td, Tooltip, Tr } from "@app/components/v2"; import { IconButton, Td, Tooltip, Tr } from "@app/components/v2";
import { useOrganization } from "@app/context";
import { getProjectBaseURL } from "@app/helpers/project"; import { getProjectBaseURL } from "@app/helpers/project";
import { formatProjectRoleName } from "@app/helpers/roles"; import { formatProjectRoleName } from "@app/helpers/roles";
import { useGetUserProjects } from "@app/hooks/api"; import { useGetUserProjects } from "@app/hooks/api";
@@ -33,6 +34,7 @@ export const IdentityProjectRow = ({
}: Props) => { }: Props) => {
const { data: workspaces } = useGetUserProjects(); const { data: workspaces } = useGetUserProjects();
const navigate = useNavigate(); const navigate = useNavigate();
const { currentOrg } = useOrganization();
const isAccessible = useMemo(() => { const isAccessible = useMemo(() => {
const workspaceIds = new Map(); const workspaceIds = new Map();
@@ -53,6 +55,7 @@ export const IdentityProjectRow = ({
navigate({ navigate({
to: `${getProjectBaseURL(project.type)}/access-management` as const, to: `${getProjectBaseURL(project.type)}/access-management` as const,
params: { params: {
orgId: currentOrg?.id || "",
projectId: project.id projectId: project.id
}, },
search: { search: {
frontend/src/pages/organization/IdentityDetailsByIDPage/route.tsx
+3 -3
View File
@@ -3,14 +3,14 @@ import { createFileRoute, linkOptions } from "@tanstack/react-router";
import { IdentityDetailsByIDPage } from "./IdentityDetailsByIDPage"; import { IdentityDetailsByIDPage } from "./IdentityDetailsByIDPage";
export const Route = createFileRoute( export const Route = createFileRoute(
"/_authenticate/_inject-org-details/_org-layout/organization/identities/$identityId" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/identities/$identityId"
)({ )({
component: IdentityDetailsByIDPage, component: IdentityDetailsByIDPage,
context: () => ({ context: ({ params }) => ({
breadcrumbs: [ breadcrumbs: [
{ {
label: "Access Control", label: "Access Control",
link: linkOptions({ to: "/organization/access-management" }) link: linkOptions({ to: "/organizations/$orgId/access-management" as const, params })
}, },
{ {
label: "Identities" label: "Identities"
frontend/src/pages/organization/NetworkingPage/route.tsx
+1 -1
View File
@@ -10,7 +10,7 @@ const NetworkingPageQueryParams = z.object({
}); });
export const Route = createFileRoute( export const Route = createFileRoute(
"/_authenticate/_inject-org-details/_org-layout/organization/networking" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/networking"
)({ )({
component: NetworkingPage, component: NetworkingPage,
validateSearch: zodValidator(NetworkingPageQueryParams), validateSearch: zodValidator(NetworkingPageQueryParams),
frontend/src/pages/organization/NoOrgPage/route.tsx
+1 -1
View File
@@ -2,6 +2,6 @@ import { createFileRoute } from "@tanstack/react-router";
import { NoOrgPage } from "./NoOrgPage"; import { NoOrgPage } from "./NoOrgPage";
export const Route = createFileRoute("/_authenticate/organization/none")({ export const Route = createFileRoute("/_authenticate/organizations/none")({
component: NoOrgPage component: NoOrgPage
}); });
frontend/src/pages/organization/ProjectsPage/ProjectsPage.tsx
+16
View File
@@ -2,6 +2,7 @@
import { useState } from "react"; import { useState } from "react";
import { Helmet } from "react-helmet"; import { Helmet } from "react-helmet";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { Outlet, useMatches } from "@tanstack/react-router";
import { UpgradePlanModal } from "@app/components/license/UpgradePlanModal"; import { UpgradePlanModal } from "@app/components/license/UpgradePlanModal";
import { NewProjectModal } from "@app/components/projects"; import { NewProjectModal } from "@app/components/projects";
@@ -27,6 +28,17 @@ import { ProjectListView } from "./components/ProjectListToggle";
export const ProjectsPage = () => { export const ProjectsPage = () => {
const { t } = useTranslation(); const { t } = useTranslation();
const matches = useMatches();
const hasChildRoute = matches.some(
(match) =>
match.pathname.includes("/secret-management/") ||
match.pathname.includes("/cert-management/") ||
match.pathname.includes("/kms/") ||
match.pathname.includes("/pam/") ||
match.pathname.includes("/ssh/") ||
match.pathname.includes("/secret-scanning/")
);
const [projectListView, setProjectListView] = useState<ProjectListView>(() => { const [projectListView, setProjectListView] = useState<ProjectListView>(() => {
const storedView = localStorage.getItem("projectListView"); const storedView = localStorage.getItem("projectListView");
@@ -57,6 +69,10 @@ export const ProjectsPage = () => {
? subscription.workspacesUsed < subscription.workspaceLimit ? subscription.workspacesUsed < subscription.workspaceLimit
: true; : true;
if (hasChildRoute) {
return <Outlet />;
}
return ( return (
<div className="mx-auto flex max-w-8xl flex-col justify-start bg-bunker-800"> <div className="mx-auto flex max-w-8xl flex-col justify-start bg-bunker-800">
<Helmet> <Helmet>
frontend/src/pages/organization/ProjectsPage/components/AllProjectView.tsx
+13 -3
View File
@@ -30,7 +30,7 @@ import {
Tooltip Tooltip
} from "@app/components/v2"; } from "@app/components/v2";
import { Badge } from "@app/components/v3"; import { Badge } from "@app/components/v3";
import { OrgPermissionActions, OrgPermissionSubjects } from "@app/context"; import { OrgPermissionActions, OrgPermissionSubjects, useOrganization } from "@app/context";
import { OrgPermissionAdminConsoleAction } from "@app/context/OrgPermissionContext/types"; import { OrgPermissionAdminConsoleAction } from "@app/context/OrgPermissionContext/types";
import { getProjectHomePage, getProjectLottieIcon, getProjectTitle } from "@app/helpers/project"; import { getProjectHomePage, getProjectLottieIcon, getProjectTitle } from "@app/helpers/project";
import { import {
@@ -62,6 +62,7 @@ export const AllProjectView = ({
onProjectListViewChange onProjectListViewChange
}: Props) => { }: Props) => {
const navigate = useNavigate(); const navigate = useNavigate();
const { currentOrg } = useOrganization();
const [searchFilter, setSearchFilter] = useState(""); const [searchFilter, setSearchFilter] = useState("");
const [debouncedSearch] = useDebounce(searchFilter); const [debouncedSearch] = useDebounce(searchFilter);
const [projectTypeFilter, setProjectTypeFilter] = useState<ProjectType>(); const [projectTypeFilter, setProjectTypeFilter] = useState<ProjectType>();
@@ -100,7 +101,8 @@ export const AllProjectView = ({
const handleAccessProject = async ( const handleAccessProject = async (
type: ProjectType, type: ProjectType,
projectId: string, projectId: string,
environments: ProjectEnv[] environments: ProjectEnv[],
orgId: string
) => { ) => {
await orgAdminAccessProject.mutateAsync({ await orgAdminAccessProject.mutateAsync({
projectId projectId
@@ -108,6 +110,7 @@ export const AllProjectView = ({
await navigate({ await navigate({
to: getProjectHomePage(type, environments), to: getProjectHomePage(type, environments),
params: { params: {
orgId,
projectId projectId
} }
}); });
@@ -263,6 +266,7 @@ export const AllProjectView = ({
navigate({ navigate({
to: getProjectHomePage(workspace.type, workspace.environments), to: getProjectHomePage(workspace.type, workspace.environments),
params: { params: {
orgId: currentOrg?.id || "",
projectId: workspace.id projectId: workspace.id
} }
}); });
@@ -273,6 +277,7 @@ export const AllProjectView = ({
navigate({ navigate({
to: getProjectHomePage(workspace.type, workspace.environments), to: getProjectHomePage(workspace.type, workspace.environments),
params: { params: {
orgId: currentOrg?.id || "",
projectId: workspace.id projectId: workspace.id
} }
}); });
@@ -317,7 +322,12 @@ export const AllProjectView = ({
onClick={(e) => { onClick={(e) => {
e.stopPropagation(); e.stopPropagation();
e.preventDefault(); e.preventDefault();
handleAccessProject(workspace.type, workspace.id, workspace.environments); handleAccessProject(
workspace.type,
workspace.id,
workspace.environments,
workspace.orgId
);
}} }}
disabled={ disabled={
orgAdminAccessProject.variables?.projectId === workspace.id && orgAdminAccessProject.variables?.projectId === workspace.id &&
frontend/src/pages/organization/ProjectsPage/components/MyProjectView.tsx
+2
View File
@@ -180,6 +180,7 @@ export const MyProjectView = ({
navigate({ navigate({
to: getProjectHomePage(workspace.type, workspace.environments), to: getProjectHomePage(workspace.type, workspace.environments),
params: { params: {
orgId: currentOrg?.id || "",
projectId: workspace.id projectId: workspace.id
} }
}); });
@@ -231,6 +232,7 @@ export const MyProjectView = ({
navigate({ navigate({
to: getProjectHomePage(workspace.type, workspace.environments), to: getProjectHomePage(workspace.type, workspace.environments),
params: { params: {
orgId: currentOrg?.id || "",
projectId: workspace.id projectId: workspace.id
} }
}); });
frontend/src/pages/organization/ProjectsPage/route.tsx
+1 -1
View File
@@ -3,7 +3,7 @@ import { createFileRoute } from "@tanstack/react-router";
import { ProjectsPage } from "./ProjectsPage"; import { ProjectsPage } from "./ProjectsPage";
export const Route = createFileRoute( export const Route = createFileRoute(
"/_authenticate/_inject-org-details/_org-layout/organization/projects" "/_authenticate/_inject-org-details/_org-layout/organizations/$orgId/projects"
)({ )({
component: ProjectsPage, component: ProjectsPage,
context: () => ({ context: () => ({

Some files were not shown because too many files have changed in this diff Show More