From 138fd39e2c4aa1b8222b88a2ec2d1e303b149c31 Mon Sep 17 00:00:00 2001 From: Sinan997 Date: Tue, 14 May 2024 20:34:09 +0300 Subject: [PATCH] update import path for config provider functions --- .../src/providers/account-config.provider.ts | 4 +-- .../packages/account/config/src/public-api.ts | 1 + .../account/config/src/utils/index.ts | 1 + .../providers/core-module-config.provider.ts | 28 +++++++------------ .../packages/core/src/lib/services/index.ts | 1 + .../packages/core/src/lib/tokens/index.ts | 3 +- .../src/lib/feature-management.module.ts | 3 +- .../feature-management-config.provider.ts | 2 +- .../src/providers/identity-config.provider.ts | 2 +- .../providers/oauth-module-config.provider.ts | 3 +- .../config/src/lib/providers/index.ts | 1 + .../setting-management-config.provider.ts | 10 ++++--- .../tenant-management-config.provider.ts | 2 +- .../providers/theme-shared-config.provider.ts | 17 ++++++----- .../theme-shared/src/lib/tokens/index.ts | 1 + 15 files changed, 41 insertions(+), 38 deletions(-) create mode 100644 npm/ng-packs/packages/account/config/src/utils/index.ts diff --git a/npm/ng-packs/packages/account/config/src/providers/account-config.provider.ts b/npm/ng-packs/packages/account/config/src/providers/account-config.provider.ts index 07d9f5aa22..49304cdfc2 100644 --- a/npm/ng-packs/packages/account/config/src/providers/account-config.provider.ts +++ b/npm/ng-packs/packages/account/config/src/providers/account-config.provider.ts @@ -1,7 +1,7 @@ import { NAVIGATE_TO_MANAGE_PROFILE } from '@abp/ng.core'; import { makeEnvironmentProviders, Injector } from '@angular/core'; -import { navigateToManageProfileFactory } from '../utils/factories'; -import { ACCOUNT_ROUTE_PROVIDERS } from './route.provider'; +import { navigateToManageProfileFactory } from '../utils'; +import { ACCOUNT_ROUTE_PROVIDERS } from './'; export function provideAccountConfig() { return makeEnvironmentProviders([ diff --git a/npm/ng-packs/packages/account/config/src/public-api.ts b/npm/ng-packs/packages/account/config/src/public-api.ts index cb4f854a64..47a2c8d3d7 100644 --- a/npm/ng-packs/packages/account/config/src/public-api.ts +++ b/npm/ng-packs/packages/account/config/src/public-api.ts @@ -1,3 +1,4 @@ export * from './account-config.module'; export * from './enums'; export * from './providers'; +export * from './utils'; diff --git a/npm/ng-packs/packages/account/config/src/utils/index.ts b/npm/ng-packs/packages/account/config/src/utils/index.ts new file mode 100644 index 0000000000..3a94418e3f --- /dev/null +++ b/npm/ng-packs/packages/account/config/src/utils/index.ts @@ -0,0 +1 @@ +export * from './factories'; diff --git a/npm/ng-packs/packages/core/src/lib/providers/core-module-config.provider.ts b/npm/ng-packs/packages/core/src/lib/providers/core-module-config.provider.ts index cf8c260e39..b07697b135 100644 --- a/npm/ng-packs/packages/core/src/lib/providers/core-module-config.provider.ts +++ b/npm/ng-packs/packages/core/src/lib/providers/core-module-config.provider.ts @@ -1,32 +1,24 @@ +import { makeEnvironmentProviders, APP_INITIALIZER, Injector, Provider } from '@angular/core'; +import { TitleStrategy } from '@angular/router'; import { - ABP, - AuthErrorFilterService, CORE_OPTIONS, - DEFAULT_DYNAMIC_LAYOUTS, - DefaultQueueManager, LOCALIZATIONS, - LocalStorageListenerService, - LocalizationService, + DYNAMIC_LAYOUTS_TOKEN, OTHERS_GROUP, QUEUE_MANAGER, SORT_COMPARE_FUNC, - SortableItem, TENANT_KEY, compareFuncFactory, coreOptionsFactory, - getInitialData, - localeInitializer, localizationContributor, - noop, -} from '@abp/ng.core'; -import { makeEnvironmentProviders, APP_INITIALIZER, Injector, Provider } from '@angular/core'; -import { TitleStrategy } from '@angular/router'; +} from '../tokens'; import { RoutesHandler } from '../handlers'; -import { AbpTitleStrategy } from '../services/title-strategy.service'; -import { DYNAMIC_LAYOUTS_TOKEN } from '../tokens/dynamic-layout.token'; -import { CookieLanguageProvider } from './cookie-language.provider'; -import { IncludeLocalizationResourcesProvider } from './include-localization-resources.provider'; -import { LocaleProvider } from './locale.provider'; +import { ABP, SortableItem } from '../models'; +import { AuthErrorFilterService } from '../abstracts'; +import { DEFAULT_DYNAMIC_LAYOUTS } from '../constants'; +import { LocalizationService, LocalStorageListenerService, AbpTitleStrategy } from '../services'; +import { DefaultQueueManager, getInitialData, localeInitializer, noop } from '../utils'; +import { CookieLanguageProvider, IncludeLocalizationResourcesProvider, LocaleProvider } from './'; export enum CoreFeatureKind { Options, diff --git a/npm/ng-packs/packages/core/src/lib/services/index.ts b/npm/ng-packs/packages/core/src/lib/services/index.ts index a20ae907ae..c47bef3106 100644 --- a/npm/ng-packs/packages/core/src/lib/services/index.ts +++ b/npm/ng-packs/packages/core/src/lib/services/index.ts @@ -22,3 +22,4 @@ export * from './local-storage.service'; export * from './window.service'; export * from './internet-connection-service'; export * from './local-storage-listener.service'; +export * from './title-strategy.service'; diff --git a/npm/ng-packs/packages/core/src/lib/tokens/index.ts b/npm/ng-packs/packages/core/src/lib/tokens/index.ts index 7d0422ad7d..d4e4314c52 100644 --- a/npm/ng-packs/packages/core/src/lib/tokens/index.ts +++ b/npm/ng-packs/packages/core/src/lib/tokens/index.ts @@ -14,4 +14,5 @@ export * from './check-authentication-state'; export * from './http-context.token'; export * from './others-group.token'; export * from './tenant-not-found-by-name'; -export * from './compare-func.token' +export * from './compare-func.token'; +export * from './dynamic-layout.token'; diff --git a/npm/ng-packs/packages/feature-management/src/lib/feature-management.module.ts b/npm/ng-packs/packages/feature-management/src/lib/feature-management.module.ts index 7db57f2c23..fd3ab95386 100644 --- a/npm/ng-packs/packages/feature-management/src/lib/feature-management.module.ts +++ b/npm/ng-packs/packages/feature-management/src/lib/feature-management.module.ts @@ -15,7 +15,8 @@ const exported = [ /** * @deprecated FeatureManagementModule is deprecated . - * @description use `provideFeatureManagementConfig` *function* for config settings. You can import directives and pipes directly, it has been switched to standalone. + * @description use `provideFeatureManagementConfig` *function* for config settings. + * You can import directives and pipes directly whichs were belongs to FeatureManagementModule are switched to standalone. */ @NgModule({ imports: [CoreModule, ThemeSharedModule, NgbNavModule, ...exported], diff --git a/npm/ng-packs/packages/feature-management/src/lib/providers/feature-management-config.provider.ts b/npm/ng-packs/packages/feature-management/src/lib/providers/feature-management-config.provider.ts index 39655563f5..9df930a361 100644 --- a/npm/ng-packs/packages/feature-management/src/lib/providers/feature-management-config.provider.ts +++ b/npm/ng-packs/packages/feature-management/src/lib/providers/feature-management-config.provider.ts @@ -1,5 +1,5 @@ import { makeEnvironmentProviders } from '@angular/core'; -import { FEATURE_MANAGEMENT_SETTINGS_PROVIDERS } from './feature-management-settings.provider'; +import { FEATURE_MANAGEMENT_SETTINGS_PROVIDERS } from './'; export function provideFeatureManagementConfig() { return makeEnvironmentProviders([FEATURE_MANAGEMENT_SETTINGS_PROVIDERS]); diff --git a/npm/ng-packs/packages/identity/config/src/providers/identity-config.provider.ts b/npm/ng-packs/packages/identity/config/src/providers/identity-config.provider.ts index b7c6e52ea1..20a56dde0f 100644 --- a/npm/ng-packs/packages/identity/config/src/providers/identity-config.provider.ts +++ b/npm/ng-packs/packages/identity/config/src/providers/identity-config.provider.ts @@ -1,5 +1,5 @@ import { makeEnvironmentProviders } from '@angular/core'; -import { IDENTITY_ROUTE_PROVIDERS } from './route.provider'; +import { IDENTITY_ROUTE_PROVIDERS } from './'; export function provideIdentityConfig() { return makeEnvironmentProviders([IDENTITY_ROUTE_PROVIDERS]); diff --git a/npm/ng-packs/packages/oauth/src/lib/providers/oauth-module-config.provider.ts b/npm/ng-packs/packages/oauth/src/lib/providers/oauth-module-config.provider.ts index 936aee113f..021ad59a05 100644 --- a/npm/ng-packs/packages/oauth/src/lib/providers/oauth-module-config.provider.ts +++ b/npm/ng-packs/packages/oauth/src/lib/providers/oauth-module-config.provider.ts @@ -10,6 +10,7 @@ import { noop, } from '@abp/ng.core'; import { APP_INITIALIZER, Provider, makeEnvironmentProviders } from '@angular/core'; +import { HTTP_INTERCEPTORS } from '@angular/common/http'; import { OAuthModule, OAuthStorage } from 'angular-oauth2-oidc'; import { AbpOAuthGuard, abpOAuthGuard } from '../guards'; import { OAuthConfigurationHandler } from '../handlers'; @@ -18,8 +19,6 @@ import { AbpOAuthService, OAuthErrorFilterService } from '../services'; import { pipeToLogin, checkAccessToken } from '../utils'; import { NavigateToManageProfileProvider } from './navigate-to-manage-profile.provider'; -import { HTTP_INTERCEPTORS } from '@angular/common/http'; - export function provideAbpOAuth() { const providers = [ { diff --git a/npm/ng-packs/packages/setting-management/config/src/lib/providers/index.ts b/npm/ng-packs/packages/setting-management/config/src/lib/providers/index.ts index a9d0434c23..c0c77b7214 100644 --- a/npm/ng-packs/packages/setting-management/config/src/lib/providers/index.ts +++ b/npm/ng-packs/packages/setting-management/config/src/lib/providers/index.ts @@ -2,3 +2,4 @@ export * from './route.provider'; export * from './setting-tab.provider'; export * from './visible.provider'; export * from './setting-management-config.provider'; +export * from './features.token'; diff --git a/npm/ng-packs/packages/setting-management/config/src/lib/providers/setting-management-config.provider.ts b/npm/ng-packs/packages/setting-management/config/src/lib/providers/setting-management-config.provider.ts index 291d48aa36..b981bc5147 100644 --- a/npm/ng-packs/packages/setting-management/config/src/lib/providers/setting-management-config.provider.ts +++ b/npm/ng-packs/packages/setting-management/config/src/lib/providers/setting-management-config.provider.ts @@ -1,8 +1,10 @@ import { makeEnvironmentProviders } from '@angular/core'; -import { SETTING_MANAGEMENT_FEATURES_PROVIDERS } from './features.token'; -import { SETTING_MANAGEMENT_ROUTE_PROVIDERS } from './route.provider'; -import { SETTING_MANAGEMENT_SETTING_TAB_PROVIDERS } from './setting-tab.provider'; -import { SETTING_MANAGEMENT_VISIBLE_PROVIDERS } from './visible.provider'; +import { + SETTING_MANAGEMENT_FEATURES_PROVIDERS, + SETTING_MANAGEMENT_ROUTE_PROVIDERS, + SETTING_MANAGEMENT_SETTING_TAB_PROVIDERS, + SETTING_MANAGEMENT_VISIBLE_PROVIDERS, +} from './'; export function provideSettingManagementConfig() { return makeEnvironmentProviders([ diff --git a/npm/ng-packs/packages/tenant-management/config/src/providers/tenant-management-config.provider.ts b/npm/ng-packs/packages/tenant-management/config/src/providers/tenant-management-config.provider.ts index b2322ecacb..c5599e410c 100644 --- a/npm/ng-packs/packages/tenant-management/config/src/providers/tenant-management-config.provider.ts +++ b/npm/ng-packs/packages/tenant-management/config/src/providers/tenant-management-config.provider.ts @@ -1,5 +1,5 @@ import { makeEnvironmentProviders } from '@angular/core'; -import { TENANT_MANAGEMENT_ROUTE_PROVIDERS } from './route.provider'; +import { TENANT_MANAGEMENT_ROUTE_PROVIDERS } from './'; export function provideTenantManagementConfig() { return makeEnvironmentProviders([TENANT_MANAGEMENT_ROUTE_PROVIDERS]); diff --git a/npm/ng-packs/packages/theme-shared/src/lib/providers/theme-shared-config.provider.ts b/npm/ng-packs/packages/theme-shared/src/lib/providers/theme-shared-config.provider.ts index 8efe332d37..b5e9ba9ce1 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/providers/theme-shared-config.provider.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/providers/theme-shared-config.provider.ts @@ -6,22 +6,25 @@ import { VALIDATION_MAP_ERRORS_FN, defaultMapErrorsFn, VALIDATION_VALIDATE_ON_SUBMIT, + Validation, } from '@ngx-validate/core'; import { DEFAULT_VALIDATION_BLUEPRINTS } from '../constants'; import { DocumentDirHandlerService, ErrorHandler } from '../handlers'; import { HttpErrorConfig } from '../models'; -import { THEME_SHARED_APPEND_CONTENT, HTTP_ERROR_CONFIG } from '../tokens'; import { + THEME_SHARED_APPEND_CONTENT, + HTTP_ERROR_CONFIG, CONFIRMATION_ICONS, ConfirmationIcons, DEFAULT_CONFIRMATION_ICONS, -} from '../tokens/confirmation-icons.token'; +} from '../tokens'; import { DateParserFormatter } from '../utils'; -import { DEFAULT_HANDLERS_PROVIDERS } from './error-handlers.provider'; -import { NG_BOOTSTRAP_CONFIG_PROVIDERS } from './ng-bootstrap-config.provider'; -import { THEME_SHARED_ROUTE_PROVIDERS } from './route.provider'; -import { tenantNotFoundProvider } from './tenant-not-found.provider'; -import { Validation } from '@ngx-validate/core'; +import { + DEFAULT_HANDLERS_PROVIDERS, + NG_BOOTSTRAP_CONFIG_PROVIDERS, + THEME_SHARED_ROUTE_PROVIDERS, + tenantNotFoundProvider, +} from './'; export enum ThemeSharedFeatureKind { HttpErrorConfig, diff --git a/npm/ng-packs/packages/theme-shared/src/lib/tokens/index.ts b/npm/ng-packs/packages/theme-shared/src/lib/tokens/index.ts index 98edb1a87b..b38eb7ae3e 100644 --- a/npm/ng-packs/packages/theme-shared/src/lib/tokens/index.ts +++ b/npm/ng-packs/packages/theme-shared/src/lib/tokens/index.ts @@ -2,3 +2,4 @@ export * from './append-content.token'; export * from './http-error.token'; export * from './ngx-datatable-messages.token'; export * from './suppress-unsaved-changes-warning.token'; +export * from './confirmation-icons.token';