Do not show retain VGs checkbox in VFM Upgrade modal + tests modifications

Business&test(cypress&UT), refactor of some files, fix of typos,
upgrade jest version etc.

Issue-ID: VID-603
Change-Id: I2153c8a7f300bfa34f6817704b08f0c2a046a4e7
Signed-off-by: Amir Skalka <amir.skalka@intl.att.com>
diff --git a/vid-webpack-master/src/app/shared/shared.module.ts b/vid-webpack-master/src/app/shared/shared.module.ts
index 273dff4..0f7c920 100644
--- a/vid-webpack-master/src/app/shared/shared.module.ts
+++ b/vid-webpack-master/src/app/shared/shared.module.ts
@@ -41,7 +41,7 @@
 import {NetworkPopupService} from "./components/genericFormPopup/genericFormServices/network/network.popup.service";
 import {NetworkControlGenerator} from "./components/genericForm/formControlsServices/networkGenerator/network.control.generator";
 import {BasicPopupService} from "./components/genericFormPopup/genericFormServices/basic.popup.service";
-import {VfModulePopuopService} from "./components/genericFormPopup/genericFormServices/vfModule/vfModule.popuop.service";
+import {VfModulePopupService} from "./components/genericFormPopup/genericFormServices/vfModule/vfModule.popup.service";
 import {VfModuleUpgradePopupService} from "./components/genericFormPopup/genericFormServices/vfModuleUpgrade/vfModule.upgrade.popuop.service";
 import {VfModuleControlGenerator} from "./components/genericForm/formControlsServices/vfModuleGenerator/vfModule.control.generator";
 import {OrderByPipe} from "./pipes/order/orderBy.pipe";
@@ -193,7 +193,7 @@
     BasicControlGenerator,
     CustomValidators,
     NetworkPopupService,
-    VfModulePopuopService,
+    VfModulePopupService,
     VfModuleUpgradePopupService,
     NetworkControlGenerator,
     VnfGroupControlGenerator,