feat: fixed all ts url errors

This commit is contained in:
=
2025-07-02 01:16:49 +05:30
parent b0c1c9ce26
commit 48ac6b4aff
280 changed files with 2163 additions and 2460 deletions
@@ -4,7 +4,6 @@ import { useNavigate, useSearch } from "@tanstack/react-router";
import { PageHeader, Tab, TabList, TabPanel, Tabs } from "@app/components/v2";
import { useWorkspace } from "@app/context";
import { ProjectType } from "@app/hooks/api/workspace/types";
import { ProjectAccessControlTabs } from "@app/types/project";
import {
@@ -25,7 +24,7 @@ const Page = () => {
const updateSelectedTab = (tab: string) => {
navigate({
to: `/${currentWorkspace.type}/$projectId/access-management` as const,
to: "/projects/$projectId/access-management",
search: (prev) => ({ ...prev, selectedTab: tab }),
params: {
projectId: currentWorkspace.id
@@ -49,9 +48,7 @@ const Page = () => {
<p>Machine Identities</p>
</div>
</Tab>
{currentWorkspace?.type === ProjectType.SecretManager && (
<Tab value={ProjectAccessControlTabs.ServiceTokens}>Service Tokens</Tab>
)}
<Tab value={ProjectAccessControlTabs.ServiceTokens}>Service Tokens</Tab>
<Tab value={ProjectAccessControlTabs.Roles}>Project Roles</Tab>
</TabList>
<TabPanel value={ProjectAccessControlTabs.Member}>
@@ -63,11 +60,9 @@ const Page = () => {
<TabPanel value={ProjectAccessControlTabs.Identities}>
<IdentityTab />
</TabPanel>
{currentWorkspace?.type === ProjectType.SecretManager && (
<TabPanel value={ProjectAccessControlTabs.ServiceTokens}>
<ServiceTokenTab />
</TabPanel>
)}
<TabPanel value={ProjectAccessControlTabs.ServiceTokens}>
<ServiceTokenTab />
</TabPanel>
<TabPanel value={ProjectAccessControlTabs.Roles}>
<ProjectRoleListTab />
</TabPanel>
@@ -158,7 +158,7 @@ export const GroupTable = ({ handlePopUpOpen }: Props) => {
onKeyDown={(evt) => {
if (evt.key === "Enter") {
navigate({
to: `/${currentWorkspace.type}/$projectId/groups/$groupId` as const,
to: "/projects/$projectId/groups/$groupId",
params: {
projectId: currentWorkspace.id,
groupId: id
@@ -168,7 +168,7 @@ export const GroupTable = ({ handlePopUpOpen }: Props) => {
}}
onClick={() =>
navigate({
to: `/${currentWorkspace.type}/$projectId/groups/$groupId` as const,
to: "/projects/$projectId/groups/$groupId",
params: {
projectId: currentWorkspace.id,
groupId: id
@@ -260,7 +260,7 @@ export const IdentityTab = withProjectPermission(
onKeyDown={(evt) => {
if (evt.key === "Enter") {
navigate({
to: `/${currentWorkspace?.type}/$projectId/identities/$identityId` as const,
to: "/projects/$projectId/identities/$identityId",
params: {
projectId: currentWorkspace.id,
identityId: id
@@ -270,7 +270,7 @@ export const IdentityTab = withProjectPermission(
}}
onClick={() =>
navigate({
to: `/${currentWorkspace?.type}/$projectId/identities/$identityId` as const,
to: "/projects/$projectId/identities/$identityId",
params: {
projectId: currentWorkspace.id,
identityId: id
@@ -21,7 +21,7 @@ export const MemberRoleForm = ({ projectMember, onOpenUpgradeModal }: Props) =>
>
<AlertDescription>
<Link
to={`/${currentWorkspace.type}/$projectId/members/$membershipId` as const}
to="/projects/$projectId/members/$membershipId"
params={{
projectId: currentWorkspace.id,
membershipId: projectMember.id
@@ -311,7 +311,7 @@ export const MembersTable = ({ handlePopUpOpen }: Props) => {
onKeyDown={(evt) => {
if (evt.key === "Enter") {
navigate({
to: `/${currentWorkspace.type}/$projectId/members/$membershipId` as const,
to: "/projects/$projectId/members/$membershipId",
params: {
projectId: workspaceId,
membershipId
@@ -321,7 +321,7 @@ export const MembersTable = ({ handlePopUpOpen }: Props) => {
}}
onClick={() =>
navigate({
to: `/${currentWorkspace.type}/$projectId/members/$membershipId` as const,
to: "/projects/$projectId/members/$membershipId",
params: {
projectId: workspaceId,
membershipId
@@ -249,7 +249,7 @@ export const ProjectRoleList = () => {
className="h-10 cursor-pointer transition-colors duration-100 hover:bg-mineshaft-700"
onClick={() =>
navigate({
to: `/${currentWorkspace?.type}/$projectId/roles/$roleSlug` as const,
to: "/projects/$projectId/roles/$roleSlug",
params: {
projectId: currentWorkspace.id,
roleSlug: slug
@@ -291,7 +291,7 @@ export const ProjectRoleList = () => {
onClick={(e) => {
e.stopPropagation();
navigate({
to: `/${currentWorkspace?.type}/$projectId/roles/$roleSlug` as const,
to: "/projects/$projectId/roles/$roleSlug",
params: {
projectId: currentWorkspace.id,
roleSlug: slug
@@ -46,7 +46,13 @@ export const GroupDetailsSection = ({ groupMembership }: Props) => {
});
navigate({
to: `/${currentWorkspace.type}/${currentWorkspace.id}/access-management?selectedTab=groups`
to: "/projects/$projectId/access-management",
params: {
projectId: currentWorkspace.id
},
search: {
selectedTab: "groups"
}
});
handlePopUpClose("deleteGroup");
@@ -24,6 +24,7 @@ import {
Tr
} from "@app/components/v2";
import { useWorkspace } from "@app/context";
import { getCurrentProductFromUrl, getProjectHomePage } from "@app/helpers/project";
import {
getUserTablePreference,
PreferenceKey,
@@ -136,20 +137,10 @@ export const GroupMembersTable = ({ groupMembership }: Props) => {
text: "User privilege assumption has started"
});
let overviewPage: string;
switch (currentWorkspace.type) {
case ProjectType.SecretScanning:
overviewPage = "data-sources";
break;
case ProjectType.CertificateManager:
overviewPage = "subscribers";
break;
default:
overviewPage = "overview";
}
window.location.href = `/${currentWorkspace.type}/${currentWorkspace.id}/${overviewPage}`;
const url = getProjectHomePage(
getCurrentProductFromUrl(window.location.href) || ProjectType.SecretManager
);
window.location.href = url.replace("$projectId", currentWorkspace.id);
}
}
);
@@ -1,14 +1,14 @@
import { createFileRoute } from '@tanstack/react-router'
import { createFileRoute } from "@tanstack/react-router";
import { GroupDetailsByIDPage } from './GroupDetailsByIDPage'
import { GroupDetailsByIDPage } from "./GroupDetailsByIDPage";
export const Route = createFileRoute(
'/_authenticate/_inject-org-details/_org-layout/projects/$projectId/_project-layout/_project-general-layout/groups/$groupId',
"/_authenticate/_inject-org-details/_org-layout/projects/$projectId/_project-layout/_project-general-layout/groups/$groupId"
)({
component: GroupDetailsByIDPage,
beforeLoad: ({ context }) => {
return {
breadcrumbs: [],
}
},
})
breadcrumbs: []
};
}
});
@@ -20,6 +20,7 @@ import {
ProjectPermissionSub,
useWorkspace
} from "@app/context";
import { getCurrentProductFromUrl, getProjectHomePage } from "@app/helpers/project";
import { usePopUp } from "@app/hooks";
import {
useAssumeProjectPrivileges,
@@ -27,6 +28,7 @@ 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";
@@ -66,7 +68,10 @@ const Page = () => {
type: "success",
text: "Identity privilege assumption has started"
});
window.location.href = `/${currentWorkspace.type}/${currentWorkspace.id}/overview`;
const url = getProjectHomePage(
getCurrentProductFromUrl(window.location.href) || ProjectType.SecretManager
);
window.location.href = url.replace("$projectId", currentWorkspace.id);
}
}
);
@@ -84,7 +89,7 @@ const Page = () => {
});
handlePopUpClose("deleteIdentity");
navigate({
to: `/${currentWorkspace.type}/$projectId/access-management` as const,
to: "/projects/$projectId/access-management",
params: {
projectId: workspaceId
},
@@ -1,14 +1,14 @@
import { createFileRoute } from '@tanstack/react-router'
import { createFileRoute } from "@tanstack/react-router";
import { IdentityDetailsByIDPage } from './IdentityDetailsByIDPage'
import { IdentityDetailsByIDPage } from "./IdentityDetailsByIDPage";
export const Route = createFileRoute(
'/_authenticate/_inject-org-details/_org-layout/projects/$projectId/_project-layout/_project-general-layout/identities/$identityId',
"/_authenticate/_inject-org-details/_org-layout/projects/$projectId/_project-layout/_project-general-layout/identities/$identityId"
)({
component: IdentityDetailsByIDPage,
beforeLoad: ({ context }) => {
return {
breadcrumbs: [],
}
},
})
breadcrumbs: []
};
}
});
@@ -21,6 +21,7 @@ import {
useOrganization,
useWorkspace
} from "@app/context";
import { getCurrentProductFromUrl, getProjectHomePage } from "@app/helpers/project";
import { usePopUp } from "@app/hooks";
import {
useAssumeProjectPrivileges,
@@ -72,20 +73,10 @@ export const Page = () => {
text: "User privilege assumption has started"
});
let page: string;
switch (currentWorkspace.type) {
case ProjectType.SecretScanning:
page = "data-sources";
break;
case ProjectType.CertificateManager:
page = "subscribers";
break;
default:
page = "overview";
}
window.location.href = `/${currentWorkspace.type}/${currentWorkspace.id}/${page}`;
const url = getProjectHomePage(
getCurrentProductFromUrl(window.location.href) || ProjectType.SecretManager
);
window.location.href = url.replace("$projectId", currentWorkspace.id);
}
}
);
@@ -105,7 +96,7 @@ export const Page = () => {
type: "success"
});
navigate({
to: `/${currentWorkspace.type}/$projectId/access-management` as const,
to: "/projects/$projectId/access-management",
params: {
projectId: currentWorkspace.id
}
@@ -1,14 +1,14 @@
import { createFileRoute } from '@tanstack/react-router'
import { createFileRoute } from "@tanstack/react-router";
import { MemberDetailsByIDPage } from './MemberDetailsByIDPage'
import { MemberDetailsByIDPage } from "./MemberDetailsByIDPage";
export const Route = createFileRoute(
'/_authenticate/_inject-org-details/_org-layout/projects/$projectId/_project-layout/_project-general-layout/members/$membershipId',
"/_authenticate/_inject-org-details/_org-layout/projects/$projectId/_project-layout/_project-general-layout/members/$membershipId"
)({
component: MemberDetailsByIDPage,
beforeLoad: ({ context }) => {
return {
breadcrumbs: [],
}
},
})
breadcrumbs: []
};
}
});
@@ -60,7 +60,7 @@ const Page = () => {
});
handlePopUpClose("deleteRole");
navigate({
to: `/${currentWorkspace?.type}/$projectId/access-management` as const,
to: "/projects/$projectId/access-management",
params: {
projectId
},
@@ -80,7 +80,7 @@ const Content = ({ role, onClose }: ContentProps) => {
});
navigate({
to: `/${currentWorkspace.type}/$projectId/roles/$roleSlug` as const,
to: "/projects/$projectId/roles/$roleSlug",
params: {
roleSlug: newRole.slug,
projectId: currentWorkspace.id
@@ -100,7 +100,7 @@ export const RoleModal = ({ popUp, handlePopUpToggle }: Props) => {
});
navigate({
to: `/${currentWorkspace.type}/$projectId/roles/$roleSlug` as const,
to: "/projects/$projectId/roles/$roleSlug",
params: {
roleSlug: newRole.slug,
projectId
@@ -1,14 +1,14 @@
import { createFileRoute } from '@tanstack/react-router'
import { createFileRoute } from "@tanstack/react-router";
import { RoleDetailsBySlugPage } from './RoleDetailsBySlugPage'
import { RoleDetailsBySlugPage } from "./RoleDetailsBySlugPage";
export const Route = createFileRoute(
'/_authenticate/_inject-org-details/_org-layout/projects/$projectId/_project-layout/_project-general-layout/roles/$roleSlug',
"/_authenticate/_inject-org-details/_org-layout/projects/$projectId/_project-layout/_project-general-layout/roles/$roleSlug"
)({
component: RoleDetailsBySlugPage,
beforeLoad: ({ context }) => {
beforeLoad: ({}) => {
return {
breadcrumbs: [],
}
},
})
breadcrumbs: []
};
}
});
@@ -1,14 +1,15 @@
import { createFileRoute } from '@tanstack/react-router'
import { SettingsPage } from './SettingsPage'
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',
"/_authenticate/_inject-org-details/_org-layout/projects/$projectId/_project-layout/_project-general-layout/settings"
)({
component: SettingsPage,
beforeLoad: ({ context, params }) => {
return {
breadcrumbs: [
...context.breadcrumbs,
...context.breadcrumbs
// {
// label: "Access Control",
// link: linkOptions({
@@ -18,7 +19,7 @@ export const Route = createFileRoute(
// }
// })
// }
],
}
},
})
]
};
}
});
@@ -1,8 +1,9 @@
import { ProjectGeneralLayout } from '@app/layouts/ProjectGeneralLayout'
import { createFileRoute } from '@tanstack/react-router'
import { createFileRoute } from "@tanstack/react-router";
import { ProjectGeneralLayout } from "@app/layouts/ProjectGeneralLayout";
export const Route = createFileRoute(
'/_authenticate/_inject-org-details/_org-layout/projects/$projectId/_project-layout/_project-general-layout',
"/_authenticate/_inject-org-details/_org-layout/projects/$projectId/_project-layout/_project-general-layout"
)({
component: ProjectGeneralLayout,
})
component: ProjectGeneralLayout
});
+2 -2
View File
@@ -1,10 +1,10 @@
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 { BreadcrumbTypes } from "@app/components/v2";
import { ProjectSelect } from "@app/layouts/ProjectLayout/components/ProjectSelect";
export const Route = createFileRoute(