From f6d0e454b85daffe1d640a7b0953c1aba9f9fe74 Mon Sep 17 00:00:00 2001 From: muhammedaltug Date: Tue, 28 Sep 2021 15:59:43 +0300 Subject: [PATCH] Move SettingTabsService to @abp/ng.setting-management/config package from @abp/ng.core --- .../packages/core/src/lib/services/routes.service.ts | 3 --- .../config/src/providers/route.provider.ts | 3 ++- .../config/src/providers/setting-tab.provider.ts | 2 +- .../packages/setting-management/config/src/public-api.ts | 5 +++-- .../packages/setting-management/config/src/services/index.ts | 1 + .../config/src/services/settings-tab.service.ts | 5 +++++ .../src/lib/components/setting-management.component.ts | 3 ++- 7 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 npm/ng-packs/packages/setting-management/config/src/services/index.ts create mode 100644 npm/ng-packs/packages/setting-management/config/src/services/settings-tab.service.ts diff --git a/npm/ng-packs/packages/core/src/lib/services/routes.service.ts b/npm/ng-packs/packages/core/src/lib/services/routes.service.ts index 13461491e3..d2aba62c09 100644 --- a/npm/ng-packs/packages/core/src/lib/services/routes.service.ts +++ b/npm/ng-packs/packages/core/src/lib/services/routes.service.ts @@ -181,6 +181,3 @@ export abstract class AbstractNavTreeService @Injectable({ providedIn: 'root' }) export class RoutesService extends AbstractNavTreeService {} - -@Injectable({ providedIn: 'root' }) -export class SettingTabsService extends AbstractNavTreeService {} diff --git a/npm/ng-packs/packages/setting-management/config/src/providers/route.provider.ts b/npm/ng-packs/packages/setting-management/config/src/providers/route.provider.ts index 9d272b8be0..de80336feb 100644 --- a/npm/ng-packs/packages/setting-management/config/src/providers/route.provider.ts +++ b/npm/ng-packs/packages/setting-management/config/src/providers/route.provider.ts @@ -1,8 +1,9 @@ -import { eLayoutType, RoutesService, SettingTabsService } from '@abp/ng.core'; +import { eLayoutType, RoutesService } from '@abp/ng.core'; import { eThemeSharedRouteNames } from '@abp/ng.theme.shared'; import { APP_INITIALIZER } from '@angular/core'; import { debounceTime, map } from 'rxjs/operators'; import { eSettingManagementRouteNames } from '../enums/route-names'; +import { SettingTabsService } from '../services/settings-tab.service'; export const SETTING_MANAGEMENT_ROUTE_PROVIDERS = [ { provide: APP_INITIALIZER, useFactory: configureRoutes, deps: [RoutesService], multi: true }, diff --git a/npm/ng-packs/packages/setting-management/config/src/providers/setting-tab.provider.ts b/npm/ng-packs/packages/setting-management/config/src/providers/setting-tab.provider.ts index f88e3c3020..200c80e2c3 100644 --- a/npm/ng-packs/packages/setting-management/config/src/providers/setting-tab.provider.ts +++ b/npm/ng-packs/packages/setting-management/config/src/providers/setting-tab.provider.ts @@ -1,7 +1,7 @@ -import { SettingTabsService } from '@abp/ng.core'; import { APP_INITIALIZER } from '@angular/core'; import { EmailSettingGroupComponent } from '../components/email-setting-group/email-setting-group.component'; import { eSettingManamagementSettingTabNames } from '../enums/setting-tab-names'; +import { SettingTabsService } from '../services/settings-tab.service'; export const SETTING_MANAGEMENT_SETTING_TAB_PROVIDERS = [ { diff --git a/npm/ng-packs/packages/setting-management/config/src/public-api.ts b/npm/ng-packs/packages/setting-management/config/src/public-api.ts index c33f10d4d2..56141f7c3d 100644 --- a/npm/ng-packs/packages/setting-management/config/src/public-api.ts +++ b/npm/ng-packs/packages/setting-management/config/src/public-api.ts @@ -1,5 +1,6 @@ +export * from './components/email-setting-group/email-setting-group.component'; export * from './enums'; export * from './providers'; -export * from './setting-management-config.module'; export * from './proxy'; -export * from './components/email-setting-group/email-setting-group.component'; +export * from './services/index'; +export * from './setting-management-config.module'; diff --git a/npm/ng-packs/packages/setting-management/config/src/services/index.ts b/npm/ng-packs/packages/setting-management/config/src/services/index.ts new file mode 100644 index 0000000000..4d033922c2 --- /dev/null +++ b/npm/ng-packs/packages/setting-management/config/src/services/index.ts @@ -0,0 +1 @@ +export * from './settings-tab.service'; diff --git a/npm/ng-packs/packages/setting-management/config/src/services/settings-tab.service.ts b/npm/ng-packs/packages/setting-management/config/src/services/settings-tab.service.ts new file mode 100644 index 0000000000..7e35070016 --- /dev/null +++ b/npm/ng-packs/packages/setting-management/config/src/services/settings-tab.service.ts @@ -0,0 +1,5 @@ +import { Injectable } from '@angular/core'; +import { ABP, AbstractNavTreeService } from '@abp/ng.core'; + +@Injectable({ providedIn: 'root' }) +export class SettingTabsService extends AbstractNavTreeService {} diff --git a/npm/ng-packs/packages/setting-management/src/lib/components/setting-management.component.ts b/npm/ng-packs/packages/setting-management/src/lib/components/setting-management.component.ts index f72a222cdd..4404939c36 100644 --- a/npm/ng-packs/packages/setting-management/src/lib/components/setting-management.component.ts +++ b/npm/ng-packs/packages/setting-management/src/lib/components/setting-management.component.ts @@ -1,5 +1,6 @@ -import { ABP, SettingTabsService } from '@abp/ng.core'; +import { ABP } from '@abp/ng.core'; import { Component, OnDestroy, OnInit, TrackByFunction } from '@angular/core'; +import { SettingTabsService } from '@abp/ng.setting-management/config'; import { Subscription } from 'rxjs'; @Component({