Stream deploy: fix quotes parameters

Resolves #854

Author: oodamien

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

@@ -75,6 +75,7 @@ export class StreamDeployComponent implements OnInit, OnDestroy {
    * @param {NotificationService} notificationService
    * @param {BusyService} busyService
    * @param {LoggerService} loggerService
+   * @param {StreamDeployService} streamDeployService
    * @param {Router} router
    * @param {SharedAboutService} sharedAboutService
    */
@@ -83,6 +84,7 @@ export class StreamDeployComponent implements OnInit, OnDestroy {
               private notificationService: NotificationService,
               private busyService: BusyService,
               private loggerService: LoggerService,
+              private streamDeployService: StreamDeployService,
               private router: Router,
               private sharedAboutService: SharedAboutService) {
   }
@@ -109,13 +111,11 @@ export class StreamDeployComponent implements OnInit, OnDestroy {
           .pipe(map((deploymentInfo) => {
             const properties = [];
             const ignoreProperties = [];
-            const cleanValue = (v) => (v && v.length > 1 && v.startsWith('"') && v.endsWith('"'))
-              ? v.substring(1, v.length - 1) : v;
 
             // Deployer properties
             Object.keys(deploymentInfo.deploymentProperties).map(app => {
               Object.keys(deploymentInfo.deploymentProperties[app]).forEach((key: string) => {
-                const value = cleanValue(deploymentInfo.deploymentProperties[app][key]);
+                const value = this.streamDeployService.cleanValueProperties(deploymentInfo.deploymentProperties[app][key]);
                 if (key === StreamDeployService.version.keyEdit) {
                   properties.push(`version.${app}=${value}`);
                 } else if (key.startsWith(StreamDeployService.deployer.keyEdit)) {
@@ -138,7 +138,7 @@ export class StreamDeployComponent implements OnInit, OnDestroy {
               const appType = node['name'];
               if (node['options']) {
                 node.options.forEach((value, key) => {
-                  value = cleanValue(value);
+                  value = this.streamDeployService.cleanValueProperties(value);
                   let keyShort = key;
                   if (key.startsWith(`${appType}.`)) {
                     keyShort = key.substring(`${appType}.`.length, key.length);

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

@@ -1,11 +1,11 @@
-import {SharedAppsService} from '../../shared/services/shared-apps.service';
-import {ErrorHandler} from '../../shared/model';
-import {StreamsService} from '../streams.service';
-import {AppsService} from '../../apps/apps.service';
-import {AppsWorkaroundService} from '../../apps/apps.workaround.service';
-import {StreamDeployService} from './stream-deploy.service';
-import {Observable} from 'rxjs/Observable';
-import {HttpUtils} from '../../shared/support/http.utils';
+import { SharedAppsService } from '../../shared/services/shared-apps.service';
+import { ErrorHandler } from '../../shared/model';
+import { StreamsService } from '../streams.service';
+import { AppsService } from '../../apps/apps.service';
+import { AppsWorkaroundService } from '../../apps/apps.workaround.service';
+import { StreamDeployService } from './stream-deploy.service';
+import { Observable } from 'rxjs/Observable';
+import { HttpUtils } from '../../shared/support/http.utils';
 import { LoggerService } from '../../shared/services/logger.service';
 
 /**
@@ -76,4 +76,34 @@ describe('StreamDeployService', () => {
 
   });
 
+  describe('Clean Value properties', () => {
+
+    it('without change', () => {
+      [
+        'foo',
+        'foo bar',
+        'foo " bar',
+        '"foo',
+        '\'foo',
+        'foo\'',
+        'foo barr"'
+      ].forEach((mock) => {
+        expect(this.streamDeployService.cleanValueProperties(mock)).toBe(mock);
+      });
+    });
+
+    it('with change', () => {
+      [
+        ['\'foo\'', 'foo'],
+        ['\"foo\"', 'foo'],
+        ['\"foo bar\"', 'foo bar'],
+        ['\"foo \' bar\"', 'foo \' bar'],
+        ['\"foo \" bar\"', 'foo \" bar']
+      ].forEach((mock) => {
+        expect(this.streamDeployService.cleanValueProperties(mock[0])).toBe(mock[1]);
+      });
+    });
+
+  });
+
 });

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

@@ -284,4 +284,19 @@ export class StreamDeployService {
       });
   }
 
+  /**
+   * Clean value properties
+   * @param {string} value
+   * @returns {any}
+   */
+  cleanValueProperties(value:string) {
+    if ((value && value.length > 1 && value.startsWith('"') && value.endsWith('"'))) {
+      return value.substring(1, value.length - 1);
+    }
+    if ((value && value.length > 1 && value.startsWith("'") && value.endsWith("'"))) {
+      return value.substring(1, value.length - 1);
+    }
+    return value;
+  }
+
 }