TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-02-28 16:37:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: move org create into parent routing module (#2765)

Browse Source
This commit is contained in:
Max Peintner 2021-12-01 14:42:15 +01:00 committed by GitHub
parent 30c130f102
commit 524f8e7a84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 173 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
console/src/app/app-routing.module.ts
View File

@ -4,17 +4,17 @@ import { QuicklinkStrategy } from 'ngx-quicklink';
import { AuthGuard } from './guards/auth.guard';
import { RoleGuard } from './guards/role.guard';
import { OrgCreateComponent } from './pages/org-create/org-create.component';
const routes: Routes = [
{
path: '',
loadChildren: () => import('./pages/home/home.module').then(m => m.HomeModule),
loadChildren: () => import('./pages/home/home.module').then((m) => m.HomeModule),
canActivate: [AuthGuard],
},
{
path: 'firststeps',
loadChildren: () => import('./modules/onboarding/onboarding.module')
.then(m => m.OnboardingModule),
loadChildren: () => import('./modules/onboarding/onboarding.module').then((m) => m.OnboardingModule),
canActivate: [AuthGuard, RoleGuard],
data: {
roles: ['iam.write'],
@ -22,8 +22,8 @@ const routes: Routes = [
},
{
path: 'granted-projects',
loadChildren: () => import('./pages/projects/granted-projects/granted-projects.module')
.then(m => m.GrantedProjectsModule),
loadChildren: () =>
import('./pages/projects/granted-projects/granted-projects.module').then((m) => m.GrantedProjectsModule),
canActivate: [AuthGuard, RoleGuard],
data: {
roles: ['project.grant.read'],
@ -31,8 +31,7 @@ const routes: Routes = [
},
{
path: 'projects',
loadChildren: () => import('./pages/projects/owned-projects/owned-projects.module')
.then(m => m.OwnedProjectsModule),
loadChildren: () => import('./pages/projects/owned-projects/owned-projects.module').then((m) => m.OwnedProjectsModule),
canActivate: [AuthGuard, RoleGuard],
data: {
roles: ['project.read'],
@ -44,8 +43,7 @@ const routes: Routes = [
children: [
{
path: 'list',
loadChildren: () => import('src/app/pages/users/user-list/user-list.module')
.then(m => m.UserListModule),
loadChildren: () => import('src/app/pages/users/user-list/user-list.module').then((m) => m.UserListModule),
canActivate: [RoleGuard],
data: {
roles: ['user.read'],
@ -53,14 +51,13 @@ const routes: Routes = [
},
{
path: '',
loadChildren: () => import('src/app/pages/users/user-detail/user-detail.module')
.then(m => m.UserDetailModule),
loadChildren: () => import('src/app/pages/users/user-detail/user-detail.module').then((m) => m.UserDetailModule),
},
],
},
{
path: 'iam',
loadChildren: () => import('./pages/iam/iam.module').then(m => m.IamModule),
loadChildren: () => import('./pages/iam/iam.module').then((m) => m.IamModule),
canActivate: [AuthGuard, RoleGuard],
data: {
roles: ['iam.read', 'iam.write'],
@ -68,15 +65,24 @@ const routes: Routes = [
},
{
path: 'org',
loadChildren: () => import('./pages/orgs/orgs.module').then(m => m.OrgsModule),
loadChildren: () => import('./pages/orgs/orgs.module').then((m) => m.OrgsModule),
canActivate: [AuthGuard, RoleGuard],
data: {
roles: ['org.read'],
},
},
{
path: 'org/create',
component: OrgCreateComponent,
canActivate: [RoleGuard],
data: {
roles: ['(org.create)?(iam.write)?'],
},
loadChildren: () => import('./pages/org-create/org-create.module').then((m) => m.OrgCreateModule),
},
{
path: 'actions',
loadChildren: () => import('./pages/actions/actions.module').then(m => m.ActionsModule),
loadChildren: () => import('./pages/actions/actions.module').then((m) => m.ActionsModule),
canActivate: [AuthGuard, RoleGuard],
data: {
roles: ['org.read'],
@ -84,7 +90,7 @@ const routes: Routes = [
},
{
path: 'grants',
loadChildren: () => import('./pages/grants/grants.module').then(m => m.GrantsModule),
loadChildren: () => import('./pages/grants/grants.module').then((m) => m.GrantsModule),
canActivate: [AuthGuard, RoleGuard],
data: {
roles: ['user.grant.read'],
@ -96,8 +102,8 @@ const routes: Routes = [
children: [
{
path: 'project/:projectid/grant/:grantid',
loadChildren: () => import('src/app/pages/user-grant-create/user-grant-create.module')
.then(m => m.UserGrantCreateModule),
loadChildren: () =>
import('src/app/pages/user-grant-create/user-grant-create.module').then((m) => m.UserGrantCreateModule),
canActivate: [RoleGuard],
data: {
roles: ['user.grant.write'],
@ -105,8 +111,8 @@ const routes: Routes = [
},
{
path: 'project/:projectid',
loadChildren: () => import('src/app/pages/user-grant-create/user-grant-create.module')
.then(m => m.UserGrantCreateModule),
loadChildren: () =>
import('src/app/pages/user-grant-create/user-grant-create.module').then((m) => m.UserGrantCreateModule),
canActivate: [RoleGuard],
data: {
roles: ['user.grant.write'],
@ -114,8 +120,8 @@ const routes: Routes = [
},
{
path: 'user/:userid',
loadChildren: () => import('src/app/pages/user-grant-create/user-grant-create.module')
.then(m => m.UserGrantCreateModule),
loadChildren: () =>
import('src/app/pages/user-grant-create/user-grant-create.module').then((m) => m.UserGrantCreateModule),
canActivate: [RoleGuard],
data: {
roles: ['user.grant.write'],
@ -123,8 +129,8 @@ const routes: Routes = [
},
{
path: '',
loadChildren: () => import('src/app/pages/user-grant-create/user-grant-create.module')
.then(m => m.UserGrantCreateModule),
loadChildren: () =>
import('src/app/pages/user-grant-create/user-grant-create.module').then((m) => m.UserGrantCreateModule),
canActivate: [RoleGuard],
data: {
roles: ['user.grant.write'],
@ -134,7 +140,7 @@ const routes: Routes = [
},
{
path: 'signedout',
loadChildren: () => import('./pages/signedout/signedout.module').then(m => m.SignedoutModule),
loadChildren: () => import('./pages/signedout/signedout.module').then((m) => m.SignedoutModule),
},
{
path: '**',
@ -144,13 +150,10 @@ const routes: Routes = [
@NgModule({
imports: [
RouterModule.forRoot(
routes,
{
RouterModule.forRoot(routes, {
preloadingStrategy: QuicklinkStrategy,
relativeLinkResolution: 'legacy',
},
),
}),
],
exports: [RouterModule],
})

0
console/src/app/pages/orgs/org-create/org-create-routing.module.ts → console/src/app/pages/org-create/org-create-routing.module.ts
View File

0
console/src/app/pages/orgs/org-create/org-create.component.html → console/src/app/pages/org-create/org-create.component.html
View File

0
console/src/app/pages/orgs/org-create/org-create.component.scss → console/src/app/pages/org-create/org-create.component.scss
View File

0
console/src/app/pages/orgs/org-create/org-create.component.spec.ts → console/src/app/pages/org-create/org-create.component.spec.ts
View File

0
console/src/app/pages/orgs/org-create/org-create.component.ts → console/src/app/pages/org-create/org-create.component.ts
View File

0
console/src/app/pages/orgs/org-create/org-create.module.ts → console/src/app/pages/org-create/org-create.module.ts
View File

64
console/src/app/pages/orgs/orgs-routing.module.ts
View File

@ -4,25 +4,15 @@ import { RoleGuard } from 'src/app/guards/role.guard';
import { FeatureServiceType } from 'src/app/modules/features/features.component';
import { PolicyComponentServiceType, PolicyComponentType } from 'src/app/modules/policies/policy-component-types.enum';
import { OrgCreateComponent } from './org-create/org-create.component';
import { OrgDetailComponent } from './org-detail/org-detail.component';
const routes: Routes = [
{
path: 'create',
component: OrgCreateComponent,
canActivate: [RoleGuard],
data: {
roles: ['(org.create)?(iam.write)?'],
},
loadChildren: () => import('./org-create/org-create.module').then(m => m.OrgCreateModule),
},
{
path: 'idp',
children: [
{
path: 'create',
loadChildren: () => import('src/app/modules/idp-create/idp-create.module').then(m => m.IdpCreateModule),
loadChildren: () => import('src/app/modules/idp-create/idp-create.module').then((m) => m.IdpCreateModule),
canActivate: [RoleGuard],
data: {
roles: ['org.idp.write'],
@ -31,7 +21,7 @@ const routes: Routes = [
},
{
path: ':id',
loadChildren: () => import('src/app/modules/idp/idp.module').then(m => m.IdpModule),
loadChildren: () => import('src/app/modules/idp/idp.module').then((m) => m.IdpModule),
canActivate: [RoleGuard],
data: {
roles: ['org.idp.read'],
@ -42,7 +32,7 @@ const routes: Routes = [
},
{
path: 'features',
loadChildren: () => import('src/app/modules/features/features.module').then(m => m.FeaturesModule),
loadChildren: () => import('src/app/modules/features/features.module').then((m) => m.FeaturesModule),
canActivate: [RoleGuard],
data: {
roles: ['features.read'],
@ -57,78 +47,86 @@ const routes: Routes = [
data: {
serviceType: PolicyComponentServiceType.MGMT,
},
loadChildren: () => import('src/app/modules/policies/password-age-policy/password-age-policy.module')
.then(m => m.PasswordAgePolicyModule),
loadChildren: () =>
import('src/app/modules/policies/password-age-policy/password-age-policy.module').then(
(m) => m.PasswordAgePolicyModule,
),
},
{
path: PolicyComponentType.LOCKOUT,
data: {
serviceType: PolicyComponentServiceType.MGMT,
},
loadChildren: () => import('src/app/modules/policies/password-lockout-policy/password-lockout-policy.module')
.then(m => m.PasswordLockoutPolicyModule),
loadChildren: () =>
import('src/app/modules/policies/password-lockout-policy/password-lockout-policy.module').then(
(m) => m.PasswordLockoutPolicyModule,
),
},
{
path: PolicyComponentType.PRIVATELABEL,
data: {
serviceType: PolicyComponentServiceType.MGMT,
},
loadChildren: () => import('src/app/modules/policies/private-labeling-policy/private-labeling-policy.module')
.then(m => m.PrivateLabelingPolicyModule),
loadChildren: () =>
import('src/app/modules/policies/private-labeling-policy/private-labeling-policy.module').then(
(m) => m.PrivateLabelingPolicyModule,
),
},
{
path: PolicyComponentType.COMPLEXITY,
data: {
serviceType: PolicyComponentServiceType.MGMT,
},
loadChildren: () => import('src/app/modules/policies/password-complexity-policy/password-complexity-policy.module')
.then(m => m.PasswordComplexityPolicyModule),
loadChildren: () =>
import('src/app/modules/policies/password-complexity-policy/password-complexity-policy.module').then(
(m) => m.PasswordComplexityPolicyModule,
),
},
{
path: PolicyComponentType.IAM,
data: {
serviceType: PolicyComponentServiceType.MGMT,
},
loadChildren: () => import('src/app/modules/policies/org-iam-policy/org-iam-policy.module')
.then(m => m.OrgIamPolicyModule),
loadChildren: () =>
import('src/app/modules/policies/org-iam-policy/org-iam-policy.module').then((m) => m.OrgIamPolicyModule),
},
{
path: PolicyComponentType.LOGIN,
data: {
serviceType: PolicyComponentServiceType.MGMT,
},
loadChildren: () => import('src/app/modules/policies/login-policy/login-policy.module')
.then(m => m.LoginPolicyModule),
loadChildren: () =>
import('src/app/modules/policies/login-policy/login-policy.module').then((m) => m.LoginPolicyModule),
},
{
path: PolicyComponentType.MESSAGETEXTS,
data: {
serviceType: PolicyComponentServiceType.MGMT,
},
loadChildren: () => import('src/app/modules/policies/message-texts/message-texts.module')
.then(m => m.MessageTextsPolicyModule),
loadChildren: () =>
import('src/app/modules/policies/message-texts/message-texts.module').then((m) => m.MessageTextsPolicyModule),
},
{
path: PolicyComponentType.LOGINTEXTS,
data: {
serviceType: PolicyComponentServiceType.MGMT,
},
loadChildren: () => import('src/app/modules/policies/login-texts/login-texts.module')
.then(m => m.LoginTextsPolicyModule),
loadChildren: () =>
import('src/app/modules/policies/login-texts/login-texts.module').then((m) => m.LoginTextsPolicyModule),
},
{
path: PolicyComponentType.PRIVACYPOLICY,
data: {
serviceType: PolicyComponentServiceType.MGMT,
},
loadChildren: () => import('src/app/modules/policies/privacy-policy/privacy-policy.module')
.then(m => m.PrivacyPolicyModule),
loadChildren: () =>
import('src/app/modules/policies/privacy-policy/privacy-policy.module').then((m) => m.PrivacyPolicyModule),
},
],
},
{
path: 'members',
loadChildren: () => import('./org-members/org-members.module').then(m => m.OrgMembersModule),
loadChildren: () => import('./org-members/org-members.module').then((m) => m.OrgMembersModule),
},
{
path: '',
@ -136,7 +134,7 @@ const routes: Routes = [
},
{
path: 'overview',
loadChildren: () => import('./org-list/org-list.module').then(m => m.OrgListModule),
loadChildren: () => import('./org-list/org-list.module').then((m) => m.OrgListModule),
},
];