Merge pull request #743 from TIBCOSoftware/fix-save-mapping

Fix save is disable if updating object mapping.
project-flogo · Apr 7, 2018 · f825531 · f825531
2 parents e389ed4 + a86f624
commit f825531
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 19 deletions.
diff --git a/src/client/flogo/flow/shared/mapper/utils/mapper-translator.ts b/src/client/flogo/flow/shared/mapper/utils/mapper-translator.ts
@@ -178,17 +178,7 @@ function isInvalidMapping(mapping: IMapExpression) {
   if (!expression || !expression.trim().length) {
     return false;
   }
-  let isInvalid = false;
-  if (mapping.mappingType === MAPPING_TYPE.OBJECT_TEMPLATE) {
-    try {
-      JSON.parse(expression);
-    } catch (e) {
-      isInvalid = true;
-    }
-  } else {
-    return !isValidExpression(expression);
-  }
-  return isInvalid;
+  return !isValidExpression(expression);
 }
 
 function isValidExpression(expression: string) {

diff --git a/src/client/flogo/flow/task-configurator/task-configurator.component.ts b/src/client/flogo/flow/task-configurator/task-configurator.component.ts
@@ -114,6 +114,7 @@ export class TaskConfiguratorComponent implements OnDestroy {
       inputMappings: mappings
     };
   }
+
   onIteratorValueChange(newValue: string) {
     this.tabs.get('iterator').isValid = MapperTranslator.isValidExpression(newValue);
     this.iterableValue = newValue;
@@ -125,14 +126,6 @@ export class TaskConfiguratorComponent implements OnDestroy {
     this.checkIsIteratorDirty();
   }
 
-  get isValid() {
-    return this.tabs.areDirty();
-  }
-
-  get isDirty() {
-    return this.tabs.areDirty();
-  }
-
   save() {
     const isIterable = this.iteratorModeOn && !_.isEmpty(this.iterableValue);
     this._postService.publish(_.assign({}, PUB_EVENTS.saveTask, {