Fix setting the value for property id vs name for Tasks

Author: BoykoAlex

ui/src/app/shared/flo/support/properties-group-model.ts

@@ -72,13 +72,9 @@ export class PropertiesGroupModel extends Properties.PropertiesGroupModel {
     });
   }
 
-  private determineAttributeName(metadata: Flo.PropertyMetadata): string {
+  protected determineAttributeName(metadata: Flo.PropertyMetadata): string {
     const nameAttr = `props/${metadata.name}`;
     const idAttr = `props/${metadata.id}`;
-    if (this.cell.attr('metadata/group') === 'other') {
-      // For something in the other group (like tap) use the id not the name of the property
-      return idAttr;
-    }
     const valueFromName = this.cell.attr(nameAttr);
     const valueFromId = this.cell.attr(idAttr);
     if ((valueFromName === undefined || valueFromName === null) && !(valueFromId === undefined || valueFromId === null)) {

ui/src/app/streams/flo/properties/stream-properties-dialog.component.ts

@@ -2,7 +2,7 @@
 
 import { Component, ViewEncapsulation } from '@angular/core';
 import { BsModalRef } from 'ngx-bootstrap';
-import { Properties } from 'spring-flo';
+import { Flo, Properties } from 'spring-flo';
 import { Validators } from '@angular/forms';
 import { dia } from 'jointjs';
 import { StreamsService } from '../../streams.service';
@@ -93,6 +93,15 @@ class StreamPropertiesGroupModel extends PropertiesGroupModel {
     }
     return notationalProperties;
   }
+
+  protected determineAttributeName(metadata: Flo.PropertyMetadata): string {
+    if (this.cell.attr('metadata/group') === 'other') {
+      // For something in the other group (like tap) use the id not the name of the property
+      return `props/${metadata.id}`;
+    }
+    return super.determineAttributeName(metadata);
+  }
+
 }
 
 /**

ui/src/app/tasks/flo/properties/task-properties-dialog-component.ts

@@ -2,7 +2,7 @@
 
 import { Component, ViewEncapsulation } from '@angular/core';
 import { BsModalRef } from 'ngx-bootstrap';
-import { Properties } from 'spring-flo';
+import { Flo, Properties } from 'spring-flo';
 import { Validators } from '@angular/forms';
 import { dia } from 'jointjs';
 import { ApplicationType } from '../../../shared/model/application-type';
@@ -56,6 +56,15 @@ class TaskPropertiesGroupModel extends PropertiesGroupModel {
     }
     return notationalProperties;
   }
+
+  protected determineAttributeName(metadata: Flo.PropertyMetadata): string {
+    if (this.cell instanceof dia.Link) {
+      // For links properties are always id based
+      return `props/${metadata.id}`;
+    }
+    return super.determineAttributeName(metadata);
+  }
+
 }
 
 /**