From f6d0e454b85daffe1d640a7b0953c1aba9f9fe74 Mon Sep 17 00:00:00 2001 From: muhammedaltug Date: Tue, 28 Sep 2021 15:59:43 +0300 Subject: [PATCH 1/4] 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({ From b7e4fe0e76a5788c3e9ccc2c059a125c039bf073 Mon Sep 17 00:00:00 2001 From: muhammedaltug Date: Tue, 28 Sep 2021 16:05:28 +0300 Subject: [PATCH 2/4] rename file --- .../setting-management/config/src/providers/route.provider.ts | 2 +- .../config/src/providers/setting-tab.provider.ts | 2 +- .../packages/setting-management/config/src/services/index.ts | 2 +- .../{settings-tab.service.ts => settings-tabs.service.ts} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename npm/ng-packs/packages/setting-management/config/src/services/{settings-tab.service.ts => settings-tabs.service.ts} (100%) 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 de80336feb..200a5feb15 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 @@ -3,7 +3,7 @@ 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'; +import { SettingTabsService } from '../services/settings-tabs.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 200c80e2c3..f05104c177 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 { 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'; +import { SettingTabsService } from '../services/settings-tabs.service'; export const SETTING_MANAGEMENT_SETTING_TAB_PROVIDERS = [ { 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 index 4d033922c2..a130d0a4a9 100644 --- a/npm/ng-packs/packages/setting-management/config/src/services/index.ts +++ b/npm/ng-packs/packages/setting-management/config/src/services/index.ts @@ -1 +1 @@ -export * from './settings-tab.service'; +export * from './settings-tabs.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-tabs.service.ts similarity index 100% rename from npm/ng-packs/packages/setting-management/config/src/services/settings-tab.service.ts rename to npm/ng-packs/packages/setting-management/config/src/services/settings-tabs.service.ts From 0dce9e8feb949f77053fc2e269a5d14cbf511ae8 Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 28 Sep 2021 17:17:50 +0300 Subject: [PATCH 3/4] Update public-api.ts --- .../packages/setting-management/config/src/public-api.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 56141f7c3d..83eb57e505 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 @@ -2,5 +2,5 @@ export * from './components/email-setting-group/email-setting-group.component'; export * from './enums'; export * from './providers'; export * from './proxy'; -export * from './services/index'; +export * from './services'; export * from './setting-management-config.module'; From eb85c9e5ff51e3687cde2b17f40531f59768140e Mon Sep 17 00:00:00 2001 From: muhammedaltug Date: Wed, 29 Sep 2021 11:46:54 +0300 Subject: [PATCH 4/4] update docs --- docs/en/Modules/Setting-Management.md | 2 +- docs/zh-Hans/Modules/Setting-Management.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/en/Modules/Setting-Management.md b/docs/en/Modules/Setting-Management.md index 4eedcc969d..68b06372eb 100644 --- a/docs/en/Modules/Setting-Management.md +++ b/docs/en/Modules/Setting-Management.md @@ -278,7 +278,7 @@ Open the `app.component.ts` and modify the file as shown below: ```js import { Component } from '@angular/core'; -import { SettingTabsService } from '@abp/ng.core'; // imported SettingTabsService +import { SettingTabsService } from '@abp/ng.setting-management/config'; // imported SettingTabsService import { MySettingsComponent } from './my-settings/my-settings.component'; // imported MySettingsComponent @Component(/* component metadata */) diff --git a/docs/zh-Hans/Modules/Setting-Management.md b/docs/zh-Hans/Modules/Setting-Management.md index acb4469fea..c99397e4b4 100644 --- a/docs/zh-Hans/Modules/Setting-Management.md +++ b/docs/zh-Hans/Modules/Setting-Management.md @@ -249,7 +249,7 @@ yarn ng generate component my-settings ```js import { Component } from '@angular/core'; -import { SettingTabsService } from '@abp/ng.core'; // imported SettingTabsService +import { SettingTabsService } from '@abp/ng.setting-management/config'; // imported SettingTabsService import { MySettingsComponent } from './my-settings/my-settings.component'; // imported MySettingsComponent @Component(/* component metadata */) @@ -273,4 +273,4 @@ export class AppComponent { 导航到 `/setting-management` 路由你会看到以下变化: -![Custom Settings Tab](../images/custom-settings.png) \ No newline at end of file +![Custom Settings Tab](../images/custom-settings.png)