Browse Source

Dynamic layout musst solve layout oninit.

Update guard
pull/17186/head
Mahmut Gundogdu 3 years ago
parent
commit
564bb1d3d5
  1. 11
      npm/ng-packs/packages/core/src/lib/components/dynamic-layout.component.ts
  2. 12
      npm/ng-packs/packages/oauth/src/lib/guards/oauth.guard.ts

11
npm/ng-packs/packages/core/src/lib/components/dynamic-layout.component.ts

@ -1,4 +1,4 @@
import { Component, Injector, isDevMode, Optional, SkipSelf, Type } from '@angular/core';
import { Component, Injector, isDevMode, OnInit, Optional, SkipSelf, Type } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { eLayoutType } from '../enums/common';
import { ABP } from '../models';
@ -16,7 +16,7 @@ import { TreeNode } from '../utils/tree-utils';
template: ` <ng-container *ngIf="isLayoutVisible" [ngComponentOutlet]="layout"></ng-container> `,
providers: [SubscriptionService],
})
export class DynamicLayoutComponent {
export class DynamicLayoutComponent implements OnInit {
layout?: Type<any>;
layoutKey?: eLayoutType;
@ -53,6 +53,13 @@ export class DynamicLayoutComponent {
this.listenToLanguageChange();
}
ngOnInit(): void {
if(this.layout){
return;
}
this.getLayout()
}
private checkLayoutOnNavigationEnd() {
const navigationEnd$ = this.routerEvents.getNavigationEvents('End');
this.subscription.addOne(navigationEnd$, () => this.getLayout());

12
npm/ng-packs/packages/oauth/src/lib/guards/oauth.guard.ts

@ -23,14 +23,8 @@ export class AbpOAuthGuard implements IAbpGuard {
if (hasValidAccessToken) {
return true;
}
return of(false).pipe(
tap(() => this.httpErrorReporter.reportError({ status: 401 } as HttpErrorResponse)),
delay(1500),
tap(() => {
const params = { returnUrl: state.url };
this.authService.navigateToLogin(params);
}),
);
const params = { returnUrl: state.url };
this.authService.navigateToLogin(params);
return false;
}
}

Loading…
Cancel
Save