From e1f7974f0badbd4440d5b7ea5f1b1cb2d4973818 Mon Sep 17 00:00:00 2001
From: Einat Vinouze <einat.vinouze@intl.att.com>
Date: Tue, 27 Aug 2019 16:01:01 +0300
Subject: Adding feature:  Replace vfmodule

Issue-ID: VID-603
Change-Id: I59068a0979d6fb733e4243c8f78921f396dc9d17
Signed-off-by: Einat Vinouze <einat.vinouze@intl.att.com>
Signed-off-by: Amichai Hemli <amichai.hemli@intl.att.com>
Signed-off-by: Ittay Stern <ittay.stern@att.com>
---
 .../webapp/app/vid/scripts/constants/componentConstants.js   |  1 +
 .../app/vid/scripts/controller/InstantiationController.js    | 12 ++++++++++--
 .../main/webapp/app/vid/scripts/view-models/instantiate.htm  |  4 +++-
 3 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'vid-app-common/src/main/webapp/app')

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/constants/componentConstants.js b/vid-app-common/src/main/webapp/app/vid/scripts/constants/componentConstants.js
index 01b8e8acf..67a89ee74 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/constants/componentConstants.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/constants/componentConstants.js
@@ -262,6 +262,7 @@ appDS2
       FLAG_VF_MODULE_RESUME_STATUS_CREATE: "FLAG_VF_MODULE_RESUME_STATUS_CREATE",
       FLAG_1908_RELEASE_TENANT_ISOLATION: "FLAG_1908_RELEASE_TENANT_ISOLATION",
       FLAG_FLASH_REPLACE_VF_MODULE: "FLAG_FLASH_REPLACE_VF_MODULE",
+      FLAG_FLASH_VIEW_IN_NEW_VIEWEDIT_SCREEN: "FLAG_FLASH_VIEW_IN_NEW_VIEWEDIT_SCREEN",
     }
 
   };
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js
index 7fa312ed9..a21776e5d 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js
@@ -225,12 +225,20 @@
         };
 
         $scope.allowTransferToNewScreenAndShowButton = function (){
-          if(featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_FLASH_REPLACE_VF_MODULE)) {
-              return $scope.isPermitted && !($scope.isMacro());
+          if(featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_FLASH_VIEW_IN_NEW_VIEWEDIT_SCREEN)) {
+              return $scope.isPermitted;
           }
           return false;
         };
 
+        $scope.navigateToNewEditViewScreen = function(){
+                window.location.href = 'serviceModels.htm#/servicePlanning/EDIT?' +
+                    'serviceModelId=' +     _.get($scope, 'service.model.service.uuid') +
+                    '&subscriberId=' +      $location.search().subscriberId  +
+                    '&serviceType=' +       $location.search().serviceType      +
+                    '&serviceInstanceId=' + $location.search().serviceInstanceId;
+        };
+
         $scope.deleteService = function (serviceObject, serviceOrchestrationStatus) {
 
             var serviceInstance = serviceObject.object;
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/instantiate.htm b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/instantiate.htm
index f80f924b3..6399065f8 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/instantiate.htm
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/instantiate.htm
@@ -41,7 +41,9 @@
         <h1 class="heading1" style="margin-top: 20px;">{{isPermitted ? "View/Edit" : "View"}} Service Instance</h1>
         <a class="btn btn-primary btn-xs pull-right" ng-click="reloadRoute();"><span
                 class="glyphicon glyphicon-refresh"></span></a>
-
+        <a class="pull-right btn btn-primary btn-xs" data-nodrag
+           data-tests-id="show-new-screen" ng-if="allowTransferToNewScreenAndShowButton()"
+           ng-click="navigateToNewEditViewScreen()" style="margin-right: 8px;">More actions</a>
         <br>
 
         <center>
-- 
cgit 1.2.3-korg