Merge "create unit test for shouldShowUpgrade function"

1 files changed, 6 insertions, 6 deletions

diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.ts
index 9e7a0211e..de859e4ea 100644
--- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.ts
+++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.ts
@@ -216,13 +216,13 @@ export class SharedTreeService {
    * should return true if customer can upgrade a VFM *
    ****************************************************/
   shouldShowUpgrade(node, serviceModelId): boolean {
-    if (FeatureFlagsService.getFlagState(Features.FLAG_FLASH_REPLACE_VF_MODULE, this._store) &&
-      (this.isThereAnUpdatedLatestVersion(serviceModelId)) || this.isVfmoduleAlmostPartOfModelOnlyCustomizationUuidDiffer(node, serviceModelId)) {
-      return this.shouldShowButtonGeneric(node, VNFMethods.UPGRADE, serviceModelId);
-    }
-    else {
-      return false
+      return (this.isVfMoudleCouldBeUpgraded(node, serviceModelId))
+        && this.shouldShowButtonGeneric(node, VNFMethods.UPGRADE, serviceModelId) ;
     }
+
+  isVfMoudleCouldBeUpgraded(node, serviceModelId): boolean{
+    return (FeatureFlagsService.getFlagState(Features.FLAG_FLASH_REPLACE_VF_MODULE, this._store) &&
+      ((this.isThereAnUpdatedLatestVersion(serviceModelId)) || this.isVfmoduleAlmostPartOfModelOnlyCustomizationUuidDiffer(node, serviceModelId)))
   }