From a4ea45486b1709c1f041685a86da0596c7291f93 Mon Sep 17 00:00:00 2001
From: erdemcaygor <erdem.caygor@gmail.com>
Date: Wed, 14 May 2025 11:34:22 +0300
Subject: [PATCH] refactoring

---
 .../chart.js/src/chart.component.ts           |  1 -
 .../tree/src/lib/components/tree.component.ts | 28 +++++++++++++++---
 .../expanded-icon-template.directive.ts       |  1 -
 .../templates/tree-node-template.directive.ts |  1 -
 .../email-setting-group.component.ts          | 29 ++++++++++++++++---
 5 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/npm/ng-packs/packages/components/chart.js/src/chart.component.ts b/npm/ng-packs/packages/components/chart.js/src/chart.component.ts
index d40b274443..c700a0bce8 100644
--- a/npm/ng-packs/packages/components/chart.js/src/chart.component.ts
+++ b/npm/ng-packs/packages/components/chart.js/src/chart.component.ts
@@ -16,7 +16,6 @@ import {
 let Chart: any;
 
 @Component({
-  standalone: false,
   selector: 'abp-chart',
   template: `
     <div
diff --git a/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts b/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts
index 2d227787ca..4aa0f67e09 100644
--- a/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts
+++ b/npm/ng-packs/packages/components/tree/src/lib/components/tree.component.ts
@@ -11,24 +11,44 @@ import {
   TemplateRef,
   ViewEncapsulation,
 } from '@angular/core';
-import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap';
-import { NzFormatBeforeDropEvent, NzFormatEmitEvent, NzTreeNode } from 'ng-zorro-antd/tree';
-import { LazyLoadService, LOADING_STRATEGY, SubscriptionService } from '@abp/ng.core';
+import { NgbDropdown, NgbDropdownMenu, NgbDropdownToggle } from '@ng-bootstrap/ng-bootstrap';
+import {
+  NzFormatBeforeDropEvent,
+  NzFormatEmitEvent,
+  NzTreeComponent,
+  NzTreeNode,
+} from 'ng-zorro-antd/tree';
+import {
+  InitDirective,
+  LazyLoadService,
+  LOADING_STRATEGY,
+  SubscriptionService,
+} from '@abp/ng.core';
 import { of } from 'rxjs';
 import { DISABLE_TREE_STYLE_LOADING_TOKEN } from '../disable-tree-style-loading.token';
 import { TreeNodeTemplateDirective } from '../templates/tree-node-template.directive';
 import { ExpandedIconTemplateDirective } from '../templates/expanded-icon-template.directive';
+import { CommonModule } from '@angular/common';
+import { NzNoAnimationDirective } from 'ng-zorro-antd/core/no-animation';
 
 export type DropEvent = NzFormatEmitEvent & { pos: number };
 
 @Component({
-  standalone: false,
   selector: 'abp-tree',
   templateUrl: 'tree.component.html',
   styleUrls: ['tree.component.scss'],
   encapsulation: ViewEncapsulation.None,
   providers: [SubscriptionService],
   changeDetection: ChangeDetectionStrategy.OnPush,
+  imports: [
+    CommonModule,
+    NzTreeComponent,
+    NgbDropdown,
+    NgbDropdownMenu,
+    NgbDropdownToggle,
+    InitDirective,
+    NzNoAnimationDirective,
+  ],
 })
 export class TreeComponent implements OnInit {
   private lazyLoadService = inject(LazyLoadService);
diff --git a/npm/ng-packs/packages/components/tree/src/lib/templates/expanded-icon-template.directive.ts b/npm/ng-packs/packages/components/tree/src/lib/templates/expanded-icon-template.directive.ts
index 03bb2c8fed..35706bd25f 100644
--- a/npm/ng-packs/packages/components/tree/src/lib/templates/expanded-icon-template.directive.ts
+++ b/npm/ng-packs/packages/components/tree/src/lib/templates/expanded-icon-template.directive.ts
@@ -1,7 +1,6 @@
 import { Directive, TemplateRef } from '@angular/core';
 
 @Directive({
-  standalone: false,
   selector: '[abpTreeExpandedIconTemplate],[abp-tree-expanded-icon-template]',
 })
 export class ExpandedIconTemplateDirective {
diff --git a/npm/ng-packs/packages/components/tree/src/lib/templates/tree-node-template.directive.ts b/npm/ng-packs/packages/components/tree/src/lib/templates/tree-node-template.directive.ts
index 5fd75b2025..56c66af04b 100644
--- a/npm/ng-packs/packages/components/tree/src/lib/templates/tree-node-template.directive.ts
+++ b/npm/ng-packs/packages/components/tree/src/lib/templates/tree-node-template.directive.ts
@@ -1,7 +1,6 @@
 import { Directive, TemplateRef } from '@angular/core';
 
 @Directive({
-  standalone: false,
   selector: '[abpTreeNodeTemplate],[abp-tree-node-template]',
 })
 export class TreeNodeTemplateDirective {
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 f1c8557ed1..a0c7903bb5 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
@@ -1,21 +1,42 @@
 import { NgbModalOptions } from '@ng-bootstrap/ng-bootstrap';
-import { collapse, ToasterService } from '@abp/ng.theme.shared';
+import {
+  ButtonComponent,
+  collapse,
+  ModalCloseDirective,
+  ModalComponent,
+  ToasterService,
+} from '@abp/ng.theme.shared';
 import { Component, inject, OnInit } from '@angular/core';
 import { toSignal } from '@angular/core/rxjs-interop';
-import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
+import {
+  ReactiveFormsModule,
+  UntypedFormBuilder,
+  UntypedFormGroup,
+  Validators,
+} from '@angular/forms';
 import { finalize } from 'rxjs/operators';
 import { SettingManagementPolicyNames } from '../../enums/policy-names';
 import { EmailSettingsService } from '@abp/ng.setting-management/proxy';
 import { EmailSettingsDto } from '../../proxy/models';
-import { ConfigStateService, LocalizationService } from '@abp/ng.core';
+import { ConfigStateService, LocalizationPipe, LocalizationService } from '@abp/ng.core';
+import { NgxValidateCoreModule, ValidationDirective } from '@ngx-validate/core';
+import { CommonModule } from '@angular/common';
 
 const { required, email } = Validators;
 
 @Component({
-  standalone: false,
   selector: 'abp-email-setting-group',
   templateUrl: 'email-setting-group.component.html',
   animations: [collapse],
+  imports: [
+    ReactiveFormsModule,
+    CommonModule,
+    LocalizationPipe,
+    ButtonComponent,
+    ModalComponent,
+    ModalCloseDirective,
+    NgxValidateCoreModule,
+  ],
 })
 export class EmailSettingGroupComponent implements OnInit {
   protected readonly localizationService = inject(LocalizationService);