From 83300a6138d30168f423102ae6b6a5019efe10f0 Mon Sep 17 00:00:00 2001
From: godind <godind@hotmail.com>
Date: Sun, 5 May 2024 01:23:41 -0400
Subject: [PATCH] fix path update issue and form validation

---
 .../boolean-multicontrol-options.component.ts              | 2 ++
 .../modal-widget-config/modal-widget-config.component.html | 2 +-
 .../modal-widget-config/modal-widget-config.component.ts   | 5 -----
 .../path-control-config/path-control-config.component.ts   | 7 +++++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/app/widget-config/boolean-multicontrol-options/boolean-multicontrol-options.component.ts b/src/app/widget-config/boolean-multicontrol-options/boolean-multicontrol-options.component.ts
index 12d71ba9..bce31f7a 100644
--- a/src/app/widget-config/boolean-multicontrol-options/boolean-multicontrol-options.component.ts
+++ b/src/app/widget-config/boolean-multicontrol-options/boolean-multicontrol-options.component.ts
@@ -71,6 +71,8 @@ export class BooleanMultiControlOptionsComponent implements OnInit, OnDestroy {
       source: 'default',
       pathType: 'boolean',
       isPathConfigurable: true,
+      showPathSkUnitsFilter: false,
+      pathSkUnitsFilter: null,
       convertUnitTo: 'unitless',
       sampleTime: 500
     }
diff --git a/src/app/widget-config/modal-widget-config/modal-widget-config.component.html b/src/app/widget-config/modal-widget-config/modal-widget-config.component.html
index 899d0107..184da850 100644
--- a/src/app/widget-config/modal-widget-config/modal-widget-config.component.html
+++ b/src/app/widget-config/modal-widget-config/modal-widget-config.component.html
@@ -117,7 +117,7 @@
             <mat-checkbox class="options-grid-span2" *ngIf="(widgetConfig.courseOverGroundEnable !== undefined)" name="courseOverGroundEnable" formControlName="courseOverGroundEnable" (change)="setPaths()">
               Show Course Over Ground
             </mat-checkbox>
-            <mat-checkbox class="options-grid-span2" *ngIf="(widgetConfig.waypointEnable !== undefined)" name="waypointEnable" formControlName="waypointEnable" (change)="setPaths()">
+            <mat-checkbox class="options-grid-span2" *ngIf="(widgetConfig.waypointEnable !== undefined)" name="waypointEnable" formControlName="waypointEnable">
               Show Next Waypoint
             </mat-checkbox>
 
diff --git a/src/app/widget-config/modal-widget-config/modal-widget-config.component.ts b/src/app/widget-config/modal-widget-config/modal-widget-config.component.ts
index 3dff4b55..07b5d81e 100644
--- a/src/app/widget-config/modal-widget-config/modal-widget-config.component.ts
+++ b/src/app/widget-config/modal-widget-config/modal-widget-config.component.ts
@@ -207,11 +207,6 @@ export class ModalWidgetConfigComponent implements OnInit {
   }
 
   private setFormOptions(): void {
-    if (this.formMaster.contains('waypointEnable')) {
-      const ctrlGrp = this.formMaster.get('paths.nextWaypointBearing');
-      this.formMaster.controls['waypointEnable'].value ? ctrlGrp.enable() : ctrlGrp.disable()
-    }
-
     if (this.formMaster.contains('courseOverGroundEnable')) {
       const ctrlGrp = this.formMaster.get('paths.courseOverGround');
       this.formMaster.controls['courseOverGroundEnable'].value ? ctrlGrp.enable() : ctrlGrp.disable();
diff --git a/src/app/widget-config/path-control-config/path-control-config.component.ts b/src/app/widget-config/path-control-config/path-control-config.component.ts
index 404a6877..f869f920 100644
--- a/src/app/widget-config/path-control-config/path-control-config.component.ts
+++ b/src/app/widget-config/path-control-config/path-control-config.component.ts
@@ -91,6 +91,7 @@ export class ModalPathControlConfigComponent implements OnInit, OnChanges, OnDes
         } else {
           this.disablePathFields();
         }
+        this.pathFormGroup.updateValueAndValidity();
       });
   }
 
@@ -118,8 +119,10 @@ export class ModalPathControlConfigComponent implements OnInit, OnChanges, OnDes
     let filteredPaths = this.availablePaths;
 
     // If a unit filter is set, apply it first
-      if (this.pathSkUnitsFilterControl.value != null) {
-      filteredPaths = filteredPaths.filter(item => item.meta.units === this.pathSkUnitsFilterControl.value.unit);
+    if (this.pathSkUnitsFilterControl.value != null) {
+      filteredPaths = filteredPaths.filter(item =>
+        item.meta && item.meta.units && item.meta.units === this.pathSkUnitsFilterControl.value.unit
+      );
     }
 
     // Then filter based on string