From b36ebd8e45922b0be3621e28403f36f28af44a95 Mon Sep 17 00:00:00 2001 From: bnymncoskuner Date: Thu, 17 Jun 2021 10:44:31 +0300 Subject: [PATCH] fix: remove tenant-box from reset-password page --- .../account/src/lib/account-routing.module.ts | 1 + .../auth-wrapper/auth-wrapper.component.html | 2 +- .../auth-wrapper/auth-wrapper.component.ts | 20 +++++++++++++++++-- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/npm/ng-packs/packages/account/src/lib/account-routing.module.ts b/npm/ng-packs/packages/account/src/lib/account-routing.module.ts index 3eee83c781..c2bba2189e 100644 --- a/npm/ng-packs/packages/account/src/lib/account-routing.module.ts +++ b/npm/ng-packs/packages/account/src/lib/account-routing.module.ts @@ -69,6 +69,7 @@ const routes: Routes = [ component: ReplaceableRouteContainerComponent, canActivate: [AuthenticationFlowGuard], data: { + tenantBoxVisible: false, replaceableComponent: { key: eAccountComponents.ResetPassword, defaultComponent: ResetPasswordComponent, diff --git a/npm/ng-packs/packages/account/src/lib/components/auth-wrapper/auth-wrapper.component.html b/npm/ng-packs/packages/account/src/lib/components/auth-wrapper/auth-wrapper.component.html index b932025c3d..decf6a54b6 100644 --- a/npm/ng-packs/packages/account/src/lib/components/auth-wrapper/auth-wrapper.component.html +++ b/npm/ng-packs/packages/account/src/lib/components/auth-wrapper/auth-wrapper.component.html @@ -1,6 +1,6 @@
- + diff --git a/npm/ng-packs/packages/account/src/lib/components/auth-wrapper/auth-wrapper.component.ts b/npm/ng-packs/packages/account/src/lib/components/auth-wrapper/auth-wrapper.component.ts index 245d1c4c25..b436d23e95 100644 --- a/npm/ng-packs/packages/account/src/lib/components/auth-wrapper/auth-wrapper.component.ts +++ b/npm/ng-packs/packages/account/src/lib/components/auth-wrapper/auth-wrapper.component.ts @@ -1,8 +1,9 @@ import { ConfigStateService, MultiTenancyService, SubscriptionService } from '@abp/ng.core'; -import { Component } from '@angular/core'; +import { Component, Injector } from '@angular/core'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { eAccountComponents } from '../../enums/components'; +import { ActivatedRoute } from '@angular/router'; @Component({ selector: 'abp-auth-wrapper', @@ -20,9 +21,24 @@ export class AuthWrapperComponent { } tenantBoxKey = eAccountComponents.TenantBox; + route: ActivatedRoute; + + private _tenantBoxVisible = true; + + private setTenantBoxVisibility = () => { + this._tenantBoxVisible = this.route.snapshot.firstChild.data.tenantBoxVisible ?? true; + }; + + get isTenantBoxVisible() { + return this._tenantBoxVisible && this.multiTenancy.isTenantBoxVisible; + } constructor( public readonly multiTenancy: MultiTenancyService, private configState: ConfigStateService, - ) {} + injector: Injector, + ) { + this.route = injector.get(ActivatedRoute); + this.setTenantBoxVisibility(); + } }