Task/migrate rule settings dialog from ngModel to form control (#7037)

* Migrate from ngModel to form control

* Update changelog

CHANGELOG.md

@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Improved the styling of the tabs across various dialogs
 - Improved the styling of the page tabs component on desktop
 - Enabled the _Bull Dashboard_ tab in the admin control panel (experimental)
+- Migrated the settings dialog to customize the rule thresholds of the _X-ray_ page from `ngModel` to form control
 - Improved the language localization for Spanish (`es`)
 - Upgraded `bull-board` from version `7.1.5` to `7.2.1`
 - Upgraded `date-fns` from version `4.1.0` to `4.4.0`

apps/client/src/app/components/rule/rule-settings-dialog/rule-settings-dialog.component.ts

@@ -1,8 +1,7 @@
-import { XRayRulesSettings } from '@ghostfolio/common/interfaces';
 import { GfValueComponent } from '@ghostfolio/ui/value';
 
-import { Component, Inject } from '@angular/core';
+import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
-import { FormsModule } from '@angular/forms';
+import { FormBuilder, FormGroup, ReactiveFormsModule } from '@angular/forms';
 import { MatButtonModule } from '@angular/material/button';
 import {
   MAT_DIALOG_DATA,
@@ -14,22 +13,37 @@ import { MatSliderModule } from '@angular/material/slider';
 import { RuleSettingsDialogParams } from './interfaces/interfaces';
 
 @Component({
+  changeDetection: ChangeDetectionStrategy.OnPush,
   imports: [
-    FormsModule,
     GfValueComponent,
     MatButtonModule,
     MatDialogModule,
-    MatSliderModule
+    MatSliderModule,
+    ReactiveFormsModule
   ],
   selector: 'gf-rule-settings-dialog',
   styleUrls: ['./rule-settings-dialog.scss'],
   templateUrl: './rule-settings-dialog.html'
 })
 export class GfRuleSettingsDialogComponent {
-  public settings: XRayRulesSettings['AccountClusterRiskCurrentInvestment'];
+  public settingsForm: FormGroup;
 
   public constructor(
     @Inject(MAT_DIALOG_DATA) public data: RuleSettingsDialogParams,
-    public dialogRef: MatDialogRef<GfRuleSettingsDialogComponent>
+    public dialogRef: MatDialogRef<GfRuleSettingsDialogComponent>,
-  ) {}
+    private formBuilder: FormBuilder
+  ) {
+    this.settingsForm = this.formBuilder.group({
+      thresholdMax: [this.data.settings.thresholdMax],
+      thresholdMin: [this.data.settings.thresholdMin]
+    });
+  }
+
+  public onSubmit() {
+    this.dialogRef.close({
+      ...this.data.settings,
+      thresholdMax: this.settingsForm.get('thresholdMax')?.value,
+      thresholdMin: this.settingsForm.get('thresholdMin')?.value
+    });
+  }
 }

apps/client/src/app/components/rule/rule-settings-dialog/rule-settings-dialog.html

@@ -1,8 +1,14 @@
 <div mat-dialog-title>{{ data.categoryName }} › {{ data.rule.name }}</div>
 
+<form
+  class="d-flex flex-column h-100"
+  [formGroup]="settingsForm"
+  (ngSubmit)="onSubmit()"
+>
   <div class="py-3" mat-dialog-content>
     @if (
-    data.rule.configuration.thresholdMin && data.rule.configuration.thresholdMax
+      data.rule.configuration.thresholdMin &&
+      data.rule.configuration.thresholdMax
     ) {
       <div class="w-100">
         <h6 class="d-flex mb-0">
@@ -12,14 +18,14 @@
             [isPercent]="data.rule.configuration.threshold.unit === '%'"
             [locale]="data.locale"
             [precision]="2"
-          [value]="data.settings.thresholdMin"
+            [value]="settingsForm.get('thresholdMin').value"
           />
           <span class="mx-1">-</span>
           <gf-value
             [isPercent]="data.rule.configuration.threshold.unit === '%'"
             [locale]="data.locale"
             [precision]="2"
-          [value]="data.settings.thresholdMax"
+            [value]="settingsForm.get('thresholdMax').value"
           />
         </h6>
         <div class="align-items-center d-flex w-100">
@@ -35,8 +41,8 @@
             [min]="data.rule.configuration.threshold.min"
             [step]="data.rule.configuration.threshold.step"
           >
-          <input matSliderStartThumb [(ngModel)]="data.settings.thresholdMin" />
+            <input formControlName="thresholdMin" matSliderStartThumb />
-          <input matSliderEndThumb [(ngModel)]="data.settings.thresholdMax" />
+            <input formControlName="thresholdMax" matSliderEndThumb />
           </mat-slider>
           <gf-value
             [isPercent]="data.rule.configuration.threshold.unit === '%'"
@@ -55,7 +61,7 @@
             [isPercent]="data.rule.configuration.threshold.unit === '%'"
             [locale]="data.locale"
             [precision]="2"
-          [value]="data.settings.thresholdMin"
+            [value]="settingsForm.get('thresholdMin').value"
           />
         </h6>
         <div class="align-items-center d-flex w-100">
@@ -72,7 +78,7 @@
             [min]="data.rule.configuration.threshold.min"
             [step]="data.rule.configuration.threshold.step"
           >
-          <input matSliderThumb [(ngModel)]="data.settings.thresholdMin" />
+            <input formControlName="thresholdMin" matSliderThumb />
           </mat-slider>
           <gf-value
             [isPercent]="data.rule.configuration.threshold.unit === '%'"
@@ -90,7 +96,7 @@
             [isPercent]="data.rule.configuration.threshold.unit === '%'"
             [locale]="data.locale"
             [precision]="2"
-          [value]="data.settings.thresholdMax"
+            [value]="settingsForm.get('thresholdMax').value"
           />
         </h6>
         <div class="align-items-center d-flex w-100">
@@ -107,7 +113,7 @@
             [min]="data.rule.configuration.threshold.min"
             [step]="data.rule.configuration.threshold.step"
           >
-          <input matSliderThumb [(ngModel)]="data.settings.thresholdMax" />
+            <input formControlName="thresholdMax" matSliderThumb />
           </mat-slider>
           <gf-value
             [isPercent]="data.rule.configuration.threshold.unit === '%'"
@@ -121,12 +127,16 @@
   </div>
 
   <div align="end" mat-dialog-actions>
-  <button i18n mat-button (click)="dialogRef.close()">Close</button>
+    <button mat-button type="button" (click)="dialogRef.close()">
+      <ng-container i18n>Close</ng-container>
+    </button>
     <button
       color="primary"
       mat-flat-button
-    (click)="dialogRef.close(data.settings)"
+      type="submit"
+      [disabled]="!settingsForm.dirty"
     >
       <ng-container i18n>Save</ng-container>
     </button>
   </div>
+</form>