mirror of
https://github.com/andwati/zitadel.git
synced 2026-10-21 06:54:25 +00:00
# Which Problems Are Solved The new breadcrumbs were causing problems with some more advanced Zitadel setups. This pr removes the new breadcrumbs to revert to the old navigation behaviour. # How the Problems Are Solved Most of the changes could be kept but those specific to the navigation where mostly reverted. # Additional Changes Updated some dependencies. # Additional Context - Closes #10863
This commit is contained in:
@@ -1,13 +1,13 @@
|
||||
import { ConnectedPosition, ConnectionPositionPair } from '@angular/cdk/overlay';
|
||||
import { Component, EventEmitter, Input, Output } from '@angular/core';
|
||||
import { Component, EventEmitter, input, Input, Output } from '@angular/core';
|
||||
import { Router } from '@angular/router';
|
||||
import { User } from 'src/app/proto/generated/zitadel/user_pb';
|
||||
import { BreadcrumbService, BreadcrumbType } from 'src/app/services/breadcrumb.service';
|
||||
import { GrpcAuthService } from 'src/app/services/grpc-auth.service';
|
||||
import { ManagementService } from 'src/app/services/mgmt.service';
|
||||
import { ActionKeysType } from '../action-keys/action-keys.component';
|
||||
import { NewOrganizationService } from '../../services/new-organization.service';
|
||||
import { Organization } from '@zitadel/proto/zitadel/org/v2/org_pb';
|
||||
import { Org } from '@zitadel/proto/zitadel/org_pb';
|
||||
|
||||
@Component({
|
||||
selector: 'cnsl-header',
|
||||
@@ -20,11 +20,12 @@ export class HeaderComponent {
|
||||
@Input({ required: true }) public user!: User.AsObject;
|
||||
public showOrgContext: boolean = false;
|
||||
|
||||
@Input() public org?: Organization | null;
|
||||
public org = input<Organization | Org | null>();
|
||||
|
||||
@Output() public changedActiveOrg = new EventEmitter<void>();
|
||||
public showAccount: boolean = false;
|
||||
protected readonly BreadcrumbType = BreadcrumbType;
|
||||
protected readonly ActionKeysType = ActionKeysType;
|
||||
public BreadcrumbType = BreadcrumbType;
|
||||
public ActionKeysType = ActionKeysType;
|
||||
|
||||
public positions: ConnectedPosition[] = [
|
||||
new ConnectionPositionPair({ originX: 'start', originY: 'bottom' }, { overlayX: 'start', overlayY: 'top' }, 0, 10),
|
||||
@@ -40,11 +41,10 @@ export class HeaderComponent {
|
||||
public mgmtService: ManagementService,
|
||||
public breadcrumbService: BreadcrumbService,
|
||||
public router: Router,
|
||||
private readonly newOrganizationService: NewOrganizationService,
|
||||
) {}
|
||||
|
||||
public async setActiveOrg(orgId: string): Promise<void> {
|
||||
await this.newOrganizationService.setOrgId(orgId);
|
||||
await this.authService.getActiveOrg(orgId);
|
||||
this.changedActiveOrg.emit();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user