From 8122ace25e753bb93ee72a501fcf5c6ee802376e Mon Sep 17 00:00:00 2001 From: Fahri Gedik Date: Tue, 8 Jul 2025 10:40:55 +0300 Subject: [PATCH] refactor : migrate setting-management package to inject() DI --- .../email-setting-group.component.ts | 10 ++++------ .../config/src/lib/proxy/email-settings.service.ts | 6 +++--- .../proxy/src/lib/proxy/email-settings.service.ts | 8 ++++---- .../proxy/src/lib/proxy/time-zone-settings.service.ts | 8 ++++---- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.ts b/npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.ts index f61c158e0e..8745e0ffd4 100644 --- a/npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.ts +++ b/npm/ng-packs/packages/setting-management/config/src/lib/components/email-setting-group/email-setting-group.component.ts @@ -45,6 +45,10 @@ const { required, email } = Validators; ], }) export class EmailSettingGroupComponent implements OnInit { + private emailSettingsService = inject(EmailSettingsService); + private fb = inject(UntypedFormBuilder); + private toasterService = inject(ToasterService); + protected readonly localizationService = inject(LocalizationService); protected readonly configStateSevice = inject(ConfigStateService); protected readonly currentUserEmail = toSignal( @@ -58,12 +62,6 @@ export class EmailSettingGroupComponent implements OnInit { isEmailTestModalOpen = false; modalSize: NgbModalOptions = { size: 'lg' }; - constructor( - private emailSettingsService: EmailSettingsService, - private fb: UntypedFormBuilder, - private toasterService: ToasterService, - ) {} - ngOnInit() { this.getData(); } diff --git a/npm/ng-packs/packages/setting-management/config/src/lib/proxy/email-settings.service.ts b/npm/ng-packs/packages/setting-management/config/src/lib/proxy/email-settings.service.ts index 0252b18c12..a1835e1a38 100644 --- a/npm/ng-packs/packages/setting-management/config/src/lib/proxy/email-settings.service.ts +++ b/npm/ng-packs/packages/setting-management/config/src/lib/proxy/email-settings.service.ts @@ -1,6 +1,6 @@ import type { EmailSettingsDto, SendTestEmailInput, UpdateEmailSettingsDto } from './models'; import { RestService } from '@abp/ng.core'; -import { Injectable } from '@angular/core'; +import { Injectable, inject } from '@angular/core'; /** @deprecated This method is deprecated, use it from @abp/ng.setting-management/proxy @@ -9,6 +9,8 @@ import { Injectable } from '@angular/core'; providedIn: 'root', }) export class EmailSettingsService { + private restService = inject(RestService); + apiName = 'SettingManagement'; get = () => @@ -33,6 +35,4 @@ export class EmailSettingsService { body: input, }, { apiName: this.apiName }); - - constructor(private restService: RestService) {} } diff --git a/npm/ng-packs/packages/setting-management/proxy/src/lib/proxy/email-settings.service.ts b/npm/ng-packs/packages/setting-management/proxy/src/lib/proxy/email-settings.service.ts index a05cfc27a7..af6a2f5843 100644 --- a/npm/ng-packs/packages/setting-management/proxy/src/lib/proxy/email-settings.service.ts +++ b/npm/ng-packs/packages/setting-management/proxy/src/lib/proxy/email-settings.service.ts @@ -1,11 +1,13 @@ import type { EmailSettingsDto, SendTestEmailInput, UpdateEmailSettingsDto } from './models'; import { RestService, Rest } from '@abp/ng.core'; -import { Injectable } from '@angular/core'; +import { Injectable, inject } from '@angular/core'; @Injectable({ providedIn: 'root', }) -export class EmailSettingsService { +export class EmailSettingsService { + private restService = inject(RestService); + apiName = 'SettingManagement'; @@ -33,6 +35,4 @@ export class EmailSettingsService { body: input, }, { apiName: this.apiName,...config }); - - constructor(private restService: RestService) {} } diff --git a/npm/ng-packs/packages/setting-management/proxy/src/lib/proxy/time-zone-settings.service.ts b/npm/ng-packs/packages/setting-management/proxy/src/lib/proxy/time-zone-settings.service.ts index 7141bce27d..1a20916673 100644 --- a/npm/ng-packs/packages/setting-management/proxy/src/lib/proxy/time-zone-settings.service.ts +++ b/npm/ng-packs/packages/setting-management/proxy/src/lib/proxy/time-zone-settings.service.ts @@ -1,11 +1,13 @@ import type { NameValue } from './volo/abp/models'; import { RestService, Rest } from '@abp/ng.core'; -import { Injectable } from '@angular/core'; +import { Injectable, inject } from '@angular/core'; @Injectable({ providedIn: 'root', }) -export class TimeZoneSettingsService { +export class TimeZoneSettingsService { + private restService = inject(RestService); + apiName = 'SettingManagement'; @@ -33,6 +35,4 @@ export class TimeZoneSettingsService { params: { timezone }, }, { apiName: this.apiName,...config }); - - constructor(private restService: RestService) {} }