Allow app and deployment properties to have more than 1 = char

resolves #529

Author: cppwfs

ui/src/app/streams/stream-definitions/deployment-properties/deployment-properties.component.spec.ts

@@ -76,4 +76,17 @@ describe('DeploymentPropertiesComponent', () => {
     expect(submitEvent).toHaveBeenCalled();
   });
 
+  it('should update the stream definition to deploy with multiple properties and emit event Submit on submit', () => {
+    component.stream = new StreamDefinition('foo2', 'time |log', 'undeployed');
+    fixture.detectChanges();
+    const submitEvent = spyOn(component.submit, 'emit');
+    component.deploymentProperties.setValue('a=a\nb=c=d\ne=f');
+    component.deployDefinition();
+    expect(component.stream.deploymentProperties.a).toBe('a');
+    expect(component.stream.deploymentProperties.b).toBe('c=d');
+    expect(component.stream.deploymentProperties.e).toBe('f');
+
+    expect(submitEvent).toHaveBeenCalled();
+  });
+
 });

ui/src/app/streams/stream-definitions/deployment-properties/deployment-properties.component.ts

@@ -57,9 +57,9 @@ export class DeploymentPropertiesComponent implements OnInit {
     if (this.deploymentProperties.value) {
       for (const prop of this.deploymentProperties.value.split('\n')) {
         if (prop && prop.length > 0 && !prop.startsWith('#')) {
-          const keyValue = prop.split('=');
-          if (keyValue.length === 2) {
-            propertiesAsMap[keyValue[0]] = keyValue[1];
+          const index = prop.indexOf('=');
+          if (index > 0) {
+            propertiesAsMap[prop.substr(0, index)] = prop.substr(index + 1);
           }
         }
       }

ui/src/app/streams/stream-deploy/stream-deploy-validators.ts

@@ -7,16 +7,12 @@ import { FormControl } from '@angular/forms';
  */
 export function validateDeploymentProperties(formControl: FormControl) {
   const properties = formControl.value.split('\n');
-  let propertiesAsMap = null;
 
   if (properties) {
-    propertiesAsMap = {};
     for (const prop of properties) {
       if (prop && prop.length > 0 && !prop.startsWith('#')) {
         const keyValue = prop.split('=');
-        if (keyValue.length === 2) {
-          propertiesAsMap[keyValue[0]] = keyValue[1];
-        } else {
+        if (keyValue.length < 2) {
           return {
             validateDeploymentProperties: {
               reason: `Invalid deployment property "${prop}" must contain a single "=".`

ui/src/app/streams/stream-deploy/stream-deploy.component.spec.ts

@@ -80,8 +80,11 @@ describe('StreamDeployComponent', () => {
     const de: DebugElement = fixture.debugElement.query(By.css('button[id=deployBtn]'));
     const el: HTMLElement = de.nativeElement;
     const navigate = spyOn((<any>component).router, 'navigate');
-    component.deploymentProperties.setValue('app.bar=foo');
+    component.deploymentProperties.setValue('app.bar=foo\napp.aaa=bbb=ccc\napp.ddd=eee');
     el.click();
+    expect(component.propertiesAsMap['app.bar']).toBe('foo');
+    expect(component.propertiesAsMap['app.aaa']).toBe('bbb=ccc');
+    expect(component.propertiesAsMap['app.ddd']).toBe('eee');
 
     expect(navigate).toHaveBeenCalledWith(['streams/definitions']);
     expect(toastyService.testSuccess).toContain('Successfully deployed stream definition "1"');

ui/src/app/streams/stream-deploy/stream-deploy.component.ts

@@ -22,6 +22,7 @@ export class StreamDeployComponent implements OnInit, OnDestroy {
   private sub: any;
   form: FormGroup;
   deploymentProperties = new FormControl('', validateDeploymentProperties);
+  propertiesAsMap = {};
 
   /**
    * Adds deployment properties to the FormBuilder
@@ -69,19 +70,19 @@ export class StreamDeployComponent implements OnInit, OnDestroy {
   deployDefinition() {
     console.log('deployDefinition ' + this.deploymentProperties.value);
 
-    const propertiesAsMap = {};
+    this.propertiesAsMap = {};
     if (this.deploymentProperties.value) {
       for (const prop of this.deploymentProperties.value.split('\n')) {
         if (prop && prop.length > 0 && !prop.startsWith('#')) {
-          const keyValue = prop.split('=');
-          if (keyValue.length === 2) {
-            propertiesAsMap[keyValue[0]] = keyValue[1];
+          const index = prop.indexOf('=');
+          if (index > 0) {
+            this.propertiesAsMap[prop.substr(0, index)] = prop.substr(index + 1);
           }
         }
       }
     }
 
-    this.streamsService.deployDefinition(this.id, propertiesAsMap).subscribe(
+    this.streamsService.deployDefinition(this.id, this.propertiesAsMap).subscribe(
       data => {
         this.toastyService.success('Successfully deployed stream definition "'
           + this.id + '"');