Browse Source

fix for cyclical load errors

pull/2883/head
Jorge Rocha Gualtieri 7 years ago
parent
commit
df457fd633
  1. 3
      npm/ng-packs/packages/account-config/src/lib/services/account-config.service.ts
  2. 8
      npm/ng-packs/packages/core/src/lib/services/rest.service.ts
  3. 2
      npm/ng-packs/packages/identity-config/src/lib/services/identity-config.service.ts
  4. 6
      npm/ng-packs/packages/setting-management-config/src/lib/services/setting-management-config.service.ts

3
npm/ng-packs/packages/account-config/src/lib/services/account-config.service.ts

@ -1,12 +1,11 @@
import { eLayoutType, RestService, addAbpRoutes } from '@abp/ng.core';
import { Injectable } from '@angular/core';
import { Router } from '@angular/router';
@Injectable({
providedIn: 'root',
})
export class AccountConfigService {
constructor(private router: Router, private restService: RestService) {
constructor(private restService: RestService) {
addAbpRoutes({
name: 'AbpAccount::Menu:Account',
path: 'account',

8
npm/ng-packs/packages/core/src/lib/services/rest.service.ts

@ -1,5 +1,5 @@
import { HttpClient, HttpRequest } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { Injectable, Injector } from '@angular/core';
import { Store } from '@ngxs/store';
import { Observable, throwError } from 'rxjs';
import { catchError, take, tap } from 'rxjs/operators';
@ -11,7 +11,11 @@ import { ConfigState } from '../states/config.state';
providedIn: 'root',
})
export class RestService {
constructor(private http: HttpClient, private store: Store) {}
constructor(private injector: Injector, private http: HttpClient) {}
private get store(): Store {
return this.injector.get(Store);
}
handleError(err: any): Observable<any> {
this.store.dispatch(new RestOccurError(err));

2
npm/ng-packs/packages/identity-config/src/lib/services/identity-config.service.ts

@ -7,7 +7,7 @@ import { Observable } from 'rxjs';
providedIn: 'root',
})
export class IdentityConfigService {
constructor(private router: Router, private restService: RestService) {
constructor(private restService: RestService) {
addAbpRoutes([
{
name: 'AbpUiNavigation::Menu:Administration',

6
npm/ng-packs/packages/setting-management-config/src/lib/services/setting-management-config.service.ts

@ -1,4 +1,4 @@
import { Injectable } from '@angular/core';
import { Injectable, Injector } from '@angular/core';
import { addAbpRoutes, eLayoutType, PatchRouteByName, ABP } from '@abp/ng.core';
import { getSettingTabs } from '@abp/ng.theme.shared';
import { Store } from '@ngxs/store';
@ -7,7 +7,7 @@ import { Store } from '@ngxs/store';
providedIn: 'root',
})
export class SettingManagementConfigService {
constructor(private store: Store) {
constructor(private injector: Injector) {
const route = {
name: 'AbpSettingManagement::Settings',
path: 'setting-management',
@ -23,7 +23,7 @@ export class SettingManagementConfigService {
setTimeout(() => {
const tabs = getSettingTabs();
if (!tabs || !tabs.length) {
this.store.dispatch(new PatchRouteByName('AbpSettingManagement::Settings', { ...route, invisible: true }));
this.injector.get(Store).dispatch(new PatchRouteByName('AbpSettingManagement::Settings', { ...route, invisible: true }));
}
});
}

Loading…
Cancel
Save