set default values in VFM Upgrade popup

Issue-ID: VID-794
Signed-off-by: Alexey Sandler <alexey.sandler@intl.att.com>
Change-Id: Ic8c896e0eea0535e0e52a394c403c2e167240b47
Signed-off-by: Alexey Sandler <alexey.sandler@intl.att.com>

3 files changed, 17 insertions, 7 deletions

diff --git a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/sharedControlles/shared.controllers.service.spec.ts b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/sharedControlles/shared.controllers.service.spec.ts
index f456a747a..b141a1e79 100644
--- a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/sharedControlles/shared.controllers.service.spec.ts
+++ b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/sharedControlles/shared.controllers.service.spec.ts
@@ -9,6 +9,7 @@ import {FeatureFlagsService} from "../../../../services/featureFlag/feature-flag
 import {DropdownFormControl} from "../../../../models/formControlModels/dropdownFormControl.model";
 import {FormControlModel, ValidatorOptions} from "../../../../models/formControlModels/formControl.model";
 import {ControlGeneratorUtil} from "../control.generator.util.service";
+import each from "jest-each";
 
 
 describe('Shared Controllers Service', () => {
@@ -99,11 +100,19 @@ describe('Shared Controllers Service', () => {
     expect(lcpRegionControl.isDisabled).toBeFalsy();
   });
 
-  test('sdn-preload checkbox is visible', () => {
-    const instance = {};
-    const sdncPreload: FormControlModel = service.getSDNCControl(instance);
+  each(
+    [
+      [' checked', true, true],
+      [' not checked', false, false ]
+    ]
+  ).
+  test('sdn-preload checkbox is %s', (
+    description: string, checkedByDefault: boolean, expected: boolean
+  ) => {
+    const instance = null;
+    const sdncPreload: FormControlModel = service.getSDNCControl(instance, checkedByDefault);
     expect (sdncPreload.displayName).toEqual('SDN-C pre-load');
-    expect (sdncPreload.value).toBeFalsy();
+    expect (sdncPreload.value).toBe(expected);
   });
 
   test('getlegacyRegion with AAIAIC25 - isVisible true', () => {
diff --git a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/sharedControlles/shared.controllers.service.ts b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/sharedControlles/shared.controllers.service.ts
index 32259b198..d82ba36a9 100644
--- a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/sharedControlles/shared.controllers.service.ts
+++ b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/sharedControlles/shared.controllers.service.ts
@@ -236,12 +236,13 @@ export class SharedControllersService {
     tenantsControl['hasEmptyOptions'] = tenants && tenants.length === 0;
   };
 
-  getSDNCControl = (instance: any, extraContents? : object[]): FormControlModel => {
+
+  getSDNCControl = (instance: any, checkedByDefault: boolean, extraContents? : object[]): FormControlModel => {
     return new CheckboxFormControl({
       controlName: SDN_C_PRE_LOAD,
       displayName: 'SDN-C pre-load',
       dataTestId: 'sdncPreLoad',
-      value: instance ? instance.sdncPreLoad : false,
+      value: instance ? instance.sdncPreLoad : checkedByDefault,
       validations: [new ValidatorModel(ValidatorOptions.required, 'is required')],
       extraContents
     })
diff --git a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vfModuleGenerator/vfModule.control.generator.ts b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vfModuleGenerator/vfModule.control.generator.ts
index b614ecf30..b7cf80be3 100644
--- a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vfModuleGenerator/vfModule.control.generator.ts
+++ b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/vfModuleGenerator/vfModule.control.generator.ts
@@ -132,7 +132,7 @@ export class VfModuleControlGenerator {
       result.push(this._sharedControllersService.getTenantControl(serviceId, vfModuleInstance));
     }
     result.push(this._sharedControllersService.getRollbackOnFailureControl(vfModuleInstance));
-    result.push(this._sharedControllersService.getSDNCControl(vfModuleInstance, this.getSdncExtraContents()));
+    result.push(this._sharedControllersService.getSDNCControl(vfModuleInstance, false, this.getSdncExtraContents()));
     if (this.store.getState().global.flags['FLAG_SUPPLEMENTARY_FILE']) {
       result = this._basicControlGenerator.concatSupplementaryFile(result, vfModuleInstance);
     }