update supplementaryFileContent at onSubmit of VfModule upgrade

Issue-ID: VID-603
Change-Id: I7fac657454de7a6d3674708c956eb099c11ad2ea
Signed-off-by: Eylon Malin <eylon.malin@intl.att.com>

1 files changed, 15 insertions, 13 deletions

diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popuop.service.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popuop.service.ts
index 9c900b77b..20336e5eb 100644
--- a/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popuop.service.ts
+++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/genericFormServices/vfModule/vfModule.popuop.service.ts
@@ -137,6 +137,20 @@ export abstract class VfModulePopupServiceBase {
       }
     );
   }
+
+  updateFormValueWithSupplementaryFile(form: FormGroup, that) {
+    if (!_.isNil(form.controls['supplementaryFile_hidden_content']) && form.controls['supplementaryFile_hidden_content'].value) {
+      form.value['supplementaryFileContent'] = JSON.parse(form.controls['supplementaryFile_hidden_content'].value);
+      if (!_.isNil(form.controls['supplementaryFile_hidden'].value)) {
+        form.value['supplementaryFileName'] = form.controls['supplementaryFile_hidden'].value.name;
+      } else {
+        form.value['supplementaryFileName'] = that.instance.supplementaryFileName;
+      }
+    } else {
+      delete form.value['supplementaryFileContent'];
+      delete form.value['supplementaryFileName'];
+    }
+  }
 }
 
 @Injectable()
@@ -184,19 +198,7 @@ export class VfModulePopuopService extends VfModulePopupServiceBase implements G
 
   onSubmit(that, form: FormGroup) {
     form.value['instanceParams'] = form.value['instanceParams'] && [form.value['instanceParams']];
-    if (!_.isNil(form.controls['supplementaryFile_hidden_content']) && form.controls['supplementaryFile_hidden_content'].value) {
-      form.value['supplementaryFileContent'] = JSON.parse(form.controls['supplementaryFile_hidden_content'].value);
-      if (!_.isNil(form.controls['supplementaryFile_hidden'].value)) {
-        form.value['supplementaryFileName'] = form.controls['supplementaryFile_hidden'].value.name;
-      }
-      else {
-        form.value['supplementaryFileName'] = that.instance.supplementaryFileName;
-      }
-    }
-    else {
-      delete form.value['supplementaryFileContent'];
-      delete form.value['supplementaryFileName'];
-    }
+    this.updateFormValueWithSupplementaryFile(form, that);
     that.storeVFModule(that, form.value);
     this.postSubmitIframeMessage(that);
     this.onCancel(that, form);