mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-10-14 16:40:30 +00:00
feat: resolved merge issues
This commit is contained in:
@@ -11,7 +11,7 @@ import { ProjectLayout } from '@app/layouts/ProjectLayout'
|
||||
import { ProjectSelect } from '@app/layouts/ProjectLayout/components/ProjectSelect'
|
||||
|
||||
export const Route = createFileRoute(
|
||||
'/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_project-layout-fallback-approval',
|
||||
'/_authenticate/_inject-org-details/_org-layout/projects/$projectId/_project-layout',
|
||||
)({
|
||||
component: ProjectLayout,
|
||||
beforeLoad: async ({ params, context }) => {
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
import { createFileRoute, redirect } from "@tanstack/react-router";
|
||||
import { createFileRoute, redirect } from '@tanstack/react-router'
|
||||
|
||||
// this is done as part of migration for multi product inside project
|
||||
export const Route = createFileRoute(
|
||||
"/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/_project-layout-fallback-approval/approval"
|
||||
'/_authenticate/_inject-org-details/_org-layout/secret-manager/$projectId/approval',
|
||||
)({
|
||||
beforeLoad: ({ params, search }) => {
|
||||
throw redirect({
|
||||
to: "/projects/$projectId/secret-manager/approval",
|
||||
to: '/projects/$projectId/secret-manager/approval',
|
||||
params,
|
||||
search
|
||||
});
|
||||
}
|
||||
});
|
||||
search,
|
||||
})
|
||||
},
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user