From 6715aae1404fc578e72c1856096eb3e4473e464b Mon Sep 17 00:00:00 2001
From: erdemcaygor <erdem.caygor@gmail.com>
Date: Wed, 8 Oct 2025 23:54:51 +0300
Subject: [PATCH] refactoring

---
 .../dynamic-form-field.component.html         |  4 ---
 .../dynamic-form-field.component.scss         |  4 +++
 .../dynamic-form-field.component.ts           |  1 +
 .../src/dynamic-form.component.html           |  9 +++++-
 .../src/dynamic-form.component.scss           | 12 ++++++++
 .../src/dynamic-form.component.ts             | 28 ++++++++++++++-----
 6 files changed, 46 insertions(+), 12 deletions(-)
 create mode 100644 npm/ng-packs/packages/components/dynamic-form/src/dynamic-form-field/dynamic-form-field.component.scss
 create mode 100644 npm/ng-packs/packages/components/dynamic-form/src/dynamic-form.component.scss

diff --git a/npm/ng-packs/packages/components/dynamic-form/src/dynamic-form-field/dynamic-form-field.component.html b/npm/ng-packs/packages/components/dynamic-form/src/dynamic-form-field/dynamic-form-field.component.html
index 68bc9cb23d..f82083e95a 100644
--- a/npm/ng-packs/packages/components/dynamic-form/src/dynamic-form-field/dynamic-form-field.component.html
+++ b/npm/ng-packs/packages/components/dynamic-form/src/dynamic-form-field/dynamic-form-field.component.html
@@ -1,6 +1,4 @@
 @if (visible()) {
-  <div class="field-container">
-
     @if (field().type === 'text') {
       <!-- Text Input -->
       <div class="form-group">
@@ -99,6 +97,4 @@
               }-->
       </div>
     }
-  </div>
-  <!--      Add more field types as needed-->
 }
diff --git a/npm/ng-packs/packages/components/dynamic-form/src/dynamic-form-field/dynamic-form-field.component.scss b/npm/ng-packs/packages/components/dynamic-form/src/dynamic-form-field/dynamic-form-field.component.scss
new file mode 100644
index 0000000000..a1b8a5c16f
--- /dev/null
+++ b/npm/ng-packs/packages/components/dynamic-form/src/dynamic-form-field/dynamic-form-field.component.scss
@@ -0,0 +1,4 @@
+.form-group {
+  display: flex;
+  flex-direction: column;
+}
diff --git a/npm/ng-packs/packages/components/dynamic-form/src/dynamic-form-field/dynamic-form-field.component.ts b/npm/ng-packs/packages/components/dynamic-form/src/dynamic-form-field/dynamic-form-field.component.ts
index fd92a8040c..32f0de1543 100644
--- a/npm/ng-packs/packages/components/dynamic-form/src/dynamic-form-field/dynamic-form-field.component.ts
+++ b/npm/ng-packs/packages/components/dynamic-form/src/dynamic-form-field/dynamic-form-field.component.ts
@@ -37,6 +37,7 @@ const DYNAMIC_FORM_FIELD_CONTROL_VALUE_ACCESSOR = {
 @Component({
   selector: 'abp-dynamic-form-field',
   templateUrl: './dynamic-form-field.component.html',
+  styleUrls: ['./dynamic-form-field.component.scss'],
   providers: [
     { provide: ABP_DYNAMIC_FORM_FIELD, useExisting: DynamicFormFieldComponent },
     DYNAMIC_FORM_FIELD_CONTROL_VALUE_ACCESSOR
diff --git a/npm/ng-packs/packages/components/dynamic-form/src/dynamic-form.component.html b/npm/ng-packs/packages/components/dynamic-form/src/dynamic-form.component.html
index c216a9ef7f..e7b10338a6 100644
--- a/npm/ng-packs/packages/components/dynamic-form/src/dynamic-form.component.html
+++ b/npm/ng-packs/packages/components/dynamic-form/src/dynamic-form.component.html
@@ -10,6 +10,13 @@
       </div>
     </div>
   }
+  <ng-content select="[actions]">
+    <ng-container [ngTemplateOutlet]="defaultActions"></ng-container>
+  </ng-content>
+
+</form>
+
+<ng-template #defaultActions>
   <div class="form-actions">
     @if (showCancelButton()) {
       <button
@@ -26,4 +33,4 @@
       {{ submitButtonText() }}
     </button>
   </div>
-</form>
+</ng-template>
diff --git a/npm/ng-packs/packages/components/dynamic-form/src/dynamic-form.component.scss b/npm/ng-packs/packages/components/dynamic-form/src/dynamic-form.component.scss
new file mode 100644
index 0000000000..f82cbec465
--- /dev/null
+++ b/npm/ng-packs/packages/components/dynamic-form/src/dynamic-form.component.scss
@@ -0,0 +1,12 @@
+:host(.abp-dynamic-form) {
+  form {
+    display: flex;
+    flex-direction: column;
+    gap: 0.5rem;
+  }
+}
+.form-actions {
+  display: flex;
+  justify-content: flex-end;
+  gap: 0.5rem;
+}
diff --git a/npm/ng-packs/packages/components/dynamic-form/src/dynamic-form.component.ts b/npm/ng-packs/packages/components/dynamic-form/src/dynamic-form.component.ts
index b89dc1be20..573335b638 100644
--- a/npm/ng-packs/packages/components/dynamic-form/src/dynamic-form.component.ts
+++ b/npm/ng-packs/packages/components/dynamic-form/src/dynamic-form.component.ts
@@ -6,17 +6,21 @@ import {
   inject,
   OnInit,
   DestroyRef,
+  effect,
+  ChangeDetectorRef,
 } from '@angular/core';
 import { FormBuilder, FormGroup, ReactiveFormsModule } from '@angular/forms';
 import { CommonModule } from '@angular/common';
+import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { DynamicFormService } from './dynamic-form.service';
 import { FormFieldConfig } from './dynamic-form.models';
 import { DynamicFormFieldComponent } from './dynamic-form-field';
-import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 
 @Component({
   selector: 'abp-dynamic-form',
   templateUrl: './dynamic-form.component.html',
+  styleUrls: ['./dynamic-form.component.scss'],
+  host: { class: 'abp-dynamic-form' },
   changeDetection: ChangeDetectionStrategy.OnPush,
   imports: [CommonModule, DynamicFormFieldComponent, ReactiveFormsModule],
 })
@@ -30,14 +34,13 @@ export class DynamicFormComponent implements OnInit {
   formCancel = output<void>();
   private dynamicFormService = inject(DynamicFormService);
   readonly destroyRef = inject(DestroyRef);
+  readonly changeDetectorRef = inject(ChangeDetectorRef);
 
   dynamicForm!: FormGroup;
   fieldVisibility: { [key: string]: boolean } = {};
 
   ngOnInit() {
-    this.dynamicForm = this.dynamicFormService.createFormGroup(this.fields());
-    this.initializeFieldVisibility();
-    this.setupConditionalLogic();
+    this.setupFormAndLogic();
   }
 
   get sortedFields(): FormFieldConfig[] {
@@ -61,12 +64,15 @@ export class DynamicFormComponent implements OnInit {
   }
 
   isFieldVisible(field: FormFieldConfig): boolean {
+    if (field.key === 'adminNotes') {
+      console.log('adminNotes visibility:', this.fieldVisibility[field.key] !== false);
+    }
     return this.fieldVisibility[field.key] !== false;
   }
 
   private initializeFieldVisibility() {
     this.fields().forEach(field => {
-      this.fieldVisibility[field.key] = !field.conditionalLogic?.length;
+      this.fieldVisibility = { ...this.fieldVisibility, [field.key]: !field.conditionalLogic?.length };
     });
   }
 
@@ -76,6 +82,7 @@ export class DynamicFormComponent implements OnInit {
         field.conditionalLogic.forEach(rule => {
           const dependentControl = this.dynamicForm.get(rule.dependsOn);
           if (dependentControl) {
+            this.evaluateConditionalLogic(field.key);
             dependentControl.valueChanges.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(() => {
               this.evaluateConditionalLogic(field.key);
             });
@@ -119,10 +126,10 @@ export class DynamicFormComponent implements OnInit {
 
     switch (action) {
       case 'show':
-        this.fieldVisibility[fieldKey] = shouldApply;
+        this.fieldVisibility = { ...this.fieldVisibility, [fieldKey]: shouldApply };
         break;
       case 'hide':
-        this.fieldVisibility[fieldKey] = !shouldApply;
+        this.fieldVisibility = { ...this.fieldVisibility, [fieldKey]: !shouldApply };
         break;
       case 'enable':
         if (control) {
@@ -137,6 +144,13 @@ export class DynamicFormComponent implements OnInit {
     }
   }
 
+  private setupFormAndLogic() {
+    this.dynamicForm = this.dynamicFormService.createFormGroup(this.fields());
+    this.initializeFieldVisibility();
+    this.setupConditionalLogic();
+    this.changeDetectorRef.markForCheck();
+  }
+
   private markAllFieldsAsTouched() {
     Object.keys(this.dynamicForm.controls).forEach(key => {
       this.dynamicForm.get(key)?.markAsTouched();