diff --git a/console/src/app/app-routing.module.ts b/console/src/app/app-routing.module.ts index 624c32a81..4900c8e42 100644 --- a/console/src/app/app-routing.module.ts +++ b/console/src/app/app-routing.module.ts @@ -125,39 +125,6 @@ const routes: Routes = [ }, ], }, - { - path: 'failed-events', - loadChildren: () => import('./pages/failed-events/failed-events.module'), - canActivate: [AuthGuard, RoleGuard], - data: { - roles: ['iam.read'], - }, - }, - { - path: 'views', - loadChildren: () => import('./pages/iam-views/iam-views.module'), - canActivate: [AuthGuard, RoleGuard], - data: { - roles: ['iam.read'], - }, - }, - { - path: 'events', - loadChildren: () => import('./pages/events/events.module'), - canActivate: [AuthGuard, RoleGuard], - data: { - roles: ['iam.read'], - }, - }, - { - path: 'settings', - loadChildren: () => import('./pages/instance-settings/instance-settings.module'), - canActivate: [AuthGuard, RoleGuard], - data: { - roles: ['iam.read', 'iam.policy.read'], - requiresAll: true, - }, - }, { path: 'org-settings', loadChildren: () => import('./pages/org-settings/org-settings.module'), diff --git a/console/src/app/modules/events/events.component.html b/console/src/app/modules/events/events.component.html new file mode 100644 index 000000000..71696cdc1 --- /dev/null +++ b/console/src/app/modules/events/events.component.html @@ -0,0 +1,129 @@ +

{{ 'IAM.EVENTS.TITLE' | translate }}

+

{{ 'IAM.EVENTS.DESCRIPTION' | translate }}

+ + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{ 'IAM.EVENTS.EDITOR' | translate }} + +
+ + {{ editor.displayName }} + {{ editor.service }} +
+ + 		{{ 'IAM.EVENTS.AGGREGATE' | translate }} + +
+ {{ event.aggregate.id }}{{ + event.aggregate.type.localized.localizedMessage + }} +
+ + 		{{ 'IAM.EVENTS.RESOURCEOWNER' | translate }} + + {{ event.aggregate.resourceOwner }} + + + {{ 'IAM.EVENTS.SEQUENCE' | translate }} + + + {{ event.sequence }} + + + {{ 'IAM.EVENTS.CREATIONDATE' | translate }} + + + {{ event?.creationDate | timestampToDate | localizedDate: 'EEE dd. MMM, HH:mm:ss' }} + + {{ 'IAM.EVENTS.TYPE' | translate }} + + {{ event.type.localized.localizedMessage }} + + {{ 'IAM.EVENTS.PAYLOAD' | translate }} + + {{ payload | json }} +
+ +
+ +
+ + + diff --git a/console/src/app/pages/events/events.component.scss b/console/src/app/modules/events/events.component.scss similarity index 97% rename from console/src/app/pages/events/events.component.scss rename to console/src/app/modules/events/events.component.scss index 5a9ac466c..1b53b96fc 100644 --- a/console/src/app/pages/events/events.component.scss +++ b/console/src/app/modules/events/events.component.scss @@ -61,10 +61,6 @@ } } -.events-title { - margin: 2rem 0 0 0; -} - .events-desc { font-size: 14px; } diff --git a/console/src/app/pages/events/events.component.spec.ts b/console/src/app/modules/events/events.component.spec.ts similarity index 100% rename from console/src/app/pages/events/events.component.spec.ts rename to console/src/app/modules/events/events.component.spec.ts diff --git a/console/src/app/pages/events/events.component.ts b/console/src/app/modules/events/events.component.ts similarity index 100% rename from console/src/app/pages/events/events.component.ts rename to console/src/app/modules/events/events.component.ts diff --git a/console/src/app/pages/events/events.module.ts b/console/src/app/modules/events/events.module.ts similarity index 95% rename from console/src/app/pages/events/events.module.ts rename to console/src/app/modules/events/events.module.ts index b1ba802f3..fcd3444b3 100644 --- a/console/src/app/pages/events/events.module.ts +++ b/console/src/app/modules/events/events.module.ts @@ -26,13 +26,11 @@ import { DisplayJsonDialogModule } from 'src/app/modules/display-json-dialog/dis import { FilterEventsModule } from 'src/app/modules/filter-events/filter-events.module'; import { ToObjectPipeModule } from 'src/app/pipes/to-object/to-object.module'; import { ToPayloadPipeModule } from 'src/app/pipes/to-payload/to-payload.module'; -import { EventsRoutingModule } from './events-routing.module'; import { EventsComponent } from './events.component'; @NgModule({ declarations: [EventsComponent], imports: [ - EventsRoutingModule, CommonModule, TableActionsModule, MatIconModule, @@ -60,6 +58,6 @@ import { EventsComponent } from './events.component'; MatSortModule, OverlayModule, ], - exports: [], + exports: [EventsComponent], }) -export default class IamViewsModule {} +export default class EventsModule {} diff --git a/console/src/app/modules/failed-events/failed-events.component.html b/console/src/app/modules/failed-events/failed-events.component.html new file mode 100644 index 000000000..1c31a66bc --- /dev/null +++ b/console/src/app/modules/failed-events/failed-events.component.html @@ -0,0 +1,68 @@ +

{{ 'IAM.FAILEDEVENTS.TITLE' | translate }}

+

{{ 'IAM.FAILEDEVENTS.DESCRIPTION' | translate }}

+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{ 'IAM.FAILEDEVENTS.VIEWNAME' | translate }}{{ event.viewName }}{{ 'IAM.FAILEDEVENTS.DATABASE' | translate }}{{ event.database }}{{ 'IAM.FAILEDEVENTS.FAILEDSEQUENCE' | translate }} + {{ event?.failedSequence }} + {{ 'IAM.FAILEDEVENTS.FAILURECOUNT' | translate }} + {{ event?.failureCount }} + {{ 'IAM.FAILEDEVENTS.LASTFAILED' | translate }} + {{ event?.lastFailed | timestampToDate | localizedDate: 'EEE dd. MMM, HH:mm' }} + {{ 'IAM.FAILEDEVENTS.ERRORMESSAGE' | translate }} + {{ event?.errorMessage }} + + + + +
+ + + +
diff --git a/console/src/app/pages/failed-events/failed-events.component.scss b/console/src/app/modules/failed-events/failed-events.component.scss similarity index 70% rename from console/src/app/pages/failed-events/failed-events.component.scss rename to console/src/app/modules/failed-events/failed-events.component.scss index 669595321..a87380904 100644 --- a/console/src/app/pages/failed-events/failed-events.component.scss +++ b/console/src/app/modules/failed-events/failed-events.component.scss @@ -1,7 +1,3 @@ -.failed-events-title { - margin: 2rem 0 0 0; -} - .failed-events-desc { font-size: 14px; } diff --git a/console/src/app/pages/failed-events/failed-events.component.spec.ts b/console/src/app/modules/failed-events/failed-events.component.spec.ts similarity index 100% rename from console/src/app/pages/failed-events/failed-events.component.spec.ts rename to console/src/app/modules/failed-events/failed-events.component.spec.ts diff --git a/console/src/app/pages/failed-events/failed-events.component.ts b/console/src/app/modules/failed-events/failed-events.component.ts similarity index 100% rename from console/src/app/pages/failed-events/failed-events.component.ts rename to console/src/app/modules/failed-events/failed-events.component.ts diff --git a/console/src/app/pages/failed-events/failed-events.module.ts b/console/src/app/modules/failed-events/failed-events.module.ts similarity index 94% rename from console/src/app/pages/failed-events/failed-events.module.ts rename to console/src/app/modules/failed-events/failed-events.module.ts index 39954791e..d891127fd 100644 --- a/console/src/app/pages/failed-events/failed-events.module.ts +++ b/console/src/app/modules/failed-events/failed-events.module.ts @@ -18,13 +18,11 @@ import { HasRolePipeModule } from 'src/app/pipes/has-role-pipe/has-role-pipe.mod import { LocalizedDatePipeModule } from 'src/app/pipes/localized-date-pipe/localized-date-pipe.module'; import { TimestampToDatePipeModule } from 'src/app/pipes/timestamp-to-date-pipe/timestamp-to-date-pipe.module'; -import { FailedEventsRoutingModule } from './failed-events-routing.module'; import { FailedEventsComponent } from './failed-events.component'; @NgModule({ declarations: [FailedEventsComponent], imports: [ - FailedEventsRoutingModule, CommonModule, TableActionsModule, MatIconModule, @@ -44,5 +42,6 @@ import { FailedEventsComponent } from './failed-events.component'; MatTableModule, MatSortModule, ], + exports: [FailedEventsComponent], }) export default class FailedEventsModule {} diff --git a/console/src/app/modules/iam-views/iam-views.component.html b/console/src/app/modules/iam-views/iam-views.component.html new file mode 100644 index 000000000..f6db88674 --- /dev/null +++ b/console/src/app/modules/iam-views/iam-views.component.html @@ -0,0 +1,40 @@ +

{{ 'IAM.VIEWS.TITLE' | translate }}

+

{{ 'IAM.VIEWS.DESCRIPTION' | translate }}

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{{ 'IAM.VIEWS.VIEWNAME' | translate }}{{ view.viewName }}{{ 'IAM.VIEWS.DATABASE' | translate }}{{ view.database }}{{ 'IAM.VIEWS.SEQUENCE' | translate }}{{ view.processedSequence }}{{ 'IAM.VIEWS.EVENTTIMESTAMP' | translate }} + {{ view?.eventTimestamp | timestampToDate | localizedDate: 'EEE dd. MMM, HH:mm' }} + {{ 'IAM.VIEWS.LASTSPOOL' | translate }} + {{ view?.lastSuccessfulSpoolerRun | timestampToDate | localizedDate: 'EEE dd. MMM, HH:mm' }} +
+ + + diff --git a/console/src/app/modules/iam-views/iam-views.component.scss b/console/src/app/modules/iam-views/iam-views.component.scss new file mode 100644 index 000000000..b1d6596f1 --- /dev/null +++ b/console/src/app/modules/iam-views/iam-views.component.scss @@ -0,0 +1,3 @@ +.views-desc { + font-size: 14px; +} diff --git a/console/src/app/pages/iam-views/iam-views.component.spec.ts b/console/src/app/modules/iam-views/iam-views.component.spec.ts similarity index 100% rename from console/src/app/pages/iam-views/iam-views.component.spec.ts rename to console/src/app/modules/iam-views/iam-views.component.spec.ts diff --git a/console/src/app/pages/iam-views/iam-views.component.ts b/console/src/app/modules/iam-views/iam-views.component.ts similarity index 100% rename from console/src/app/pages/iam-views/iam-views.component.ts rename to console/src/app/modules/iam-views/iam-views.component.ts diff --git a/console/src/app/pages/iam-views/iam-views.module.ts b/console/src/app/modules/iam-views/iam-views.module.ts similarity index 94% rename from console/src/app/pages/iam-views/iam-views.module.ts rename to console/src/app/modules/iam-views/iam-views.module.ts index 13c30ba8d..5958ca0dc 100644 --- a/console/src/app/pages/iam-views/iam-views.module.ts +++ b/console/src/app/modules/iam-views/iam-views.module.ts @@ -18,13 +18,11 @@ import { HasRolePipeModule } from 'src/app/pipes/has-role-pipe/has-role-pipe.mod import { LocalizedDatePipeModule } from 'src/app/pipes/localized-date-pipe/localized-date-pipe.module'; import { TimestampToDatePipeModule } from 'src/app/pipes/timestamp-to-date-pipe/timestamp-to-date-pipe.module'; -import { IamViewsRoutingModule } from './iam-views-routing.module'; import { IamViewsComponent } from './iam-views.component'; @NgModule({ declarations: [IamViewsComponent], imports: [ - IamViewsRoutingModule, CommonModule, TableActionsModule, MatIconModule, @@ -44,6 +42,6 @@ import { IamViewsComponent } from './iam-views.component'; MatTableModule, MatSortModule, ], - exports: [], + exports: [IamViewsComponent], }) export default class IamViewsModule {} diff --git a/console/src/app/modules/nav/nav.component.html b/console/src/app/modules/nav/nav.component.html index 3317e41f9..d601a76be 100644 --- a/console/src/app/modules/nav/nav.component.html +++ b/console/src/app/modules/nav/nav.component.html @@ -7,99 +7,12 @@ *ngIf=" breadc[breadc.length - 1] && !breadc[breadc.length - 1].hideNav && - breadc[breadc.length - 1].type !== BreadcrumbType.AUTHUSER + breadc[breadc.length - 1].type !== BreadcrumbType.AUTHUSER && + breadc[breadc.length - 1].type !== BreadcrumbType.INSTANCE " [ngSwitch]="breadc[0].type" >
- -
- - -
- {{ 'MENU.INSTANCEOVERVIEW' | translate }} -
- - - -
- {{ 'MENU.ORGS' | translate }} -
- - - -
- {{ 'MENU.EVENTS' | translate }} -
- - - -
- {{ 'MENU.VIEWS' | translate }} -
- - - -
- {{ 'MENU.FAILEDEVENTS' | translate }} -
- - - -
- {{ 'MENU.SETTINGS' | translate }} -
- - - -
- {{ 'MENU.CUSTOMERPORTAL' | translate }} -
- - - - - -
- -
{{ 'MENU.SETTINGS' | translate }} diff --git a/console/src/app/modules/nav/nav.component.ts b/console/src/app/modules/nav/nav.component.ts index 75093d290..a08b79315 100644 --- a/console/src/app/modules/nav/nav.component.ts +++ b/console/src/app/modules/nav/nav.component.ts @@ -90,7 +90,6 @@ export class NavComponent implements OnDestroy { private destroy$: Subject = new Subject(); public BreadcrumbType: any = BreadcrumbType; - public customerPortalLink$ = this.envService.env.pipe(map((env) => env.customer_portal)); public positions: ConnectedPosition[] = [ new ConnectionPositionPair({ originX: 'start', originY: 'bottom' }, { overlayX: 'start', overlayY: 'top' }, 0, 10), @@ -98,7 +97,6 @@ export class NavComponent implements OnDestroy { ]; constructor( - private envService: EnvironmentService, public authService: GrpcAuthService, public adminService: AdminService, public authenticationService: AuthenticationService, diff --git a/console/src/app/modules/settings-list/settings-list.component.html b/console/src/app/modules/settings-list/settings-list.component.html index 96792c5f0..8f98d0b28 100644 --- a/console/src/app/modules/settings-list/settings-list.component.html +++ b/console/src/app/modules/settings-list/settings-list.component.html @@ -6,6 +6,12 @@ [settingsList]="settingsList" queryParam="id" > + +

{{ 'ORG.PAGES.LIST' | translate }}

+

{{ 'ORG.PAGES.LISTDESCRIPTION' | translate }}

+ + + @@ -57,4 +63,13 @@ + + + + + + + + + diff --git a/console/src/app/modules/settings-list/settings-list.module.ts b/console/src/app/modules/settings-list/settings-list.module.ts index 007375166..f84ad42dd 100644 --- a/console/src/app/modules/settings-list/settings-list.module.ts +++ b/console/src/app/modules/settings-list/settings-list.module.ts @@ -24,6 +24,11 @@ import { SecretGeneratorModule } from '../policies/secret-generator/secret-gener import { SecurityPolicyModule } from '../policies/security-policy/security-policy.module'; import { SidenavModule } from '../sidenav/sidenav.module'; import { SettingsListComponent } from './settings-list.component'; +import FailedEventsModule from '../failed-events/failed-events.module'; +import IamViewsModule from '../iam-views/iam-views.module'; +import EventsModule from '../events/events.module'; +import OrgListModule from 'src/app/pages/org-list/org-list.module'; +import { OrgTableModule } from '../org-table/org-table.module'; @NgModule({ declarations: [SettingsListComponent], @@ -44,6 +49,7 @@ import { SettingsListComponent } from './settings-list.component'; SecurityPolicyModule, DomainsModule, LoginTextsPolicyModule, + OrgTableModule, DomainPolicyModule, TranslateModule, HasRolePipeModule, @@ -51,6 +57,9 @@ import { SettingsListComponent } from './settings-list.component'; NotificationSMSProviderModule, OIDCConfigurationModule, SecretGeneratorModule, + FailedEventsModule, + IamViewsModule, + EventsModule, ], exports: [SettingsListComponent], }) diff --git a/console/src/app/modules/settings-list/settings.ts b/console/src/app/modules/settings-list/settings.ts index d88c1b883..a5c07930f 100644 --- a/console/src/app/modules/settings-list/settings.ts +++ b/console/src/app/modules/settings-list/settings.ts @@ -1,6 +1,15 @@ import { PolicyComponentServiceType } from '../policies/policy-component-types.enum'; import { SidenavSetting } from '../sidenav/sidenav.component'; +export const ORGANIZATIONS: SidenavSetting = { + id: 'organizations', + i18nKey: 'SETTINGS.LIST.ORGS', + groupI18nKey: 'SETTINGS.GROUPS.GENERAL', + requiredRoles: { + [PolicyComponentServiceType.ADMIN]: ['iam.read'], + }, +}; + export const LANGUAGES: SidenavSetting = { id: 'languages', i18nKey: 'SETTINGS.LIST.LANGUAGES', @@ -33,6 +42,33 @@ export const SECURITY: SidenavSetting = { }, }; +export const VIEWS: SidenavSetting = { + id: 'views', + i18nKey: 'SETTINGS.LIST.VIEWS', + groupI18nKey: 'SETTINGS.GROUPS.STORAGE', + requiredRoles: { + [PolicyComponentServiceType.ADMIN]: ['iam.read'], + }, +}; + +export const FAILEDEVENTS: SidenavSetting = { + id: 'failedevents', + i18nKey: 'SETTINGS.LIST.FAILEDEVENTS', + groupI18nKey: 'SETTINGS.GROUPS.STORAGE', + requiredRoles: { + [PolicyComponentServiceType.ADMIN]: ['iam.read'], + }, +}; + +export const EVENTS: SidenavSetting = { + id: 'events', + i18nKey: 'SETTINGS.LIST.EVENTS', + groupI18nKey: 'SETTINGS.GROUPS.STORAGE', + requiredRoles: { + [PolicyComponentServiceType.ADMIN]: ['events.read'], + }, +}; + export const LOGIN: SidenavSetting = { id: 'login', i18nKey: 'SETTINGS.LIST.LOGIN', diff --git a/console/src/app/pages/events/events-routing.module.ts b/console/src/app/pages/events/events-routing.module.ts deleted file mode 100644 index 6338715e6..000000000 --- a/console/src/app/pages/events/events-routing.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; - -import { EventsComponent } from './events.component'; - -const routes: Routes = [ - { - path: '', - component: EventsComponent, - }, -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], -}) -export class EventsRoutingModule {} diff --git a/console/src/app/pages/events/events.component.html b/console/src/app/pages/events/events.component.html deleted file mode 100644 index 39c567b4d..000000000 --- a/console/src/app/pages/events/events.component.html +++ /dev/null @@ -1,131 +0,0 @@ -
-

{{ 'IAM.EVENTS.TITLE' | translate }}

-

{{ 'IAM.EVENTS.DESCRIPTION' | translate }}

- - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{ 'IAM.EVENTS.EDITOR' | translate }} - -
- - {{ editor.displayName }} - {{ editor.service }} -
- - 		{{ 'IAM.EVENTS.AGGREGATE' | translate }} - -
- {{ event.aggregate.id }}{{ - event.aggregate.type.localized.localizedMessage - }} -
- - 		{{ 'IAM.EVENTS.RESOURCEOWNER' | translate }} - - {{ event.aggregate.resourceOwner }} - - - {{ 'IAM.EVENTS.SEQUENCE' | translate }} - - - {{ event.sequence }} - - - {{ 'IAM.EVENTS.CREATIONDATE' | translate }} - - - {{ event?.creationDate | timestampToDate | localizedDate: 'EEE dd. MMM, HH:mm:ss' }} - - {{ 'IAM.EVENTS.TYPE' | translate }} - - {{ event.type.localized.localizedMessage }} - - {{ 'IAM.EVENTS.PAYLOAD' | translate }} - - {{ payload | json }} -
- -
- -
- - - -
diff --git a/console/src/app/pages/failed-events/failed-events-routing.module.ts b/console/src/app/pages/failed-events/failed-events-routing.module.ts deleted file mode 100644 index c63c5ec9d..000000000 --- a/console/src/app/pages/failed-events/failed-events-routing.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; - -import { FailedEventsComponent } from './failed-events.component'; - -const routes: Routes = [ - { - path: '', - component: FailedEventsComponent, - }, -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], -}) -export class FailedEventsRoutingModule {} diff --git a/console/src/app/pages/failed-events/failed-events.component.html b/console/src/app/pages/failed-events/failed-events.component.html deleted file mode 100644 index 136a41a4d..000000000 --- a/console/src/app/pages/failed-events/failed-events.component.html +++ /dev/null @@ -1,70 +0,0 @@ -
-

{{ 'IAM.FAILEDEVENTS.TITLE' | translate }}

-

{{ 'IAM.FAILEDEVENTS.DESCRIPTION' | translate }}

- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{ 'IAM.FAILEDEVENTS.VIEWNAME' | translate }}{{ event.viewName }}{{ 'IAM.FAILEDEVENTS.DATABASE' | translate }}{{ event.database }}{{ 'IAM.FAILEDEVENTS.FAILEDSEQUENCE' | translate }} - {{ event?.failedSequence }} - {{ 'IAM.FAILEDEVENTS.FAILURECOUNT' | translate }} - {{ event?.failureCount }} - {{ 'IAM.FAILEDEVENTS.LASTFAILED' | translate }} - {{ event?.lastFailed | timestampToDate | localizedDate: 'EEE dd. MMM, HH:mm' }} - {{ 'IAM.FAILEDEVENTS.ERRORMESSAGE' | translate }} - {{ event?.errorMessage }} - - - - -
- - - -
-
diff --git a/console/src/app/pages/iam-views/iam-views-routing.module.ts b/console/src/app/pages/iam-views/iam-views-routing.module.ts deleted file mode 100644 index 7c7c61c1a..000000000 --- a/console/src/app/pages/iam-views/iam-views-routing.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; - -import { IamViewsComponent } from './iam-views.component'; - -const routes: Routes = [ - { - path: '', - component: IamViewsComponent, - }, -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], -}) -export class IamViewsRoutingModule {} diff --git a/console/src/app/pages/iam-views/iam-views.component.html b/console/src/app/pages/iam-views/iam-views.component.html deleted file mode 100644 index 7b2930d03..000000000 --- a/console/src/app/pages/iam-views/iam-views.component.html +++ /dev/null @@ -1,42 +0,0 @@ -
-

{{ 'IAM.VIEWS.TITLE' | translate }}

-

{{ 'IAM.VIEWS.DESCRIPTION' | translate }}

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{{ 'IAM.VIEWS.VIEWNAME' | translate }}{{ view.viewName }}{{ 'IAM.VIEWS.DATABASE' | translate }}{{ view.database }}{{ 'IAM.VIEWS.SEQUENCE' | translate }}{{ view.processedSequence }}{{ 'IAM.VIEWS.EVENTTIMESTAMP' | translate }} - {{ view?.eventTimestamp | timestampToDate | localizedDate: 'EEE dd. MMM, HH:mm' }} - {{ 'IAM.VIEWS.LASTSPOOL' | translate }} - {{ view?.lastSuccessfulSpoolerRun | timestampToDate | localizedDate: 'EEE dd. MMM, HH:mm' }} -
- - - -
diff --git a/console/src/app/pages/iam-views/iam-views.component.scss b/console/src/app/pages/iam-views/iam-views.component.scss deleted file mode 100644 index 9bea7eaf7..000000000 --- a/console/src/app/pages/iam-views/iam-views.component.scss +++ /dev/null @@ -1,7 +0,0 @@ -.views-title { - margin: 2rem 0 0 0; -} - -.views-desc { - font-size: 14px; -} diff --git a/console/src/app/pages/instance-settings/instance-settings-routing.module.ts b/console/src/app/pages/instance-settings/instance-settings-routing.module.ts deleted file mode 100644 index dd7fbd592..000000000 --- a/console/src/app/pages/instance-settings/instance-settings-routing.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; - -import { InstanceSettingsComponent } from './instance-settings.component'; - -const routes: Routes = [ - { - path: '', - component: InstanceSettingsComponent, - }, -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], -}) -export class InstanceSettingsRoutingModule {} diff --git a/console/src/app/pages/instance-settings/instance-settings.component.html b/console/src/app/pages/instance-settings/instance-settings.component.html deleted file mode 100644 index b01323e94..000000000 --- a/console/src/app/pages/instance-settings/instance-settings.component.html +++ /dev/null @@ -1,18 +0,0 @@ -
-
-
-
-

{{ 'SETTINGS.INSTANCE.TITLE' | translate }}

-
-

{{ 'SETTINGS.INSTANCE.DESCRIPTION' | translate }}

-
- -
- - - -
diff --git a/console/src/app/pages/instance-settings/instance-settings.component.scss b/console/src/app/pages/instance-settings/instance-settings.component.scss deleted file mode 100644 index ba889aa83..000000000 --- a/console/src/app/pages/instance-settings/instance-settings.component.scss +++ /dev/null @@ -1,34 +0,0 @@ -.settings-top-view { - display: flex; - align-items: center; - padding-top: 2rem; - - .settings-title-row { - display: flex; - align-items: center; - - h1 { - margin: 0; - } - - a i { - font-size: 1.2rem; - height: 1.2rem; - line-height: 1.2rem; - } - } - - .fill-space { - flex: 1; - } - - .actions { - display: flex; - align-items: center; - } -} - -.desc { - margin-bottom: 2rem; - font-size: 14px; -} diff --git a/console/src/app/pages/instance-settings/instance-settings.component.spec.ts b/console/src/app/pages/instance-settings/instance-settings.component.spec.ts deleted file mode 100644 index 0c8f615bb..000000000 --- a/console/src/app/pages/instance-settings/instance-settings.component.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { InstanceSettingsComponent } from './instance-settings.component'; - -describe('InstanceSettingsComponent', () => { - let component: InstanceSettingsComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [InstanceSettingsComponent], - }).compileComponents(); - }); - - beforeEach(() => { - fixture = TestBed.createComponent(InstanceSettingsComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/console/src/app/pages/instance-settings/instance-settings.component.ts b/console/src/app/pages/instance-settings/instance-settings.component.ts deleted file mode 100644 index e2b2a23ca..000000000 --- a/console/src/app/pages/instance-settings/instance-settings.component.ts +++ /dev/null @@ -1,97 +0,0 @@ -import { Component, OnDestroy, OnInit } from '@angular/core'; -import { ActivatedRoute, Params } from '@angular/router'; -import { Observable, of, Subject, takeUntil } from 'rxjs'; -import { PolicyComponentServiceType } from 'src/app/modules/policies/policy-component-types.enum'; -import { SidenavSetting } from 'src/app/modules/sidenav/sidenav.component'; -import { Breadcrumb, BreadcrumbService, BreadcrumbType } from 'src/app/services/breadcrumb.service'; - -import { GrpcAuthService } from 'src/app/services/grpc-auth.service'; -import { - BRANDING, - COMPLEXITY, - DOMAIN, - LANGUAGES, - IDP, - LOCKOUT, - LOGIN, - LOGINTEXTS, - MESSAGETEXTS, - NOTIFICATIONS, - OIDC, - PRIVACYPOLICY, - SECRETS, - SECURITY, - SMS_PROVIDER, - SMTP_PROVIDER, -} from '../../modules/settings-list/settings'; - -@Component({ - selector: 'cnsl-instance-settings', - templateUrl: './instance-settings.component.html', - styleUrls: ['./instance-settings.component.scss'], -}) -export class InstanceSettingsComponent implements OnInit, OnDestroy { - public id: string = ''; - public PolicyComponentServiceType: any = PolicyComponentServiceType; - public defaultSettingsList: SidenavSetting[] = [ - // notifications - // { showWarn: true, ...NOTIFICATIONS }, - NOTIFICATIONS, - SMTP_PROVIDER, - SMS_PROVIDER, - // login - LOGIN, - IDP, - COMPLEXITY, - LOCKOUT, - - DOMAIN, - // appearance - BRANDING, - MESSAGETEXTS, - LOGINTEXTS, - // others - PRIVACYPOLICY, - LANGUAGES, - OIDC, - SECRETS, - SECURITY, - ]; - - public settingsList: Observable = of([]); - - private destroy$: Subject = new Subject(); - constructor( - breadcrumbService: BreadcrumbService, - activatedRoute: ActivatedRoute, - public authService: GrpcAuthService, - ) { - const breadcrumbs = [ - new Breadcrumb({ - type: BreadcrumbType.INSTANCE, - name: 'Instance', - routerLink: ['/instance'], - }), - ]; - breadcrumbService.setBreadcrumb(breadcrumbs); - - activatedRoute.queryParams.pipe(takeUntil(this.destroy$)).subscribe((params: Params) => { - const { id } = params; - if (id) { - this.id = id; - } - }); - } - - ngOnInit(): void { - this.settingsList = this.authService.isAllowedMapper( - this.defaultSettingsList, - (setting) => setting.requiredRoles.admin || [], - ); - } - - ngOnDestroy(): void { - this.destroy$.next(); - this.destroy$.complete(); - } -} diff --git a/console/src/app/pages/instance-settings/instance-settings.module.ts b/console/src/app/pages/instance-settings/instance-settings.module.ts deleted file mode 100644 index 1871afaed..000000000 --- a/console/src/app/pages/instance-settings/instance-settings.module.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { CommonModule } from '@angular/common'; -import { NgModule } from '@angular/core'; -import { TranslateModule } from '@ngx-translate/core'; -import { SettingsListModule } from 'src/app/modules/settings-list/settings-list.module'; -import { HasRolePipeModule } from 'src/app/pipes/has-role-pipe/has-role-pipe.module'; - -import { InstanceSettingsRoutingModule } from './instance-settings-routing.module'; -import { InstanceSettingsComponent } from './instance-settings.component'; - -@NgModule({ - declarations: [InstanceSettingsComponent], - imports: [CommonModule, InstanceSettingsRoutingModule, SettingsListModule, HasRolePipeModule, TranslateModule], -}) -export default class InstanceSettingsModule {} diff --git a/console/src/app/pages/instance/instance.component.html b/console/src/app/pages/instance/instance.component.html index 2e311ff9d..d32aa035c 100644 --- a/console/src/app/pages/instance/instance.component.html +++ b/console/src/app/pages/instance/instance.component.html @@ -7,29 +7,45 @@ [hasContributors]="true" stateTooltip="{{ 'INSTANCE.STATE.' + instance?.state | translate }}" > - - - +
+ +
+ {{ 'MENU.CUSTOMERPORTAL' | translate }} + +
+ + + +
-

{{ 'ORG.LIST.TITLE' | translate }}

- -

{{ 'ORG.LIST.DESCRIPTION' | translate }}

- - - - +
+ + + +
diff --git a/console/src/app/pages/instance/instance.component.scss b/console/src/app/pages/instance/instance.component.scss index 4c8cf2338..2fdbe8234 100644 --- a/console/src/app/pages/instance/instance.component.scss +++ b/console/src/app/pages/instance/instance.component.scss @@ -11,6 +11,23 @@ margin-top: 2rem; } +.instance-action-wrapper { + display: flex; + align-items: center; + + .portal-link { + margin-right: 1rem; + + .portal-span { + margin-right: 0.5rem; + } + } +} + .instance-table-desc { font-size: 14px; } + +.instance-settings-wrapper { + margin-top: 2rem; +} diff --git a/console/src/app/pages/instance/instance.component.ts b/console/src/app/pages/instance/instance.component.ts index a0f7cc1a8..177f9a061 100644 --- a/console/src/app/pages/instance/instance.component.ts +++ b/console/src/app/pages/instance/instance.component.ts @@ -1,8 +1,8 @@ import { Component } from '@angular/core'; import { MatDialog } from '@angular/material/dialog'; -import { Router } from '@angular/router'; -import { BehaviorSubject, from, Observable, of } from 'rxjs'; -import { catchError, finalize, map } from 'rxjs/operators'; +import { ActivatedRoute, Params, Router } from '@angular/router'; +import { BehaviorSubject, from, Observable, of, Subject } from 'rxjs'; +import { catchError, finalize, map, takeUntil } from 'rxjs/operators'; import { CreationType, MemberCreateDialogComponent } from 'src/app/modules/add-member-dialog/member-create-dialog.component'; import { PolicyComponentServiceType } from 'src/app/modules/policies/policy-component-types.enum'; import { InstanceDetail, State } from 'src/app/proto/generated/zitadel/instance_pb'; @@ -11,7 +11,31 @@ import { User } from 'src/app/proto/generated/zitadel/user_pb'; import { AdminService } from 'src/app/services/admin.service'; import { Breadcrumb, BreadcrumbService, BreadcrumbType } from 'src/app/services/breadcrumb.service'; import { ToastService } from 'src/app/services/toast.service'; - +import { + BRANDING, + COMPLEXITY, + DOMAIN, + LANGUAGES, + IDP, + LOCKOUT, + LOGIN, + LOGINTEXTS, + MESSAGETEXTS, + NOTIFICATIONS, + OIDC, + PRIVACYPOLICY, + SECRETS, + SECURITY, + SMS_PROVIDER, + SMTP_PROVIDER, + VIEWS, + FAILEDEVENTS, + EVENTS, + ORGANIZATIONS, +} from '../../modules/settings-list/settings'; +import { SidenavSetting } from 'src/app/modules/sidenav/sidenav.component'; +import { GrpcAuthService } from 'src/app/services/grpc-auth.service'; +import { EnvironmentService } from 'src/app/services/environment.service'; @Component({ selector: 'cnsl-instance', templateUrl: './instance.component.html', @@ -25,12 +49,51 @@ export class InstanceComponent { public totalMemberResult: number = 0; public membersSubject: BehaviorSubject = new BehaviorSubject([]); public State: any = State; + + public id: string = ''; + public defaultSettingsList: SidenavSetting[] = [ + ORGANIZATIONS, + // notifications + // { showWarn: true, ...NOTIFICATIONS }, + NOTIFICATIONS, + SMTP_PROVIDER, + SMS_PROVIDER, + // login + LOGIN, + IDP, + COMPLEXITY, + LOCKOUT, + + DOMAIN, + // appearance + BRANDING, + MESSAGETEXTS, + LOGINTEXTS, + // storage + VIEWS, + EVENTS, + FAILEDEVENTS, + // others + PRIVACYPOLICY, + LANGUAGES, + OIDC, + SECRETS, + SECURITY, + ]; + + public settingsList: Observable = of([]); + public customerPortalLink$ = this.envService.env.pipe(map((env) => env.customer_portal)); + + private destroy$: Subject = new Subject(); constructor( public adminService: AdminService, private dialog: MatDialog, private toast: ToastService, breadcrumbService: BreadcrumbService, private router: Router, + private authService: GrpcAuthService, + private envService: EnvironmentService, + activatedRoute: ActivatedRoute, ) { this.loadMembers(); @@ -52,6 +115,13 @@ export class InstanceComponent { .catch((error) => { this.toast.showError(error); }); + + activatedRoute.queryParams.pipe(takeUntil(this.destroy$)).subscribe((params: Params) => { + const { id } = params; + if (id) { + this.id = id; + } + }); } public loadMembers(): void { @@ -113,4 +183,16 @@ export class InstanceComponent { public showDetail(): void { this.router.navigate(['/instance', 'members']); } + + ngOnInit(): void { + this.settingsList = this.authService.isAllowedMapper( + this.defaultSettingsList, + (setting) => setting.requiredRoles.admin || [], + ); + } + + ngOnDestroy(): void { + this.destroy$.next(); + this.destroy$.complete(); + } } diff --git a/console/src/app/pages/instance/instance.module.ts b/console/src/app/pages/instance/instance.module.ts index c4a67540e..310298343 100644 --- a/console/src/app/pages/instance/instance.module.ts +++ b/console/src/app/pages/instance/instance.module.ts @@ -29,6 +29,7 @@ import { TimestampToDatePipeModule } from 'src/app/pipes/timestamp-to-date-pipe/ import { IamRoutingModule } from './instance-routing.module'; import { InstanceComponent } from './instance.component'; +import { SettingsListModule } from 'src/app/modules/settings-list/settings-list.module'; @NgModule({ declarations: [InstanceComponent], @@ -61,6 +62,7 @@ import { InstanceComponent } from './instance.component'; TimestampToDatePipeModule, RefreshTableModule, HasRolePipeModule, + SettingsListModule, MatSortModule, SettingsGridModule, ], diff --git a/console/src/app/pages/org-create/org-create.component.ts b/console/src/app/pages/org-create/org-create.component.ts index 96a946b19..a82e04d2b 100644 --- a/console/src/app/pages/org-create/org-create.component.ts +++ b/console/src/app/pages/org-create/org-create.component.ts @@ -21,6 +21,7 @@ import { Breadcrumb, BreadcrumbService, BreadcrumbType } from 'src/app/services/ import { ManagementService } from 'src/app/services/mgmt.service'; import { ToastService } from 'src/app/services/toast.service'; import { LanguagesService } from '../../services/languages.service'; +import { GrpcAuthService } from 'src/app/services/grpc-auth.service'; @Component({ selector: 'cnsl-org-create', @@ -59,6 +60,7 @@ export class OrgCreateComponent { private _location: Location, private fb: UntypedFormBuilder, private mgmtService: ManagementService, + private authService: GrpcAuthService, public langSvc: LanguagesService, breadcrumbService: BreadcrumbService, ) { @@ -101,6 +103,7 @@ export class OrgCreateComponent { this.adminService .SetUpOrg(createOrgRequest, humanRequest) .then(() => { + this.authService.revalidateOrgs(); this.router.navigate(['/orgs']); }) .catch((error) => { @@ -191,6 +194,7 @@ export class OrgCreateComponent { this.mgmtService .addOrg(this.name.value) .then(() => { + this.authService.revalidateOrgs(); this.router.navigate(['/orgs']); }) .catch((error) => { diff --git a/console/src/app/pages/org-list/org-list.module.ts b/console/src/app/pages/org-list/org-list.module.ts index 90fe530d8..04e2723ec 100644 --- a/console/src/app/pages/org-list/org-list.module.ts +++ b/console/src/app/pages/org-list/org-list.module.ts @@ -9,5 +9,6 @@ import { OrgListComponent } from './org-list.component'; @NgModule({ declarations: [OrgListComponent], imports: [CommonModule, OrgListRoutingModule, OrgTableModule, TranslateModule], + exports: [OrgListComponent], }) export default class OrgListModule {} diff --git a/console/src/app/services/grpc-auth.service.ts b/console/src/app/services/grpc-auth.service.ts index ace6ed22b..987721180 100644 --- a/console/src/app/services/grpc-auth.service.ts +++ b/console/src/app/services/grpc-auth.service.ts @@ -140,14 +140,13 @@ export class GrpcAuthService { public zitadelPermissions: BehaviorSubject = new BehaviorSubject([]); public readonly fetchedZitadelPermissions: BehaviorSubject = new BehaviorSubject(false); - private cachedOrgs: Org.AsObject[] = []; + public cachedOrgs: BehaviorSubject = new BehaviorSubject([]); private cachedLabelPolicies: { [orgId: string]: LabelPolicy.AsObject } = {}; constructor( private readonly grpcService: GrpcService, private oauthService: OAuthService, private storage: StorageService, - themeService: ThemeService, ) { this.zitadelPermissions$.subscribe(this.zitadelPermissions); @@ -221,15 +220,14 @@ export class GrpcAuthService { public async getActiveOrg(id?: string): Promise { if (id) { - const find = this.cachedOrgs.find((tmp) => tmp.id === id); + const find = this.cachedOrgs.getValue().find((tmp) => tmp.id === id); if (find) { this.setActiveOrg(find); return Promise.resolve(find); } else { const orgs = (await this.listMyProjectOrgs(10, 0)).resultList; - this.cachedOrgs = orgs; - - const toFind = this.cachedOrgs.find((tmp) => tmp.id === id); + this.cachedOrgs.next(orgs); + const toFind = orgs.find((tmp) => tmp.id === id); if (toFind) { this.setActiveOrg(toFind); return Promise.resolve(toFind); @@ -238,10 +236,10 @@ export class GrpcAuthService { } } } else { - let orgs = this.cachedOrgs; + let orgs = this.cachedOrgs.getValue(); if (orgs.length === 0) { orgs = (await this.listMyProjectOrgs()).resultList; - this.cachedOrgs = orgs; + this.cachedOrgs.next(orgs); } const org = this.storage.getItem(StorageKey.organization, StorageLocation.local); @@ -373,6 +371,11 @@ export class GrpcAuthService { return this.grpcService.auth.listMyAuthFactors(new ListMyAuthFactorsRequest(), null).then((resp) => resp.toObject()); } + public async revalidateOrgs() { + const orgs = (await this.listMyProjectOrgs()).resultList; + this.cachedOrgs.next(orgs); + } + public listMyProjectOrgs( limit?: number, offset?: number, diff --git a/console/src/assets/i18n/bg.json b/console/src/assets/i18n/bg.json index ecf859efd..38dbcb0eb 100644 --- a/console/src/assets/i18n/bg.json +++ b/console/src/assets/i18n/bg.json @@ -90,7 +90,7 @@ } }, "MENU": { - "INSTANCE": "Инстанция", + "INSTANCE": "настройките по подразбиране", "DASHBOARD": "Табло", "PERSONAL_INFO": "Лична информация", "DOCUMENTATION": "Документация", @@ -1017,6 +1017,7 @@ "DESCRIPTION": "Тези настройки разширяват и презаписват настройките на вашия екземпляр." }, "LIST": { + "ORGS": "Организации", "LANGUAGES": "Езици", "LOGIN": "Поведение при влизане и сигурност", "LOCKOUT": "Блокиране", @@ -1034,15 +1035,20 @@ "PRIVACYPOLICY": "Политика за бедност", "OIDC": "Живот и изтичане на OIDC Token", "SECRETS": "Тайна поява", - "SECURITY": "Настройки на сигурността" + "SECURITY": "Настройки на сигурността", + "EVENTS": "Събития", + "FAILEDEVENTS": "Неуспешни събития", + "VIEWS": "Изгледи" }, "GROUPS": { + "GENERAL": "Главна информация", "NOTIFICATIONS": "Известия", "LOGIN": "Вход и достъп", "DOMAIN": "Домейн", "TEXTS": "Текстове и езици", "APPEARANCE": "Външен вид", - "OTHER": "други" + "OTHER": "други", + "STORAGE": "Съхранение" } }, "SETTING": { diff --git a/console/src/assets/i18n/cs.json b/console/src/assets/i18n/cs.json index 3aa28dc72..71baadfc4 100644 --- a/console/src/assets/i18n/cs.json +++ b/console/src/assets/i18n/cs.json @@ -90,7 +90,7 @@ } }, "MENU": { - "INSTANCE": "Instance", + "INSTANCE": "Výchozí nastavení", "DASHBOARD": "Domů", "PERSONAL_INFO": "Osobní informace", "DOCUMENTATION": "Dokumentace", @@ -1024,6 +1024,7 @@ "DESCRIPTION": "Tato nastavení rozšiřují a přepisují nastavení vaší instance." }, "LIST": { + "ORGS": "Organizace", "LANGUAGES": "Jazyky", "LOGIN": "Chování při přihlášení a bezpečnost", "LOCKOUT": "Blokování", @@ -1041,15 +1042,20 @@ "PRIVACYPOLICY": "Zásady ochrany osobních údajů", "OIDC": "Životnost a expirace OIDC tokenu", "SECRETS": "Generátor tajemství", - "SECURITY": "Bezpečnostní nastavení" + "SECURITY": "Bezpečnostní nastavení", + "EVENTS": "Události", + "FAILEDEVENTS": "Selhané události", + "VIEWS": "Pohledy" }, "GROUPS": { + "GENERAL": "Obecné informace", "NOTIFICATIONS": "Oznámení", "LOGIN": "Přihlášení a přístup", "DOMAIN": "Doména", "TEXTS": "Texty a jazyky", "APPEARANCE": "Vzhled", - "OTHER": "Ostatní" + "OTHER": "Ostatní", + "STORAGE": "Data" } }, "SETTING": { diff --git a/console/src/assets/i18n/de.json b/console/src/assets/i18n/de.json index 3c6ee5ba8..508db351b 100644 --- a/console/src/assets/i18n/de.json +++ b/console/src/assets/i18n/de.json @@ -90,7 +90,7 @@ } }, "MENU": { - "INSTANCE": "Instanz", + "INSTANCE": "Standardeinstellungen", "DASHBOARD": "Startseite", "PERSONAL_INFO": "Persönliche Informationen", "DOCUMENTATION": "Dokumentation", @@ -1023,6 +1023,7 @@ "DESCRIPTION": "Diese Einstellungen erweitern bzw. überschreiben die Einstellungen Ihrer Instanz." }, "LIST": { + "ORGS": "Organisationen", "LANGUAGES": "Sprachen", "LOGIN": "Loginverhalten und Sicherheit", "LOCKOUT": "Sperrmechanismen", @@ -1040,15 +1041,20 @@ "PRIVACYPOLICY": "Datenschutzrichtlinie", "OIDC": "OIDC Token Lifetime und Expiration", "SECRETS": "Secret Generator", - "SECURITY": "Sicherheitseinstellungen" + "SECURITY": "Sicherheitseinstellungen", + "EVENTS": "Events", + "FAILEDEVENTS": "Fehlerhafte Events", + "VIEWS": "Views" }, "GROUPS": { + "GENERAL": "Allgemein", "NOTIFICATIONS": "Benachrichtigungen", "LOGIN": "Login und Zugriff", "DOMAIN": "Domain", "TEXTS": "Texte und Sprachen", "APPEARANCE": "Erscheinungsbild", - "OTHER": "Anderes" + "OTHER": "Anderes", + "STORAGE": "Speicher" } }, "SETTING": { diff --git a/console/src/assets/i18n/en.json b/console/src/assets/i18n/en.json index e48021ab4..ec475db3b 100644 --- a/console/src/assets/i18n/en.json +++ b/console/src/assets/i18n/en.json @@ -90,7 +90,7 @@ } }, "MENU": { - "INSTANCE": "Instance", + "INSTANCE": "Default settings", "DASHBOARD": "Home", "PERSONAL_INFO": "Personal Information", "DOCUMENTATION": "Documentation", @@ -1024,6 +1024,7 @@ "DESCRIPTION": "These settings extend and overwrite your instance settings." }, "LIST": { + "ORGS": "Organizations", "LANGUAGES": "Languages", "LOGIN": "Login Behavior and Security", "LOCKOUT": "Lockout", @@ -1041,15 +1042,20 @@ "PRIVACYPOLICY": "Privacy Policy", "OIDC": "OIDC Token lifetime and expiration", "SECRETS": "Secret Generator", - "SECURITY": "Security settings" + "SECURITY": "Security settings", + "EVENTS": "Events", + "FAILEDEVENTS": "Failed Events", + "VIEWS": "Views" }, "GROUPS": { + "GENERAL": "General Information", "NOTIFICATIONS": "Notifications", "LOGIN": "Login and Access", "DOMAIN": "Domain", "TEXTS": "Texts and Languages", "APPEARANCE": "Appearance", - "OTHER": "Other" + "OTHER": "Other", + "STORAGE": "Storage" } }, "SETTING": { diff --git a/console/src/assets/i18n/es.json b/console/src/assets/i18n/es.json index 4d057417d..84d71a3a9 100644 --- a/console/src/assets/i18n/es.json +++ b/console/src/assets/i18n/es.json @@ -90,7 +90,7 @@ } }, "MENU": { - "INSTANCE": "Instancia", + "INSTANCE": "configuración por defecto", "DASHBOARD": "Inicio", "PERSONAL_INFO": "Información personal", "DOCUMENTATION": "Documentación", @@ -1025,6 +1025,7 @@ "DESCRIPTION": "Estas configuraciones amplían y sobrescriben tus configuraciones de instancia." }, "LIST": { + "ORGS": "Organizaciones", "LANGUAGES": "Idiomas", "LOGIN": "Comportamiento del inicio de sesión y de la seguridad", "LOCKOUT": "Bloqueo", @@ -1042,15 +1043,20 @@ "PRIVACYPOLICY": "Política de privacidad", "OIDC": "OIDC Token lifetime and expiration", "SECRETS": "Apariencia del secreto", - "SECURITY": "Ajustes de seguridad" + "SECURITY": "Ajustes de seguridad", + "EVENTS": "Eventos", + "FAILEDEVENTS": "Eventos fallidos", + "VIEWS": "Vistas" }, "GROUPS": { + "GENERAL": "General", "NOTIFICATIONS": "Notificaciones", "LOGIN": "Inicio de sesión y acceso", "DOMAIN": "Dominio", "TEXTS": "Textos e idiomas", "APPEARANCE": "Apariencia", - "OTHER": "Otros" + "OTHER": "Otros", + "STORAGE": "Datos" } }, "SETTING": { diff --git a/console/src/assets/i18n/fr.json b/console/src/assets/i18n/fr.json index ffc13075c..4e61fdf75 100644 --- a/console/src/assets/i18n/fr.json +++ b/console/src/assets/i18n/fr.json @@ -90,7 +90,7 @@ } }, "MENU": { - "INSTANCE": "Instance", + "INSTANCE": "paramètres par défaut", "DASHBOARD": "Accueil", "PERSONAL_INFO": "Informations personnelles", "DOCUMENTATION": "Documentation", @@ -1023,6 +1023,7 @@ "DESCRIPTION": "Ces paramètres étendent et remplacent les paramètres de votre instance." }, "LIST": { + "ORGS": "Organisations", "LANGUAGES": "Langues", "LOGIN": "Comportement de connexion et sécurité", "LOCKOUT": "Verrouillage", @@ -1040,15 +1041,20 @@ "PRIVACYPOLICY": "Politique de confidentialité", "OIDC": "Durée de vie et expiration des jetons OIDC", "SECRETS": "Apparence secrète", - "SECURITY": "Paramètres de sécurité" + "SECURITY": "Paramètres de sécurité", + "EVENTS": "Événements", + "FAILEDEVENTS": "Événements échoués", + "VIEWS": "Vues" }, "GROUPS": { + "GENERAL": "Général", "NOTIFICATIONS": "Notifications", "LOGIN": "Connexion et accès", "DOMAIN": "Domaine", "TEXTS": "Textes et langues", "APPEARANCE": "Apparence", - "OTHER": "Autres" + "OTHER": "Autres", + "STORAGE": "Stockage" } }, "SETTING": { diff --git a/console/src/assets/i18n/it.json b/console/src/assets/i18n/it.json index e0f188610..965074954 100644 --- a/console/src/assets/i18n/it.json +++ b/console/src/assets/i18n/it.json @@ -90,7 +90,7 @@ } }, "MENU": { - "INSTANCE": "Istanza", + "INSTANCE": "Impostazioni default", "DASHBOARD": "Pagina iniziale", "PERSONAL_INFO": "Informazioni personali", "DOCUMENTATION": "Documentazione", @@ -1023,6 +1023,7 @@ "DESCRIPTION": "Queste impostazioni si applicheranno alla organizzazione corrente." }, "LIST": { + "ORGS": "Organizzazioni", "LANGUAGES": "Lingue", "LOGIN": "Comportamento login e sicurezza", "LOCKOUT": "Meccanismi di bloccaggio", @@ -1040,15 +1041,20 @@ "PRIVACYPOLICY": "Informativa sulla privacy e TOS", "OIDC": "OIDC Token lifetime e scadenza", "SECRETS": "Aspetto dei segreti", - "SECURITY": "Impostazioni di sicurezza" + "SECURITY": "Impostazioni di sicurezza", + "EVENTS": "Eventi", + "FAILEDEVENTS": "Eventi falliti", + "VIEWS": "Views" }, "GROUPS": { + "GENERAL": "Generale", "NOTIFICATIONS": "Notifiche", "LOGIN": "Accesso e login", "DOMAIN": "Dominio", "TEXTS": "Testi e lingue", "APPEARANCE": "Aspetto", - "OTHER": "Altro" + "OTHER": "Altro", + "STORAGE": "Dati" } }, "SETTING": { diff --git a/console/src/assets/i18n/ja.json b/console/src/assets/i18n/ja.json index 62341b20e..5de4521a1 100644 --- a/console/src/assets/i18n/ja.json +++ b/console/src/assets/i18n/ja.json @@ -90,7 +90,7 @@ } }, "MENU": { - "INSTANCE": "インスタンス", + "INSTANCE": "デフォルトの設定", "DASHBOARD": "ホーム", "PERSONAL_INFO": "個人情報", "DOCUMENTATION": "ドキュメント", @@ -1024,6 +1024,7 @@ "DESCRIPTION": "これらの設定は、インスタンス設定を拡張・上書きします。" }, "LIST": { + "ORGS": "組織", "LANGUAGES": "一般設定", "LOGIN": "ログイン動作とセキュリティ", "LOCKOUT": "ロックアウト", @@ -1041,15 +1042,20 @@ "PRIVACYPOLICY": "プライバシーポリシー", "OIDC": "OIDCトークンのライフタイムと有効期限", "SECRETS": "シークレット設定", - "SECURITY": "セキュリティ設定" + "SECURITY": "セキュリティ設定", + "EVENTS": "イベント", + "FAILEDEVENTS": "失敗したイベント", + "VIEWS": "ビュー" }, "GROUPS": { + "GENERAL": "一般", "NOTIFICATIONS": "通知", "LOGIN": "ログインとアクセス", "DOMAIN": "ドメイン", "TEXTS": "テキストと言語", "APPEARANCE": "設定", - "OTHER": "その他" + "OTHER": "その他", + "STORAGE": "ストレージ" } }, "SETTING": { diff --git a/console/src/assets/i18n/mk.json b/console/src/assets/i18n/mk.json index d19d736b2..91f08126b 100644 --- a/console/src/assets/i18n/mk.json +++ b/console/src/assets/i18n/mk.json @@ -90,7 +90,7 @@ } }, "MENU": { - "INSTANCE": "Инстанца", + "INSTANCE": "стандардни поставки", "DASHBOARD": "Дома", "PERSONAL_INFO": "Лични информации", "DOCUMENTATION": "Документација", @@ -1025,6 +1025,7 @@ "DESCRIPTION": "Овие подесувања ги прошируваат и препишуваат подесувањата на вашата инстанца." }, "LIST": { + "ORGS": "Организации", "LANGUAGES": "Општо", "LOGIN": "Правила и безбедност при најава", "LOCKOUT": "Забрана на пристап", @@ -1042,15 +1043,20 @@ "PRIVACYPOLICY": "Политика за приватност", "OIDC": "OIDC времетраење и истекување на токени", "SECRETS": "Изглед на тајни", - "SECURITY": "Подесувања за безбедност" + "SECURITY": "Подесувања за безбедност", + "EVENTS": "Настани", + "FAILEDEVENTS": "Неуспешни настани", + "VIEWS": "Прегледи" }, "GROUPS": { + "GENERAL": "Општи информации", "NOTIFICATIONS": "Известувања", "LOGIN": "Најава и пристап", "DOMAIN": "Домен", "TEXTS": "Текстови и јазици", "APPEARANCE": "Изглед", - "OTHER": "Друго" + "OTHER": "Друго", + "STORAGE": "складирање" } }, "SETTING": { diff --git a/console/src/assets/i18n/nl.json b/console/src/assets/i18n/nl.json index 9e5d04076..55e4acd9d 100644 --- a/console/src/assets/i18n/nl.json +++ b/console/src/assets/i18n/nl.json @@ -90,7 +90,7 @@ } }, "MENU": { - "INSTANCE": "Instantie", + "INSTANCE": "Standaard instellingen", "DASHBOARD": "Home", "PERSONAL_INFO": "Persoonlijke informatie", "DOCUMENTATION": "Documentatie", @@ -1024,6 +1024,7 @@ "DESCRIPTION": "Deze instellingen breiden uw instantie instellingen uit en overschrijven deze." }, "LIST": { + "ORGS": "Organisaties", "LANGUAGES": "Talen", "LOGIN": "Login Gedrag en Beveiliging", "LOCKOUT": "Lockout", @@ -1041,15 +1042,20 @@ "PRIVACYPOLICY": "Privacybeleid", "OIDC": "OIDC Token levensduur en vervaldatum", "SECRETS": "Secret Generator", - "SECURITY": "Beveiligingsinstellingen" + "SECURITY": "Beveiligingsinstellingen", + "EVENTS": "Evenementen", + "FAILEDEVENTS": "Mislukte evenementen", + "VIEWS": "Weergaves" }, "GROUPS": { + "GENERAL": "Algemeen", "NOTIFICATIONS": "Notificaties", "LOGIN": "Login en Toegang", "DOMAIN": "Domein", "TEXTS": "Teksten en Talen", "APPEARANCE": "Verschijning", - "OTHER": "Andere" + "OTHER": "Andere", + "STORAGE": "opslag" } }, "SETTING": { diff --git a/console/src/assets/i18n/pl.json b/console/src/assets/i18n/pl.json index 36ccc2db0..d01d279f7 100644 --- a/console/src/assets/i18n/pl.json +++ b/console/src/assets/i18n/pl.json @@ -90,7 +90,7 @@ } }, "MENU": { - "INSTANCE": "Instancja", + "INSTANCE": "Ustawienia domyślne", "DASHBOARD": "Strona główna", "PERSONAL_INFO": "Informacje Osobiste", "DOCUMENTATION": "Dokumentacja", @@ -1023,6 +1023,7 @@ "DESCRIPTION": "Te ustawienia rozszerzają i nadpisują ustawienia instancji." }, "LIST": { + "ORGS": "Organizacje", "LANGUAGES": "Języki", "LOGIN": "Zachowanie logowania i bezpieczeństwo", "LOCKOUT": "Blokada", @@ -1040,15 +1041,20 @@ "PRIVACYPOLICY": "Polityka prywatności", "OIDC": "Czas trwania tokenów OIDC i wygaśnięcie", "SECRETS": "Wygląd sekretów", - "SECURITY": "Ustawienia bezpieczeństwa" + "SECURITY": "Ustawienia bezpieczeństwa", + "EVENTS": "Zdarzenia", + "FAILEDEVENTS": "Nieudane Zdarzenia", + "VIEWS": "Widoki" }, "GROUPS": { + "GENERAL": "Informacje ogólne", "NOTIFICATIONS": "Powiadomienia", "LOGIN": "Logowanie i dostęp", "DOMAIN": "Domena", "TEXTS": "Teksty i języki", "APPEARANCE": "Wygląd", - "OTHER": "Inne" + "OTHER": "Inne", + "STORAGE": "składowanie" } }, "SETTING": { diff --git a/console/src/assets/i18n/pt.json b/console/src/assets/i18n/pt.json index 132d3f36f..3528222c4 100644 --- a/console/src/assets/i18n/pt.json +++ b/console/src/assets/i18n/pt.json @@ -90,7 +90,7 @@ } }, "MENU": { - "INSTANCE": "Instância", + "INSTANCE": "Configurações padrão", "DASHBOARD": "Início", "PERSONAL_INFO": "Informações Pessoais", "DOCUMENTATION": "Documentação", @@ -1025,6 +1025,7 @@ "DESCRIPTION": "Essas configurações estendem e sobrescrevem as configurações da sua instância." }, "LIST": { + "ORGS": "Organizações", "LANGUAGES": "Idiomas", "LOGIN": "Comportamento de Login e Segurança", "LOCKOUT": "Bloqueio", @@ -1042,15 +1043,20 @@ "PRIVACYPOLICY": "Política de Privacidade", "OIDC": "Tempo de Vida e Expiração do Token OIDC", "SECRETS": "Aparência de Segredo", - "SECURITY": "Configurações de Segurança" + "SECURITY": "Configurações de Segurança", + "EVENTS": "Eventos", + "FAILEDEVENTS": "Eventos com Falha", + "VIEWS": "Visualizações" }, "GROUPS": { + "GENERAL": "Geral", "NOTIFICATIONS": "Notificações", "LOGIN": "Login e Acesso", "DOMAIN": "Domínio", "TEXTS": "Textos e Idiomas", "APPEARANCE": "Aparência", - "OTHER": "Outro" + "OTHER": "Outro", + "STORAGE": "armazenar" } }, "SETTING": { diff --git a/console/src/assets/i18n/ru.json b/console/src/assets/i18n/ru.json index 181848273..3c82142cd 100644 --- a/console/src/assets/i18n/ru.json +++ b/console/src/assets/i18n/ru.json @@ -85,7 +85,7 @@ } }, "MENU": { - "INSTANCE": "Система", + "INSTANCE": "настройки по умолчанию", "DASHBOARD": "Главная", "PERSONAL_INFO": "Персональная информация", "DOCUMENTATION": "Документация", @@ -1020,6 +1020,7 @@ "DESCRIPTION": "Эти настройки расширяют и перезаписывают настройки вашего экземпляра." }, "LIST": { + "ORGS": "Организации", "LANGUAGES": "Языки", "LOGIN": "Поведение при входе и безопасность", "LOCKOUT": "Блокировка", @@ -1034,15 +1035,20 @@ "PRIVACYPOLICY": "Политика конфиденциальности", "OIDC": "Срок действия и срок действия токена OIDC", "SECRETS": "Тайное появление", - "SECURITY": "Настройки безопасности" + "SECURITY": "Настройки безопасности", + "EVENTS": "События", + "FAILEDEVENTS": "Неудачные события", + "VIEWS": "Отображение" }, "GROUPS": { + "GENERAL": "Общая информация", "NOTIFICATIONS": "Уведомления", "LOGIN": "Вход и доступ", "DOMAIN": "Домен", "TEXTS": "Тексты и языки", "APPEARANCE": "Внешний вид", - "OTHER": "Другой" + "OTHER": "Другой", + "STORAGE": "хранилище" } }, "SETTING": { diff --git a/console/src/assets/i18n/zh.json b/console/src/assets/i18n/zh.json index f9878afc7..04f1a8d05 100644 --- a/console/src/assets/i18n/zh.json +++ b/console/src/assets/i18n/zh.json @@ -90,7 +90,7 @@ } }, "MENU": { - "INSTANCE": "实例", + "INSTANCE": "默认设置", "DASHBOARD": "首页", "PERSONAL_INFO": "个人信息", "DOCUMENTATION": "文档", @@ -1023,6 +1023,7 @@ "DESCRIPTION": "这些设置将扩展或覆盖您的实例设置。" }, "LIST": { + "ORGS": "组织", "LANGUAGES": "语言", "LOGIN": "登录行为和安全", "LOCKOUT": "安全锁策略", @@ -1040,15 +1041,20 @@ "PRIVACYPOLICY": "隐私政策", "OIDC": "OIDC 令牌有效期和过期时间", "SECRETS": "验证码外观", - "SECURITY": "安全设置" + "SECURITY": "安全设置", + "EVENTS": "活动", + "FAILEDEVENTS": "失败事件", + "VIEWS": "数据表" }, "GROUPS": { + "GENERAL": "通用", "NOTIFICATIONS": "通知", "LOGIN": "登录和访问", "DOMAIN": "域名", "TEXTS": "文本和语言", "APPEARANCE": "外观", - "OTHER": "其他" + "OTHER": "其他", + "STORAGE": "贮存" } }, "SETTING": { diff --git a/console/src/component-themes.scss b/console/src/component-themes.scss index c77acd3d1..aecbde287 100644 --- a/console/src/component-themes.scss +++ b/console/src/component-themes.scss @@ -57,7 +57,7 @@ @import 'src/app/modules/shortcuts/shortcuts.component.scss'; @import 'src/app/modules/policies/idp-settings/idp-settings.component.scss'; @import 'src/app/modules/project-role-chip/project-role-chip.component'; -@import 'src/app/pages/events/events.component'; +@import 'src/app/modules/events/events.component'; @import 'src/app/pages/home/home.component.scss'; @import 'src/app/modules/policies/security-policy/security-policy.component.scss'; @import 'src/app/modules/idp-table/idp-table.component.scss'; diff --git a/docs/docs/guides/integrate/identity-providers/_custom_login_policy.mdx b/docs/docs/guides/integrate/identity-providers/_custom_login_policy.mdx index fe7b882a6..476d84c24 100644 --- a/docs/docs/guides/integrate/identity-providers/_custom_login_policy.mdx +++ b/docs/docs/guides/integrate/identity-providers/_custom_login_policy.mdx @@ -1,6 +1,6 @@ The login policy can be configured on two levels. Once as default on the instance and this can be overwritten for each organization. The only difference is where you configure it. Go either to the settings page of a specific organization or to the settings page of your instance. -Instance: $YOUR-DOMAIN/ui/console/settings?id=general +Instance: $YOUR-DOMAIN/ui/console/instance?id=general Organization: Choose the organization in the menu and go to $YOUR-DOMAIN/ui/console/org-settings?id=login 1. Go to the Settings diff --git a/docs/static/img/accounts_multifactor.png b/docs/static/img/accounts_multifactor.png deleted file mode 100644 index dfbc9b204..000000000 Binary files a/docs/static/img/accounts_multifactor.png and /dev/null differ diff --git a/docs/static/img/accounts_org_register_light.png b/docs/static/img/accounts_org_register_light.png deleted file mode 100644 index da6ba44f0..000000000 Binary files a/docs/static/img/accounts_org_register_light.png and /dev/null differ diff --git a/docs/static/img/accounts_otp_select.png b/docs/static/img/accounts_otp_select.png deleted file mode 100644 index 6524c6402..000000000 Binary files a/docs/static/img/accounts_otp_select.png and /dev/null differ diff --git a/docs/static/img/accounts_otp_setup.png b/docs/static/img/accounts_otp_setup.png deleted file mode 100644 index 7cd6188e7..000000000 Binary files a/docs/static/img/accounts_otp_setup.png and /dev/null differ diff --git a/docs/static/img/accounts_otp_setup_done.png b/docs/static/img/accounts_otp_setup_done.png deleted file mode 100644 index e56c7f9e3..000000000 Binary files a/docs/static/img/accounts_otp_setup_done.png and /dev/null differ diff --git a/docs/static/img/accounts_otp_verify.png b/docs/static/img/accounts_otp_verify.png deleted file mode 100644 index 6cc3ac5ff..000000000 Binary files a/docs/static/img/accounts_otp_verify.png and /dev/null differ diff --git a/docs/static/img/accounts_page.png b/docs/static/img/accounts_page.png deleted file mode 100644 index 43c2a4451..000000000 Binary files a/docs/static/img/accounts_page.png and /dev/null differ diff --git a/docs/static/img/accounts_password.png b/docs/static/img/accounts_password.png deleted file mode 100644 index 74252e711..000000000 Binary files a/docs/static/img/accounts_password.png and /dev/null differ diff --git a/docs/static/img/accounts_verify_code_password.png b/docs/static/img/accounts_verify_code_password.png deleted file mode 100644 index 280427265..000000000 Binary files a/docs/static/img/accounts_verify_code_password.png and /dev/null differ diff --git a/docs/static/img/accounts_verify_code_password_done.png b/docs/static/img/accounts_verify_code_password_done.png deleted file mode 100644 index 459888809..000000000 Binary files a/docs/static/img/accounts_verify_code_password_done.png and /dev/null differ diff --git a/docs/static/img/change_password.gif b/docs/static/img/change_password.gif deleted file mode 100644 index 7e88c0919..000000000 Binary files a/docs/static/img/change_password.gif and /dev/null differ diff --git a/docs/static/img/concepts/audit-trail/event-viewer.png b/docs/static/img/concepts/audit-trail/event-viewer.png index a6f23a8ea..25f441d25 100644 Binary files a/docs/static/img/concepts/audit-trail/event-viewer.png and b/docs/static/img/concepts/audit-trail/event-viewer.png differ diff --git a/docs/static/img/console_admin_entry.png b/docs/static/img/console_admin_entry.png deleted file mode 100644 index 3166ebb64..000000000 Binary files a/docs/static/img/console_admin_entry.png and /dev/null differ diff --git a/docs/static/img/console_admin_system.png b/docs/static/img/console_admin_system.png deleted file mode 100644 index c48107b99..000000000 Binary files a/docs/static/img/console_admin_system.png and /dev/null differ diff --git a/docs/static/img/console_authz_add_1.png b/docs/static/img/console_authz_add_1.png deleted file mode 100644 index 157fcf1ac..000000000 Binary files a/docs/static/img/console_authz_add_1.png and /dev/null differ diff --git a/docs/static/img/console_authz_add_2.png b/docs/static/img/console_authz_add_2.png deleted file mode 100644 index cd56c5a32..000000000 Binary files a/docs/static/img/console_authz_add_2.png and /dev/null differ diff --git a/docs/static/img/console_authz_add_3.png b/docs/static/img/console_authz_add_3.png deleted file mode 100644 index d95652ed5..000000000 Binary files a/docs/static/img/console_authz_add_3.png and /dev/null differ diff --git a/docs/static/img/console_authz_overview.png b/docs/static/img/console_authz_overview.png deleted file mode 100644 index fca20ab82..000000000 Binary files a/docs/static/img/console_authz_overview.png and /dev/null differ diff --git a/docs/static/img/console_clients_my_first_spa_config.png b/docs/static/img/console_clients_my_first_spa_config.png deleted file mode 100644 index 2e22583f6..000000000 Binary files a/docs/static/img/console_clients_my_first_spa_config.png and /dev/null differ diff --git a/docs/static/img/console_clients_my_first_spa_wizard_1.png b/docs/static/img/console_clients_my_first_spa_wizard_1.png deleted file mode 100644 index 4b9ca1978..000000000 Binary files a/docs/static/img/console_clients_my_first_spa_wizard_1.png and /dev/null differ diff --git a/docs/static/img/console_clients_my_first_spa_wizard_2.png b/docs/static/img/console_clients_my_first_spa_wizard_2.png deleted file mode 100644 index b7beddf19..000000000 Binary files a/docs/static/img/console_clients_my_first_spa_wizard_2.png and /dev/null differ diff --git a/docs/static/img/console_clients_my_first_spa_wizard_3.png b/docs/static/img/console_clients_my_first_spa_wizard_3.png deleted file mode 100644 index 7e84935b9..000000000 Binary files a/docs/static/img/console_clients_my_first_spa_wizard_3.png and /dev/null differ diff --git a/docs/static/img/console_clients_my_first_spa_wizard_4.png b/docs/static/img/console_clients_my_first_spa_wizard_4.png deleted file mode 100644 index 7f69d9550..000000000 Binary files a/docs/static/img/console_clients_my_first_spa_wizard_4.png and /dev/null differ diff --git a/docs/static/img/console_dashboard.png b/docs/static/img/console_dashboard.png index ea1ecf90d..af31b52f6 100644 Binary files a/docs/static/img/console_dashboard.png and b/docs/static/img/console_dashboard.png differ diff --git a/docs/static/img/console_granted_projects_overview.png b/docs/static/img/console_granted_projects_overview.png deleted file mode 100644 index b6fdbb454..000000000 Binary files a/docs/static/img/console_granted_projects_overview.png and /dev/null differ diff --git a/docs/static/img/console_iam_admin_failed.png b/docs/static/img/console_iam_admin_failed.png deleted file mode 100644 index e7df46db2..000000000 Binary files a/docs/static/img/console_iam_admin_failed.png and /dev/null differ diff --git a/docs/static/img/console_iam_admin_views.png b/docs/static/img/console_iam_admin_views.png deleted file mode 100644 index a06deb2b4..000000000 Binary files a/docs/static/img/console_iam_admin_views.png and /dev/null differ diff --git a/docs/static/img/console_org_custom_login_policy.gif b/docs/static/img/console_org_custom_login_policy.gif deleted file mode 100644 index c8c8fd1db..000000000 Binary files a/docs/static/img/console_org_custom_login_policy.gif and /dev/null differ diff --git a/docs/static/img/console_org_domain.png b/docs/static/img/console_org_domain.png deleted file mode 100644 index 3f67f65fa..000000000 Binary files a/docs/static/img/console_org_domain.png and /dev/null differ diff --git a/docs/static/img/console_org_domain_add.png b/docs/static/img/console_org_domain_add.png deleted file mode 100644 index 8a22bc407..000000000 Binary files a/docs/static/img/console_org_domain_add.png and /dev/null differ diff --git a/docs/static/img/console_org_domain_added.png b/docs/static/img/console_org_domain_added.png deleted file mode 100644 index a848f84fa..000000000 Binary files a/docs/static/img/console_org_domain_added.png and /dev/null differ diff --git a/docs/static/img/console_org_domain_default.png b/docs/static/img/console_org_domain_default.png deleted file mode 100644 index be763903d..000000000 Binary files a/docs/static/img/console_org_domain_default.png and /dev/null differ diff --git a/docs/static/img/console_org_domain_primary.png b/docs/static/img/console_org_domain_primary.png deleted file mode 100644 index 5daf75d20..000000000 Binary files a/docs/static/img/console_org_domain_primary.png and /dev/null differ diff --git a/docs/static/img/console_org_domain_verified.png b/docs/static/img/console_org_domain_verified.png deleted file mode 100644 index 551b6e436..000000000 Binary files a/docs/static/img/console_org_domain_verified.png and /dev/null differ diff --git a/docs/static/img/console_org_domain_verify.png b/docs/static/img/console_org_domain_verify.png deleted file mode 100644 index 3f67f65fa..000000000 Binary files a/docs/static/img/console_org_domain_verify.png and /dev/null differ diff --git a/docs/static/img/console_org_domain_verify_dns.png b/docs/static/img/console_org_domain_verify_dns.png deleted file mode 100644 index 8c1f90cfb..000000000 Binary files a/docs/static/img/console_org_domain_verify_dns.png and /dev/null differ diff --git a/docs/static/img/console_org_manage_roles_1.png b/docs/static/img/console_org_manage_roles_1.png deleted file mode 100644 index 43b7da2c0..000000000 Binary files a/docs/static/img/console_org_manage_roles_1.png and /dev/null differ diff --git a/docs/static/img/console_org_manage_roles_2.png b/docs/static/img/console_org_manage_roles_2.png deleted file mode 100644 index b2565d5b0..000000000 Binary files a/docs/static/img/console_org_manage_roles_2.png and /dev/null differ diff --git a/docs/static/img/console_personal_information.png b/docs/static/img/console_personal_information.png deleted file mode 100644 index 2d1b20285..000000000 Binary files a/docs/static/img/console_personal_information.png and /dev/null differ diff --git a/docs/static/img/console_personal_information_org_owner.png b/docs/static/img/console_personal_information_org_owner.png deleted file mode 100644 index 4793134c6..000000000 Binary files a/docs/static/img/console_personal_information_org_owner.png and /dev/null differ diff --git a/docs/static/img/console_private_labeling.png b/docs/static/img/console_private_labeling.png index b4f32d83d..70f9501ae 100644 Binary files a/docs/static/img/console_private_labeling.png and b/docs/static/img/console_private_labeling.png differ diff --git a/docs/static/img/console_project_manage_roles_1.png b/docs/static/img/console_project_manage_roles_1.png deleted file mode 100644 index 3b6e8a0db..000000000 Binary files a/docs/static/img/console_project_manage_roles_1.png and /dev/null differ diff --git a/docs/static/img/console_project_manage_roles_2.png b/docs/static/img/console_project_manage_roles_2.png deleted file mode 100644 index 8b272f656..000000000 Binary files a/docs/static/img/console_project_manage_roles_2.png and /dev/null differ diff --git a/docs/static/img/console_projects_granted.png b/docs/static/img/console_projects_granted.png index 9a06a57bc..c45a12281 100644 Binary files a/docs/static/img/console_projects_granted.png and b/docs/static/img/console_projects_granted.png differ diff --git a/docs/static/img/console_projects_my_first_project.png b/docs/static/img/console_projects_my_first_project.png deleted file mode 100644 index 64f2e0ab3..000000000 Binary files a/docs/static/img/console_projects_my_first_project.png and /dev/null differ diff --git a/docs/static/img/console_user_create_done.png b/docs/static/img/console_user_create_done.png deleted file mode 100644 index 3d5b3d3ee..000000000 Binary files a/docs/static/img/console_user_create_done.png and /dev/null differ diff --git a/docs/static/img/console_user_create_form.png b/docs/static/img/console_user_create_form.png deleted file mode 100644 index 27d160841..000000000 Binary files a/docs/static/img/console_user_create_form.png and /dev/null differ diff --git a/docs/static/img/console_user_entry.png b/docs/static/img/console_user_entry.png deleted file mode 100644 index c798bda56..000000000 Binary files a/docs/static/img/console_user_entry.png and /dev/null differ diff --git a/docs/static/img/console_user_list.png b/docs/static/img/console_user_list.png deleted file mode 100644 index d8bea6993..000000000 Binary files a/docs/static/img/console_user_list.png and /dev/null differ diff --git a/docs/static/img/console_user_list_search.png b/docs/static/img/console_user_list_search.png deleted file mode 100644 index 35b49a265..000000000 Binary files a/docs/static/img/console_user_list_search.png and /dev/null differ diff --git a/docs/static/img/console_user_manage_roles_1.png b/docs/static/img/console_user_manage_roles_1.png deleted file mode 100644 index b8ed7be01..000000000 Binary files a/docs/static/img/console_user_manage_roles_1.png and /dev/null differ diff --git a/docs/static/img/console_user_manage_roles_2.png b/docs/static/img/console_user_manage_roles_2.png deleted file mode 100644 index c0ebeace6..000000000 Binary files a/docs/static/img/console_user_manage_roles_2.png and /dev/null differ diff --git a/docs/static/img/console_user_personal_info.png b/docs/static/img/console_user_personal_info.png deleted file mode 100644 index 292d524b3..000000000 Binary files a/docs/static/img/console_user_personal_info.png and /dev/null differ diff --git a/docs/static/img/console_user_personal_information.png b/docs/static/img/console_user_personal_information.png deleted file mode 100644 index 024be81e0..000000000 Binary files a/docs/static/img/console_user_personal_information.png and /dev/null differ diff --git a/docs/static/img/console_users_create_new_user.gif b/docs/static/img/console_users_create_new_user.gif deleted file mode 100644 index 9c220a22b..000000000 Binary files a/docs/static/img/console_users_create_new_user.gif and /dev/null differ diff --git a/docs/static/img/device-auth/device-auth-01.png b/docs/static/img/device-auth/device-auth-01.png index f9b92b089..909edd6cb 100644 Binary files a/docs/static/img/device-auth/device-auth-01.png and b/docs/static/img/device-auth/device-auth-01.png differ diff --git a/docs/static/img/email-verify.gif b/docs/static/img/email-verify.gif deleted file mode 100644 index 9d4c2d991..000000000 Binary files a/docs/static/img/email-verify.gif and /dev/null differ diff --git a/docs/static/img/enable-mfa-handling.gif b/docs/static/img/enable-mfa-handling.gif deleted file mode 100644 index bb5532c7d..000000000 Binary files a/docs/static/img/enable-mfa-handling.gif and /dev/null differ diff --git a/docs/static/img/enable-selfregister.gif b/docs/static/img/enable-selfregister.gif deleted file mode 100644 index 91fa2aa5e..000000000 Binary files a/docs/static/img/enable-selfregister.gif and /dev/null differ diff --git a/docs/static/img/github-header01-dark@2x.png b/docs/static/img/github-header01-dark@2x.png deleted file mode 100644 index 3245715df..000000000 Binary files a/docs/static/img/github-header01-dark@2x.png and /dev/null differ diff --git a/docs/static/img/github-header01-light@2x.png b/docs/static/img/github-header01-light@2x.png deleted file mode 100644 index 63ec42b8d..000000000 Binary files a/docs/static/img/github-header01-light@2x.png and /dev/null differ diff --git a/docs/static/img/google_add_credentials.gif b/docs/static/img/google_add_credentials.gif deleted file mode 100644 index 23aaf2052..000000000 Binary files a/docs/static/img/google_add_credentials.gif and /dev/null differ diff --git a/docs/static/img/grafana_client_settings.png b/docs/static/img/grafana_client_settings.png deleted file mode 100644 index b9de9a8e2..000000000 Binary files a/docs/static/img/grafana_client_settings.png and /dev/null differ diff --git a/docs/static/img/grafana_login_button.png b/docs/static/img/grafana_login_button.png deleted file mode 100644 index 1cec6e2ef..000000000 Binary files a/docs/static/img/grafana_login_button.png and /dev/null differ diff --git a/docs/static/img/grafana_profile_settings.png b/docs/static/img/grafana_profile_settings.png deleted file mode 100644 index 6abaa028b..000000000 Binary files a/docs/static/img/grafana_profile_settings.png and /dev/null differ diff --git a/docs/static/img/grafana_project_settings.png b/docs/static/img/grafana_project_settings.png deleted file mode 100644 index f3fd6b181..000000000 Binary files a/docs/static/img/grafana_project_settings.png and /dev/null differ diff --git a/docs/static/img/grafana_zitadel_authorization.png b/docs/static/img/grafana_zitadel_authorization.png deleted file mode 100644 index 27bd669cf..000000000 Binary files a/docs/static/img/grafana_zitadel_authorization.png and /dev/null differ diff --git a/docs/static/img/guides/action_email_verify.png b/docs/static/img/guides/action_email_verify.png deleted file mode 100644 index 55d67ce9f..000000000 Binary files a/docs/static/img/guides/action_email_verify.png and /dev/null differ diff --git a/docs/static/img/guides/action_pre_creation_email_verify.png b/docs/static/img/guides/action_pre_creation_email_verify.png deleted file mode 100644 index db74ade43..000000000 Binary files a/docs/static/img/guides/action_pre_creation_email_verify.png and /dev/null differ diff --git a/docs/static/img/guides/console/instancebutton.png b/docs/static/img/guides/console/instancebutton.png index 74a3f95bb..026592a62 100644 Binary files a/docs/static/img/guides/console/instancebutton.png and b/docs/static/img/guides/console/instancebutton.png differ diff --git a/docs/static/img/guides/console/myprofile.png b/docs/static/img/guides/console/myprofile.png index 3b3c0d27e..9d1d6a759 100644 Binary files a/docs/static/img/guides/console/myprofile.png and b/docs/static/img/guides/console/myprofile.png differ diff --git a/docs/static/img/guides/console/posproject.png b/docs/static/img/guides/console/posproject.png index 3d6136690..be5d3b33b 100644 Binary files a/docs/static/img/guides/console/posproject.png and b/docs/static/img/guides/console/posproject.png differ diff --git a/docs/static/img/guides/quickstart/1.png b/docs/static/img/guides/quickstart/1.png deleted file mode 100644 index 13477fb39..000000000 Binary files a/docs/static/img/guides/quickstart/1.png and /dev/null differ diff --git a/docs/static/img/guides/quickstart/10.png b/docs/static/img/guides/quickstart/10.png deleted file mode 100644 index ec56f876c..000000000 Binary files a/docs/static/img/guides/quickstart/10.png and /dev/null differ diff --git a/docs/static/img/guides/quickstart/11.png b/docs/static/img/guides/quickstart/11.png deleted file mode 100644 index c8b75f490..000000000 Binary files a/docs/static/img/guides/quickstart/11.png and /dev/null differ diff --git a/docs/static/img/guides/quickstart/12.png b/docs/static/img/guides/quickstart/12.png deleted file mode 100644 index 8f061749c..000000000 Binary files a/docs/static/img/guides/quickstart/12.png and /dev/null differ diff --git a/docs/static/img/guides/quickstart/13.png b/docs/static/img/guides/quickstart/13.png deleted file mode 100644 index 4eba2031c..000000000 Binary files a/docs/static/img/guides/quickstart/13.png and /dev/null differ diff --git a/docs/static/img/guides/quickstart/14.png b/docs/static/img/guides/quickstart/14.png deleted file mode 100644 index 8bf7d1189..000000000 Binary files a/docs/static/img/guides/quickstart/14.png and /dev/null differ diff --git a/docs/static/img/guides/quickstart/15.png b/docs/static/img/guides/quickstart/15.png deleted file mode 100644 index 42bcf3943..000000000 Binary files a/docs/static/img/guides/quickstart/15.png and /dev/null differ diff --git a/docs/static/img/guides/quickstart/16.png b/docs/static/img/guides/quickstart/16.png deleted file mode 100644 index e9b3cef20..000000000 Binary files a/docs/static/img/guides/quickstart/16.png and /dev/null differ diff --git a/docs/static/img/guides/quickstart/17.png b/docs/static/img/guides/quickstart/17.png deleted file mode 100644 index e37e5ce53..000000000 Binary files a/docs/static/img/guides/quickstart/17.png and /dev/null differ diff --git a/docs/static/img/guides/quickstart/18.png b/docs/static/img/guides/quickstart/18.png deleted file mode 100644 index 864badeac..000000000 Binary files a/docs/static/img/guides/quickstart/18.png and /dev/null differ diff --git a/docs/static/img/guides/quickstart/19.png b/docs/static/img/guides/quickstart/19.png deleted file mode 100644 index ced5c88c3..000000000 Binary files a/docs/static/img/guides/quickstart/19.png and /dev/null differ diff --git a/docs/static/img/guides/quickstart/2.png b/docs/static/img/guides/quickstart/2.png deleted file mode 100644 index 00940132c..000000000 Binary files a/docs/static/img/guides/quickstart/2.png and /dev/null differ diff --git a/docs/static/img/guides/quickstart/20.png b/docs/static/img/guides/quickstart/20.png index e35e10fc2..8ad3af1c5 100644 Binary files a/docs/static/img/guides/quickstart/20.png and b/docs/static/img/guides/quickstart/20.png differ diff --git a/docs/static/img/guides/quickstart/21.png b/docs/static/img/guides/quickstart/21.png index ebaec11c6..b27a5d878 100644 Binary files a/docs/static/img/guides/quickstart/21.png and b/docs/static/img/guides/quickstart/21.png differ diff --git a/docs/static/img/guides/quickstart/22.png b/docs/static/img/guides/quickstart/22.png index dd06b5e8d..6780fd898 100644 Binary files a/docs/static/img/guides/quickstart/22.png and b/docs/static/img/guides/quickstart/22.png differ diff --git a/docs/static/img/guides/quickstart/23.png b/docs/static/img/guides/quickstart/23.png index 793b678f6..904b0c618 100644 Binary files a/docs/static/img/guides/quickstart/23.png and b/docs/static/img/guides/quickstart/23.png differ diff --git a/docs/static/img/guides/quickstart/24.png b/docs/static/img/guides/quickstart/24.png index 66f3d452e..38eb37fe7 100644 Binary files a/docs/static/img/guides/quickstart/24.png and b/docs/static/img/guides/quickstart/24.png differ diff --git a/docs/static/img/guides/quickstart/25.png b/docs/static/img/guides/quickstart/25.png index 271f58c9b..6cef0bfe3 100644 Binary files a/docs/static/img/guides/quickstart/25.png and b/docs/static/img/guides/quickstart/25.png differ diff --git a/docs/static/img/guides/quickstart/26.png b/docs/static/img/guides/quickstart/26.png index 33f4c15c4..b3d8f70f9 100644 Binary files a/docs/static/img/guides/quickstart/26.png and b/docs/static/img/guides/quickstart/26.png differ diff --git a/docs/static/img/guides/quickstart/28.png b/docs/static/img/guides/quickstart/28.png index 9d7be1141..186bf139c 100644 Binary files a/docs/static/img/guides/quickstart/28.png and b/docs/static/img/guides/quickstart/28.png differ diff --git a/docs/static/img/guides/quickstart/29.png b/docs/static/img/guides/quickstart/29.png index fea1b6045..0c24026aa 100644 Binary files a/docs/static/img/guides/quickstart/29.png and b/docs/static/img/guides/quickstart/29.png differ diff --git a/docs/static/img/guides/quickstart/3.png b/docs/static/img/guides/quickstart/3.png deleted file mode 100644 index b6a903939..000000000 Binary files a/docs/static/img/guides/quickstart/3.png and /dev/null differ diff --git a/docs/static/img/guides/quickstart/30.png b/docs/static/img/guides/quickstart/30.png index 2f13dea74..a7c32404d 100644 Binary files a/docs/static/img/guides/quickstart/30.png and b/docs/static/img/guides/quickstart/30.png differ diff --git a/docs/static/img/guides/quickstart/31.png b/docs/static/img/guides/quickstart/31.png index 84d3d2089..9b3d4d56d 100644 Binary files a/docs/static/img/guides/quickstart/31.png and b/docs/static/img/guides/quickstart/31.png differ diff --git a/docs/static/img/guides/quickstart/33.png b/docs/static/img/guides/quickstart/33.png index ca17ea0b2..b6ba34104 100644 Binary files a/docs/static/img/guides/quickstart/33.png and b/docs/static/img/guides/quickstart/33.png differ diff --git a/docs/static/img/guides/quickstart/34.png b/docs/static/img/guides/quickstart/34.png index 2618cb766..84c990a4d 100644 Binary files a/docs/static/img/guides/quickstart/34.png and b/docs/static/img/guides/quickstart/34.png differ diff --git a/docs/static/img/guides/quickstart/35.png b/docs/static/img/guides/quickstart/35.png index 69380984f..7520cf4d3 100644 Binary files a/docs/static/img/guides/quickstart/35.png and b/docs/static/img/guides/quickstart/35.png differ diff --git a/docs/static/img/guides/quickstart/36.png b/docs/static/img/guides/quickstart/36.png index 17abdea2f..e1c27b0c2 100644 Binary files a/docs/static/img/guides/quickstart/36.png and b/docs/static/img/guides/quickstart/36.png differ diff --git a/docs/static/img/guides/quickstart/38.png b/docs/static/img/guides/quickstart/38.png index ec1baba46..5c588a423 100644 Binary files a/docs/static/img/guides/quickstart/38.png and b/docs/static/img/guides/quickstart/38.png differ diff --git a/docs/static/img/guides/quickstart/39.png b/docs/static/img/guides/quickstart/39.png index c52fd5571..8de05371e 100644 Binary files a/docs/static/img/guides/quickstart/39.png and b/docs/static/img/guides/quickstart/39.png differ diff --git a/docs/static/img/guides/quickstart/4.png b/docs/static/img/guides/quickstart/4.png deleted file mode 100644 index bb31fdde9..000000000 Binary files a/docs/static/img/guides/quickstart/4.png and /dev/null differ diff --git a/docs/static/img/guides/quickstart/5.png b/docs/static/img/guides/quickstart/5.png deleted file mode 100644 index 4c65e9d9a..000000000 Binary files a/docs/static/img/guides/quickstart/5.png and /dev/null differ diff --git a/docs/static/img/guides/quickstart/50.png b/docs/static/img/guides/quickstart/50.png index f2d03f013..73ddb1e9c 100644 Binary files a/docs/static/img/guides/quickstart/50.png and b/docs/static/img/guides/quickstart/50.png differ diff --git a/docs/static/img/guides/quickstart/6.png b/docs/static/img/guides/quickstart/6.png deleted file mode 100644 index 03393795a..000000000 Binary files a/docs/static/img/guides/quickstart/6.png and /dev/null differ diff --git a/docs/static/img/guides/quickstart/7.png b/docs/static/img/guides/quickstart/7.png deleted file mode 100644 index 90d7982e8..000000000 Binary files a/docs/static/img/guides/quickstart/7.png and /dev/null differ diff --git a/docs/static/img/guides/quickstart/8.png b/docs/static/img/guides/quickstart/8.png deleted file mode 100644 index eb58e5b48..000000000 Binary files a/docs/static/img/guides/quickstart/8.png and /dev/null differ diff --git a/docs/static/img/guides/quickstart/9.png b/docs/static/img/guides/quickstart/9.png deleted file mode 100644 index 1f11e2a34..000000000 Binary files a/docs/static/img/guides/quickstart/9.png and /dev/null differ diff --git a/docs/static/img/guides/solution-scenarios/frontend-calling-backend-API_1.png b/docs/static/img/guides/solution-scenarios/frontend-calling-backend-API_1.png index 14577545a..6dab2b6b5 100644 Binary files a/docs/static/img/guides/solution-scenarios/frontend-calling-backend-API_1.png and b/docs/static/img/guides/solution-scenarios/frontend-calling-backend-API_1.png differ diff --git a/docs/static/img/linking-accounts.gif b/docs/static/img/linking-accounts.gif deleted file mode 100644 index fec816096..000000000 Binary files a/docs/static/img/linking-accounts.gif and /dev/null differ diff --git a/docs/static/img/login-mfa.gif b/docs/static/img/login-mfa.gif deleted file mode 100644 index 22024699a..000000000 Binary files a/docs/static/img/login-mfa.gif and /dev/null differ diff --git a/docs/static/img/manage-external-idp.png b/docs/static/img/manage-external-idp.png deleted file mode 100644 index 9c43123d1..000000000 Binary files a/docs/static/img/manage-external-idp.png and /dev/null differ diff --git a/docs/static/img/personal2.png b/docs/static/img/personal2.png deleted file mode 100644 index 373fd332e..000000000 Binary files a/docs/static/img/personal2.png and /dev/null differ diff --git a/docs/static/img/projects2.png b/docs/static/img/projects2.png deleted file mode 100644 index 36b779e99..000000000 Binary files a/docs/static/img/projects2.png and /dev/null differ diff --git a/docs/static/img/register.gif b/docs/static/img/register.gif deleted file mode 100644 index 3dae01e27..000000000 Binary files a/docs/static/img/register.gif and /dev/null differ diff --git a/docs/static/img/self-register.gif b/docs/static/img/self-register.gif deleted file mode 100644 index 383a818d6..000000000 Binary files a/docs/static/img/self-register.gif and /dev/null differ diff --git a/docs/static/img/usermanual.png b/docs/static/img/usermanual.png deleted file mode 100644 index 5ae41a37f..000000000 Binary files a/docs/static/img/usermanual.png and /dev/null differ diff --git a/e2e/cypress/e2e/events/events.cy.ts b/e2e/cypress/e2e/events/events.cy.ts index facd298b1..f7800000e 100644 --- a/e2e/cypress/e2e/events/events.cy.ts +++ b/e2e/cypress/e2e/events/events.cy.ts @@ -5,7 +5,7 @@ describe('events', () => { it('events can be filtered', () => { const eventTypeEnglish = 'Instance added'; - cy.visit('/events'); + cy.visit('/instance?id=events'); cy.get('[data-e2e="event-type-cell"]').should('have.length', 20); cy.get('[data-e2e="open-filter-button"]').click(); cy.get('[data-e2e="event-type-filter-checkbox"]').click(); diff --git a/e2e/cypress/e2e/instance/settings/notifications.cy.ts b/e2e/cypress/e2e/instance/settings/notifications.cy.ts index 06207ce52..4e6856dca 100644 --- a/e2e/cypress/e2e/instance/settings/notifications.cy.ts +++ b/e2e/cypress/e2e/instance/settings/notifications.cy.ts @@ -1,6 +1,6 @@ -const notificationPath = `/settings?id=notifications`; -const smtpPath = `/settings?id=smtpprovider`; -const smsPath = `/settings?id=smsprovider`; +const notificationPath = `/instance?id=notifications`; +const smtpPath = `/instance?id=smtpprovider`; +const smsPath = `/instance?id=smsprovider`; beforeEach(() => { cy.context().as('ctx'); diff --git a/e2e/cypress/e2e/settings/oidc-settings.cy.ts b/e2e/cypress/e2e/settings/oidc-settings.cy.ts index 8997c1e7d..dc6a8e8a0 100644 --- a/e2e/cypress/e2e/settings/oidc-settings.cy.ts +++ b/e2e/cypress/e2e/settings/oidc-settings.cy.ts @@ -2,7 +2,7 @@ import { apiAuth } from '../../support/api/apiauth'; import { ensureOIDCSettingsSet } from '../../support/api/oidc-settings'; describe('oidc settings', () => { - const oidcSettingsPath = `/settings?id=oidc`; + const oidcSettingsPath = `/instance?id=oidc`; const accessTokenPrecondition = 1; const idTokenPrecondition = 2; const refreshTokenExpirationPrecondition = 7;