diff --git a/console/package-lock.json b/console/package-lock.json index 12d02e719e..dff479742a 100644 --- a/console/package-lock.json +++ b/console/package-lock.json @@ -62,10 +62,10 @@ "@types/jsonwebtoken": "^8.5.5", "@types/node": "^17.0.35", "@typescript-eslint/eslint-plugin": "5.25.0", - "@typescript-eslint/parser": "5.26.0", + "@typescript-eslint/parser": "5.27.0", "codelyzer": "^6.0.0", "cypress": "^9.5.1", - "cypress-terminal-report": "^3.4.1", + "cypress-terminal-report": "^4.0.1", "eslint": "^8.16.0", "jasmine-core": "~4.1.1", "jasmine-spec-reporter": "~7.0.0", @@ -4415,14 +4415,14 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "5.26.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.26.0.tgz", - "integrity": "sha512-n/IzU87ttzIdnAH5vQ4BBDnLPly7rC5VnjN3m0xBG82HK6rhRxnCb3w/GyWbNDghPd+NktJqB/wl6+YkzZ5T5Q==", + "version": "5.27.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.27.0.tgz", + "integrity": "sha512-8oGjQF46c52l7fMiPPvX4It3u3V3JipssqDfHQ2hcR0AeR8Zge+OYyKUCm5b70X72N1qXt0qgHenwN6Gc2SXZA==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.26.0", - "@typescript-eslint/types": "5.26.0", - "@typescript-eslint/typescript-estree": "5.26.0", + "@typescript-eslint/scope-manager": "5.27.0", + "@typescript-eslint/types": "5.27.0", + "@typescript-eslint/typescript-estree": "5.27.0", "debug": "^4.3.4" }, "engines": { @@ -4442,13 +4442,13 @@ } }, "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": { - "version": "5.26.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.26.0.tgz", - "integrity": "sha512-gVzTJUESuTwiju/7NiTb4c5oqod8xt5GhMbExKsCTp6adU3mya6AGJ4Pl9xC7x2DX9UYFsjImC0mA62BCY22Iw==", + "version": "5.27.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.27.0.tgz", + "integrity": "sha512-VnykheBQ/sHd1Vt0LJ1JLrMH1GzHO+SzX6VTXuStISIsvRiurue/eRkTqSrG0CexHQgKG8shyJfR4o5VYioB9g==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.26.0", - "@typescript-eslint/visitor-keys": "5.26.0" + "@typescript-eslint/types": "5.27.0", + "@typescript-eslint/visitor-keys": "5.27.0" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -4459,12 +4459,12 @@ } }, "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": { - "version": "5.26.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.26.0.tgz", - "integrity": "sha512-wei+ffqHanYDOQgg/fS6Hcar6wAWv0CUPQ3TZzOWd2BLfgP539rb49bwua8WRAs7R6kOSLn82rfEu2ro6Llt8Q==", + "version": "5.27.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.27.0.tgz", + "integrity": "sha512-46cYrteA2MrIAjv9ai44OQDUoCZyHeGIc4lsjCUX2WT6r4C+kidz1bNiR4017wHOPUythYeH+Sc7/cFP97KEAA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.26.0", + "@typescript-eslint/types": "5.27.0", "eslint-visitor-keys": "^3.3.0" }, "engines": { @@ -4566,9 +4566,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "5.26.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.26.0.tgz", - "integrity": "sha512-8794JZFE1RN4XaExLWLI2oSXsVImNkl79PzTOOWt9h0UHROwJedNOD2IJyfL0NbddFllcktGIO2aOu10avQQyA==", + "version": "5.27.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.27.0.tgz", + "integrity": "sha512-lY6C7oGm9a/GWhmUDOs3xAVRz4ty/XKlQ2fOLr8GAIryGn0+UBOoJDWyHer3UgrHkenorwvBnphhP+zPmzmw0A==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -4579,13 +4579,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "5.26.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.26.0.tgz", - "integrity": "sha512-EyGpw6eQDsfD6jIqmXP3rU5oHScZ51tL/cZgFbFBvWuCwrIptl+oueUZzSmLtxFuSOQ9vDcJIs+279gnJkfd1w==", + "version": "5.27.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.27.0.tgz", + "integrity": "sha512-QywPMFvgZ+MHSLRofLI7BDL+UczFFHyj0vF5ibeChDAJgdTV8k4xgEwF0geFhVlPc1p8r70eYewzpo6ps+9LJQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.26.0", - "@typescript-eslint/visitor-keys": "5.26.0", + "@typescript-eslint/types": "5.27.0", + "@typescript-eslint/visitor-keys": "5.27.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -4606,12 +4606,12 @@ } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/@typescript-eslint/visitor-keys": { - "version": "5.26.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.26.0.tgz", - "integrity": "sha512-wei+ffqHanYDOQgg/fS6Hcar6wAWv0CUPQ3TZzOWd2BLfgP539rb49bwua8WRAs7R6kOSLn82rfEu2ro6Llt8Q==", + "version": "5.27.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.27.0.tgz", + "integrity": "sha512-46cYrteA2MrIAjv9ai44OQDUoCZyHeGIc4lsjCUX2WT6r4C+kidz1bNiR4017wHOPUythYeH+Sc7/cFP97KEAA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.26.0", + "@typescript-eslint/types": "5.27.0", "eslint-visitor-keys": "^3.3.0" }, "engines": { @@ -7169,9 +7169,9 @@ } }, "node_modules/cypress-terminal-report": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/cypress-terminal-report/-/cypress-terminal-report-3.5.2.tgz", - "integrity": "sha512-06y4xTOnztyUOIwk3B+YoAYrK5DSwgCMZhUieUdU3EDXjIb4BgRs/wqPYbfCrH/N5/Yb9aV2hjO95pjzEClwqQ==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/cypress-terminal-report/-/cypress-terminal-report-4.0.1.tgz", + "integrity": "sha512-d74XcGKIeKUzFBccmWCiXmDXkI8KkxYAXZGOaLpejT1cAtJYDRmy7tbbbroO5r6JBXU0tNCabgZbccsReEWDag==", "dev": true, "dependencies": { "chalk": "^3.0.0", @@ -22588,34 +22588,34 @@ } }, "@typescript-eslint/parser": { - "version": "5.26.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.26.0.tgz", - "integrity": "sha512-n/IzU87ttzIdnAH5vQ4BBDnLPly7rC5VnjN3m0xBG82HK6rhRxnCb3w/GyWbNDghPd+NktJqB/wl6+YkzZ5T5Q==", + "version": "5.27.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.27.0.tgz", + "integrity": "sha512-8oGjQF46c52l7fMiPPvX4It3u3V3JipssqDfHQ2hcR0AeR8Zge+OYyKUCm5b70X72N1qXt0qgHenwN6Gc2SXZA==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "5.26.0", - "@typescript-eslint/types": "5.26.0", - "@typescript-eslint/typescript-estree": "5.26.0", + "@typescript-eslint/scope-manager": "5.27.0", + "@typescript-eslint/types": "5.27.0", + "@typescript-eslint/typescript-estree": "5.27.0", "debug": "^4.3.4" }, "dependencies": { "@typescript-eslint/scope-manager": { - "version": "5.26.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.26.0.tgz", - "integrity": "sha512-gVzTJUESuTwiju/7NiTb4c5oqod8xt5GhMbExKsCTp6adU3mya6AGJ4Pl9xC7x2DX9UYFsjImC0mA62BCY22Iw==", + "version": "5.27.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.27.0.tgz", + "integrity": "sha512-VnykheBQ/sHd1Vt0LJ1JLrMH1GzHO+SzX6VTXuStISIsvRiurue/eRkTqSrG0CexHQgKG8shyJfR4o5VYioB9g==", "dev": true, "requires": { - "@typescript-eslint/types": "5.26.0", - "@typescript-eslint/visitor-keys": "5.26.0" + "@typescript-eslint/types": "5.27.0", + "@typescript-eslint/visitor-keys": "5.27.0" } }, "@typescript-eslint/visitor-keys": { - "version": "5.26.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.26.0.tgz", - "integrity": "sha512-wei+ffqHanYDOQgg/fS6Hcar6wAWv0CUPQ3TZzOWd2BLfgP539rb49bwua8WRAs7R6kOSLn82rfEu2ro6Llt8Q==", + "version": "5.27.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.27.0.tgz", + "integrity": "sha512-46cYrteA2MrIAjv9ai44OQDUoCZyHeGIc4lsjCUX2WT6r4C+kidz1bNiR4017wHOPUythYeH+Sc7/cFP97KEAA==", "dev": true, "requires": { - "@typescript-eslint/types": "5.26.0", + "@typescript-eslint/types": "5.27.0", "eslint-visitor-keys": "^3.3.0" } }, @@ -22671,19 +22671,19 @@ } }, "@typescript-eslint/types": { - "version": "5.26.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.26.0.tgz", - "integrity": "sha512-8794JZFE1RN4XaExLWLI2oSXsVImNkl79PzTOOWt9h0UHROwJedNOD2IJyfL0NbddFllcktGIO2aOu10avQQyA==", + "version": "5.27.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.27.0.tgz", + "integrity": "sha512-lY6C7oGm9a/GWhmUDOs3xAVRz4ty/XKlQ2fOLr8GAIryGn0+UBOoJDWyHer3UgrHkenorwvBnphhP+zPmzmw0A==", "dev": true }, "@typescript-eslint/typescript-estree": { - "version": "5.26.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.26.0.tgz", - "integrity": "sha512-EyGpw6eQDsfD6jIqmXP3rU5oHScZ51tL/cZgFbFBvWuCwrIptl+oueUZzSmLtxFuSOQ9vDcJIs+279gnJkfd1w==", + "version": "5.27.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.27.0.tgz", + "integrity": "sha512-QywPMFvgZ+MHSLRofLI7BDL+UczFFHyj0vF5ibeChDAJgdTV8k4xgEwF0geFhVlPc1p8r70eYewzpo6ps+9LJQ==", "dev": true, "requires": { - "@typescript-eslint/types": "5.26.0", - "@typescript-eslint/visitor-keys": "5.26.0", + "@typescript-eslint/types": "5.27.0", + "@typescript-eslint/visitor-keys": "5.27.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -22692,12 +22692,12 @@ }, "dependencies": { "@typescript-eslint/visitor-keys": { - "version": "5.26.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.26.0.tgz", - "integrity": "sha512-wei+ffqHanYDOQgg/fS6Hcar6wAWv0CUPQ3TZzOWd2BLfgP539rb49bwua8WRAs7R6kOSLn82rfEu2ro6Llt8Q==", + "version": "5.27.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.27.0.tgz", + "integrity": "sha512-46cYrteA2MrIAjv9ai44OQDUoCZyHeGIc4lsjCUX2WT6r4C+kidz1bNiR4017wHOPUythYeH+Sc7/cFP97KEAA==", "dev": true, "requires": { - "@typescript-eslint/types": "5.26.0", + "@typescript-eslint/types": "5.27.0", "eslint-visitor-keys": "^3.3.0" } }, @@ -24692,9 +24692,9 @@ } }, "cypress-terminal-report": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/cypress-terminal-report/-/cypress-terminal-report-3.5.2.tgz", - "integrity": "sha512-06y4xTOnztyUOIwk3B+YoAYrK5DSwgCMZhUieUdU3EDXjIb4BgRs/wqPYbfCrH/N5/Yb9aV2hjO95pjzEClwqQ==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/cypress-terminal-report/-/cypress-terminal-report-4.0.1.tgz", + "integrity": "sha512-d74XcGKIeKUzFBccmWCiXmDXkI8KkxYAXZGOaLpejT1cAtJYDRmy7tbbbroO5r6JBXU0tNCabgZbccsReEWDag==", "dev": true, "requires": { "chalk": "^3.0.0", diff --git a/console/package.json b/console/package.json index a7cc57cb85..ace0cef80f 100644 --- a/console/package.json +++ b/console/package.json @@ -65,10 +65,10 @@ "@types/jasminewd2": "~2.0.10", "@types/jsonwebtoken": "^8.5.5", "@types/node": "^17.0.35", - "@typescript-eslint/parser": "5.26.0", + "@typescript-eslint/parser": "5.27.0", "codelyzer": "^6.0.0", "cypress": "^9.5.1", - "cypress-terminal-report": "^3.4.1", + "cypress-terminal-report": "^4.0.1", "eslint": "^8.16.0", "@typescript-eslint/eslint-plugin": "5.25.0", "jasmine-core": "~4.1.1", diff --git a/console/src/app/directives/outside-click/outside-click.directive.ts b/console/src/app/directives/outside-click/outside-click.directive.ts deleted file mode 100644 index bd429f1c93..0000000000 --- a/console/src/app/directives/outside-click/outside-click.directive.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { Directive, ElementRef, EventEmitter, HostListener, Output } from '@angular/core'; - -@Directive({ - selector: '[cnslOutsideClick]', -}) -export class OutsideClickDirective { - constructor(private elementRef: ElementRef) { } - - @Output() public clickOutside: EventEmitter = new EventEmitter(); - - @HostListener('document:click', ['$event.target']) onMouseEnter(targetElement: HTMLElement): void { - const clickedInside = this.elementRef.nativeElement.contains(targetElement); - if (!clickedInside) { - this.clickOutside.emit(targetElement); - } - } -} diff --git a/console/src/app/directives/outside-click/outside-click.module.ts b/console/src/app/directives/outside-click/outside-click.module.ts deleted file mode 100644 index 60a299a297..0000000000 --- a/console/src/app/directives/outside-click/outside-click.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { CommonModule } from '@angular/common'; -import { NgModule } from '@angular/core'; - -import { OutsideClickDirective } from './outside-click.directive'; - - - - -@NgModule({ - declarations: [ - OutsideClickDirective, - ], - imports: [ - CommonModule, - ], - exports: [ - OutsideClickDirective, - ], -}) -export class OutsideClickModule { } diff --git a/console/src/app/modules/accounts-card/accounts-card.component.html b/console/src/app/modules/accounts-card/accounts-card.component.html index 376ca8f055..cb7fc37eed 100644 --- a/console/src/app/modules/accounts-card/accounts-card.component.html +++ b/console/src/app/modules/accounts-card/accounts-card.component.html @@ -1,4 +1,4 @@ -
+
{{ session.displayName ? session.displayName : session.userName }} {{ session.loginName }} - + {{ 'USER.STATE.' + session.authState | translate }}
keyboard_arrow_right diff --git a/console/src/app/modules/accounts-card/accounts-card.component.scss b/console/src/app/modules/accounts-card/accounts-card.component.scss index 039b3b2613..895bfe11bc 100644 --- a/console/src/app/modules/accounts-card/accounts-card.component.scss +++ b/console/src/app/modules/accounts-card/accounts-card.component.scss @@ -28,6 +28,7 @@ align-items: center; padding: 1rem 0; position: relative; + color: map-get($foreground, text); .avatar { font-size: 80px; @@ -47,7 +48,7 @@ .u-email { font-size: 0.8rem; - margin-top: 0; + margin: 0.5rem 0; } button { @@ -96,6 +97,7 @@ border-radius: 50%; margin: 0 1rem; text-align: center; + display: flex; i { margin: auto; @@ -112,13 +114,26 @@ font-weight: 500; font-size: 0.9rem; line-height: 1rem; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; } - .email, + .state, .loginname { - color: $secondary-text; font-size: 0.8rem; line-height: 1rem; + width: fit-content; + } + + .loginname { + color: $secondary-text; + } + + .state { + margin-top: 3px; + font-size: 11px; + padding: 1px 0.5rem; } } diff --git a/console/src/app/modules/accounts-card/accounts-card.component.ts b/console/src/app/modules/accounts-card/accounts-card.component.ts index d53aebe7b6..654e6d7aa7 100644 --- a/console/src/app/modules/accounts-card/accounts-card.component.ts +++ b/console/src/app/modules/accounts-card/accounts-card.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { Router } from '@angular/router'; import { AuthConfig } from 'angular-oauth2-oidc'; -import { Session, User } from 'src/app/proto/generated/zitadel/user_pb'; +import { Session, User, UserState } from 'src/app/proto/generated/zitadel/user_pb'; import { AuthenticationService } from 'src/app/services/authentication.service'; import { GrpcAuthService } from 'src/app/services/grpc-auth.service'; @@ -17,6 +17,7 @@ export class AccountsCardComponent implements OnInit { @Output() public closedCard: EventEmitter = new EventEmitter(); public sessions: Session.AsObject[] = []; public loadingUsers: boolean = false; + public UserState: any = UserState; constructor(public authService: AuthenticationService, private router: Router, private userService: GrpcAuthService) { this.userService .listMyUserSessions() @@ -34,7 +35,7 @@ export class AccountsCardComponent implements OnInit { }); } - public ngOnInit(): void { + ngOnInit(): void { this.loadingUsers = true; } @@ -49,10 +50,6 @@ export class AccountsCardComponent implements OnInit { } } - public close(): void { - this.closedCard.emit(); - } - public selectAccount(loginHint?: string): void { const configWithPrompt: Partial = { customQueryParams: { diff --git a/console/src/app/modules/accounts-card/accounts-card.module.ts b/console/src/app/modules/accounts-card/accounts-card.module.ts index 5bffb57d56..057175a793 100644 --- a/console/src/app/modules/accounts-card/accounts-card.module.ts +++ b/console/src/app/modules/accounts-card/accounts-card.module.ts @@ -5,23 +5,13 @@ import { MatIconModule } from '@angular/material/icon'; import { MatProgressBarModule } from '@angular/material/progress-bar'; import { RouterModule } from '@angular/router'; import { TranslateModule } from '@ngx-translate/core'; -import { OutsideClickModule } from 'src/app/directives/outside-click/outside-click.module'; import { AvatarModule } from '../avatar/avatar.module'; import { AccountsCardComponent } from './accounts-card.component'; @NgModule({ declarations: [AccountsCardComponent], - imports: [ - CommonModule, - MatIconModule, - MatButtonModule, - MatProgressBarModule, - OutsideClickModule, - RouterModule, - AvatarModule, - TranslateModule, - ], + imports: [CommonModule, MatIconModule, MatButtonModule, MatProgressBarModule, RouterModule, AvatarModule, TranslateModule], exports: [AccountsCardComponent], }) export class AccountsCardModule {} diff --git a/console/src/app/modules/add-key-dialog/add-key-dialog.component.html b/console/src/app/modules/add-key-dialog/add-key-dialog.component.html index 8c7a4cf0f7..389428dabb 100644 --- a/console/src/app/modules/add-key-dialog/add-key-dialog.component.html +++ b/console/src/app/modules/add-key-dialog/add-key-dialog.component.html @@ -1,34 +1,39 @@ -{{'USER.MACHINE.ADD.TITLE' | translate}} +{{ 'USER.MACHINE.ADD.TITLE' | translate }}
-

{{'USER.MACHINE.ADD.DESCRIPTION' | translate}}

+

{{ 'USER.MACHINE.ADD.DESCRIPTION' | translate }}

- - {{'USER.MACHINE.TYPE' | translate}} + + {{ 'USER.MACHINE.TYPE' | translate }} - {{'USER.MACHINE.KEYTYPES.'+t | translate}} + {{ 'USER.MACHINE.KEYTYPES.' + t | translate }} - - {{'USER.MACHINE.CHOOSEEXPIRY' | translate}} (optional) - - - + + {{ 'USER.MACHINE.CHOOSEEXPIRY' | translate }} (optional) + + + - {{'USER.MACHINE.CHOOSEDATEAFTER' | translate}}: - {{dateControl?.errors?.matDatepickerMin.min.toDate() | localizedDate: 'EEE dd. MMM'}} + {{ 'USER.MACHINE.CHOOSEDATEAFTER' | translate }}: + {{ dateControl?.errors?.matDatepickerMin.min.toDate() | localizedDate: 'EEE dd. MMM' }}
-
+
- -
\ No newline at end of file +
diff --git a/console/src/app/modules/add-member-dialog/member-create-dialog.component.html b/console/src/app/modules/add-member-dialog/member-create-dialog.component.html index 8c362e72b3..243f18c67f 100644 --- a/console/src/app/modules/add-member-dialog/member-create-dialog.component.html +++ b/console/src/app/modules/add-member-dialog/member-create-dialog.component.html @@ -1,24 +1,32 @@

- {{'MEMBER.ADD' | translate}} + {{ 'MEMBER.ADD' | translate }}

-

{{'ORG_DETAIL.MEMBER.ADDDESCRIPTION' | translate}}

+

{{ 'ORG_DETAIL.MEMBER.ADDDESCRIPTION' | translate }}

- + {{ 'MEMBER.CREATIONTYPE' | translate }} - - {{ 'MEMBER.CREATIONTYPES.'+type.type | translate}} + + {{ 'MEMBER.CREATIONTYPES.' + type.type | translate }} -

{{'PROJECT.GRANT.CREATE.SEL_PROJECT' | translate}}

- +

{{ 'PROJECT.GRANT.CREATE.SEL_PROJECT' | translate }}

+ @@ -27,23 +35,33 @@
- +
- {{role | roletransform}} + {{ role | roletransform }} +
-
- -
\ No newline at end of file +
diff --git a/console/src/app/modules/add-member-dialog/member-create-dialog.component.scss b/console/src/app/modules/add-member-dialog/member-create-dialog.component.scss index 3c75407106..0336217b1f 100644 --- a/console/src/app/modules/add-member-dialog/member-create-dialog.component.scss +++ b/console/src/app/modules/add-member-dialog/member-create-dialog.component.scss @@ -22,6 +22,11 @@ display: flex; flex-direction: row; align-items: center; + + .info-hover { + font-size: 1.2rem; + margin-left: 0.5rem; + } } } } diff --git a/console/src/app/modules/add-member-dialog/member-create-dialog.module.ts b/console/src/app/modules/add-member-dialog/member-create-dialog.module.ts index ed6d7820fa..a274c173c2 100644 --- a/console/src/app/modules/add-member-dialog/member-create-dialog.module.ts +++ b/console/src/app/modules/add-member-dialog/member-create-dialog.module.ts @@ -6,6 +6,7 @@ import { MatCheckboxModule } from '@angular/material/checkbox'; import { MatChipsModule } from '@angular/material/chips'; import { MatDialogModule } from '@angular/material/dialog'; import { MatSelectModule } from '@angular/material/select'; +import { MatTooltipModule } from '@angular/material/tooltip'; import { TranslateModule } from '@ngx-translate/core'; import { InputModule } from 'src/app/modules/input/input.module'; import { SearchUserAutocompleteModule } from 'src/app/modules/search-user-autocomplete/search-user-autocomplete.module'; @@ -24,6 +25,7 @@ import { MemberCreateDialogComponent } from './member-create-dialog.component'; MatChipsModule, TranslateModule, InputModule, + MatTooltipModule, MatSelectModule, RoleTransformPipeModule, FormsModule, diff --git a/console/src/app/modules/add-member-roles-dialog/add-member-roles-dialog.component.html b/console/src/app/modules/add-member-roles-dialog/add-member-roles-dialog.component.html index 3ba008a22d..14d48a887f 100644 --- a/console/src/app/modules/add-member-roles-dialog/add-member-roles-dialog.component.html +++ b/console/src/app/modules/add-member-roles-dialog/add-member-roles-dialog.component.html @@ -12,6 +12,7 @@
{{ role | roletransform }} +
diff --git a/console/src/app/modules/add-member-roles-dialog/add-member-roles-dialog.component.scss b/console/src/app/modules/add-member-roles-dialog/add-member-roles-dialog.component.scss index 7db3ce5f87..e1c7139205 100644 --- a/console/src/app/modules/add-member-roles-dialog/add-member-roles-dialog.component.scss +++ b/console/src/app/modules/add-member-roles-dialog/add-member-roles-dialog.component.scss @@ -19,6 +19,11 @@ display: flex; flex-direction: row; align-items: center; + + .info-hover { + font-size: 1.2rem; + margin-left: 0.5rem; + } } } } diff --git a/console/src/app/modules/add-member-roles-dialog/add-member-roles-dialog.module.ts b/console/src/app/modules/add-member-roles-dialog/add-member-roles-dialog.module.ts index d7e1a8a15c..04eaba6b8d 100644 --- a/console/src/app/modules/add-member-roles-dialog/add-member-roles-dialog.module.ts +++ b/console/src/app/modules/add-member-roles-dialog/add-member-roles-dialog.module.ts @@ -2,6 +2,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MatCheckboxModule } from '@angular/material/checkbox'; +import { MatTooltipModule } from '@angular/material/tooltip'; import { TranslateModule } from '@ngx-translate/core'; import { LocalizedDatePipeModule } from 'src/app/pipes/localized-date-pipe/localized-date-pipe.module'; import { RoleTransformPipeModule } from 'src/app/pipes/role-transform/role-transform.module'; @@ -17,6 +18,7 @@ import { AddMemberRolesDialogComponent } from './add-member-roles-dialog.compone MatCheckboxModule, MatButtonModule, LocalizedDatePipeModule, + MatTooltipModule, RoleTransformPipeModule, TimestampToDatePipeModule, ], diff --git a/console/src/app/modules/add-token-dialog/add-token-dialog.component.html b/console/src/app/modules/add-token-dialog/add-token-dialog.component.html index 833809d423..f34d4f2fcc 100644 --- a/console/src/app/modules/add-token-dialog/add-token-dialog.component.html +++ b/console/src/app/modules/add-token-dialog/add-token-dialog.component.html @@ -1,25 +1,30 @@ -{{'USER.PERSONALACCESSTOKEN.ADD.TITLE' | translate}} +{{ 'USER.PERSONALACCESSTOKEN.ADD.TITLE' | translate }}
- {{'USER.PERSONALACCESSTOKEN.ADD.DESCRIPTION' | translate}} + {{ 'USER.PERSONALACCESSTOKEN.ADD.DESCRIPTION' | translate }} - - {{'USER.PERSONALACCESSTOKEN.ADD.CHOOSEEXPIRY' | translate}} (optional) - - + + {{ 'USER.PERSONALACCESSTOKEN.ADD.CHOOSEEXPIRY' | translate }} (optional) + + - {{'USER.PERSONALACCESSTOKEN.ADD.CHOOSEDATEAFTER' | translate}}: - {{dateControl?.errors?.matDatepickerMin.min.toDate() | localizedDate: 'EEE dd. MMM'}} + {{ 'USER.PERSONALACCESSTOKEN.ADD.CHOOSEDATEAFTER' | translate }}: + {{ dateControl?.errors?.matDatepickerMin.min.toDate() | localizedDate: 'EEE dd. MMM' }}
-
+
- -
\ No newline at end of file +
diff --git a/console/src/app/modules/add-token-dialog/add-token-dialog.component.scss b/console/src/app/modules/add-token-dialog/add-token-dialog.component.scss index 907483cd93..64a5824809 100644 --- a/console/src/app/modules/add-token-dialog/add-token-dialog.component.scss +++ b/console/src/app/modules/add-token-dialog/add-token-dialog.component.scss @@ -3,10 +3,6 @@ margin-top: 0; } -.form-field { - width: 100%; -} - .action { display: flex; justify-content: flex-end; diff --git a/console/src/app/modules/filter-user/filter-user.component.html b/console/src/app/modules/filter-user/filter-user.component.html index 2f85e5af94..c5d3d9a820 100644 --- a/console/src/app/modules/filter-user/filter-user.component.html +++ b/console/src/app/modules/filter-user/filter-user.component.html @@ -13,7 +13,7 @@ {{ 'FILTER.METHODS.1' | translate }} - + {{ 'USER.STATE.' + state | translate }} @@ -32,7 +32,7 @@ >{{ 'FILTER.DISPLAYNAME' | translate }}
- + {{ 'FILTER.METHODS.' + method | translate }} @@ -40,7 +40,7 @@ - + {{ 'FILTER.EMAIL' | translate }}
- + {{ 'FILTER.METHODS.' + method | translate }} @@ -68,7 +68,7 @@ - +
@@ -83,7 +83,7 @@ >{{ 'FILTER.USERNAME' | translate }}
- + {{ 'FILTER.METHODS.' + method | translate }} @@ -91,7 +91,7 @@ - +
diff --git a/console/src/app/modules/filter/filter.module.ts b/console/src/app/modules/filter/filter.module.ts index ea34cc8ff6..3ac5a636ee 100644 --- a/console/src/app/modules/filter/filter.module.ts +++ b/console/src/app/modules/filter/filter.module.ts @@ -7,7 +7,6 @@ import { MatCheckboxModule } from '@angular/material/checkbox'; import { MatIconModule } from '@angular/material/icon'; import { MatSelectModule } from '@angular/material/select'; import { TranslateModule } from '@ngx-translate/core'; -import { OutsideClickModule } from 'src/app/directives/outside-click/outside-click.module'; import { ActionKeysModule } from '../action-keys/action-keys.module'; import { InputModule } from '../input/input.module'; @@ -26,7 +25,6 @@ import { FilterComponent } from './filter.component'; MatCheckboxModule, InputModule, MatSelectModule, - OutsideClickModule, ], exports: [FilterComponent], }) diff --git a/console/src/app/modules/header/header.component.html b/console/src/app/modules/header/header.component.html index 2a1177aee9..09a02ca46d 100644 --- a/console/src/app/modules/header/header.component.html +++ b/console/src/app/modules/header/header.component.html @@ -196,30 +196,46 @@
-
- + +
+ - + diff --git a/console/src/app/modules/header/header.component.scss b/console/src/app/modules/header/header.component.scss index 0325e0710d..9697e1e81a 100644 --- a/console/src/app/modules/header/header.component.scss +++ b/console/src/app/modules/header/header.component.scss @@ -250,47 +250,56 @@ } } - .icon-container { - display: flex; - justify-content: space-between; + .account-card-wrapper { position: relative; - user-select: none; - border: 2px solid #ffffff80; - border-radius: 50%; - transition: border ease 0.15s; - &.iam-user { - border: 2px solid $primary-color; - } + .icon-container { + display: flex; + justify-content: space-between; + position: relative; + user-select: none; + border-radius: 50%; + transition: border ease 0.15s; + padding: 0; + border: 2px solid if($is-dark-theme, #ffffff80, #00000010); + outline: none; + background: none; - &:hover { - border-color: if($is-dark-theme, #fff, #00000050); - } + &.iam-user { + border: 2px solid $primary-color; + } - .docs { - text-decoration: none; - font-size: 1.4rem; - } + &:hover, + &:focus { + border: 2px solid if($is-dark-theme, #fff, map-get($primary, 200)); + } - .avatar-toggle { - display: block; - margin: auto; - cursor: pointer; - } + .docs { + text-decoration: none; + font-size: 1.4rem; + } - .name { - font-size: 1rem; - font-weight: 400; - } + .avatar-toggle { + display: block; + margin: auto; + cursor: pointer; + border: none; + } - .a_card { - position: absolute; - z-index: 300; - top: 55px; - right: 0; - overflow: hidden; - box-shadow: 0 0 15px 0 rgb(0 0 0 / 10%); - border-radius: 0.5rem; + .name { + font-size: 1rem; + font-weight: 400; + } + + .a_card { + position: absolute; + z-index: 300; + top: 55px; + right: 0; + overflow: hidden; + box-shadow: 0 0 15px 0 rgb(0 0 0 / 10%); + border-radius: 0.5rem; + } } } } diff --git a/console/src/app/modules/header/header.component.ts b/console/src/app/modules/header/header.component.ts index 3f7fc48f69..8264d9a495 100644 --- a/console/src/app/modules/header/header.component.ts +++ b/console/src/app/modules/header/header.component.ts @@ -38,6 +38,11 @@ export class HeaderComponent implements OnDestroy { new ConnectionPositionPair({ originX: 'start', originY: 'bottom' }, { overlayX: 'start', overlayY: 'top' }, 0, 10), new ConnectionPositionPair({ originX: 'end', originY: 'bottom' }, { overlayX: 'end', overlayY: 'top' }, 0, 10), ]; + + public accountCardPositions: ConnectedPosition[] = [ + new ConnectionPositionPair({ originX: 'end', originY: 'bottom' }, { overlayX: 'end', overlayY: 'top' }, 0, 10), + new ConnectionPositionPair({ originX: 'end', originY: 'bottom' }, { overlayX: 'end', overlayY: 'top' }, 0, 10), + ]; constructor( public authenticationService: AuthenticationService, private authService: GrpcAuthService, diff --git a/console/src/app/modules/info-row/info-row.component.html b/console/src/app/modules/info-row/info-row.component.html index 2fa08864d8..292623a8d4 100644 --- a/console/src/app/modules/info-row/info-row.component.html +++ b/console/src/app/modules/info-row/info-row.component.html @@ -1,37 +1,48 @@

{{ 'USER.PAGES.STATE' | translate }}

-

- {{'USER.DATA.STATE'+user.state - | translate}}

+

+ {{ 'USER.DATA.STATE' + user.state | translate }} +

{{ 'USER.ID' | translate }}

-

{{user.id }}

+

{{ user.id }}

{{ 'USER.DETAILS.DATECREATED' | translate }}

-

{{user.details.creationDate | - timestampToDate | localizedDate: 'dd. MMMM YYYY, HH:mm' }}

+

+ {{ user.details.creationDate | timestampToDate | localizedDate: 'dd. MMMM YYYY, HH:mm' }} +

{{ 'USER.DETAILS.DATECHANGED' | translate }}

-

{{user.details.changeDate | - timestampToDate - | localizedDate: 'dd. MMMM YYYY, HH:mm' }}

+

+ {{ user.details.changeDate | timestampToDate | localizedDate: 'dd. MMMM YYYY, HH:mm' }} +

{{ 'USER.PAGES.LOGINNAMES' | translate }}

-
@@ -40,99 +51,117 @@

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

-

- {{'ORG.STATE.'+org.state - | translate}}

+

+ {{ 'ORG.STATE.' + org.state | translate }} +

{{ 'RESOURCEID' | translate }}

-

{{org.id }}

+

{{ org.id }}

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

-

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

-

{{org.details.creationDate | - timestampToDate | localizedDate: 'dd. MMMM YYYY, HH:mm' }}

+

+ {{ org.details.creationDate | timestampToDate | localizedDate: 'dd. MMMM YYYY, HH:mm' }} +

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

-

{{org.details.changeDate | - timestampToDate - | localizedDate: 'dd. MMMM YYYY, HH:mm' }}

+

+ {{ org.details.changeDate | timestampToDate | localizedDate: 'dd. MMMM YYYY, HH:mm' }} +

{{ 'PROJECT.STATE.TITLE' | translate }}

-

- {{'PROJECT.STATE.'+project.state - | translate}}

+

+ {{ 'PROJECT.STATE.' + project.state | translate }} +

{{ 'RESOURCEID' | translate }}

-

{{project.id }}

+

{{ project.id }}

{{ 'PROJECT.PAGES.CREATEDON' | translate }}

- {{project.details.creationDate | - timestampToDate | localizedDate: 'dd. MMMM YYYY, HH:mm' }}

+ {{ project.details.creationDate | timestampToDate | localizedDate: 'dd. MMMM YYYY, HH:mm' }} +

{{ 'PROJECT.PAGES.LASTMODIFIED' | translate }}

- {{project.details.changeDate | - timestampToDate - | localizedDate: 'dd. MMMM YYYY, HH:mm' }}

+ {{ project.details.changeDate | timestampToDate | localizedDate: 'dd. MMMM YYYY, HH:mm' }} +

{{ 'PROJECT.STATE.TITLE' | translate }}

-

- {{'PROJECT.STATE.'+grantedProject.state - | translate}}

+

+ {{ 'PROJECT.STATE.' + grantedProject.state | translate }} +

{{ 'RESOURCEID' | translate }}

-

{{grantedProject.projectId }}

+

{{ grantedProject.projectId }}

{{ 'PROJECT.PAGES.CREATEDON' | translate }}

- {{grantedProject.details.creationDate | - timestampToDate | localizedDate: 'dd. MMMM YYYY, HH:mm' }}

+ {{ grantedProject.details.creationDate | timestampToDate | localizedDate: 'dd. MMMM YYYY, HH:mm' }} +

{{ 'PROJECT.PAGES.LASTMODIFIED' | translate }}

- {{grantedProject.details.changeDate | - timestampToDate - | localizedDate: 'dd. MMMM YYYY, HH:mm' }}

+ {{ grantedProject.details.changeDate | timestampToDate | localizedDate: 'dd. MMMM YYYY, HH:mm' }} +

@@ -140,84 +169,95 @@

{{ 'APP.PAGES.STATE' | translate }}

-

- {{'APP.PAGES.DETAIL.STATE.'+app.state - | translate}}

+

+ {{ 'APP.PAGES.DETAIL.STATE.' + app.state | translate }} +

{{ 'APP.PAGES.ID' | translate }}

-

{{app.id }}

+

{{ app.id }}

{{ 'APP.PAGES.DATECREATED' | translate }}

-

{{app.details.creationDate | - timestampToDate - | localizedDate: 'dd. MMMM YYYY, HH:mm' }}

+

+ {{ app.details.creationDate | timestampToDate | localizedDate: 'dd. MMMM YYYY, HH:mm' }} +

{{ 'APP.PAGES.DATECHANGED' | translate }}

-

{{app.details.changeDate | - timestampToDate | - localizedDate: 'dd. MMMM YYYY, HH:mm' }}

+

+ {{ app.details.changeDate | timestampToDate | localizedDate: 'dd. MMMM YYYY, HH:mm' }} +

{{ 'APP.OIDC.INFO.CLIENTID' | translate }}

-
-
-

{{ 'IDP.ID' | translate }}

-
- -
+

+ {{ idp.id }} +

{{ 'IDP.DETAIL.DATECREATED' | translate }}

-

{{idp.details.creationDate | - timestampToDate - | localizedDate: 'dd. MMMM YYYY, HH:mm' }}

+

+ {{ idp.details.creationDate | timestampToDate | localizedDate: 'dd. MMMM YYYY, HH:mm' }} +

{{ 'IDP.DETAIL.DATECHANGED' | translate }}

-

{{idp.details.changeDate | - timestampToDate | - localizedDate: 'dd. MMMM YYYY, HH:mm' }}

+

+ {{ idp.details.changeDate | timestampToDate | localizedDate: 'dd. MMMM YYYY, HH:mm' }} +

{{ 'IDP.STATE' | translate }}

-

- {{'IDP.STATES.'+idp.state - | translate}}

+

+ {{ 'IDP.STATES.' + idp.state | translate }} +

-
\ No newline at end of file +
diff --git a/console/src/app/modules/paginator/paginator.component.html b/console/src/app/modules/paginator/paginator.component.html index f5cee0943d..08fa472c4c 100644 --- a/console/src/app/modules/paginator/paginator.component.html +++ b/console/src/app/modules/paginator/paginator.component.html @@ -12,7 +12,7 @@ >{{ pageIndex * pageSize }} - {{ pageIndex * pageSize + pageSize }}
- + {{ sizeOption }} diff --git a/console/src/app/modules/policies/login-policy/login-policy.component.html b/console/src/app/modules/policies/login-policy/login-policy.component.html index 1b1ec22164..7aae637b28 100644 --- a/console/src/app/modules/policies/login-policy/login-policy.component.html +++ b/console/src/app/modules/policies/login-policy/login-policy.component.html @@ -1,5 +1,3 @@ - - diff --git a/console/src/app/modules/policies/login-texts/login-texts.component.html b/console/src/app/modules/policies/login-texts/login-texts.component.html index 50dfb40796..1151399be3 100644 --- a/console/src/app/modules/policies/login-texts/login-texts.component.html +++ b/console/src/app/modules/policies/login-texts/login-texts.component.html @@ -23,7 +23,7 @@
- + {{ 'POLICY.LOGIN_TEXTS.KEYNAME' | translate }} diff --git a/console/src/app/modules/policies/private-labeling-policy/color/color.component.html b/console/src/app/modules/policies/private-labeling-policy/color/color.component.html index 8ea4c1cc75..a8142eaba6 100644 --- a/console/src/app/modules/policies/private-labeling-policy/color/color.component.html +++ b/console/src/app/modules/policies/private-labeling-policy/color/color.component.html @@ -24,7 +24,6 @@ (detach)="submitColor()" [cdkConnectedOverlayOrigin]="trigger" [cdkConnectedOverlayOpen]="isOpen" - (overlayOutsideClick)="isOpen = false" > diff --git a/console/src/app/modules/search-project-autocomplete/search-project-autocomplete.component.html b/console/src/app/modules/search-project-autocomplete/search-project-autocomplete.component.html index 359676c0ab..b241dcba3a 100644 --- a/console/src/app/modules/search-project-autocomplete/search-project-autocomplete.component.html +++ b/console/src/app/modules/search-project-autocomplete/search-project-autocomplete.component.html @@ -1,8 +1,7 @@ - - {{'USER.GRANTS.PROJECTNAME' | translate}} - + + {{ 'USER.GRANTS.PROJECTNAME' | translate }} + @@ -11,14 +10,15 @@
- {{project?.name ? project?.name : project?.projectName ? project?.projectName : ''}} + {{ project?.name ? project?.name : project?.projectName ? project?.projectName : '' }} - {{(project.name ? 'USER.GRANTS.PROJECT-OWNED' : - project?.projectName ? 'USER.GRANTS.PROJECT-GRANTED' : '') | - translate}} + {{ + (project.name ? 'USER.GRANTS.PROJECT-OWNED' : project?.projectName ? 'USER.GRANTS.PROJECT-GRANTED' : '') + | translate + }}
- \ No newline at end of file + diff --git a/console/src/app/modules/search-roles-autocomplete/search-roles-autocomplete.component.html b/console/src/app/modules/search-roles-autocomplete/search-roles-autocomplete.component.html index dbaa75e807..5fa9c90517 100644 --- a/console/src/app/modules/search-roles-autocomplete/search-roles-autocomplete.component.html +++ b/console/src/app/modules/search-roles-autocomplete/search-roles-autocomplete.component.html @@ -1,27 +1,47 @@
- - Role Name - + + Role Name + - - - {{selectedRole.displayName}} - cancel - - - + + + {{ selectedRole.displayName }} + cancel + + + - - - - - - {{role.displayName}} - - - - \ No newline at end of file + + + + + + {{ role.displayName }} + + +
+ diff --git a/console/src/app/pages/actions/actions.component.html b/console/src/app/pages/actions/actions.component.html index 429de78ca2..df9d75796a 100644 --- a/console/src/app/pages/actions/actions.component.html +++ b/console/src/app/pages/actions/actions.component.html @@ -22,7 +22,7 @@
- + {{ 'FLOWS.FLOWTYPE' | translate }} diff --git a/console/src/app/pages/actions/add-action-dialog/add-action-dialog.component.html b/console/src/app/pages/actions/add-action-dialog/add-action-dialog.component.html index 340032b2e8..3cd1357994 100644 --- a/console/src/app/pages/actions/add-action-dialog/add-action-dialog.component.html +++ b/console/src/app/pages/actions/add-action-dialog/add-action-dialog.component.html @@ -1,38 +1,42 @@ -{{'FLOWS.DIALOG.ADD.TITLE' | translate}} -{{'FLOWS.DIALOG.UPDATE.TITLE' | translate}} +{{ 'FLOWS.DIALOG.ADD.TITLE' | translate }} +{{ 'FLOWS.DIALOG.UPDATE.TITLE' | translate }}
- - {{'FLOWS.NAME' | translate}} - + + {{ 'FLOWS.NAME' | translate }} + - + - - {{'FLOWS.TIMEOUTINSEC' | translate}} - + + {{ 'FLOWS.TIMEOUTINSEC' | translate }} + - {{'FLOWS.ALLOWEDTOFAIL' | translate}} + {{ 'FLOWS.ALLOWEDTOFAIL' | translate }}
-
\ No newline at end of file +
diff --git a/console/src/app/pages/actions/add-flow-dialog/add-flow-dialog.component.html b/console/src/app/pages/actions/add-flow-dialog/add-flow-dialog.component.html index ed5bec4d7c..eeb89ab2bb 100644 --- a/console/src/app/pages/actions/add-flow-dialog/add-flow-dialog.component.html +++ b/console/src/app/pages/actions/add-flow-dialog/add-flow-dialog.component.html @@ -1,27 +1,27 @@ -{{'FLOWS.DIALOG.ADD.TITLE' | translate}} +{{ 'FLOWS.DIALOG.ADD.TITLE' | translate }}
- - {{'FLOWS.FLOWTYPE' | translate}} + + {{ 'FLOWS.FLOWTYPE' | translate }} - {{ 'FLOWS.TYPES.'+type | translate }} + {{ 'FLOWS.TYPES.' + type | translate }} - - {{'FLOWS.TRIGGERTYPE' | translate}} + + {{ 'FLOWS.TRIGGERTYPE' | translate }} - {{ 'FLOWS.TRIGGERTYPES.'+type | translate }} + {{ 'FLOWS.TRIGGERTYPES.' + type | translate }} - - {{'FLOWS.ACTIONS' | translate}} + + {{ 'FLOWS.ACTIONS' | translate }} {{ action.name }} @@ -30,12 +30,12 @@
-
+
-
\ No newline at end of file +
diff --git a/console/src/app/pages/domains/add-domain-dialog/add-domain-dialog.component.html b/console/src/app/pages/domains/add-domain-dialog/add-domain-dialog.component.html index 317644c1b9..5dd2f7896c 100644 --- a/console/src/app/pages/domains/add-domain-dialog/add-domain-dialog.component.html +++ b/console/src/app/pages/domains/add-domain-dialog/add-domain-dialog.component.html @@ -2,7 +2,7 @@

{{ 'ORG.DOMAINS.ADD.DESCRIPTION' | translate }}

- + Domain diff --git a/console/src/app/pages/domains/domain-verification/domain-verification.component.html b/console/src/app/pages/domains/domain-verification/domain-verification.component.html index 5b8830c014..10ce7ecb8b 100644 --- a/console/src/app/pages/domains/domain-verification/domain-verification.component.html +++ b/console/src/app/pages/domains/domain-verification/domain-verification.component.html @@ -1,25 +1,36 @@ -{{'ORG.PAGES.ORGDOMAIN.TITLE' | translate}} {{domain.domainName}} +{{ 'ORG.PAGES.ORGDOMAIN.TITLE' | translate }} {{ domain.domainName }}

{{ 'ORG.PAGES.ORGDOMAIN.VERIFICATION' | translate }}

- {{ 'ORG.PAGES.ORGDOMAIN.VERIFICATION_VALIDATION_DESC' | - translate }} + {{ + 'ORG.PAGES.ORGDOMAIN.VERIFICATION_VALIDATION_DESC' | translate + }} -

- {{'ORG.PAGES.ORGDOMAIN.VERIFICATION_VALIDATION_ONGOING' | translate: domain }} - {{'ORG.PAGES.ORGDOMAIN.VERIFICATION_VALIDATION_ONGOING_TYPE' | translate}} - {{'ORG.PAGES.ORGDOMAIN.TYPES.'+ domain.validationType | translate}}

+

+ {{ 'ORG.PAGES.ORGDOMAIN.VERIFICATION_VALIDATION_ONGOING' | translate: domain }} + {{ 'ORG.PAGES.ORGDOMAIN.VERIFICATION_VALIDATION_ONGOING_TYPE' | translate }} + {{ 'ORG.PAGES.ORGDOMAIN.TYPES.' + domain.validationType | translate }} +

- - +
@@ -33,11 +44,10 @@

HTTP TOKEN

-

{{http?.url}}.txt

+

{{ http?.url }}.txt

- + @@ -47,10 +57,17 @@

DNS TOKEN

-
-

{{dns?.token}}

- @@ -59,12 +76,12 @@
-

{{dns?.url}}

+

{{ dns?.url }}

- -
\ No newline at end of file +
diff --git a/console/src/app/pages/domains/domain-verification/domain-verification.component.scss b/console/src/app/pages/domains/domain-verification/domain-verification.component.scss index 79e3bde92d..fff5b62c85 100644 --- a/console/src/app/pages/domains/domain-verification/domain-verification.component.scss +++ b/console/src/app/pages/domains/domain-verification/domain-verification.component.scss @@ -14,9 +14,10 @@ .entry { margin: 0.5rem 0; + display: inline-block; } -.line { +.domain-line { display: flex; align-items: center; } @@ -24,8 +25,4 @@ .action { display: flex; justify-content: flex-start; - - .ok-button { - margin-left: 0.5rem; - } } diff --git a/console/src/app/pages/org-create/org-create.component.html b/console/src/app/pages/org-create/org-create.component.html index 60a10a2a47..2492dd67d5 100644 --- a/console/src/app/pages/org-create/org-create.component.html +++ b/console/src/app/pages/org-create/org-create.component.html @@ -22,11 +22,11 @@
- + {{ 'ORG_DETAIL.DETAIL.NAME' | translate }} - + {{ 'ORG_DETAIL.DETAIL.DOMAIN' | translate }} @@ -54,35 +54,35 @@

{{ 'USER.CREATE.NAMEANDEMAILSECTION' | translate }}

- + {{ 'USER.PROFILE.USERNAME' | translate }} {{ 'USER.VALIDATION.REQUIRED' | translate }} - + {{ 'USER.PROFILE.EMAIL' | translate }} {{ 'USER.VALIDATION.REQUIRED' | translate }} - + {{ 'USER.PROFILE.FIRSTNAME' | translate }} {{ 'USER.VALIDATION.REQUIRED' | translate }} - + {{ 'USER.PROFILE.LASTNAME' | translate }} {{ 'USER.VALIDATION.REQUIRED' | translate }} - + {{ 'USER.PROFILE.NICKNAME' | translate }} @@ -92,7 +92,7 @@

{{ 'USER.CREATE.GENDERLANGSECTION' | translate }}

- + {{ 'USER.PROFILE.GENDER' | translate }} @@ -103,7 +103,7 @@ {{ 'USER.VALIDATION.REQUIRED' | translate }} - + {{ 'USER.PROFILE.PREFERRED_LANGUAGE' | translate }} @@ -131,7 +131,7 @@ - + {{ 'USER.PASSWORD.NEW' | translate }} @@ -139,7 +139,7 @@ {{ 'USER.VALIDATION.REQUIRED' | translate }} - + {{ 'USER.PASSWORD.CONFIRM' | translate }}
- + {{ 'ORG_DETAIL.DETAIL.NAME' | translate }} diff --git a/console/src/app/pages/orgs/org-detail/org-detail.component.html b/console/src/app/pages/orgs/org-detail/org-detail.component.html index 26dc3d525f..6ee33a017b 100644 --- a/console/src/app/pages/orgs/org-detail/org-detail.component.html +++ b/console/src/app/pages/orgs/org-detail/org-detail.component.html @@ -24,8 +24,16 @@
- + + + + +
+ {{ + 'ORG.PAGES.NOPERMISSION' | translate + }} +
diff --git a/console/src/app/pages/orgs/org-detail/org-detail.component.scss b/console/src/app/pages/orgs/org-detail/org-detail.component.scss index cfce0e4280..781b551cd7 100644 --- a/console/src/app/pages/orgs/org-detail/org-detail.component.scss +++ b/console/src/app/pages/orgs/org-detail/org-detail.component.scss @@ -8,3 +8,7 @@ text-transform: uppercase; margin-top: 2rem; } + +.no-permission-warn-wrapper { + padding-top: 1.5rem; +} diff --git a/console/src/app/pages/orgs/org-detail/org-detail.component.ts b/console/src/app/pages/orgs/org-detail/org-detail.component.ts index 27ed8b88fb..bbfa3a6960 100644 --- a/console/src/app/pages/orgs/org-detail/org-detail.component.ts +++ b/console/src/app/pages/orgs/org-detail/org-detail.component.ts @@ -5,6 +5,7 @@ import { BehaviorSubject, from, Observable, of, Subject, takeUntil } from 'rxjs' import { catchError, finalize, map } from 'rxjs/operators'; import { CreationType, MemberCreateDialogComponent } from 'src/app/modules/add-member-dialog/member-create-dialog.component'; import { ChangeType } from 'src/app/modules/changes/changes.component'; +import { InfoSectionType } from 'src/app/modules/info-section/info-section.component'; import { PolicyComponentServiceType } from 'src/app/modules/policies/policy-component-types.enum'; import { Member } from 'src/app/proto/generated/zitadel/member_pb'; import { Org, OrgState } from 'src/app/proto/generated/zitadel/org_pb'; @@ -31,6 +32,8 @@ export class OrgDetailComponent implements OnInit, OnDestroy { public totalMemberResult: number = 0; public membersSubject: BehaviorSubject = new BehaviorSubject([]); private destroy$: Subject = new Subject(); + + public InfoSectionType: any = InfoSectionType; constructor( private dialog: MatDialog, public mgmtService: ManagementService, diff --git a/console/src/app/pages/projects/apps/app-create/app-create.component.html b/console/src/app/pages/projects/apps/app-create/app-create.component.html index 7453cc9729..7835c60031 100644 --- a/console/src/app/pages/projects/apps/app-create/app-create.component.html +++ b/console/src/app/pages/projects/apps/app-create/app-create.component.html @@ -24,7 +24,7 @@ {{ 'APP.OIDC.NAMEANDTYPESECTION' | translate }}

{{ 'APP.OIDC.TITLEFIRST' | translate }}

- + {{ 'APP.NAME' | translate }} {{ 'PROJECT.APP.NAMEREQUIRED' | translate }} @@ -250,12 +250,12 @@
- + {{ 'APP.NAME' | translate }} - + {{ 'APP.TYPE' | translate }} @@ -265,7 +265,7 @@ - + {{ 'APP.OIDC.GRANTTYPE' | translate }} @@ -274,7 +274,7 @@ - + {{ 'APP.OIDC.RESPONSETYPE' | translate }} @@ -284,7 +284,7 @@ - + {{ 'APP.AUTHMETHOD' | translate }} diff --git a/console/src/app/pages/projects/apps/app-detail/app-detail.component.html b/console/src/app/pages/projects/apps/app-detail/app-detail.component.html index 1532a04271..dfdd13fcc9 100644 --- a/console/src/app/pages/projects/apps/app-detail/app-detail.component.html +++ b/console/src/app/pages/projects/apps/app-detail/app-detail.component.html @@ -87,12 +87,12 @@
- + {{ 'APP.OIDC.CLIENTID' | translate }} - + {{ 'APP.TYPE' | translate }} @@ -101,7 +101,7 @@ - + {{ 'APP.OIDC.RESPONSETYPE' | translate }} @@ -110,7 +110,7 @@ - + {{ 'APP.AUTHMETHOD' | translate }} @@ -119,7 +119,7 @@ - + {{ 'APP.OIDC.GRANTTYPE' | translate }} @@ -158,7 +158,7 @@ - + {{ 'APP.OIDC.TOKENTYPE' | translate }} diff --git a/console/src/assets/i18n/de.json b/console/src/assets/i18n/de.json index c8d522c9e2..07b607c249 100644 --- a/console/src/assets/i18n/de.json +++ b/console/src/assets/i18n/de.json @@ -124,6 +124,24 @@ "SHOWUSER": "Zeige Benutzer {{value}}" } }, + "MEMBERROLES": { + "IAM_OWNER": "Hat die Kontrolle über die gesamte Instanz, einschließlich aller Organisationen", + "IAM_OWNER_VIEWER": "Hat die Leseberechtigung, die gesamte Instanz einschließlich aller Organisationen zu überprüfen", + "IAM_ORG_MANAGER": "Hat die Berechtigung zum Erstellen und Verwalten von Organisationen", + "IAM_USER_MANAGER": "Hat die Berechtigung zum Erstellen und Verwalten von Benutzern", + "ORG_OWNER": "Hat die Berechtigung für die gesamte Organisation", + "ORG_USER_MANAGER": "Hat die Berechtigung, Benutzer der Organisation zu erstellen und zu verwalten", + "ORG_OWNER_VIEWER": "Hat die Leseberechtigung, die gesamte Organisation zu überprüfen", + "ORG_USER_PERMISSION_EDITOR": "Verfügt über die Berechtigung zum Verwalten von User grants", + "ORG_PROJECT_PERMISSION_EDITOR": "Hat die Berechtigung, Projektberechtigungen für externe Organisationen zu verwalten", + "ORG_PROJECT_CREATOR": "Hat die Berechtigung, seine eigenen Projekte und zugrunde liegenden Einstellungen zu erstellen", + "PROJECT_OWNER": "Hat die Berechtigung für das gesamte Projekt", + "PROJECT_OWNER_VIEWER": "Hat die Leseberechtigung, das gesamte Projekt zu überprüfen", + "PROJECT_OWNER_GLOBAL": "Hat die Berechtigung für das gesamte Projekt", + "PROJECT_OWNER_VIEWER_GLOBAL": "Hat die Leseberechtigung, das gesamte Projekt zu überprüfen", + "PROJECT_GRANT_OWNER": "Hat die Berechtigung, die Projektberechtigungen für externe Organisationen zu verwalten", + "PROJECT_GRANT_OWNER_VIEWER": "Hat die Leseberechtigung, die Projektberechtigungen für externe Organisationen zu überprüfen" + }, "OVERLAYS": { "ORGSWITCHER": { "TEXT": "Alle Organisationseinstellungen und Tabellen basieren auf dieser ausgewählten Organisation. Klicken Sie auf diese Schaltfläche, um die Organisation zu wechseln oder eine neue zu erstellen." @@ -738,6 +756,7 @@ "LISTDESCRIPTION": "Wähle eine Organisation aus.", "ACTIVE": "Aktiv", "CREATE": "Organisation erstellen", + "NOPERMISSION": "Sie haben keine Berechtigung, auf Einstellungen der Organisation zuzugreifen.", "USERSELFACCOUNT": "Verwenden Sie Ihr persönliches Konto als Organisationsinhaber", "ORGDETAIL_TITLE": "Gebe den Namen und die Domain für die neue Organisation ein.", "ORGDETAIL_TITLE_WITHOUT_DOMAIN": "Geben Sie den Namen der neuen Organisation ein.", diff --git a/console/src/assets/i18n/en.json b/console/src/assets/i18n/en.json index e173feac88..961c867c41 100644 --- a/console/src/assets/i18n/en.json +++ b/console/src/assets/i18n/en.json @@ -124,6 +124,24 @@ "SHOWUSER": "Show user {{value}}" } }, + "MEMBERROLES": { + "IAM_OWNER": "Has control over the whole instance, including all organizations", + "IAM_OWNER_VIEWER": "Has permission to review the whole instance, including all organizations", + "IAM_ORG_MANAGER": "Has permission to create and manage organizations", + "IAM_USER_MANAGER": "Has permission to create and manage users", + "ORG_OWNER": "Has permission over the whole organization", + "ORG_USER_MANAGER": "Has permission to create and manage users of the organization", + "ORG_OWNER_VIEWER": "Has permission to review the whole organization", + "ORG_USER_PERMISSION_EDITOR": "Has permission to manage user grants", + "ORG_PROJECT_PERMISSION_EDITOR": "Has permission to manage project grants", + "ORG_PROJECT_CREATOR": "Has permission to create his own projects and underlying settings", + "PROJECT_OWNER": "Has permission over the whole project", + "PROJECT_OWNER_VIEWER": "Has permission to review the whole project", + "PROJECT_OWNER_GLOBAL": "Has permission over the whole project", + "PROJECT_OWNER_VIEWER_GLOBAL": "Has permission to review the whole project", + "PROJECT_GRANT_OWNER": "Has permission to manage the project grant", + "PROJECT_GRANT_OWNER_VIEWER": "Has permission to review the project grant" + }, "OVERLAYS": { "ORGSWITCHER": { "TEXT": "All organization settings and tables in console are based on a selected organization. Click this button to switch organization or create a new one." @@ -738,6 +756,7 @@ "LISTDESCRIPTION": "Choose an organization.", "ACTIVE": "Active", "CREATE": "Create Organization", + "NOPERMISSION": "You don't have the permission to access organization settings.", "USERSELFACCOUNT": "Use your personal account as organization owner", "ORGDETAIL_TITLE": "Enter the name and domain of your new organization.", "ORGDETAIL_TITLE_WITHOUT_DOMAIN": "Enter the name of your new organization.", diff --git a/console/src/assets/i18n/it.json b/console/src/assets/i18n/it.json index 9209306679..bf8efbb039 100644 --- a/console/src/assets/i18n/it.json +++ b/console/src/assets/i18n/it.json @@ -124,6 +124,24 @@ "SHOWUSER": "Mostra utente {{value}}" } }, + "MEMBERROLES": { + "IAM_OWNER": "Ha il controllo sull'intera istanza, comprese tutte le organizzazioni", + "IAM_OWNER_VIEWER": "Ha l'autorizzazione per esaminare l'intera istanza, comprese tutte le organizzazioni", + "IAM_ORG_MANAGER": "Ha il permesso di creare e gestire organizzazioni", + "IAM_USER_MANAGER": "Ha l'autorizzazione per creare e gestire utenti", + "ORG_OWNER": "Ha il permesso su tutta l'organizzazione", + "ORG_USER_MANAGER": "Ha l'autorizzazione per creare e gestire gli utenti dell'organizzazione", + "ORG_OWNER_VIEWER": "Ha il permesso di esaminare l'intera organizzazione", + "ORG_USER_PERMISSION_EDITOR": "Ha l'autorizzazione per gestire le autorizzazioni degli utenti", + "ORG_PROJECT_PERMISSION_EDITOR": "Ha il permesso di gestire le sovvenzioni di progetto (Project Grant)", + "ORG_PROJECT_CREATOR": "Ha il permesso di creare propri progetti e le impostazioni sottostanti", + "PROJECT_OWNER": "Ha il permesso per l'intero progetto", + "PROJECT_OWNER_VIEWER": "Ha il permesso di esaminare l'intero progetto", + "PROJECT_OWNER_GLOBAL": "Ha il permesso per l'intero progetto", + "PROJECT_OWNER_VIEWER_GLOBAL": "Ha il permesso di esaminare l'intero progetto", + "PROJECT_GRANT_OWNER": "Ha l'autorizzazione per gestire le sovvenzioni di progetto (Project Grant)", + "PROJECT_GRANT_OWNER_VIEWER": "Ha il permesso di esaminare le sovvenzioni di progetto (Project Grant)" + }, "OVERLAYS": { "ORGSWITCHER": { "TEXT": "Tutte le impostazioni e le tabelle dell'organizzazione si basano su un'organizzazione selezionata. Fai clic sul pulsante per cambiare organizzazione o crearne una nuova." @@ -738,6 +756,7 @@ "LISTDESCRIPTION": "Scegli un'organizzazione.", "ACTIVE": "Attivo", "CREATE": "Creare un'organizzazione", + "NOPERMISSION": "Non hai l'autorizzazione per accedere alle impostazioni dell'organizzazione.", "USERSELFACCOUNT": "Usa il tuo account personale come proprietario dell'organizzazione", "ORGDETAIL_TITLE": "Inserisci il nome e il dominio della tua nuova organizzazione.", "ORGDETAIL_TITLE_WITHOUT_DOMAIN": "Inserisci il nome della tua nuova organizzazione.", diff --git a/console/src/styles.scss b/console/src/styles.scss index 726e8d870e..110aa3eb20 100644 --- a/console/src/styles.scss +++ b/console/src/styles.scss @@ -413,6 +413,10 @@ $custom-typography: mat.define-typography-config( } } +.mat-calendar-table { + height: 280px; +} + @include component-themes($caos-dark-app-theme); @include mat.all-component-themes($caos-dark-app-theme); @@ -448,7 +452,8 @@ $custom-typography: mat.define-typography-config( } .main-container, - .mat-dialog-container { + .mat-dialog-container, + .mat-calendar { background-color: map-get($background, background); transition: background-color 0.3s cubic-bezier(0.645, 0.045, 0.355, 1); } @@ -510,7 +515,8 @@ $custom-typography: mat.define-typography-config( } .main-container, - .mat-dialog-container { + .mat-dialog-container, + .mat-calendar { background-color: map-get($background, background); transition: background-color 0.3s cubic-bezier(0.645, 0.045, 0.355, 1); }