andwati/zitadel
1
0
Fork 0
mirror of https://github.com/andwati/zitadel.git synced 2026-11-12 00:55:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(console): Idp settings, settings reset warn dialog, Accept-Language header interceptor, i18n (#3727)

Browse Source 
* fix idp table, settings reset warn dialog, fix i18n interceptor, i18n

* fix label policy on org change

* fallback

* fix preview button styles

* footer, login-policy null check

* org create btn alignment

* show error with toast

* error toast
This commit is contained in:
Max Peintner
2022-05-31 09:08:47 +02:00
committed by GitHub
parent 3513148cf6
commit f9e9b4b64b
45 changed files with 472 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files
console/src/app/modules/nav/nav.component.html
+1 -62
View File
@@ -178,67 +178,6 @@
<template [ngTemplateOutlet]="shortcutKeyRef"></template>
</div>
</ng-container>
<!-- <ng-container *ngSwitchCase="BreadcrumbType.PROJECT">
<div *ngIf="breadc[breadc.length - 1]?.param?.value" class="nav-row-abs" @navrowproject>
<ng-template cnslHasRole [hasRole]="['project.read(:[0-9]*)?']">
<a
class="nav-item"
[routerLinkActiveOptions]="{ exact: true }"
[routerLinkActive]="['active']"
[routerLink]="['/projects', breadc[breadc.length - 1]?.param?.value]"
>
<div class="c_label">
<span> {{ 'MENU.PROJECTOVERVIEW' | translate }} </span>
</div>
</a>
</ng-template>
<ng-template cnslHasRole [hasRole]="['project.read(:[0-9]*)?']">
<a
*ngIf="!breadc[breadc.length - 1]?.isZitadel"
class="nav-item"
[routerLinkActiveOptions]="{ exact: false }"
[routerLinkActive]="['active']"
[routerLink]="['/projects', breadc[breadc.length - 1]?.param?.value, 'roles']"
>
<div class="c_label">
<span> {{ 'MENU.ROLES' | translate }} </span>
</div>
</a>
</ng-template>
<ng-template cnslHasRole [hasRole]="['project.read(:[0-9]*)?']">
<a
*ngIf="!breadc[breadc.length - 1]?.isZitadel"
class="nav-item"
[routerLinkActiveOptions]="{ exact: false }"
[routerLinkActive]="['active']"
[routerLink]="['/projects', breadc[breadc.length - 1]?.param?.value, 'projectgrants']"
>
<div class="c_label">
<span> {{ 'MENU.PROJECTGRANTS' | translate }} </span>
</div>
</a>
</ng-template>
<ng-template cnslHasRole [hasRole]="['project.read(:[0-9]*)?']">
<a
*ngIf="!breadc[breadc.length - 1]?.isZitadel"
class="nav-item"
[routerLinkActiveOptions]="{ exact: true }"
[routerLinkActive]="['active']"
[routerLink]="['/projects', breadc[breadc.length - 1]?.param?.value, 'grants']"
>
<div class="c_label">
<span> {{ 'MENU.GRANTS' | translate }} </span>
</div>
</a>
</ng-template>
<template [ngTemplateOutlet]="shortcutKeyRef"></template>
</div>
</ng-container> -->
</div>
</ng-container>
</ng-container>
@@ -248,7 +187,7 @@
<ng-template #shortcutKeyRef>
<ng-container *ngIf="(isHandset$ | async) === false">
<span class="fill-space"></span>
<div class="nav-shortcut-action-key" matTooltip="{{ 'MENU.OPENSHORTCUTSTOOLTIP' | translate }}">
<div (click)="openHelp()" class="nav-shortcut-action-key" matTooltip="{{ 'MENU.OPENSHORTCUTSTOOLTIP' | translate }}">
<div class="nav-key-overlay"></div>
<span>?</span>
</div>
console/src/app/modules/nav/nav.component.ts
+6
View File
@@ -9,6 +9,7 @@ import { LabelPolicy } from 'src/app/proto/generated/zitadel/policy_pb';
import { User } from 'src/app/proto/generated/zitadel/user_pb';
import { AuthenticationService } from 'src/app/services/authentication.service';
import { BreadcrumbService, BreadcrumbType } from 'src/app/services/breadcrumb.service';
import { KeyboardShortcutsService } from 'src/app/services/keyboard-shortcuts/keyboard-shortcuts.service';
import { ManagementService } from 'src/app/services/mgmt.service';
@Component({
@@ -93,6 +94,7 @@ export class NavComponent implements OnDestroy {
public mgmtService: ManagementService,
private router: Router,
private breakpointObserver: BreakpointObserver,
private shortcutService: KeyboardShortcutsService,
) {
this.hideAdminWarn = localStorage.getItem('hideAdministratorWarning') === 'true' ? true : false;
}
@@ -111,4 +113,8 @@ export class NavComponent implements OnDestroy {
const url = this.router.url;
return url.substring(0, 6) === '/users';
}
public openHelp() {
this.shortcutService.openOverviewDialog();
}
}