{
navigate({
- to: getProjectHomePage(workspace.defaultProduct),
+ to: getProjectHomePage(workspace.type),
params: {
projectId: workspace.id
}
@@ -215,7 +215,7 @@ export const MyProjectView = ({
{
navigate({
- to: getProjectHomePage(workspace.defaultProduct),
+ to: getProjectHomePage(workspace.type),
params: {
projectId: workspace.id
}
diff --git a/frontend/src/pages/organization/UserDetailsByIDPage/components/UserProjectsSection/UserProjectRow.tsx b/frontend/src/pages/organization/UserDetailsByIDPage/components/UserProjectsSection/UserProjectRow.tsx
index 34a6a316d..ee5e233f4 100644
--- a/frontend/src/pages/organization/UserDetailsByIDPage/components/UserProjectsSection/UserProjectRow.tsx
+++ b/frontend/src/pages/organization/UserDetailsByIDPage/components/UserProjectsSection/UserProjectRow.tsx
@@ -10,6 +10,8 @@ import { useGetUserWorkspaces } from "@app/hooks/api";
import { TWorkspaceUser } from "@app/hooks/api/types";
import { UsePopUpState } from "@app/hooks/usePopUp";
import { OrgAccessControlTabSections } from "@app/types/org";
+import { getProjectBaseURL } from "@app/helpers/project";
+import { useWorkspace } from "@app/context";
type Props = {
membership: TWorkspaceUser;
@@ -25,6 +27,7 @@ export const UserProjectRow = ({
}: Props) => {
const { data: workspaces = [] } = useGetUserWorkspaces();
const navigate = useNavigate();
+ const { currentWorkspace } = useWorkspace();
const isAccessible = useMemo(() => {
const workspaceIds = new Map();
@@ -43,7 +46,7 @@ export const UserProjectRow = ({
onClick={() => {
if (isAccessible) {
navigate({
- to: "/projects/$projectId/access-management",
+ to: `${getProjectBaseURL(currentWorkspace.type)}/access-management` as const,
params: {
projectId: project.id
},
diff --git a/frontend/src/pages/project/AccessControlPage/AccessControlPage.tsx b/frontend/src/pages/project/AccessControlPage/AccessControlPage.tsx
index 096514b69..4a7eee433 100644
--- a/frontend/src/pages/project/AccessControlPage/AccessControlPage.tsx
+++ b/frontend/src/pages/project/AccessControlPage/AccessControlPage.tsx
@@ -4,6 +4,7 @@ import { useNavigate, useSearch } from "@tanstack/react-router";
import { PageHeader, Tab, TabList, TabPanel, Tabs } from "@app/components/v2";
import { useWorkspace } from "@app/context";
+import { getProjectBaseURL } from "@app/helpers/project";
import { ProjectAccessControlTabs } from "@app/types/project";
import {
@@ -24,7 +25,7 @@ const Page = () => {
const updateSelectedTab = (tab: string) => {
navigate({
- to: "/projects/$projectId/access-management",
+ to: `${getProjectBaseURL(currentWorkspace.type)}/access-management` as const,
search: (prev) => ({ ...prev, selectedTab: tab }),
params: {
projectId: currentWorkspace.id
diff --git a/frontend/src/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupsTable.tsx b/frontend/src/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupsTable.tsx
index 37816ceb9..9840fae03 100644
--- a/frontend/src/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupsTable.tsx
+++ b/frontend/src/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupsTable.tsx
@@ -44,6 +44,7 @@ import { OrderByDirection } from "@app/hooks/api/generic/types";
import { UsePopUpState } from "@app/hooks/usePopUp";
import { GroupRoles } from "./GroupRoles";
+import { getProjectBaseURL } from "@app/helpers/project";
type Props = {
handlePopUpOpen: (
@@ -158,7 +159,7 @@ export const GroupTable = ({ handlePopUpOpen }: Props) => {
onKeyDown={(evt) => {
if (evt.key === "Enter") {
navigate({
- to: "/projects/$projectId/groups/$groupId",
+ to: `${getProjectBaseURL(currentWorkspace.type)}/groups/$groupId` as const,
params: {
projectId: currentWorkspace.id,
groupId: id
@@ -168,7 +169,7 @@ export const GroupTable = ({ handlePopUpOpen }: Props) => {
}}
onClick={() =>
navigate({
- to: "/projects/$projectId/groups/$groupId",
+ to: `${getProjectBaseURL(currentWorkspace.type)}/groups/$groupId` as const,
params: {
projectId: currentWorkspace.id,
groupId: id
diff --git a/frontend/src/pages/project/AccessControlPage/components/IdentityTab/IdentityTab.tsx b/frontend/src/pages/project/AccessControlPage/components/IdentityTab/IdentityTab.tsx
index 52ac3b349..e52464600 100644
--- a/frontend/src/pages/project/AccessControlPage/components/IdentityTab/IdentityTab.tsx
+++ b/frontend/src/pages/project/AccessControlPage/components/IdentityTab/IdentityTab.tsx
@@ -60,6 +60,7 @@ import { ProjectIdentityOrderBy } from "@app/hooks/api/workspace/types";
import { usePopUp } from "@app/hooks/usePopUp";
import { IdentityModal } from "./components/IdentityModal";
+import { getProjectBaseURL } from "@app/helpers/project";
const MAX_ROLES_TO_BE_SHOWN_IN_TABLE = 2;
@@ -260,7 +261,7 @@ export const IdentityTab = withProjectPermission(
onKeyDown={(evt) => {
if (evt.key === "Enter") {
navigate({
- to: "/projects/$projectId/identities/$identityId",
+ to: `${getProjectBaseURL(currentWorkspace.type)}/identities/$identityId` as const,
params: {
projectId: currentWorkspace.id,
identityId: id
@@ -270,7 +271,7 @@ export const IdentityTab = withProjectPermission(
}}
onClick={() =>
navigate({
- to: "/projects/$projectId/identities/$identityId",
+ to: `${getProjectBaseURL(currentWorkspace.type)}/identities/$identityId` as const,
params: {
projectId: currentWorkspace.id,
identityId: id
diff --git a/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/MemberRoleForm/MemberRoleForm.tsx b/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/MemberRoleForm/MemberRoleForm.tsx
index ba4e0fac4..3dd2e2275 100644
--- a/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/MemberRoleForm/MemberRoleForm.tsx
+++ b/frontend/src/pages/project/AccessControlPage/components/MembersTab/components/MemberRoleForm/MemberRoleForm.tsx
@@ -5,6 +5,7 @@ import { useWorkspace } from "@app/context";
import { TWorkspaceUser } from "@app/hooks/api/types";
import { MemberRbacSection } from "./MemberRbacSection";
+import { getProjectBaseURL } from "@app/helpers/project";
type Props = {
projectMember: TWorkspaceUser;
@@ -21,7 +22,7 @@ export const MemberRoleForm = ({ projectMember, onOpenUpgradeModal }: Props) =>
>
{
onKeyDown={(evt) => {
if (evt.key === "Enter") {
navigate({
- to: "/projects/$projectId/members/$membershipId",
+ to: `${getProjectBaseURL(currentWorkspace.type)}/members/$membershipId`,
params: {
projectId: workspaceId,
membershipId
@@ -321,7 +322,7 @@ export const MembersTable = ({ handlePopUpOpen }: Props) => {
}}
onClick={() =>
navigate({
- to: "/projects/$projectId/members/$membershipId",
+ to: `${getProjectBaseURL(currentWorkspace.type)}/members/$membershipId`,
params: {
projectId: workspaceId,
membershipId
diff --git a/frontend/src/pages/project/AccessControlPage/components/ProjectRoleListTab/components/ProjectRoleList/ProjectRoleList.tsx b/frontend/src/pages/project/AccessControlPage/components/ProjectRoleListTab/components/ProjectRoleList/ProjectRoleList.tsx
index 2a01764b0..cfe6c97e4 100644
--- a/frontend/src/pages/project/AccessControlPage/components/ProjectRoleListTab/components/ProjectRoleList/ProjectRoleList.tsx
+++ b/frontend/src/pages/project/AccessControlPage/components/ProjectRoleListTab/components/ProjectRoleList/ProjectRoleList.tsx
@@ -52,6 +52,7 @@ import { OrderByDirection } from "@app/hooks/api/generic/types";
import { ProjectMembershipRole, TProjectRole } from "@app/hooks/api/roles/types";
import { DuplicateProjectRoleModal } from "@app/pages/project/RoleDetailsBySlugPage/components/DuplicateProjectRoleModal";
import { RoleModal } from "@app/pages/project/RoleDetailsBySlugPage/components/RoleModal";
+import { getProjectBaseURL } from "@app/helpers/project";
enum RolesOrderBy {
Name = "name",
@@ -249,7 +250,7 @@ export const ProjectRoleList = () => {
className="h-10 cursor-pointer transition-colors duration-100 hover:bg-mineshaft-700"
onClick={() =>
navigate({
- to: "/projects/$projectId/roles/$roleSlug",
+ to: `${getProjectBaseURL(currentWorkspace.type)}/roles/$roleSlug`,
params: {
projectId: currentWorkspace.id,
roleSlug: slug
@@ -291,7 +292,7 @@ export const ProjectRoleList = () => {
onClick={(e) => {
e.stopPropagation();
navigate({
- to: "/projects/$projectId/roles/$roleSlug",
+ to: `${getProjectBaseURL(currentWorkspace.type)}/roles/$roleSlug`,
params: {
projectId: currentWorkspace.id,
roleSlug: slug
diff --git a/frontend/src/pages/project/AccessControlPage/route-cert-manager.tsx b/frontend/src/pages/project/AccessControlPage/route-cert-manager.tsx
new file mode 100644
index 000000000..08edaaabf
--- /dev/null
+++ b/frontend/src/pages/project/AccessControlPage/route-cert-manager.tsx
@@ -0,0 +1,34 @@
+import { createFileRoute, stripSearchParams } from '@tanstack/react-router'
+import { zodValidator } from '@tanstack/zod-adapter'
+import { z } from 'zod'
+
+import { ProjectAccessControlTabs } from '@app/types/project'
+
+import { AccessControlPage } from './AccessControlPage'
+
+const AccessControlPageQuerySchema = z.object({
+ selectedTab: z
+ .nativeEnum(ProjectAccessControlTabs)
+ .catch(ProjectAccessControlTabs.Member),
+ requesterEmail: z.string().catch(''),
+})
+
+export const Route = createFileRoute(
+ '/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/access-management',
+)({
+ component: AccessControlPage,
+ validateSearch: zodValidator(AccessControlPageQuerySchema),
+ search: {
+ middlewares: [stripSearchParams({ requesterEmail: '' })],
+ },
+ beforeLoad: ({ context }) => {
+ return {
+ breadcrumbs: [
+ ...context.breadcrumbs,
+ {
+ label: 'Access Control',
+ },
+ ],
+ }
+ },
+})
diff --git a/frontend/src/pages/project/AccessControlPage/route-kms.tsx b/frontend/src/pages/project/AccessControlPage/route-kms.tsx
new file mode 100644
index 000000000..df197ec80
--- /dev/null
+++ b/frontend/src/pages/project/AccessControlPage/route-kms.tsx
@@ -0,0 +1,34 @@
+import { createFileRoute, stripSearchParams } from '@tanstack/react-router'
+import { zodValidator } from '@tanstack/zod-adapter'
+import { z } from 'zod'
+
+import { ProjectAccessControlTabs } from '@app/types/project'
+
+import { AccessControlPage } from './AccessControlPage'
+
+const AccessControlPageQuerySchema = z.object({
+ selectedTab: z
+ .nativeEnum(ProjectAccessControlTabs)
+ .catch(ProjectAccessControlTabs.Member),
+ requesterEmail: z.string().catch(''),
+})
+
+export const Route = createFileRoute(
+ '/_authenticate/_inject-org-details/_org-layout/projects/kms/$projectId/_kms-layout/access-management',
+)({
+ component: AccessControlPage,
+ validateSearch: zodValidator(AccessControlPageQuerySchema),
+ search: {
+ middlewares: [stripSearchParams({ requesterEmail: '' })],
+ },
+ beforeLoad: ({ context }) => {
+ return {
+ breadcrumbs: [
+ ...context.breadcrumbs,
+ {
+ label: 'Access Control',
+ },
+ ],
+ }
+ },
+})
diff --git a/frontend/src/pages/project/AccessControlPage/route-secret-manager.tsx b/frontend/src/pages/project/AccessControlPage/route-secret-manager.tsx
new file mode 100644
index 000000000..71801c858
--- /dev/null
+++ b/frontend/src/pages/project/AccessControlPage/route-secret-manager.tsx
@@ -0,0 +1,34 @@
+import { createFileRoute, stripSearchParams } from '@tanstack/react-router'
+import { zodValidator } from '@tanstack/zod-adapter'
+import { z } from 'zod'
+
+import { ProjectAccessControlTabs } from '@app/types/project'
+
+import { AccessControlPage } from './AccessControlPage'
+
+const AccessControlPageQuerySchema = z.object({
+ selectedTab: z
+ .nativeEnum(ProjectAccessControlTabs)
+ .catch(ProjectAccessControlTabs.Member),
+ requesterEmail: z.string().catch(''),
+})
+
+export const Route = createFileRoute(
+ '/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/access-management',
+)({
+ component: AccessControlPage,
+ validateSearch: zodValidator(AccessControlPageQuerySchema),
+ search: {
+ middlewares: [stripSearchParams({ requesterEmail: '' })],
+ },
+ beforeLoad: ({ context }) => {
+ return {
+ breadcrumbs: [
+ ...context.breadcrumbs,
+ {
+ label: 'Access Control',
+ },
+ ],
+ }
+ },
+})
diff --git a/frontend/src/pages/project/AccessControlPage/route-secret-scanning.tsx b/frontend/src/pages/project/AccessControlPage/route-secret-scanning.tsx
new file mode 100644
index 000000000..87e92d294
--- /dev/null
+++ b/frontend/src/pages/project/AccessControlPage/route-secret-scanning.tsx
@@ -0,0 +1,34 @@
+import { createFileRoute, stripSearchParams } from '@tanstack/react-router'
+import { zodValidator } from '@tanstack/zod-adapter'
+import { z } from 'zod'
+
+import { ProjectAccessControlTabs } from '@app/types/project'
+
+import { AccessControlPage } from './AccessControlPage'
+
+const AccessControlPageQuerySchema = z.object({
+ selectedTab: z
+ .nativeEnum(ProjectAccessControlTabs)
+ .catch(ProjectAccessControlTabs.Member),
+ requesterEmail: z.string().catch(''),
+})
+
+export const Route = createFileRoute(
+ '/_authenticate/_inject-org-details/_org-layout/projects/secret-scanning/$projectId/_secret-scanning-layout/access-management',
+)({
+ component: AccessControlPage,
+ validateSearch: zodValidator(AccessControlPageQuerySchema),
+ search: {
+ middlewares: [stripSearchParams({ requesterEmail: '' })],
+ },
+ beforeLoad: ({ context }) => {
+ return {
+ breadcrumbs: [
+ ...context.breadcrumbs,
+ {
+ label: 'Access Control',
+ },
+ ],
+ }
+ },
+})
diff --git a/frontend/src/pages/project/AccessControlPage/route-ssh.tsx b/frontend/src/pages/project/AccessControlPage/route-ssh.tsx
new file mode 100644
index 000000000..fb7236281
--- /dev/null
+++ b/frontend/src/pages/project/AccessControlPage/route-ssh.tsx
@@ -0,0 +1,34 @@
+import { createFileRoute, stripSearchParams } from '@tanstack/react-router'
+import { zodValidator } from '@tanstack/zod-adapter'
+import { z } from 'zod'
+
+import { ProjectAccessControlTabs } from '@app/types/project'
+
+import { AccessControlPage } from './AccessControlPage'
+
+const AccessControlPageQuerySchema = z.object({
+ selectedTab: z
+ .nativeEnum(ProjectAccessControlTabs)
+ .catch(ProjectAccessControlTabs.Member),
+ requesterEmail: z.string().catch(''),
+})
+
+export const Route = createFileRoute(
+ '/_authenticate/_inject-org-details/_org-layout/projects/ssh/$projectId/_ssh-layout/access-management',
+)({
+ component: AccessControlPage,
+ validateSearch: zodValidator(AccessControlPageQuerySchema),
+ search: {
+ middlewares: [stripSearchParams({ requesterEmail: '' })],
+ },
+ beforeLoad: ({ context }) => {
+ return {
+ breadcrumbs: [
+ ...context.breadcrumbs,
+ {
+ label: 'Access Control',
+ },
+ ],
+ }
+ },
+})
diff --git a/frontend/src/pages/project/GroupDetailsByIDPage/components/GroupDetailsSection.tsx b/frontend/src/pages/project/GroupDetailsByIDPage/components/GroupDetailsSection.tsx
index b23cfdad1..e1f4196df 100644
--- a/frontend/src/pages/project/GroupDetailsByIDPage/components/GroupDetailsSection.tsx
+++ b/frontend/src/pages/project/GroupDetailsByIDPage/components/GroupDetailsSection.tsx
@@ -19,6 +19,7 @@ import { usePopUp } from "@app/hooks";
import { useDeleteGroupFromWorkspace } from "@app/hooks/api";
import { TGroupMembership } from "@app/hooks/api/groups/types";
import { GroupRoles } from "@app/pages/project/AccessControlPage/components/GroupsTab/components/GroupsSection/GroupRoles";
+import { getProjectBaseURL } from "@app/helpers/project";
type Props = {
groupMembership: TGroupMembership;
@@ -46,7 +47,7 @@ export const GroupDetailsSection = ({ groupMembership }: Props) => {
});
navigate({
- to: "/projects/$projectId/access-management",
+ to: `${getProjectBaseURL(currentWorkspace.type)}/access-management`,
params: {
projectId: currentWorkspace.id
},
diff --git a/frontend/src/pages/project/GroupDetailsByIDPage/route-cert-manager.tsx b/frontend/src/pages/project/GroupDetailsByIDPage/route-cert-manager.tsx
new file mode 100644
index 000000000..319ea1eb5
--- /dev/null
+++ b/frontend/src/pages/project/GroupDetailsByIDPage/route-cert-manager.tsx
@@ -0,0 +1,33 @@
+import { createFileRoute, linkOptions } from '@tanstack/react-router'
+
+import { ProjectAccessControlTabs } from '@app/types/project'
+
+import { GroupDetailsByIDPage } from './GroupDetailsByIDPage'
+
+export const Route = createFileRoute(
+ '/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/groups/$groupId',
+)({
+ component: GroupDetailsByIDPage,
+ beforeLoad: ({ context, params }) => {
+ return {
+ breadcrumbs: [
+ ...context.breadcrumbs,
+ {
+ label: 'Access Control',
+ link: linkOptions({
+ to: '/projects/$projectId/access-management',
+ params: {
+ projectId: params.projectId,
+ },
+ search: {
+ selectedTab: ProjectAccessControlTabs.Groups,
+ },
+ }),
+ },
+ {
+ label: 'Group',
+ },
+ ],
+ }
+ },
+})
diff --git a/frontend/src/pages/project/GroupDetailsByIDPage/route-kms.tsx b/frontend/src/pages/project/GroupDetailsByIDPage/route-kms.tsx
new file mode 100644
index 000000000..6fba57a44
--- /dev/null
+++ b/frontend/src/pages/project/GroupDetailsByIDPage/route-kms.tsx
@@ -0,0 +1,33 @@
+import { createFileRoute, linkOptions } from '@tanstack/react-router'
+
+import { ProjectAccessControlTabs } from '@app/types/project'
+
+import { GroupDetailsByIDPage } from './GroupDetailsByIDPage'
+
+export const Route = createFileRoute(
+ '/_authenticate/_inject-org-details/_org-layout/projects/kms/$projectId/_kms-layout/groups/$groupId',
+)({
+ component: GroupDetailsByIDPage,
+ beforeLoad: ({ context, params }) => {
+ return {
+ breadcrumbs: [
+ ...context.breadcrumbs,
+ {
+ label: 'Access Control',
+ link: linkOptions({
+ to: '/projects/$projectId/access-management',
+ params: {
+ projectId: params.projectId,
+ },
+ search: {
+ selectedTab: ProjectAccessControlTabs.Groups,
+ },
+ }),
+ },
+ {
+ label: 'Group',
+ },
+ ],
+ }
+ },
+})
diff --git a/frontend/src/pages/project/GroupDetailsByIDPage/route-secret-manager.tsx b/frontend/src/pages/project/GroupDetailsByIDPage/route-secret-manager.tsx
new file mode 100644
index 000000000..02697c36e
--- /dev/null
+++ b/frontend/src/pages/project/GroupDetailsByIDPage/route-secret-manager.tsx
@@ -0,0 +1,33 @@
+import { createFileRoute, linkOptions } from '@tanstack/react-router'
+
+import { ProjectAccessControlTabs } from '@app/types/project'
+
+import { GroupDetailsByIDPage } from './GroupDetailsByIDPage'
+
+export const Route = createFileRoute(
+ '/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/groups/$groupId',
+)({
+ component: GroupDetailsByIDPage,
+ beforeLoad: ({ context, params }) => {
+ return {
+ breadcrumbs: [
+ ...context.breadcrumbs,
+ {
+ label: 'Access Control',
+ link: linkOptions({
+ to: '/projects/$projectId/access-management',
+ params: {
+ projectId: params.projectId,
+ },
+ search: {
+ selectedTab: ProjectAccessControlTabs.Groups,
+ },
+ }),
+ },
+ {
+ label: 'Group',
+ },
+ ],
+ }
+ },
+})
diff --git a/frontend/src/pages/project/GroupDetailsByIDPage/route-secret-scanning.tsx b/frontend/src/pages/project/GroupDetailsByIDPage/route-secret-scanning.tsx
new file mode 100644
index 000000000..5bb7f3856
--- /dev/null
+++ b/frontend/src/pages/project/GroupDetailsByIDPage/route-secret-scanning.tsx
@@ -0,0 +1,33 @@
+import { createFileRoute, linkOptions } from '@tanstack/react-router'
+
+import { ProjectAccessControlTabs } from '@app/types/project'
+
+import { GroupDetailsByIDPage } from './GroupDetailsByIDPage'
+
+export const Route = createFileRoute(
+ '/_authenticate/_inject-org-details/_org-layout/projects/secret-scanning/$projectId/_secret-scanning-layout/groups/$groupId',
+)({
+ component: GroupDetailsByIDPage,
+ beforeLoad: ({ context, params }) => {
+ return {
+ breadcrumbs: [
+ ...context.breadcrumbs,
+ {
+ label: 'Access Control',
+ link: linkOptions({
+ to: '/projects/$projectId/access-management',
+ params: {
+ projectId: params.projectId,
+ },
+ search: {
+ selectedTab: ProjectAccessControlTabs.Groups,
+ },
+ }),
+ },
+ {
+ label: 'Group',
+ },
+ ],
+ }
+ },
+})
diff --git a/frontend/src/pages/project/GroupDetailsByIDPage/route-ssh.tsx b/frontend/src/pages/project/GroupDetailsByIDPage/route-ssh.tsx
new file mode 100644
index 000000000..ba3a63762
--- /dev/null
+++ b/frontend/src/pages/project/GroupDetailsByIDPage/route-ssh.tsx
@@ -0,0 +1,33 @@
+import { createFileRoute, linkOptions } from '@tanstack/react-router'
+
+import { ProjectAccessControlTabs } from '@app/types/project'
+
+import { GroupDetailsByIDPage } from './GroupDetailsByIDPage'
+
+export const Route = createFileRoute(
+ '/_authenticate/_inject-org-details/_org-layout/projects/ssh/$projectId/_ssh-layout/groups/$groupId',
+)({
+ component: GroupDetailsByIDPage,
+ beforeLoad: ({ context, params }) => {
+ return {
+ breadcrumbs: [
+ ...context.breadcrumbs,
+ {
+ label: 'Access Control',
+ link: linkOptions({
+ to: '/projects/$projectId/access-management',
+ params: {
+ projectId: params.projectId,
+ },
+ search: {
+ selectedTab: ProjectAccessControlTabs.Groups,
+ },
+ }),
+ },
+ {
+ label: 'Group',
+ },
+ ],
+ }
+ },
+})
diff --git a/frontend/src/pages/project/IdentityDetailsByIDPage/IdentityDetailsByIDPage.tsx b/frontend/src/pages/project/IdentityDetailsByIDPage/IdentityDetailsByIDPage.tsx
index bc4ae078f..19d6c4acc 100644
--- a/frontend/src/pages/project/IdentityDetailsByIDPage/IdentityDetailsByIDPage.tsx
+++ b/frontend/src/pages/project/IdentityDetailsByIDPage/IdentityDetailsByIDPage.tsx
@@ -20,7 +20,7 @@ import {
ProjectPermissionSub,
useWorkspace
} from "@app/context";
-import { getCurrentProductFromUrl, getProjectHomePage } from "@app/helpers/project";
+import { getProjectBaseURL, getProjectHomePage } from "@app/helpers/project";
import { usePopUp } from "@app/hooks";
import {
useAssumeProjectPrivileges,
@@ -28,7 +28,6 @@ import {
useGetWorkspaceIdentityMembershipDetails
} from "@app/hooks/api";
import { ActorType } from "@app/hooks/api/auditLogs/enums";
-import { ProjectType } from "@app/hooks/api/workspace/types";
import { IdentityProjectAdditionalPrivilegeSection } from "./components/IdentityProjectAdditionalPrivilegeSection";
import { IdentityRoleDetailsSection } from "./components/IdentityRoleDetailsSection";
@@ -68,9 +67,7 @@ const Page = () => {
type: "success",
text: "Identity privilege assumption has started"
});
- const url = getProjectHomePage(
- getCurrentProductFromUrl(window.location.href) || ProjectType.SecretManager
- );
+ const url = getProjectHomePage(currentWorkspace.type);
window.location.href = url.replace("$projectId", currentWorkspace.id);
}
}
@@ -89,7 +86,7 @@ const Page = () => {
});
handlePopUpClose("deleteIdentity");
navigate({
- to: "/projects/$projectId/access-management",
+ to: `${getProjectBaseURL(currentWorkspace.type)}/access-management` as const,
params: {
projectId: workspaceId
},
diff --git a/frontend/src/pages/project/IdentityDetailsByIDPage/route-cert-manager.tsx b/frontend/src/pages/project/IdentityDetailsByIDPage/route-cert-manager.tsx
new file mode 100644
index 000000000..55b97e665
--- /dev/null
+++ b/frontend/src/pages/project/IdentityDetailsByIDPage/route-cert-manager.tsx
@@ -0,0 +1,33 @@
+import { createFileRoute, linkOptions } from '@tanstack/react-router'
+
+import { ProjectAccessControlTabs } from '@app/types/project'
+
+import { IdentityDetailsByIDPage } from './IdentityDetailsByIDPage'
+
+export const Route = createFileRoute(
+ '/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/identities/$identityId',
+)({
+ component: IdentityDetailsByIDPage,
+ beforeLoad: ({ context, params }) => {
+ return {
+ breadcrumbs: [
+ ...context.breadcrumbs,
+ {
+ label: 'Access Control',
+ link: linkOptions({
+ to: '/projects/$projectId/access-management',
+ params: {
+ projectId: params.projectId,
+ },
+ search: {
+ selectedTab: ProjectAccessControlTabs.Identities,
+ },
+ }),
+ },
+ {
+ label: 'Machine Identity',
+ },
+ ],
+ }
+ },
+})
diff --git a/frontend/src/pages/project/IdentityDetailsByIDPage/route-kms.tsx b/frontend/src/pages/project/IdentityDetailsByIDPage/route-kms.tsx
new file mode 100644
index 000000000..d1adcfa81
--- /dev/null
+++ b/frontend/src/pages/project/IdentityDetailsByIDPage/route-kms.tsx
@@ -0,0 +1,33 @@
+import { createFileRoute, linkOptions } from '@tanstack/react-router'
+
+import { ProjectAccessControlTabs } from '@app/types/project'
+
+import { IdentityDetailsByIDPage } from './IdentityDetailsByIDPage'
+
+export const Route = createFileRoute(
+ '/_authenticate/_inject-org-details/_org-layout/projects/kms/$projectId/_kms-layout/identities/$identityId',
+)({
+ component: IdentityDetailsByIDPage,
+ beforeLoad: ({ context, params }) => {
+ return {
+ breadcrumbs: [
+ ...context.breadcrumbs,
+ {
+ label: 'Access Control',
+ link: linkOptions({
+ to: '/projects/$projectId/access-management',
+ params: {
+ projectId: params.projectId,
+ },
+ search: {
+ selectedTab: ProjectAccessControlTabs.Identities,
+ },
+ }),
+ },
+ {
+ label: 'Machine Identity',
+ },
+ ],
+ }
+ },
+})
diff --git a/frontend/src/pages/project/IdentityDetailsByIDPage/route-secret-manager.tsx b/frontend/src/pages/project/IdentityDetailsByIDPage/route-secret-manager.tsx
new file mode 100644
index 000000000..71a1bfa8e
--- /dev/null
+++ b/frontend/src/pages/project/IdentityDetailsByIDPage/route-secret-manager.tsx
@@ -0,0 +1,33 @@
+import { createFileRoute, linkOptions } from '@tanstack/react-router'
+
+import { ProjectAccessControlTabs } from '@app/types/project'
+
+import { IdentityDetailsByIDPage } from './IdentityDetailsByIDPage'
+
+export const Route = createFileRoute(
+ '/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/identities/$identityId',
+)({
+ component: IdentityDetailsByIDPage,
+ beforeLoad: ({ context, params }) => {
+ return {
+ breadcrumbs: [
+ ...context.breadcrumbs,
+ {
+ label: 'Access Control',
+ link: linkOptions({
+ to: '/projects/$projectId/access-management',
+ params: {
+ projectId: params.projectId,
+ },
+ search: {
+ selectedTab: ProjectAccessControlTabs.Identities,
+ },
+ }),
+ },
+ {
+ label: 'Machine Identity',
+ },
+ ],
+ }
+ },
+})
diff --git a/frontend/src/pages/project/IdentityDetailsByIDPage/route-secret-scanning.tsx b/frontend/src/pages/project/IdentityDetailsByIDPage/route-secret-scanning.tsx
new file mode 100644
index 000000000..8766aae36
--- /dev/null
+++ b/frontend/src/pages/project/IdentityDetailsByIDPage/route-secret-scanning.tsx
@@ -0,0 +1,33 @@
+import { createFileRoute, linkOptions } from '@tanstack/react-router'
+
+import { ProjectAccessControlTabs } from '@app/types/project'
+
+import { IdentityDetailsByIDPage } from './IdentityDetailsByIDPage'
+
+export const Route = createFileRoute(
+ '/_authenticate/_inject-org-details/_org-layout/projects/secret-scanning/$projectId/_secret-scanning-layout/identities/$identityId',
+)({
+ component: IdentityDetailsByIDPage,
+ beforeLoad: ({ context, params }) => {
+ return {
+ breadcrumbs: [
+ ...context.breadcrumbs,
+ {
+ label: 'Access Control',
+ link: linkOptions({
+ to: '/projects/$projectId/access-management',
+ params: {
+ projectId: params.projectId,
+ },
+ search: {
+ selectedTab: ProjectAccessControlTabs.Identities,
+ },
+ }),
+ },
+ {
+ label: 'Machine Identity',
+ },
+ ],
+ }
+ },
+})
diff --git a/frontend/src/pages/project/IdentityDetailsByIDPage/route-ssh.tsx b/frontend/src/pages/project/IdentityDetailsByIDPage/route-ssh.tsx
new file mode 100644
index 000000000..f9a4e7c31
--- /dev/null
+++ b/frontend/src/pages/project/IdentityDetailsByIDPage/route-ssh.tsx
@@ -0,0 +1,33 @@
+import { createFileRoute, linkOptions } from '@tanstack/react-router'
+
+import { ProjectAccessControlTabs } from '@app/types/project'
+
+import { IdentityDetailsByIDPage } from './IdentityDetailsByIDPage'
+
+export const Route = createFileRoute(
+ '/_authenticate/_inject-org-details/_org-layout/projects/ssh/$projectId/_ssh-layout/identities/$identityId',
+)({
+ component: IdentityDetailsByIDPage,
+ beforeLoad: ({ context, params }) => {
+ return {
+ breadcrumbs: [
+ ...context.breadcrumbs,
+ {
+ label: 'Access Control',
+ link: linkOptions({
+ to: '/projects/$projectId/access-management',
+ params: {
+ projectId: params.projectId,
+ },
+ search: {
+ selectedTab: ProjectAccessControlTabs.Identities,
+ },
+ }),
+ },
+ {
+ label: 'Machine Identity',
+ },
+ ],
+ }
+ },
+})
diff --git a/frontend/src/pages/project/MemberDetailsByIDPage/MemberDetailsByIDPage.tsx b/frontend/src/pages/project/MemberDetailsByIDPage/MemberDetailsByIDPage.tsx
index f84e0ea36..7bac32f75 100644
--- a/frontend/src/pages/project/MemberDetailsByIDPage/MemberDetailsByIDPage.tsx
+++ b/frontend/src/pages/project/MemberDetailsByIDPage/MemberDetailsByIDPage.tsx
@@ -21,7 +21,7 @@ import {
useOrganization,
useWorkspace
} from "@app/context";
-import { getCurrentProductFromUrl, getProjectHomePage } from "@app/helpers/project";
+import { getProjectBaseURL, getProjectHomePage } from "@app/helpers/project";
import { usePopUp } from "@app/hooks";
import {
useAssumeProjectPrivileges,
@@ -29,7 +29,6 @@ import {
useGetWorkspaceUserDetails
} from "@app/hooks/api";
import { ActorType } from "@app/hooks/api/auditLogs/enums";
-import { ProjectType } from "@app/hooks/api/workspace/types";
import { MemberProjectAdditionalPrivilegeSection } from "./components/MemberProjectAdditionalPrivilegeSection";
import { MemberRoleDetailsSection } from "./components/MemberRoleDetailsSection";
@@ -73,9 +72,7 @@ export const Page = () => {
text: "User privilege assumption has started"
});
- const url = getProjectHomePage(
- getCurrentProductFromUrl(window.location.href) || ProjectType.SecretManager
- );
+ const url = getProjectHomePage(currentWorkspace.type);
window.location.href = url.replace("$projectId", currentWorkspace.id);
}
}
@@ -96,7 +93,7 @@ export const Page = () => {
type: "success"
});
navigate({
- to: "/projects/$projectId/access-management",
+ to: `${getProjectBaseURL(currentWorkspace.type)}/access-management` as const,
params: {
projectId: currentWorkspace.id
}
diff --git a/frontend/src/pages/project/MemberDetailsByIDPage/route-cert-manager.tsx b/frontend/src/pages/project/MemberDetailsByIDPage/route-cert-manager.tsx
new file mode 100644
index 000000000..def050e18
--- /dev/null
+++ b/frontend/src/pages/project/MemberDetailsByIDPage/route-cert-manager.tsx
@@ -0,0 +1,33 @@
+import { createFileRoute, linkOptions } from '@tanstack/react-router'
+
+import { ProjectAccessControlTabs } from '@app/types/project'
+
+import { MemberDetailsByIDPage } from './MemberDetailsByIDPage'
+
+export const Route = createFileRoute(
+ '/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/members/$membershipId',
+)({
+ component: MemberDetailsByIDPage,
+ beforeLoad: ({ context, params }) => {
+ return {
+ breadcrumbs: [
+ ...context.breadcrumbs,
+ {
+ label: 'Access Control',
+ link: linkOptions({
+ to: '/projects/$projectId/access-management',
+ params: {
+ projectId: params.projectId,
+ },
+ search: {
+ selectedTab: ProjectAccessControlTabs.Member,
+ },
+ }),
+ },
+ {
+ label: 'User',
+ },
+ ],
+ }
+ },
+})
diff --git a/frontend/src/pages/project/MemberDetailsByIDPage/route-kms.tsx b/frontend/src/pages/project/MemberDetailsByIDPage/route-kms.tsx
new file mode 100644
index 000000000..0eee9c738
--- /dev/null
+++ b/frontend/src/pages/project/MemberDetailsByIDPage/route-kms.tsx
@@ -0,0 +1,33 @@
+import { createFileRoute, linkOptions } from '@tanstack/react-router'
+
+import { ProjectAccessControlTabs } from '@app/types/project'
+
+import { MemberDetailsByIDPage } from './MemberDetailsByIDPage'
+
+export const Route = createFileRoute(
+ '/_authenticate/_inject-org-details/_org-layout/projects/kms/$projectId/_kms-layout/members/$membershipId',
+)({
+ component: MemberDetailsByIDPage,
+ beforeLoad: ({ context, params }) => {
+ return {
+ breadcrumbs: [
+ ...context.breadcrumbs,
+ {
+ label: 'Access Control',
+ link: linkOptions({
+ to: '/projects/$projectId/access-management',
+ params: {
+ projectId: params.projectId,
+ },
+ search: {
+ selectedTab: ProjectAccessControlTabs.Member,
+ },
+ }),
+ },
+ {
+ label: 'User',
+ },
+ ],
+ }
+ },
+})
diff --git a/frontend/src/pages/project/MemberDetailsByIDPage/route-secret-manager.tsx b/frontend/src/pages/project/MemberDetailsByIDPage/route-secret-manager.tsx
new file mode 100644
index 000000000..a31c6642a
--- /dev/null
+++ b/frontend/src/pages/project/MemberDetailsByIDPage/route-secret-manager.tsx
@@ -0,0 +1,33 @@
+import { createFileRoute, linkOptions } from '@tanstack/react-router'
+
+import { ProjectAccessControlTabs } from '@app/types/project'
+
+import { MemberDetailsByIDPage } from './MemberDetailsByIDPage'
+
+export const Route = createFileRoute(
+ '/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/members/$membershipId',
+)({
+ component: MemberDetailsByIDPage,
+ beforeLoad: ({ context, params }) => {
+ return {
+ breadcrumbs: [
+ ...context.breadcrumbs,
+ {
+ label: 'Access Control',
+ link: linkOptions({
+ to: '/projects/$projectId/access-management',
+ params: {
+ projectId: params.projectId,
+ },
+ search: {
+ selectedTab: ProjectAccessControlTabs.Member,
+ },
+ }),
+ },
+ {
+ label: 'User',
+ },
+ ],
+ }
+ },
+})
diff --git a/frontend/src/pages/project/MemberDetailsByIDPage/route-secret-scanning.tsx b/frontend/src/pages/project/MemberDetailsByIDPage/route-secret-scanning.tsx
new file mode 100644
index 000000000..51dc7191d
--- /dev/null
+++ b/frontend/src/pages/project/MemberDetailsByIDPage/route-secret-scanning.tsx
@@ -0,0 +1,33 @@
+import { createFileRoute, linkOptions } from '@tanstack/react-router'
+
+import { ProjectAccessControlTabs } from '@app/types/project'
+
+import { MemberDetailsByIDPage } from './MemberDetailsByIDPage'
+
+export const Route = createFileRoute(
+ '/_authenticate/_inject-org-details/_org-layout/projects/secret-scanning/$projectId/_secret-scanning-layout/members/$membershipId',
+)({
+ component: MemberDetailsByIDPage,
+ beforeLoad: ({ context, params }) => {
+ return {
+ breadcrumbs: [
+ ...context.breadcrumbs,
+ {
+ label: 'Access Control',
+ link: linkOptions({
+ to: '/projects/$projectId/access-management',
+ params: {
+ projectId: params.projectId,
+ },
+ search: {
+ selectedTab: ProjectAccessControlTabs.Member,
+ },
+ }),
+ },
+ {
+ label: 'User',
+ },
+ ],
+ }
+ },
+})
diff --git a/frontend/src/pages/project/MemberDetailsByIDPage/route-ssh.tsx b/frontend/src/pages/project/MemberDetailsByIDPage/route-ssh.tsx
new file mode 100644
index 000000000..faa76f2b4
--- /dev/null
+++ b/frontend/src/pages/project/MemberDetailsByIDPage/route-ssh.tsx
@@ -0,0 +1,33 @@
+import { createFileRoute, linkOptions } from '@tanstack/react-router'
+
+import { ProjectAccessControlTabs } from '@app/types/project'
+
+import { MemberDetailsByIDPage } from './MemberDetailsByIDPage'
+
+export const Route = createFileRoute(
+ '/_authenticate/_inject-org-details/_org-layout/projects/ssh/$projectId/_ssh-layout/members/$membershipId',
+)({
+ component: MemberDetailsByIDPage,
+ beforeLoad: ({ context, params }) => {
+ return {
+ breadcrumbs: [
+ ...context.breadcrumbs,
+ {
+ label: 'Access Control',
+ link: linkOptions({
+ to: '/projects/$projectId/access-management',
+ params: {
+ projectId: params.projectId,
+ },
+ search: {
+ selectedTab: ProjectAccessControlTabs.Member,
+ },
+ }),
+ },
+ {
+ label: 'User',
+ },
+ ],
+ }
+ },
+})
diff --git a/frontend/src/pages/project/RoleDetailsBySlugPage/RoleDetailsBySlugPage.tsx b/frontend/src/pages/project/RoleDetailsBySlugPage/RoleDetailsBySlugPage.tsx
index af062aa13..8a4c2eb4d 100644
--- a/frontend/src/pages/project/RoleDetailsBySlugPage/RoleDetailsBySlugPage.tsx
+++ b/frontend/src/pages/project/RoleDetailsBySlugPage/RoleDetailsBySlugPage.tsx
@@ -25,6 +25,7 @@ import { RolePermissionsSection } from "@app/pages/project/RoleDetailsBySlugPage
import { ProjectAccessControlTabs } from "@app/types/project";
import { RoleModal } from "./components/RoleModal";
+import { getProjectBaseURL } from "@app/helpers/project";
const Page = () => {
const navigate = useNavigate();
@@ -60,7 +61,7 @@ const Page = () => {
});
handlePopUpClose("deleteRole");
navigate({
- to: "/projects/$projectId/access-management",
+ to: `${getProjectBaseURL(currentWorkspace.type)}/access-management` as const,
params: {
projectId
},
diff --git a/frontend/src/pages/project/RoleDetailsBySlugPage/components/DuplicateProjectRoleModal.tsx b/frontend/src/pages/project/RoleDetailsBySlugPage/components/DuplicateProjectRoleModal.tsx
index ccc3e4ea5..0777d9a1b 100644
--- a/frontend/src/pages/project/RoleDetailsBySlugPage/components/DuplicateProjectRoleModal.tsx
+++ b/frontend/src/pages/project/RoleDetailsBySlugPage/components/DuplicateProjectRoleModal.tsx
@@ -10,6 +10,7 @@ import { ProjectPermissionSecretActions } from "@app/context/ProjectPermissionCo
import { useCreateProjectRole, useGetProjectRoleBySlug } from "@app/hooks/api";
import { TProjectRole } from "@app/hooks/api/roles/types";
import { slugSchema } from "@app/lib/schemas";
+import { getProjectBaseURL } from "@app/helpers/project";
type Props = {
isOpen: boolean;
@@ -80,7 +81,7 @@ const Content = ({ role, onClose }: ContentProps) => {
});
navigate({
- to: "/projects/$projectId/roles/$roleSlug",
+ to: `${getProjectBaseURL(currentWorkspace.type)}/roles/$roleSlug` as const,
params: {
roleSlug: newRole.slug,
projectId: currentWorkspace.id
diff --git a/frontend/src/pages/project/RoleDetailsBySlugPage/components/RoleModal.tsx b/frontend/src/pages/project/RoleDetailsBySlugPage/components/RoleModal.tsx
index 0f1433af3..4c22f970d 100644
--- a/frontend/src/pages/project/RoleDetailsBySlugPage/components/RoleModal.tsx
+++ b/frontend/src/pages/project/RoleDetailsBySlugPage/components/RoleModal.tsx
@@ -14,6 +14,7 @@ import {
} from "@app/hooks/api";
import { UsePopUpState } from "@app/hooks/usePopUp";
import { slugSchema } from "@app/lib/schemas";
+import { getProjectBaseURL } from "@app/helpers/project";
const schema = z
.object({
@@ -100,7 +101,7 @@ export const RoleModal = ({ popUp, handlePopUpToggle }: Props) => {
});
navigate({
- to: "/projects/$projectId/roles/$roleSlug",
+ to: `${getProjectBaseURL(currentWorkspace.type)}/roles/$roleSlug` as const,
params: {
roleSlug: newRole.slug,
projectId
diff --git a/frontend/src/pages/project/RoleDetailsBySlugPage/route-cert-manager.tsx b/frontend/src/pages/project/RoleDetailsBySlugPage/route-cert-manager.tsx
new file mode 100644
index 000000000..9174e0e24
--- /dev/null
+++ b/frontend/src/pages/project/RoleDetailsBySlugPage/route-cert-manager.tsx
@@ -0,0 +1,33 @@
+import { createFileRoute, linkOptions } from '@tanstack/react-router'
+
+import { ProjectAccessControlTabs } from '@app/types/project'
+
+import { RoleDetailsBySlugPage } from './RoleDetailsBySlugPage'
+
+export const Route = createFileRoute(
+ '/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/roles/$roleSlug',
+)({
+ component: RoleDetailsBySlugPage,
+ beforeLoad: ({ context, params }) => {
+ return {
+ breadcrumbs: [
+ ...context.breadcrumbs,
+ {
+ label: 'Access Control',
+ link: linkOptions({
+ to: '/projects/$projectId/access-management',
+ params: {
+ projectId: params.projectId,
+ },
+ search: {
+ selectedTab: ProjectAccessControlTabs.Roles,
+ },
+ }),
+ },
+ {
+ label: 'Roles',
+ },
+ ],
+ }
+ },
+})
diff --git a/frontend/src/pages/project/RoleDetailsBySlugPage/route-kms.tsx b/frontend/src/pages/project/RoleDetailsBySlugPage/route-kms.tsx
new file mode 100644
index 000000000..b0f218e05
--- /dev/null
+++ b/frontend/src/pages/project/RoleDetailsBySlugPage/route-kms.tsx
@@ -0,0 +1,33 @@
+import { createFileRoute, linkOptions } from '@tanstack/react-router'
+
+import { ProjectAccessControlTabs } from '@app/types/project'
+
+import { RoleDetailsBySlugPage } from './RoleDetailsBySlugPage'
+
+export const Route = createFileRoute(
+ '/_authenticate/_inject-org-details/_org-layout/projects/kms/$projectId/_kms-layout/roles/$roleSlug',
+)({
+ component: RoleDetailsBySlugPage,
+ beforeLoad: ({ context, params }) => {
+ return {
+ breadcrumbs: [
+ ...context.breadcrumbs,
+ {
+ label: 'Access Control',
+ link: linkOptions({
+ to: '/projects/$projectId/access-management',
+ params: {
+ projectId: params.projectId,
+ },
+ search: {
+ selectedTab: ProjectAccessControlTabs.Roles,
+ },
+ }),
+ },
+ {
+ label: 'Roles',
+ },
+ ],
+ }
+ },
+})
diff --git a/frontend/src/pages/project/RoleDetailsBySlugPage/route-secret-manager.tsx b/frontend/src/pages/project/RoleDetailsBySlugPage/route-secret-manager.tsx
new file mode 100644
index 000000000..6735c7df2
--- /dev/null
+++ b/frontend/src/pages/project/RoleDetailsBySlugPage/route-secret-manager.tsx
@@ -0,0 +1,33 @@
+import { createFileRoute, linkOptions } from '@tanstack/react-router'
+
+import { ProjectAccessControlTabs } from '@app/types/project'
+
+import { RoleDetailsBySlugPage } from './RoleDetailsBySlugPage'
+
+export const Route = createFileRoute(
+ '/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/roles/$roleSlug',
+)({
+ component: RoleDetailsBySlugPage,
+ beforeLoad: ({ context, params }) => {
+ return {
+ breadcrumbs: [
+ ...context.breadcrumbs,
+ {
+ label: 'Access Control',
+ link: linkOptions({
+ to: '/projects/$projectId/access-management',
+ params: {
+ projectId: params.projectId,
+ },
+ search: {
+ selectedTab: ProjectAccessControlTabs.Roles,
+ },
+ }),
+ },
+ {
+ label: 'Roles',
+ },
+ ],
+ }
+ },
+})
diff --git a/frontend/src/pages/project/RoleDetailsBySlugPage/route-secret-scanning.tsx b/frontend/src/pages/project/RoleDetailsBySlugPage/route-secret-scanning.tsx
new file mode 100644
index 000000000..0b5f1169c
--- /dev/null
+++ b/frontend/src/pages/project/RoleDetailsBySlugPage/route-secret-scanning.tsx
@@ -0,0 +1,33 @@
+import { createFileRoute, linkOptions } from '@tanstack/react-router'
+
+import { ProjectAccessControlTabs } from '@app/types/project'
+
+import { RoleDetailsBySlugPage } from './RoleDetailsBySlugPage'
+
+export const Route = createFileRoute(
+ '/_authenticate/_inject-org-details/_org-layout/projects/secret-scanning/$projectId/_secret-scanning-layout/roles/$roleSlug',
+)({
+ component: RoleDetailsBySlugPage,
+ beforeLoad: ({ context, params }) => {
+ return {
+ breadcrumbs: [
+ ...context.breadcrumbs,
+ {
+ label: 'Access Control',
+ link: linkOptions({
+ to: '/projects/$projectId/access-management',
+ params: {
+ projectId: params.projectId,
+ },
+ search: {
+ selectedTab: ProjectAccessControlTabs.Roles,
+ },
+ }),
+ },
+ {
+ label: 'Roles',
+ },
+ ],
+ }
+ },
+})
diff --git a/frontend/src/pages/project/RoleDetailsBySlugPage/route-ssh.tsx b/frontend/src/pages/project/RoleDetailsBySlugPage/route-ssh.tsx
new file mode 100644
index 000000000..5a27da08b
--- /dev/null
+++ b/frontend/src/pages/project/RoleDetailsBySlugPage/route-ssh.tsx
@@ -0,0 +1,33 @@
+import { createFileRoute, linkOptions } from '@tanstack/react-router'
+
+import { ProjectAccessControlTabs } from '@app/types/project'
+
+import { RoleDetailsBySlugPage } from './RoleDetailsBySlugPage'
+
+export const Route = createFileRoute(
+ '/_authenticate/_inject-org-details/_org-layout/projects/ssh/$projectId/_ssh-layout/roles/$roleSlug',
+)({
+ component: RoleDetailsBySlugPage,
+ beforeLoad: ({ context, params }) => {
+ return {
+ breadcrumbs: [
+ ...context.breadcrumbs,
+ {
+ label: 'Access Control',
+ link: linkOptions({
+ to: '/projects/$projectId/access-management',
+ params: {
+ projectId: params.projectId,
+ },
+ search: {
+ selectedTab: ProjectAccessControlTabs.Roles,
+ },
+ }),
+ },
+ {
+ label: 'Roles',
+ },
+ ],
+ }
+ },
+})
diff --git a/frontend/src/pages/project/SettingsPage/route-cert-manager.tsx b/frontend/src/pages/project/SettingsPage/route-cert-manager.tsx
new file mode 100644
index 000000000..348820131
--- /dev/null
+++ b/frontend/src/pages/project/SettingsPage/route-cert-manager.tsx
@@ -0,0 +1,19 @@
+import { createFileRoute } from "@tanstack/react-router";
+
+import { SettingsPage } from "./SettingsPage";
+
+export const Route = createFileRoute(
+ "/_authenticate/_inject-org-details/_org-layout/projects/$projectId/_project-layout/_project-general-layout/settings"
+)({
+ component: SettingsPage,
+ beforeLoad: ({ context }) => {
+ return {
+ breadcrumbs: [
+ ...context.breadcrumbs,
+ {
+ label: "Settings"
+ }
+ ]
+ };
+ }
+});
\ No newline at end of file
diff --git a/frontend/src/pages/project/SettingsPage/route-kms.tsx b/frontend/src/pages/project/SettingsPage/route-kms.tsx
new file mode 100644
index 000000000..348820131
--- /dev/null
+++ b/frontend/src/pages/project/SettingsPage/route-kms.tsx
@@ -0,0 +1,19 @@
+import { createFileRoute } from "@tanstack/react-router";
+
+import { SettingsPage } from "./SettingsPage";
+
+export const Route = createFileRoute(
+ "/_authenticate/_inject-org-details/_org-layout/projects/$projectId/_project-layout/_project-general-layout/settings"
+)({
+ component: SettingsPage,
+ beforeLoad: ({ context }) => {
+ return {
+ breadcrumbs: [
+ ...context.breadcrumbs,
+ {
+ label: "Settings"
+ }
+ ]
+ };
+ }
+});
\ No newline at end of file
diff --git a/frontend/src/pages/project/SettingsPage/route-secret-manager.tsx b/frontend/src/pages/project/SettingsPage/route-secret-manager.tsx
new file mode 100644
index 000000000..348820131
--- /dev/null
+++ b/frontend/src/pages/project/SettingsPage/route-secret-manager.tsx
@@ -0,0 +1,19 @@
+import { createFileRoute } from "@tanstack/react-router";
+
+import { SettingsPage } from "./SettingsPage";
+
+export const Route = createFileRoute(
+ "/_authenticate/_inject-org-details/_org-layout/projects/$projectId/_project-layout/_project-general-layout/settings"
+)({
+ component: SettingsPage,
+ beforeLoad: ({ context }) => {
+ return {
+ breadcrumbs: [
+ ...context.breadcrumbs,
+ {
+ label: "Settings"
+ }
+ ]
+ };
+ }
+});
\ No newline at end of file
diff --git a/frontend/src/pages/project/SettingsPage/route-secret-scanning.tsx b/frontend/src/pages/project/SettingsPage/route-secret-scanning.tsx
new file mode 100644
index 000000000..348820131
--- /dev/null
+++ b/frontend/src/pages/project/SettingsPage/route-secret-scanning.tsx
@@ -0,0 +1,19 @@
+import { createFileRoute } from "@tanstack/react-router";
+
+import { SettingsPage } from "./SettingsPage";
+
+export const Route = createFileRoute(
+ "/_authenticate/_inject-org-details/_org-layout/projects/$projectId/_project-layout/_project-general-layout/settings"
+)({
+ component: SettingsPage,
+ beforeLoad: ({ context }) => {
+ return {
+ breadcrumbs: [
+ ...context.breadcrumbs,
+ {
+ label: "Settings"
+ }
+ ]
+ };
+ }
+});
\ No newline at end of file
diff --git a/frontend/src/pages/project/SettingsPage/route-ssh.tsx b/frontend/src/pages/project/SettingsPage/route-ssh.tsx
new file mode 100644
index 000000000..7eba80943
--- /dev/null
+++ b/frontend/src/pages/project/SettingsPage/route-ssh.tsx
@@ -0,0 +1,19 @@
+import { createFileRoute } from '@tanstack/react-router'
+
+import { SettingsPage } from './SettingsPage'
+
+export const Route = createFileRoute(
+ '/_authenticate/_inject-org-details/_org-layout/_project-layout/projects/ssh/$projectId/_ssh-layout/settings',
+)({
+ component: SettingsPage,
+ beforeLoad: ({ context }) => {
+ return {
+ breadcrumbs: [
+ ...context.breadcrumbs,
+ {
+ label: 'Settings',
+ },
+ ],
+ }
+ },
+})
diff --git a/frontend/src/pages/project/layout.tsx b/frontend/src/pages/project/layout.tsx
index 8f85cb1a5..baa313605 100644
--- a/frontend/src/pages/project/layout.tsx
+++ b/frontend/src/pages/project/layout.tsx
@@ -1,31 +1,15 @@
import { createFileRoute } from "@tanstack/react-router";
import { BreadcrumbTypes } from "@app/components/v2";
-import { workspaceKeys } from "@app/hooks/api";
-import { fetchUserProjectPermissions, roleQueryKeys } from "@app/hooks/api/roles/queries";
-import { fetchWorkspaceById } from "@app/hooks/api/workspace/queries";
import { ProjectLayout } from "@app/layouts/ProjectLayout";
import { ProjectSelect } from "@app/layouts/ProjectLayout/components/ProjectSelect";
export const Route = createFileRoute(
- "/_authenticate/_inject-org-details/_org-layout/projects/$projectId/_project-layout"
+ "/_authenticate/_inject-org-details/_org-layout/_project-layout"
)({
component: ProjectLayout,
- beforeLoad: async ({ params, context }) => {
- const project = await context.queryClient.ensureQueryData({
- queryKey: workspaceKeys.getWorkspaceById(params.projectId),
- queryFn: () => fetchWorkspaceById(params.projectId)
- });
-
- await context.queryClient.ensureQueryData({
- queryKey: roleQueryKeys.getUserProjectPermissions({
- workspaceId: params.projectId
- }),
- queryFn: () => fetchUserProjectPermissions({ workspaceId: params.projectId })
- });
-
+ beforeLoad: async () => {
return {
- project,
breadcrumbs: [
{
type: BreadcrumbTypes.Component,
diff --git a/frontend/src/pages/secret-manager/CommitDetailsPage/CommitDetailsPage.tsx b/frontend/src/pages/secret-manager/CommitDetailsPage/CommitDetailsPage.tsx
index 05a3c7231..06f79e9f0 100644
--- a/frontend/src/pages/secret-manager/CommitDetailsPage/CommitDetailsPage.tsx
+++ b/frontend/src/pages/secret-manager/CommitDetailsPage/CommitDetailsPage.tsx
@@ -34,7 +34,7 @@ export const CommitDetailsPage = () => {
const handleGoBackToHistory = () => {
navigate({
- to: "/projects/$projectId/secret-manager/commits/$environment/$folderId",
+ to: "/projects/secret-management/$projectId/commits/$environment/$folderId",
params: {
projectId: currentWorkspace.id,
folderId,
@@ -49,7 +49,7 @@ export const CommitDetailsPage = () => {
const handleGoToRollbackPreview = () => {
navigate({
- to: "/projects/$projectId/secret-manager/commits/$environment/$folderId/$commitId/restore",
+ to: "/projects/secret-management/$projectId/commits/$environment/$folderId/$commitId/restore",
params: {
projectId: currentWorkspace.id,
folderId,
diff --git a/frontend/src/pages/secret-manager/CommitDetailsPage/components/RollbackPreviewTab/RollbackPreviewTab.tsx b/frontend/src/pages/secret-manager/CommitDetailsPage/components/RollbackPreviewTab/RollbackPreviewTab.tsx
index b14a5fe94..e06daea38 100644
--- a/frontend/src/pages/secret-manager/CommitDetailsPage/components/RollbackPreviewTab/RollbackPreviewTab.tsx
+++ b/frontend/src/pages/secret-manager/CommitDetailsPage/components/RollbackPreviewTab/RollbackPreviewTab.tsx
@@ -102,7 +102,7 @@ export const RollbackPreviewTab = (): JSX.Element => {
const goBackToHistory = () => {
navigate({
- to: "/projects/$projectId/secret-manager/commits/$environment/$folderId",
+ to: "/projects/secret-management/$projectId/commits/$environment/$folderId",
params: {
projectId: currentWorkspace.id,
folderId,
diff --git a/frontend/src/pages/secret-manager/CommitDetailsPage/components/RollbackPreviewTab/route.tsx b/frontend/src/pages/secret-manager/CommitDetailsPage/components/RollbackPreviewTab/route.tsx
index d0d3aead0..f78b27b4e 100644
--- a/frontend/src/pages/secret-manager/CommitDetailsPage/components/RollbackPreviewTab/route.tsx
+++ b/frontend/src/pages/secret-manager/CommitDetailsPage/components/RollbackPreviewTab/route.tsx
@@ -12,7 +12,7 @@ const RollbackPreviewTabQueryParamsSchema = z.object({
});
export const Route = createFileRoute(
- "/_authenticate/_inject-org-details/_org-layout/projects/$projectId/_project-layout/secret-manager/_secret-manager-layout/commits/$environment/$folderId/$commitId/restore"
+ "/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/commits/$environment/$folderId/$commitId/restore"
)({
component: RollbackPreviewTab,
validateSearch: zodValidator(RollbackPreviewTabQueryParamsSchema),
@@ -33,7 +33,7 @@ export const Route = createFileRoute(
links: context.project.environments.map((el) => ({
label: el.name,
link: linkOptions({
- to: "/projects/$projectId/secret-manager/secrets/$envSlug",
+ to: "/projects/secret-management/$projectId/secrets/$envSlug",
params: {
projectId: params.projectId,
envSlug: el.slug
@@ -56,7 +56,7 @@ export const Route = createFileRoute(
{
label: "Commits",
link: linkOptions({
- to: "/projects/$projectId/secret-manager/commits/$environment/$folderId",
+ to: "/projects/secret-management/$projectId/commits/$environment/$folderId",
params: {
projectId: params.projectId,
environment: params.environment,
@@ -70,7 +70,7 @@ export const Route = createFileRoute(
{
label: params.commitId,
link: linkOptions({
- to: "/projects/$projectId/secret-manager/commits/$environment/$folderId/$commitId",
+ to: "/projects/secret-management/$projectId/commits/$environment/$folderId/$commitId",
params: {
projectId: params.projectId,
environment: params.environment,
diff --git a/frontend/src/pages/secret-manager/CommitDetailsPage/route.tsx b/frontend/src/pages/secret-manager/CommitDetailsPage/route.tsx
index 623b42050..0cd791c27 100644
--- a/frontend/src/pages/secret-manager/CommitDetailsPage/route.tsx
+++ b/frontend/src/pages/secret-manager/CommitDetailsPage/route.tsx
@@ -12,7 +12,7 @@ const CommitDetailsPageQueryParamsSchema = z.object({
});
export const Route = createFileRoute(
- "/_authenticate/_inject-org-details/_org-layout/projects/$projectId/_project-layout/secret-manager/_secret-manager-layout/commits/$environment/$folderId/$commitId/"
+ "/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/commits/$environment/$folderId/$commitId/"
)({
component: CommitDetailsPage,
validateSearch: zodValidator(CommitDetailsPageQueryParamsSchema),
@@ -33,7 +33,7 @@ export const Route = createFileRoute(
links: context.project.environments.map((el) => ({
label: el.name,
link: linkOptions({
- to: "/projects/$projectId/secret-manager/secrets/$envSlug",
+ to: "/projects/secret-management/$projectId/secrets/$envSlug",
params: {
projectId: params.projectId,
envSlug: el.slug
@@ -56,7 +56,7 @@ export const Route = createFileRoute(
{
label: "Commits",
link: linkOptions({
- to: "/projects/$projectId/secret-manager/commits/$environment/$folderId",
+ to: "/projects/secret-management/$projectId/commits/$environment/$folderId",
params: {
projectId: params.projectId,
environment: params.environment,
diff --git a/frontend/src/pages/secret-manager/CommitsPage/CommitsPage.tsx b/frontend/src/pages/secret-manager/CommitsPage/CommitsPage.tsx
index 591c03d4d..1acb76446 100644
--- a/frontend/src/pages/secret-manager/CommitsPage/CommitsPage.tsx
+++ b/frontend/src/pages/secret-manager/CommitsPage/CommitsPage.tsx
@@ -31,7 +31,7 @@ export const CommitsPage = () => {
const handleSelectCommit = (commitId: string) => {
navigate({
- to: "/projects/$projectId/secret-manager/commits/$environment/$folderId/$commitId",
+ to: "/projects/secret-management/$projectId/commits/$environment/$folderId/$commitId",
params: {
projectId: currentWorkspace.id,
folderId,
diff --git a/frontend/src/pages/secret-manager/CommitsPage/route.tsx b/frontend/src/pages/secret-manager/CommitsPage/route.tsx
index e98fcc842..0e3cbb80a 100644
--- a/frontend/src/pages/secret-manager/CommitsPage/route.tsx
+++ b/frontend/src/pages/secret-manager/CommitsPage/route.tsx
@@ -13,7 +13,7 @@ const CommitsPageQueryParamsSchema = z.object({
});
export const Route = createFileRoute(
- "/_authenticate/_inject-org-details/_org-layout/projects/$projectId/_project-layout/secret-manager/_secret-manager-layout/commits/$environment/$folderId/"
+ "/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/commits/$environment/$folderId/"
)({
component: CommitsPage,
validateSearch: zodValidator(CommitsPageQueryParamsSchema),
@@ -34,7 +34,7 @@ export const Route = createFileRoute(
links: context.project.environments.map((el) => ({
label: el.name,
link: linkOptions({
- to: "/projects/$projectId/secret-manager/secrets/$envSlug",
+ to: "/projects/secret-management/$projectId/secrets/$envSlug",
params: {
projectId: params.projectId,
envSlug: el.slug
@@ -57,7 +57,7 @@ export const Route = createFileRoute(
{
label: "Commits",
link: linkOptions({
- to: "/projects/$projectId/secret-manager/commits/$environment/$folderId",
+ to: "/projects/secret-management/$projectId/commits/$environment/$folderId",
params: {
projectId: params.projectId,
environment: params.environment,
diff --git a/frontend/src/pages/secret-manager/IPAllowlistPage/route.tsx b/frontend/src/pages/secret-manager/IPAllowlistPage/route.tsx
index 16ede0811..c55feb4ef 100644
--- a/frontend/src/pages/secret-manager/IPAllowlistPage/route.tsx
+++ b/frontend/src/pages/secret-manager/IPAllowlistPage/route.tsx
@@ -1,9 +1,9 @@
-import { createFileRoute } from "@tanstack/react-router";
+import { createFileRoute } from '@tanstack/react-router'
-import { IPAllowListPage } from "./IPAllowlistPage";
+import { IPAllowListPage } from './IPAllowlistPage'
export const Route = createFileRoute(
- "/_authenticate/_inject-org-details/_org-layout/projects/$projectId/_project-layout/secret-manager/_secret-manager-layout/allowlist"
+ '/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/allowlist',
)({
- component: () => IPAllowListPage
-});
+ component: () => IPAllowListPage,
+})
diff --git a/frontend/src/pages/secret-manager/IntegrationsDetailsByIDPage/route.tsx b/frontend/src/pages/secret-manager/IntegrationsDetailsByIDPage/route.tsx
index 424835421..29627c5a7 100644
--- a/frontend/src/pages/secret-manager/IntegrationsDetailsByIDPage/route.tsx
+++ b/frontend/src/pages/secret-manager/IntegrationsDetailsByIDPage/route.tsx
@@ -5,7 +5,7 @@ import { IntegrationsListPageTabs } from "@app/types/integrations";
import { IntegrationDetailsByIDPage } from "./IntegrationsDetailsByIDPage";
export const Route = createFileRoute(
- "/_authenticate/_inject-org-details/_org-layout/projects/$projectId/_project-layout/secret-manager/_secret-manager-layout/integrations/$integrationId"
+ "/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/$integrationId"
)({
component: IntegrationDetailsByIDPage,
beforeLoad: ({ context, params }) => {
@@ -15,7 +15,7 @@ export const Route = createFileRoute(
{
label: "Integrations",
link: linkOptions({
- to: "/projects/$projectId/secret-manager/integrations",
+ to: "/projects/secret-management/$projectId/integrations",
params,
search: {
selectedTab: IntegrationsListPageTabs.NativeIntegrations
diff --git a/frontend/src/pages/secret-manager/IntegrationsListPage/IntegrationsListPage.utils.tsx b/frontend/src/pages/secret-manager/IntegrationsListPage/IntegrationsListPage.utils.tsx
index 4120a3da3..25c12adc2 100644
--- a/frontend/src/pages/secret-manager/IntegrationsListPage/IntegrationsListPage.utils.tsx
+++ b/frontend/src/pages/secret-manager/IntegrationsListPage/IntegrationsListPage.utils.tsx
@@ -42,7 +42,7 @@ export const redirectForProviderAuth = (
switch (integrationOption.slug) {
case "gcp-secret-manager":
navigate({
- to: "/projects/$projectId/secret-manager/integrations/gcp-secret-manager/authorize",
+ to: "/projects/secret-management/$projectId/integrations/gcp-secret-manager/authorize",
params: {
projectId
}
@@ -54,7 +54,7 @@ export const redirectForProviderAuth = (
return;
}
navigate({
- to: "/projects/$projectId/secret-manager/integrations/azure-key-vault/authorize",
+ to: "/projects/secret-management/$projectId/integrations/azure-key-vault/authorize",
params: {
projectId
},
@@ -76,7 +76,7 @@ export const redirectForProviderAuth = (
}
case "aws-parameter-store":
navigate({
- to: "/projects/$projectId/secret-manager/integrations/aws-parameter-store/authorize",
+ to: "/projects/secret-management/$projectId/integrations/aws-parameter-store/authorize",
params: {
projectId
}
@@ -84,7 +84,7 @@ export const redirectForProviderAuth = (
break;
case "aws-secret-manager":
navigate({
- to: "/projects/$projectId/secret-manager/integrations/aws-secret-manager/authorize",
+ to: "/projects/secret-management/$projectId/integrations/aws-secret-manager/authorize",
params: {
projectId
}
@@ -120,7 +120,7 @@ export const redirectForProviderAuth = (
}
case "github":
navigate({
- to: "/projects/$projectId/secret-manager/integrations/github/auth-mode-selection",
+ to: "/projects/secret-management/$projectId/integrations/github/auth-mode-selection",
params: {
projectId
}
@@ -128,7 +128,7 @@ export const redirectForProviderAuth = (
break;
case "gitlab":
navigate({
- to: "/projects/$projectId/secret-manager/integrations/gitlab/authorize",
+ to: "/projects/secret-management/$projectId/integrations/gitlab/authorize",
params: {
projectId
}
@@ -136,7 +136,7 @@ export const redirectForProviderAuth = (
break;
case "render":
navigate({
- to: "/projects/$projectId/secret-manager/integrations/render/authorize",
+ to: "/projects/secret-management/$projectId/integrations/render/authorize",
params: {
projectId
}
@@ -144,7 +144,7 @@ export const redirectForProviderAuth = (
break;
case "flyio":
navigate({
- to: "/projects/$projectId/secret-manager/integrations/flyio/authorize",
+ to: "/projects/secret-management/$projectId/integrations/flyio/authorize",
params: {
projectId
}
@@ -152,7 +152,7 @@ export const redirectForProviderAuth = (
break;
case "circleci":
navigate({
- to: "/projects/$projectId/secret-manager/integrations/circleci/authorize",
+ to: "/projects/secret-management/$projectId/integrations/circleci/authorize",
params: {
projectId
}
@@ -160,7 +160,7 @@ export const redirectForProviderAuth = (
break;
case "databricks":
navigate({
- to: "/projects/$projectId/secret-manager/integrations/databricks/authorize",
+ to: "/projects/secret-management/$projectId/integrations/databricks/authorize",
params: {
projectId
}
@@ -168,7 +168,7 @@ export const redirectForProviderAuth = (
break;
case "laravel-forge":
navigate({
- to: "/projects/$projectId/secret-manager/integrations/laravel-forge/authorize",
+ to: "/projects/secret-management/$projectId/integrations/laravel-forge/authorize",
params: {
projectId
}
@@ -176,7 +176,7 @@ export const redirectForProviderAuth = (
break;
case "travisci":
navigate({
- to: "/projects/$projectId/secret-manager/integrations/travisci/authorize",
+ to: "/projects/secret-management/$projectId/integrations/travisci/authorize",
params: {
projectId
}
@@ -184,7 +184,7 @@ export const redirectForProviderAuth = (
break;
case "supabase":
navigate({
- to: "/projects/$projectId/secret-manager/integrations/supabase/authorize",
+ to: "/projects/secret-management/$projectId/integrations/supabase/authorize",
params: {
projectId
}
@@ -192,7 +192,7 @@ export const redirectForProviderAuth = (
break;
case "checkly":
navigate({
- to: "/projects/$projectId/secret-manager/integrations/checkly/authorize",
+ to: "/projects/secret-management/$projectId/integrations/checkly/authorize",
params: {
projectId
}
@@ -200,7 +200,7 @@ export const redirectForProviderAuth = (
break;
case "qovery":
navigate({
- to: "/projects/$projectId/secret-manager/integrations/qovery/authorize",
+ to: "/projects/secret-management/$projectId/integrations/qovery/authorize",
params: {
projectId
}
@@ -208,7 +208,7 @@ export const redirectForProviderAuth = (
break;
case "railway":
navigate({
- to: "/projects/$projectId/secret-manager/integrations/railway/authorize",
+ to: "/projects/secret-management/$projectId/integrations/railway/authorize",
params: {
projectId
}
@@ -216,7 +216,7 @@ export const redirectForProviderAuth = (
break;
case "terraform-cloud":
navigate({
- to: "/projects/$projectId/secret-manager/integrations/terraform-cloud/authorize",
+ to: "/projects/secret-management/$projectId/integrations/terraform-cloud/authorize",
params: {
projectId
}
@@ -224,7 +224,7 @@ export const redirectForProviderAuth = (
break;
case "hashicorp-vault":
navigate({
- to: "/projects/$projectId/secret-manager/integrations/hashicorp-vault/authorize",
+ to: "/projects/secret-management/$projectId/integrations/hashicorp-vault/authorize",
params: {
projectId
}
@@ -232,7 +232,7 @@ export const redirectForProviderAuth = (
break;
case "cloudflare-pages":
navigate({
- to: "/projects/$projectId/secret-manager/integrations/cloudflare-pages/authorize",
+ to: "/projects/secret-management/$projectId/integrations/cloudflare-pages/authorize",
params: {
projectId
}
@@ -240,7 +240,7 @@ export const redirectForProviderAuth = (
break;
case "cloudflare-workers":
navigate({
- to: "/projects/$projectId/secret-manager/integrations/cloudflare-workers/authorize",
+ to: "/projects/secret-management/$projectId/integrations/cloudflare-workers/authorize",
params: {
projectId
}
@@ -257,7 +257,7 @@ export const redirectForProviderAuth = (
}
case "codefresh":
navigate({
- to: "/projects/$projectId/secret-manager/integrations/codefresh/authorize",
+ to: "/projects/secret-management/$projectId/integrations/codefresh/authorize",
params: {
projectId
}
@@ -265,7 +265,7 @@ export const redirectForProviderAuth = (
break;
case "digital-ocean-app-platform":
navigate({
- to: "/projects/$projectId/secret-manager/integrations/digital-ocean-app-platform/authorize",
+ to: "/projects/secret-management/$projectId/integrations/digital-ocean-app-platform/authorize",
params: {
projectId
}
@@ -273,7 +273,7 @@ export const redirectForProviderAuth = (
break;
case "cloud-66":
navigate({
- to: "/projects/$projectId/secret-manager/integrations/cloud-66/authorize",
+ to: "/projects/secret-management/$projectId/integrations/cloud-66/authorize",
params: {
projectId
}
@@ -281,7 +281,7 @@ export const redirectForProviderAuth = (
break;
case "northflank":
navigate({
- to: "/projects/$projectId/secret-manager/integrations/northflank/authorize",
+ to: "/projects/secret-management/$projectId/integrations/northflank/authorize",
params: {
projectId
}
@@ -289,7 +289,7 @@ export const redirectForProviderAuth = (
break;
case "windmill":
navigate({
- to: "/projects/$projectId/secret-manager/integrations/windmill/authorize",
+ to: "/projects/secret-management/$projectId/integrations/windmill/authorize",
params: {
projectId
}
@@ -297,7 +297,7 @@ export const redirectForProviderAuth = (
break;
case "teamcity":
navigate({
- to: "/projects/$projectId/secret-manager/integrations/teamcity/authorize",
+ to: "/projects/secret-management/$projectId/integrations/teamcity/authorize",
params: {
projectId
}
@@ -305,7 +305,7 @@ export const redirectForProviderAuth = (
break;
case "hasura-cloud":
navigate({
- to: "/projects/$projectId/secret-manager/integrations/hasura-cloud/authorize",
+ to: "/projects/secret-management/$projectId/integrations/hasura-cloud/authorize",
params: {
projectId
}
@@ -313,7 +313,7 @@ export const redirectForProviderAuth = (
break;
case "rundeck":
navigate({
- to: "/projects/$projectId/secret-manager/integrations/rundeck/authorize",
+ to: "/projects/secret-management/$projectId/integrations/rundeck/authorize",
params: {
projectId
}
@@ -321,7 +321,7 @@ export const redirectForProviderAuth = (
break;
case "azure-devops":
navigate({
- to: "/projects/$projectId/secret-manager/integrations/azure-devops/authorize",
+ to: "/projects/secret-management/$projectId/integrations/azure-devops/authorize",
params: {
projectId
}
@@ -329,7 +329,7 @@ export const redirectForProviderAuth = (
break;
case "octopus-deploy":
navigate({
- to: "/projects/$projectId/secret-manager/integrations/octopus-deploy/authorize",
+ to: "/projects/secret-management/$projectId/integrations/octopus-deploy/authorize",
params: {
projectId
}
diff --git a/frontend/src/pages/secret-manager/IntegrationsListPage/components/NativeIntegrationsTab/IntegrationRow.tsx b/frontend/src/pages/secret-manager/IntegrationsListPage/components/NativeIntegrationsTab/IntegrationRow.tsx
index 194c543d2..df862b8ba 100644
--- a/frontend/src/pages/secret-manager/IntegrationsListPage/components/NativeIntegrationsTab/IntegrationRow.tsx
+++ b/frontend/src/pages/secret-manager/IntegrationsListPage/components/NativeIntegrationsTab/IntegrationRow.tsx
@@ -59,7 +59,7 @@ export const IntegrationRow = ({
navigate({
- to: "/projects/$projectId/secret-manager/integrations/$integrationId",
+ to: "/projects/secret-management/$projectId/integrations/$integrationId",
params: {
integrationId: integration.id,
projectId: currentWorkspace.id
diff --git a/frontend/src/pages/secret-manager/IntegrationsListPage/route.tsx b/frontend/src/pages/secret-manager/IntegrationsListPage/route.tsx
index c59956459..b7f8236da 100644
--- a/frontend/src/pages/secret-manager/IntegrationsListPage/route.tsx
+++ b/frontend/src/pages/secret-manager/IntegrationsListPage/route.tsx
@@ -21,7 +21,7 @@ const IntegrationsListPageQuerySchema = z.object({
});
export const Route = createFileRoute(
- "/_authenticate/_inject-org-details/_org-layout/projects/$projectId/_project-layout/secret-manager/_secret-manager-layout/integrations/"
+ "/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/integrations/"
)({
component: IntegrationsListPage,
validateSearch: zodValidator(IntegrationsListPageQuerySchema),
@@ -36,7 +36,7 @@ export const Route = createFileRoute(
});
} catch {
throw redirect({
- to: "/projects/$projectId/secret-manager/integrations",
+ to: "/projects/secret-management/$projectId/integrations",
params: {
projectId
},
@@ -46,7 +46,7 @@ export const Route = createFileRoute(
if (secretSyncs.length) {
throw redirect({
- to: "/projects/$projectId/secret-manager/integrations",
+ to: "/projects/secret-management/$projectId/integrations",
params: {
projectId
},
@@ -62,7 +62,7 @@ export const Route = createFileRoute(
});
} catch {
throw redirect({
- to: "/projects/$projectId/secret-manager/integrations",
+ to: "/projects/secret-management/$projectId/integrations",
params: {
projectId
},
@@ -72,7 +72,7 @@ export const Route = createFileRoute(
if (integrations.length) {
throw redirect({
- to: "/projects/$projectId/secret-manager/integrations",
+ to: "/projects/secret-management/$projectId/integrations",
params: {
projectId
},
@@ -81,7 +81,7 @@ export const Route = createFileRoute(
}
throw redirect({
- to: "/projects/$projectId/secret-manager/integrations",
+ to: "/projects/secret-management/$projectId/integrations",
params: {
projectId
},
diff --git a/frontend/src/pages/secret-manager/OverviewPage/OverviewPage.tsx b/frontend/src/pages/secret-manager/OverviewPage/OverviewPage.tsx
index f58edbd33..61be72832 100644
--- a/frontend/src/pages/secret-manager/OverviewPage/OverviewPage.tsx
+++ b/frontend/src/pages/secret-manager/OverviewPage/OverviewPage.tsx
@@ -667,7 +667,7 @@ export const OverviewPage = () => {
const envIndex = visibleEnvs.findIndex((el) => slug === el.slug);
if (envIndex !== -1) {
navigate({
- to: "/projects/$projectId/secret-manager/secrets/$envSlug",
+ to: "/projects/secret-management/$projectId/secrets/$envSlug",
params: {
projectId: workspaceId,
envSlug: slug
@@ -1420,7 +1420,7 @@ export const OverviewPage = () => {
iconSize="3x"
>
{
const navigate = useNavigate({
- from: "/projects/$projectId/secret-manager/overview"
+ from: "/projects/secret-management/$projectId/overview"
});
const onFolderCrumbClick = (index: number) => {
diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchDynamicSecretItem.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchDynamicSecretItem.tsx
index 0d01370d4..79911b6ee 100644
--- a/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchDynamicSecretItem.tsx
+++ b/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchDynamicSecretItem.tsx
@@ -17,7 +17,7 @@ export const QuickSearchDynamicSecretItem = ({
onClose
}: Props) => {
const navigate = useNavigate({
- from: "/projects/$projectId/secret-manager/overview"
+ from: "/projects/secret-management/$projectId/overview"
});
const [groupDynamicSecret] = dynamicSecretGroup;
diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchFolderItem.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchFolderItem.tsx
index 77f1f5215..92d2fac3e 100644
--- a/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchFolderItem.tsx
+++ b/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchFolderItem.tsx
@@ -13,7 +13,7 @@ type Props = {
export const QuickSearchFolderItem = ({ folderGroup, onClose }: Props) => {
const navigate = useNavigate({
- from: "/projects/$projectId/secret-manager/overview"
+ from: "/projects/secret-management/$projectId/overview"
});
const [groupFolder] = folderGroup;
diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchSecretItem.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchSecretItem.tsx
index c7a84f627..80b53d426 100644
--- a/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchSecretItem.tsx
+++ b/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchSecretItem.tsx
@@ -46,7 +46,7 @@ export const QuickSearchSecretItem = ({
isSingleEnv,
search
}: Props) => {
- const navigate = useNavigate({ from: "/projects/$projectId/secret-manager/overview" });
+ const navigate = useNavigate({ from: "/projects/secret-management/$projectId/overview" });
const envSlugMap = new Map(environments.map((env) => [env.slug, env]));
const [isUrlCopied, , setIsUrlCopied] = useTimedReset({
initialState: false
diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchSecretRotationItem.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchSecretRotationItem.tsx
index 84869c656..fc4b66978 100644
--- a/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchSecretRotationItem.tsx
+++ b/frontend/src/pages/secret-manager/OverviewPage/components/SecretSearchInput/components/QuickSearchSecretRotationItem.tsx
@@ -13,7 +13,7 @@ type Props = {
export const QuickSearchSecretRotationItem = ({ secretRotationGroup, onClose }: Props) => {
const navigate = useNavigate({
- from: "/projects/$projectId/secret-manager/overview"
+ from: "/projects/secret-management/$projectId/overview"
});
const [groupSecretRotation] = secretRotationGroup;
diff --git a/frontend/src/pages/secret-manager/OverviewPage/route.tsx b/frontend/src/pages/secret-manager/OverviewPage/route.tsx
index 66b57d547..968286e13 100644
--- a/frontend/src/pages/secret-manager/OverviewPage/route.tsx
+++ b/frontend/src/pages/secret-manager/OverviewPage/route.tsx
@@ -10,7 +10,7 @@ const SecretOverviewPageQuerySchema = z.object({
});
export const Route = createFileRoute(
- "/_authenticate/_inject-org-details/_org-layout/projects/$projectId/_project-layout/secret-manager/_secret-manager-layout/overview"
+ "/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/overview"
)({
component: OverviewPage,
validateSearch: zodValidator(SecretOverviewPageQuerySchema),
@@ -24,7 +24,7 @@ export const Route = createFileRoute(
{
label: "Secrets",
link: linkOptions({
- to: "/projects/$projectId/secret-manager/overview",
+ to: "/projects/secret-management/$projectId/overview",
params
})
}
diff --git a/frontend/src/pages/secret-manager/SecretApprovalsPage/route.tsx b/frontend/src/pages/secret-manager/SecretApprovalsPage/route.tsx
index abeb64951..e4544cb47 100644
--- a/frontend/src/pages/secret-manager/SecretApprovalsPage/route.tsx
+++ b/frontend/src/pages/secret-manager/SecretApprovalsPage/route.tsx
@@ -1,15 +1,15 @@
-import { createFileRoute } from "@tanstack/react-router";
-import { zodValidator } from "@tanstack/zod-adapter";
-import { z } from "zod";
+import { createFileRoute } from '@tanstack/react-router'
+import { zodValidator } from '@tanstack/zod-adapter'
+import { z } from 'zod'
-import { SecretApprovalsPage } from "./SecretApprovalsPage";
+import { SecretApprovalsPage } from './SecretApprovalsPage'
const SecretApprovalPageQueryParams = z.object({
- requestId: z.string().catch("")
-});
+ requestId: z.string().catch(''),
+})
export const Route = createFileRoute(
- "/_authenticate/_inject-org-details/_org-layout/projects/$projectId/_project-layout/secret-manager/_secret-manager-layout/approval"
+ '/_authenticate/_inject-org-details/_org-layout/projects/secret-management/$projectId/_secret-manager-layout/approval',
)({
component: SecretApprovalsPage,
validateSearch: zodValidator(SecretApprovalPageQueryParams),
@@ -18,9 +18,9 @@ export const Route = createFileRoute(
breadcrumbs: [
...context.breadcrumbs,
{
- label: "Approvals"
- }
- ]
- };
- }
-});
+ label: 'Approvals',
+ },
+ ],
+ }
+ },
+})
diff --git a/frontend/src/pages/secret-manager/SecretDashboardPage/SecretDashboardPage.tsx b/frontend/src/pages/secret-manager/SecretDashboardPage/SecretDashboardPage.tsx
index b54fce0cc..3342f6688 100644
--- a/frontend/src/pages/secret-manager/SecretDashboardPage/SecretDashboardPage.tsx
+++ b/frontend/src/pages/secret-manager/SecretDashboardPage/SecretDashboardPage.tsx
@@ -234,7 +234,7 @@ const Page = () => {
type: "error"
});
navigate({
- to: "/projects/$projectId/secret-manager/overview",
+ to: "/projects/secret-management/$projectId/overview",
params: {
projectId: workspaceId
}
@@ -386,7 +386,7 @@ const Page = () => {
const handleOnClickRollbackMode = () => {
if (isPITEnabled) {
navigate({
- to: "/projects/$projectId/secret-manager/commits/$environment/$folderId",
+ to: "/projects/secret-management/$projectId/commits/$environment/$folderId",
params: {
projectId: workspaceId,
folderId,
diff --git a/frontend/src/pages/secret-manager/SecretDashboardPage/components/SecretListView/SecretDetailSidebar.tsx b/frontend/src/pages/secret-manager/SecretDashboardPage/components/SecretListView/SecretDetailSidebar.tsx
index 142bd3216..d1e967e15 100644
--- a/frontend/src/pages/secret-manager/SecretDashboardPage/components/SecretListView/SecretDetailSidebar.tsx
+++ b/frontend/src/pages/secret-manager/SecretDashboardPage/components/SecretListView/SecretDetailSidebar.tsx
@@ -64,6 +64,7 @@ import { camelCaseToSpaces } from "@app/lib/fn/string";
import { CreateReminderForm } from "./CreateReminderForm";
import { HIDDEN_SECRET_VALUE } from "./SecretItem";
import { formSchema, SecretActionType, TFormSchema } from "./SecretListView.utils";
+import { getProjectBaseURL } from "@app/helpers/project";
type Props = {
isOpen?: boolean;
@@ -990,7 +991,9 @@ export const SecretDetailSidebar = ({
className="z-[100] capitalize"
>
({
label: el.name,
link: linkOptions({
- to: "/projects/$projectId/secret-manager/secrets/$envSlug",
+ to: "/projects/secret-management/$projectId/secrets/$envSlug",
params: {
projectId: params.projectId,
envSlug: el.slug
diff --git a/frontend/src/pages/secret-manager/SecretRotationPage/SecretRotationPage.tsx b/frontend/src/pages/secret-manager/SecretRotationPage/SecretRotationPage.tsx
index e41940380..51551999e 100644
--- a/frontend/src/pages/secret-manager/SecretRotationPage/SecretRotationPage.tsx
+++ b/frontend/src/pages/secret-manager/SecretRotationPage/SecretRotationPage.tsx
@@ -172,7 +172,7 @@ const Page = () => {
PostgreSQL and Microsoft SQL Server Rotations can now be created from the{" "}
Secret Manager Dashboard
@@ -407,7 +407,7 @@ const Page = () => {
Infisical is revamping its Secret Rotation experience. Navigate to the{" "}
Secret Manager Dashboard
@@ -424,7 +424,7 @@ const Page = () => {