mirror of
https://github.com/awatertrevi/infisical.git
synced 2026-10-20 10:23:57 +00:00
Merge branch 'main' into ENG-3955
This commit is contained in:
x032205
@@ -57,7 +57,6 @@ import { Route as organizationAccessManagementPageRouteImport } from './pages/or
|
||||
import { Route as adminGeneralPageRouteImport } from './pages/admin/GeneralPage/route'
|
||||
import { Route as secretManagerRedirectsRedirectApprovalPageImport } from './pages/secret-manager/redirects/redirect-approval-page'
|
||||
import { Route as adminResourceOverviewPageRouteImport } from './pages/admin/ResourceOverviewPage/route'
|
||||
import { Route as organizationSecretSharingSettingsPageRouteImport } from './pages/organization/SecretSharingSettingsPage/route'
|
||||
import { Route as organizationRoleByIDPageRouteImport } from './pages/organization/RoleByIDPage/route'
|
||||
import { Route as organizationUserDetailsByIDPageRouteImport } from './pages/organization/UserDetailsByIDPage/route'
|
||||
import { Route as organizationIdentityDetailsByIDPageRouteImport } from './pages/organization/IdentityDetailsByIDPage/route'
|
||||
@@ -114,6 +113,7 @@ import { Route as kmsSettingsPageRouteImport } from './pages/kms/SettingsPage/ro
|
||||
import { Route as kmsOverviewPageRouteImport } from './pages/kms/OverviewPage/route'
|
||||
import { Route as kmsKmipPageRouteImport } from './pages/kms/KmipPage/route'
|
||||
import { Route as certManagerSettingsPageRouteImport } from './pages/cert-manager/SettingsPage/route'
|
||||
import { Route as certManagerPoliciesPageRouteImport } from './pages/cert-manager/PoliciesPage/route'
|
||||
import { Route as certManagerCertificatesPageRouteImport } from './pages/cert-manager/CertificatesPage/route'
|
||||
import { Route as certManagerCertificateAuthoritiesPageRouteImport } from './pages/cert-manager/CertificateAuthoritiesPage/route'
|
||||
import { Route as certManagerAlertingPageRouteImport } from './pages/cert-manager/AlertingPage/route'
|
||||
@@ -747,14 +747,6 @@ const adminResourceOverviewPageRouteRoute =
|
||||
getParentRoute: () => adminLayoutRoute,
|
||||
} as any)
|
||||
|
||||
const organizationSecretSharingSettingsPageRouteRoute =
|
||||
organizationSecretSharingSettingsPageRouteImport.update({
|
||||
id: '/settings',
|
||||
path: '/settings',
|
||||
getParentRoute: () =>
|
||||
AuthenticateInjectOrgDetailsOrgLayoutOrganizationSecretSharingRoute,
|
||||
} as any)
|
||||
|
||||
const organizationRoleByIDPageRouteRoute =
|
||||
organizationRoleByIDPageRouteImport.update({
|
||||
id: '/roles/$roleId',
|
||||
@@ -1204,6 +1196,13 @@ const certManagerSettingsPageRouteRoute =
|
||||
getParentRoute: () => certManagerLayoutRoute,
|
||||
} as any)
|
||||
|
||||
const certManagerPoliciesPageRouteRoute =
|
||||
certManagerPoliciesPageRouteImport.update({
|
||||
id: '/policies',
|
||||
path: '/policies',
|
||||
getParentRoute: () => certManagerLayoutRoute,
|
||||
} as any)
|
||||
|
||||
const certManagerCertificatesPageRouteRoute =
|
||||
certManagerCertificatesPageRouteImport.update({
|
||||
id: '/certificates',
|
||||
@@ -2598,13 +2597,6 @@ declare module '@tanstack/react-router' {
|
||||
preLoaderRoute: typeof organizationRoleByIDPageRouteImport
|
||||
parentRoute: typeof AuthenticateInjectOrgDetailsOrgLayoutOrganizationImport
|
||||
}
|
||||
'/_authenticate/_inject-org-details/_org-layout/organization/secret-sharing/settings': {
|
||||
id: '/_authenticate/_inject-org-details/_org-layout/organization/secret-sharing/settings'
|
||||
path: '/settings'
|
||||
fullPath: '/organization/secret-sharing/settings'
|
||||
preLoaderRoute: typeof organizationSecretSharingSettingsPageRouteImport
|
||||
parentRoute: typeof AuthenticateInjectOrgDetailsOrgLayoutOrganizationSecretSharingImport
|
||||
}
|
||||
'/_authenticate/_inject-org-details/admin/_admin-layout/resources/overview': {
|
||||
id: '/_authenticate/_inject-org-details/admin/_admin-layout/resources/overview'
|
||||
path: '/resources/overview'
|
||||
@@ -2801,6 +2793,13 @@ declare module '@tanstack/react-router' {
|
||||
preLoaderRoute: typeof certManagerCertificatesPageRouteImport
|
||||
parentRoute: typeof certManagerLayoutImport
|
||||
}
|
||||
'/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/policies': {
|
||||
id: '/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/policies'
|
||||
path: '/policies'
|
||||
fullPath: '/projects/cert-management/$projectId/policies'
|
||||
preLoaderRoute: typeof certManagerPoliciesPageRouteImport
|
||||
parentRoute: typeof certManagerLayoutImport
|
||||
}
|
||||
'/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/settings': {
|
||||
id: '/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/settings'
|
||||
path: '/settings'
|
||||
@@ -3985,15 +3984,12 @@ const AuthenticateInjectOrgDetailsOrgLayoutOrganizationAppConnectionsRouteWithCh
|
||||
|
||||
interface AuthenticateInjectOrgDetailsOrgLayoutOrganizationSecretSharingRouteChildren {
|
||||
organizationSecretSharingPageRouteRoute: typeof organizationSecretSharingPageRouteRoute
|
||||
organizationSecretSharingSettingsPageRouteRoute: typeof organizationSecretSharingSettingsPageRouteRoute
|
||||
}
|
||||
|
||||
const AuthenticateInjectOrgDetailsOrgLayoutOrganizationSecretSharingRouteChildren: AuthenticateInjectOrgDetailsOrgLayoutOrganizationSecretSharingRouteChildren =
|
||||
{
|
||||
organizationSecretSharingPageRouteRoute:
|
||||
organizationSecretSharingPageRouteRoute,
|
||||
organizationSecretSharingSettingsPageRouteRoute:
|
||||
organizationSecretSharingSettingsPageRouteRoute,
|
||||
}
|
||||
|
||||
const AuthenticateInjectOrgDetailsOrgLayoutOrganizationSecretSharingRouteWithChildren =
|
||||
@@ -4131,6 +4127,7 @@ interface certManagerLayoutRouteChildren {
|
||||
certManagerAlertingPageRouteRoute: typeof certManagerAlertingPageRouteRoute
|
||||
certManagerCertificateAuthoritiesPageRouteRoute: typeof certManagerCertificateAuthoritiesPageRouteRoute
|
||||
certManagerCertificatesPageRouteRoute: typeof certManagerCertificatesPageRouteRoute
|
||||
certManagerPoliciesPageRouteRoute: typeof certManagerPoliciesPageRouteRoute
|
||||
certManagerSettingsPageRouteRoute: typeof certManagerSettingsPageRouteRoute
|
||||
projectAccessControlPageRouteCertManagerRoute: typeof projectAccessControlPageRouteCertManagerRoute
|
||||
projectAppConnectionsPageRouteCertManagerRoute: typeof projectAppConnectionsPageRouteCertManagerRoute
|
||||
@@ -4151,6 +4148,7 @@ const certManagerLayoutRouteChildren: certManagerLayoutRouteChildren = {
|
||||
certManagerCertificateAuthoritiesPageRouteRoute:
|
||||
certManagerCertificateAuthoritiesPageRouteRoute,
|
||||
certManagerCertificatesPageRouteRoute: certManagerCertificatesPageRouteRoute,
|
||||
certManagerPoliciesPageRouteRoute: certManagerPoliciesPageRouteRoute,
|
||||
certManagerSettingsPageRouteRoute: certManagerSettingsPageRouteRoute,
|
||||
projectAccessControlPageRouteCertManagerRoute:
|
||||
projectAccessControlPageRouteCertManagerRoute,
|
||||
@@ -5042,7 +5040,6 @@ export interface FileRoutesByFullPath {
|
||||
'/organization/identities/$identityId': typeof organizationIdentityDetailsByIDPageRouteRoute
|
||||
'/organization/members/$membershipId': typeof organizationUserDetailsByIDPageRouteRoute
|
||||
'/organization/roles/$roleId': typeof organizationRoleByIDPageRouteRoute
|
||||
'/organization/secret-sharing/settings': typeof organizationSecretSharingSettingsPageRouteRoute
|
||||
'/admin/resources/overview': typeof adminResourceOverviewPageRouteRoute
|
||||
'/projects/cert-management/$projectId': typeof certManagerLayoutRouteWithChildren
|
||||
'/projects/kms/$projectId': typeof kmsLayoutRouteWithChildren
|
||||
@@ -5065,6 +5062,7 @@ export interface FileRoutesByFullPath {
|
||||
'/projects/cert-management/$projectId/alerting': typeof certManagerAlertingPageRouteRoute
|
||||
'/projects/cert-management/$projectId/certificate-authorities': typeof certManagerCertificateAuthoritiesPageRouteRoute
|
||||
'/projects/cert-management/$projectId/certificates': typeof certManagerCertificatesPageRouteRoute
|
||||
'/projects/cert-management/$projectId/policies': typeof certManagerPoliciesPageRouteRoute
|
||||
'/projects/cert-management/$projectId/settings': typeof certManagerSettingsPageRouteRoute
|
||||
'/projects/kms/$projectId/kmip': typeof kmsKmipPageRouteRoute
|
||||
'/projects/kms/$projectId/overview': typeof kmsOverviewPageRouteRoute
|
||||
@@ -5275,7 +5273,6 @@ export interface FileRoutesByTo {
|
||||
'/organization/identities/$identityId': typeof organizationIdentityDetailsByIDPageRouteRoute
|
||||
'/organization/members/$membershipId': typeof organizationUserDetailsByIDPageRouteRoute
|
||||
'/organization/roles/$roleId': typeof organizationRoleByIDPageRouteRoute
|
||||
'/organization/secret-sharing/settings': typeof organizationSecretSharingSettingsPageRouteRoute
|
||||
'/admin/resources/overview': typeof adminResourceOverviewPageRouteRoute
|
||||
'/projects/cert-management/$projectId': typeof certManagerLayoutRouteWithChildren
|
||||
'/projects/kms/$projectId': typeof kmsLayoutRouteWithChildren
|
||||
@@ -5298,6 +5295,7 @@ export interface FileRoutesByTo {
|
||||
'/projects/cert-management/$projectId/alerting': typeof certManagerAlertingPageRouteRoute
|
||||
'/projects/cert-management/$projectId/certificate-authorities': typeof certManagerCertificateAuthoritiesPageRouteRoute
|
||||
'/projects/cert-management/$projectId/certificates': typeof certManagerCertificatesPageRouteRoute
|
||||
'/projects/cert-management/$projectId/policies': typeof certManagerPoliciesPageRouteRoute
|
||||
'/projects/cert-management/$projectId/settings': typeof certManagerSettingsPageRouteRoute
|
||||
'/projects/kms/$projectId/kmip': typeof kmsKmipPageRouteRoute
|
||||
'/projects/kms/$projectId/overview': typeof kmsOverviewPageRouteRoute
|
||||
@@ -5513,7 +5511,6 @@ export interface FileRoutesById {
|
||||
'/_authenticate/_inject-org-details/_org-layout/organization/identities/$identityId': typeof organizationIdentityDetailsByIDPageRouteRoute
|
||||
'/_authenticate/_inject-org-details/_org-layout/organization/members/$membershipId': typeof organizationUserDetailsByIDPageRouteRoute
|
||||
'/_authenticate/_inject-org-details/_org-layout/organization/roles/$roleId': typeof organizationRoleByIDPageRouteRoute
|
||||
'/_authenticate/_inject-org-details/_org-layout/organization/secret-sharing/settings': typeof organizationSecretSharingSettingsPageRouteRoute
|
||||
'/_authenticate/_inject-org-details/admin/_admin-layout/resources/overview': typeof adminResourceOverviewPageRouteRoute
|
||||
'/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId': typeof AuthenticateInjectOrgDetailsOrgLayoutProjectsCertManagementProjectIdRouteWithChildren
|
||||
'/_authenticate/_inject-org-details/_org-layout/projects/kms/$projectId': typeof AuthenticateInjectOrgDetailsOrgLayoutProjectsKmsProjectIdRouteWithChildren
|
||||
@@ -5542,6 +5539,7 @@ export interface FileRoutesById {
|
||||
'/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/alerting': typeof certManagerAlertingPageRouteRoute
|
||||
'/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/certificate-authorities': typeof certManagerCertificateAuthoritiesPageRouteRoute
|
||||
'/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/certificates': typeof certManagerCertificatesPageRouteRoute
|
||||
'/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/policies': typeof certManagerPoliciesPageRouteRoute
|
||||
'/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/settings': typeof certManagerSettingsPageRouteRoute
|
||||
'/_authenticate/_inject-org-details/_org-layout/projects/kms/$projectId/_kms-layout/kmip': typeof kmsKmipPageRouteRoute
|
||||
'/_authenticate/_inject-org-details/_org-layout/projects/kms/$projectId/_kms-layout/overview': typeof kmsOverviewPageRouteRoute
|
||||
@@ -5761,7 +5759,6 @@ export interface FileRouteTypes {
|
||||
| '/organization/identities/$identityId'
|
||||
| '/organization/members/$membershipId'
|
||||
| '/organization/roles/$roleId'
|
||||
| '/organization/secret-sharing/settings'
|
||||
| '/admin/resources/overview'
|
||||
| '/projects/cert-management/$projectId'
|
||||
| '/projects/kms/$projectId'
|
||||
@@ -5784,6 +5781,7 @@ export interface FileRouteTypes {
|
||||
| '/projects/cert-management/$projectId/alerting'
|
||||
| '/projects/cert-management/$projectId/certificate-authorities'
|
||||
| '/projects/cert-management/$projectId/certificates'
|
||||
| '/projects/cert-management/$projectId/policies'
|
||||
| '/projects/cert-management/$projectId/settings'
|
||||
| '/projects/kms/$projectId/kmip'
|
||||
| '/projects/kms/$projectId/overview'
|
||||
@@ -5993,7 +5991,6 @@ export interface FileRouteTypes {
|
||||
| '/organization/identities/$identityId'
|
||||
| '/organization/members/$membershipId'
|
||||
| '/organization/roles/$roleId'
|
||||
| '/organization/secret-sharing/settings'
|
||||
| '/admin/resources/overview'
|
||||
| '/projects/cert-management/$projectId'
|
||||
| '/projects/kms/$projectId'
|
||||
@@ -6016,6 +6013,7 @@ export interface FileRouteTypes {
|
||||
| '/projects/cert-management/$projectId/alerting'
|
||||
| '/projects/cert-management/$projectId/certificate-authorities'
|
||||
| '/projects/cert-management/$projectId/certificates'
|
||||
| '/projects/cert-management/$projectId/policies'
|
||||
| '/projects/cert-management/$projectId/settings'
|
||||
| '/projects/kms/$projectId/kmip'
|
||||
| '/projects/kms/$projectId/overview'
|
||||
@@ -6229,7 +6227,6 @@ export interface FileRouteTypes {
|
||||
| '/_authenticate/_inject-org-details/_org-layout/organization/identities/$identityId'
|
||||
| '/_authenticate/_inject-org-details/_org-layout/organization/members/$membershipId'
|
||||
| '/_authenticate/_inject-org-details/_org-layout/organization/roles/$roleId'
|
||||
| '/_authenticate/_inject-org-details/_org-layout/organization/secret-sharing/settings'
|
||||
| '/_authenticate/_inject-org-details/admin/_admin-layout/resources/overview'
|
||||
| '/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId'
|
||||
| '/_authenticate/_inject-org-details/_org-layout/projects/kms/$projectId'
|
||||
@@ -6258,6 +6255,7 @@ export interface FileRouteTypes {
|
||||
| '/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/alerting'
|
||||
| '/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/certificate-authorities'
|
||||
| '/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/certificates'
|
||||
| '/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/policies'
|
||||
| '/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/settings'
|
||||
| '/_authenticate/_inject-org-details/_org-layout/projects/kms/$projectId/_kms-layout/kmip'
|
||||
| '/_authenticate/_inject-org-details/_org-layout/projects/kms/$projectId/_kms-layout/overview'
|
||||
@@ -6750,8 +6748,7 @@ export const routeTree = rootRoute
|
||||
"filePath": "",
|
||||
"parent": "/_authenticate/_inject-org-details/_org-layout/organization",
|
||||
"children": [
|
||||
"/_authenticate/_inject-org-details/_org-layout/organization/secret-sharing/",
|
||||
"/_authenticate/_inject-org-details/_org-layout/organization/secret-sharing/settings"
|
||||
"/_authenticate/_inject-org-details/_org-layout/organization/secret-sharing/"
|
||||
]
|
||||
},
|
||||
"/_authenticate/_inject-org-details/_org-layout/organization/settings": {
|
||||
@@ -6797,10 +6794,6 @@ export const routeTree = rootRoute
|
||||
"filePath": "organization/RoleByIDPage/route.tsx",
|
||||
"parent": "/_authenticate/_inject-org-details/_org-layout/organization"
|
||||
},
|
||||
"/_authenticate/_inject-org-details/_org-layout/organization/secret-sharing/settings": {
|
||||
"filePath": "organization/SecretSharingSettingsPage/route.tsx",
|
||||
"parent": "/_authenticate/_inject-org-details/_org-layout/organization/secret-sharing"
|
||||
},
|
||||
"/_authenticate/_inject-org-details/admin/_admin-layout/resources/overview": {
|
||||
"filePath": "admin/ResourceOverviewPage/route.tsx",
|
||||
"parent": "/_authenticate/_inject-org-details/admin/_admin-layout"
|
||||
@@ -6898,6 +6891,7 @@ export const routeTree = rootRoute
|
||||
"/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/alerting",
|
||||
"/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/certificate-authorities",
|
||||
"/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/certificates",
|
||||
"/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/policies",
|
||||
"/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/settings",
|
||||
"/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/access-management",
|
||||
"/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/app-connections",
|
||||
@@ -7015,6 +7009,10 @@ export const routeTree = rootRoute
|
||||
"filePath": "cert-manager/CertificatesPage/route.tsx",
|
||||
"parent": "/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout"
|
||||
},
|
||||
"/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/policies": {
|
||||
"filePath": "cert-manager/PoliciesPage/route.tsx",
|
||||
"parent": "/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout"
|
||||
},
|
||||
"/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout/settings": {
|
||||
"filePath": "cert-manager/SettingsPage/route.tsx",
|
||||
"parent": "/_authenticate/_inject-org-details/_org-layout/projects/cert-management/$projectId/_cert-manager-layout"
|
||||
|
||||
Reference in New Issue
Block a user