From cbf73dae518c62d5ebd077816e457d5e8db15a85 Mon Sep 17 00:00:00 2001
From: Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com>
Date: Tue, 24 Sep 2019 07:54:09 +0200
Subject: adding orchestration type to service models view

Issue-ID: VID-602
Signed-off-by: Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com>
Change-Id: I289b55129cbfe8fbf6dd28f0e8f41715ff4ed107
---
 .../src/main/webapp/app/vid/scripts/constants/componentConstants.js   | 1 +
 .../main/webapp/app/vid/scripts/controller/ServiceModelController.js  | 4 ++++
 .../src/main/webapp/app/vid/scripts/view-models/serviceModels.htm     | 2 ++
 3 files changed, 7 insertions(+)

(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 f76d4786f..3575c382d 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
@@ -264,6 +264,7 @@ appDS2
       FLAG_1908_RELEASE_TENANT_ISOLATION: "FLAG_1908_RELEASE_TENANT_ISOLATION",
       FLAG_FLASH_REPLACE_VF_MODULE: "FLAG_FLASH_REPLACE_VF_MODULE",
       FLAG_FLASH_MORE_ACTIONS_BUTTON_IN_OLD_VIEW_EDIT: "FLAG_FLASH_MORE_ACTIONS_BUTTON_IN_OLD_VIEW_EDIT",
+      FLAG_SHOW_ORCHESTRATION_TYPE: "FLAG_SHOW_ORCHESTRATION_TYPE",
     }
 
   };
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js
index 9cb905038..b29680f9d 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/ServiceModelController.js
@@ -89,6 +89,10 @@
 			});
 		};
 
+		$scope.isShowOrchestrationType = function() {
+			return featureFlags.isOn(COMPONENT.FEATURE_FLAGS.FLAG_SHOW_ORCHESTRATION_TYPE);
+		};
+
 		var wholeData=[];
 
 		$scope.filterDataWithHigherVersion = function(serviceData){
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/serviceModels.htm b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/serviceModels.htm
index 4570a0b08..06fc7f67b 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/serviceModels.htm
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/serviceModels.htm
@@ -48,6 +48,7 @@
 				<tr>
 					<th att-table-header key="action">Action</th>
 					<th att-table-header key="uuid">UUID</th>
+					<th ng-if="isShowOrchestrationType()" att-table-header key="orchestrationType">Orchestration Type</th>
 					<th att-table-header key="invariantUUID">Invariant UUID</th>
 					<th att-table-header default-sort="A" key="name">Name</th>
 		            <th att-table-header key="version">Version</th>
@@ -62,6 +63,7 @@
 				<tr class="sdcServiceModel" data-tests-id="Browse_SDC_Service_Models-uuid-{{service['uuid']}}">
 					<td class="deploy" att-table-body ><button class="deploy-service-class" type=button data-tests-id="deploy-{{service['uuid']}}" ng-click="deployService(service)" att-button btn-type="{{deployButtonType}}" size="small">Deploy</button></td>
 					<td class="uuid" att-table-body ng-bind="service['uuid']"></td>
+					<td ng-if="isShowOrchestrationType()" class="orchestrationType" att-table-body ng-bind="service['orchestrationType']"></td>
 					<td class="invariantUUID" att-table-body data-tests-id="Invariant-{{service['invariantUUID']}}" ng-bind="service['invariantUUID']"></td>
 					<td class="name" att-table-body ng-bind="service['name']"></td>
 					<td class="version" att-table-body ng-bind="service['version']"></td>
-- 
cgit 1.2.3-korg