IOT-1487: Improved error-message when http- or oddk-datatarget has devices-decoder-elements with no device specified...

Author: Fritsen

src/app/applications/datatarget/httppush/httppush-edit/httppush-edit.component.ts

@@ -154,6 +154,7 @@ export class HttppushEditComponent
   onSubmit(): void {
     this.counter = 0;
     if (this.datatargetid) {
+      if (!this.validatePayloadDeviceDatatarget()) return;
       this.updateDatatarget();
       this.addPayloadDeviceDatatarget();
     } else {
@@ -209,6 +210,20 @@ export class HttppushEditComponent
     });
   }
 
+  private validatePayloadDeviceDatatarget = () => {
+    const isError = this.payloadDeviceDatatarget?.some(
+      (relation) => (relation.iotDeviceIds?.length ?? 0) < 1
+    );
+    if (isError) {
+      this.errorFields = ['devices'];
+      this.errorMessages = [
+        'Must attach at least one IoT-device for each element in list of devices / decoders',
+      ];
+      this.scrollToTopService.scrollToTop();
+    }
+    return !isError;
+  };
+
   countToRedirect() {
     this.counter -= 1;
     if (this.counter <= 0 && !this.formFailedSubmit) {

src/app/applications/datatarget/opendatadk/opendatadk-edit/opendatadk-edit.component.ts

@@ -158,6 +158,7 @@ export class OpendatadkEditComponent implements DatatargetEdit, OnDestroy {
   onSubmit(): void {
     this.resetErrors();
     if (this.datatargetId) {
+      if (!this.validatePayloadDeviceDatatarget()) return;
       this.pendingRequestsCounter =
         1 + (this.payloadDeviceDatatarget?.length ?? 0);
       this.updateDatatarget();
@@ -206,6 +207,19 @@ export class OpendatadkEditComponent implements DatatargetEdit, OnDestroy {
       }
     });
   }
+  private validatePayloadDeviceDatatarget = () => {
+    const isError = this.payloadDeviceDatatarget?.some(
+      (relation) => (relation.iotDeviceIds?.length ?? 0) < 1
+    );
+    if (isError) {
+      this.errorFields = ['devices'];
+      this.errorMessages = [
+        'Must attach at least one IoT-device for each element in list of devices / decoders',
+      ];
+      this.scrollToTopService.scrollToTop();
+    }
+    return !isError;
+  };
   private createDatatarget() {
     this.pendingRequestsCounter = 0;
     this.datatarget.applicationId = this.applicationId;