Browse Source

fix: add domainTenant back to MultiTenancyService

pull/9576/head
bnymncoskuner 5 years ago
parent
commit
7a33df11c2
  1. 7
      npm/ng-packs/packages/core/src/lib/services/multi-tenancy.service.ts
  2. 13
      npm/ng-packs/packages/core/src/lib/utils/multi-tenancy-utils.ts

7
npm/ng-packs/packages/core/src/lib/services/multi-tenancy.service.ts

@ -2,7 +2,10 @@ import { Injectable, Inject } from '@angular/core';
import { switchMap, map } from 'rxjs/operators'; import { switchMap, map } from 'rxjs/operators';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { ABP } from '../models/common'; import { ABP } from '../models/common';
import { FindTenantResultDto } from '../proxy/volo/abp/asp-net-core/mvc/multi-tenancy/models'; import {
FindTenantResultDto,
CurrentTenantDto,
} from '../proxy/volo/abp/asp-net-core/mvc/multi-tenancy/models';
import { RestService } from './rest.service'; import { RestService } from './rest.service';
import { AbpTenantService } from '../proxy/pages/abp/multi-tenancy'; import { AbpTenantService } from '../proxy/pages/abp/multi-tenancy';
import { ConfigStateService } from './config-state.service'; import { ConfigStateService } from './config-state.service';
@ -11,6 +14,8 @@ import { TENANT_KEY } from '../tokens/tenant-key.token';
@Injectable({ providedIn: 'root' }) @Injectable({ providedIn: 'root' })
export class MultiTenancyService { export class MultiTenancyService {
domainTenant: CurrentTenantDto = null;
isTenantBoxVisible = true; isTenantBoxVisible = true;
apiName = 'abp'; apiName = 'abp';

13
npm/ng-packs/packages/core/src/lib/utils/multi-tenancy-utils.ts

@ -35,15 +35,24 @@ export async function parseTenantFromUrl(injector: Injector) {
multiTenancyService.isTenantBoxVisible = false; multiTenancyService.isTenantBoxVisible = false;
}; };
const setEnvironmentWithTenant = (tenant: FindTenantResultDto) => { const setDomainTenant = (tenant: FindTenantResultDto) => {
multiTenancyService.domainTenant = {
id: tenant.tenantId,
name: tenant.name,
isAvailable: true,
};
};
const setEnvironmentWithDomainTenant = (tenant: FindTenantResultDto) => {
hideTenantBox(); hideTenantBox();
setDomainTenant(tenant);
replaceTenantNameWithinEnvironment(injector, tenant.name); replaceTenantNameWithinEnvironment(injector, tenant.name);
}; };
if (tenancyName) { if (tenancyName) {
return multiTenancyService return multiTenancyService
.setTenantByName(tenancyName) .setTenantByName(tenancyName)
.pipe(tap(setEnvironmentWithTenant)) .pipe(tap(setEnvironmentWithDomainTenant))
.toPromise(); .toPromise();
} else { } else {
/** /**

Loading…
Cancel
Save