From ddf63ba49cddcca5e8780148bfed067b59a18c24 Mon Sep 17 00:00:00 2001
From: xg353y <xg353y@intl.att.com>
Date: Tue, 19 Feb 2019 14:24:12 +0100
Subject: [PATCH] Remove old MS UI

Remove the isSimple flag, so that the old hard coded MS UI will be
disabled totally and clamp will only support automatically generated UI
from the tosca model for MS configuration.

Issue-ID: CLAMP-264
Change-Id: I1bf4a27c89ae5ddc97c87671daf13b97d5a2f373
Signed-off-by: xg353y <xg353y@intl.att.com>
---
 .../partials/portfolios/holmes_properties.html     | 106 -----
 .../partials/portfolios/tca_properties.html        | 505 ---------------------
 .../portfolios/vesCollector_properties.html        |  38 --
 .../resources/designer/scripts/CldsModelService.js |  26 +-
 .../designer/scripts/CldsOpenModelCtrl.js          |   4 +-
 .../META-INF/resources/designer/scripts/app.js     |  64 ---
 6 files changed, 6 insertions(+), 737 deletions(-)
 delete mode 100644 src/main/resources/META-INF/resources/designer/partials/portfolios/holmes_properties.html
 delete mode 100644 src/main/resources/META-INF/resources/designer/partials/portfolios/tca_properties.html
 delete mode 100644 src/main/resources/META-INF/resources/designer/partials/portfolios/vesCollector_properties.html

diff --git a/src/main/resources/META-INF/resources/designer/partials/portfolios/holmes_properties.html b/src/main/resources/META-INF/resources/designer/partials/portfolios/holmes_properties.html
deleted file mode 100644
index 1a9f9bad..00000000
--- a/src/main/resources/META-INF/resources/designer/partials/portfolios/holmes_properties.html
+++ /dev/null
@@ -1,106 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ONAP CLAMP
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights
-                              reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END============================================
-  ===================================================================
-  -->
-<style>
-</style>
-
-
-<div id="holmes-configuration">
-  <!-- form header -->
-  <div class="modal-header">
-    <button type="button" class="close" ng-click="close(false)" aria-hidden="true" style="margin-top: -3px">&times;</button>
-    <h4>Holmes Microservice Configuration</h4>
-  </div>
-
-  <!-- Form center-->
-  <div class="modal-body" style="height: 280px">
-
-    <form id="saveProps" class="form-horizontal">
-      <div class="form-group">
-        <div>
-          <label for="correlationalLogic" class="col-sm-4 control-label">Correlational logic</label>
-        </div>
-        <div class="col-sm-8">
-          <textarea class="form-control" focus="true" name="correlationalLogic"  id="correlationalLogic" />
-        </div>
-        <div>
-          <label for="configPolicyName" class="col-sm-4 control-label">Configuration Policy Name</label>
-        </div>
-        <div class="col-sm-8">
-          <textarea class="form-control" focus="true" name="configPolicyName"  id="configPolicyName" />
-        </div>
-      </div>
-    </form>
-
-  </div>
-
-  <!-- footer -->
-  <div class="modal-footer">
-    <button id="savePropsBtn" class="btn btn-primary">Save</button>
-    <button id="close_button" class="btn btn-primary" ng-click="close(true)">Cancel</button>
-  </div>
-</div>
-
-<script language="javascript">
-
-// load window
-loadPropertyWindow('holmes')
-
-// fill policy combo box (allPolicies from ImporSchemaCtrl.js
-if (typeof allPolicies !== "undefined"){
-	  $.each(Object.keys(allPolicies), function(val, text) {
-	      $('#operationalPolicy').append($('<option></option>').val(text).html(text));
-	  });  
-} else if (typeof elementMap !== "undefined"){
-		for (key in elementMap){
-				if (key.indexOf("Policy")>-1){
-					  $.each(Object.keys(elementMap[key]), function(val, text){
-						    $('#operationalPolicy').append(
-							      $('<option></option>').val(text).html(text)
-						    );
-					  });
-				}
-		}
-}
-
-// load property values
-var el=elementMap[lastElementSelected];
-if(el!==undefined){
-    for(var i=0;i<el.length;i++){
-        $("#"+el[i].name).val(el[i].value);
-    }
-}
-
-$("#saveProps").on('submit', function (event) {
-    saveProperties($(this).serializeArray())
-    event.preventDefault();
-    $("#close_button").click();
-});
-
-$("#savePropsBtn").click(function (event) {
-    $("#saveProps").submit();
-});
-
-
-
-
-
-</script>
diff --git a/src/main/resources/META-INF/resources/designer/partials/portfolios/tca_properties.html b/src/main/resources/META-INF/resources/designer/partials/portfolios/tca_properties.html
deleted file mode 100644
index 89b13fa1..00000000
--- a/src/main/resources/META-INF/resources/designer/partials/portfolios/tca_properties.html
+++ /dev/null
@@ -1,505 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ONAP CLAMP
-  ================================================================================
-  Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
-                              reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License"); 
-  you may not use this file except in compliance with the License. 
-  You may obtain a copy of the License at
-  
-  http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software 
-  distributed under the License is distributed on an "AS IS" BASIS, 
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
-  See the License for the specific language governing permissions and 
-  limitations under the License.
-  ============LICENSE_END============================================
-  ===================================================================
-  
-  -->
-
-<style>
-#createNewThresh{
-	height:34px;
-	width:120px; /*84*/
-	background-color:#f2bfab;
-}
-
-#deleteThresh{
-	height:34px;
-	background-color:#dddd;
-}
-
-.form-group {
-	margin-bottom:15px;
-	display:-webkit-flex; 
-	display: flex; 
-	align-items: center;
-}
-
-#tcaEditHolder{
-	background-color: #f5f5f5; 
-	padding:10px 10px; 
-	margin: 15px 15px 0 0; 
-	float: right;
-}
-
-
-#tcaEditHolder #properties_tab>div+div {
-  margin-top: 10px;
-}
-
-.tcaErr{
-	display:none; 
-	text-align:center; 
-	margin-bottom:20px; 
-	color:red;
-}
-
-.tcaParentItems {
-	padding-left: 20px;
-}
-
-.tcaParentItems label{
-	margin-bottom: 0px;
-}
-
-#tcaTable{
-	cursor: pointer;
-	width:100%;
-}
-
-#tcaTable tr{
-	border-bottom: 1px solid #ddd;
-	border-collapse: collapse;
-	text-align: center;
-	font-size: 12px;
-	font-weight: normal;
-}
-
-#tcaTable td{
-	padding: 8px 10px;
-}
-
-#tcaTable tr.highlight{
-	background-color: #f5f5f5;
-	font-weight: bold;
-	font-size: 13px;
-}
-
-#tcaTableHolder{
-	height:160px; 
-	width: 100%; 
-	overflow:auto;
-}
-
-</style>
-
-<div id="configure-widgets" class="disabled-block-container">
-	<div class="modal-header">
-		<button type="button" class="close" ng-click="close(false)"
-			aria-hidden="true" style="margin-top: -3px">&times;</button>
-		<h4>TCA Micro Services</h4>
-	</div>
-	<div class="modal-body">
-		<div style="height: 10px"></div>
-		<div class="panel panel-default" id="panelHolder">
-			
-			<span id="formSpan" style="display:none;">
-			<div class="panel-body">
-			
-				<form class="tcaParentItems">
-					<div class="row">
-						<div class="col-sm-8 form-group">
-							<label class="col-sm-3"> Name </label>
-							<div class="col-sm-9" style="padding:0px;">
-								<input class="form-control" type="text" maxlength="48" id="tname" name="tname"></input>
-							</div>
-						</div>
-						
-						<div class="col-sm-8 form-group" style="display:none;">
-							<label class="col-sm-3"> UUID </label>
-							<div class="col-sm-9" style="padding:0px;">
-								<input class="form-control" onkeydown="return false;" type="text" id="tuuid" name="tuuid"></input>
-							</div>
-						</div>
-					</div>
-					<div class="row">
-						<div class="col-sm-8 form-group">
-							<label class="col-sm-3"> Policy </label>
-							<div class="col-sm-9" style="padding:0px;">
-								<select name="tcaPol" id="tcaPol" enableFilter="true"></select>
-							</div>
-						</div>
-						<div class="col-sm-8 form-group">
-							<label class="col-sm-3">EventName</label>
-							<div class="col-sm-9" style="padding:0px;">
-								<select name="eventName" id="eventName" enableFilter="true"></select>
-							</div>
-						</div>
-						<div class="col-sm-8 form-group">
-							<label class="col-sm-3">Control Loop Schema Type</label>
-							<div class="col-sm-9" style="padding:0px;">
-								<select name="controlLoopSchemaType" id="controlLoopSchemaType" enableFilter="true"></select>
-							</div>
-						</div>
-						<div class="col-sm-8 form-group" style="display:none;">
-							<label class="col-sm-3"> Policy ID </label>
-							<div class="col-sm-9" style="padding:0px;">
-								<input class="form-control" onkeydown="return false;" type="text" id="tcaPolId" name="tcaPolId"></input>
-							</div>
-						</div>
-
-					</div>
-				</form>
-
- 				<div class="tcaBody row">
-					<div class="col-sm-5" style="padding:0px 5px; margin: 15px;">
-						<div class="panel panel-default" id="tcaTableHolder">
-							<table id="tcaTable">
-							</table>
-						</div>
-						<div id="tcaError" class="tcaErr">Error: Please define/delete this new threshold</div>
-						<div id="tcaUnique" class="tcaErr">Error: Duplicate Set Name Found</div>
-						<div style="float:left">
-							<button type="button" id="createNewThresh" class="btn btn-sm">New Threshold</button>
-						</div>
-						<div style="float:right">
-							<button type="button" id="deleteThresh" class="btn btn-sm glyphicon glyphicon-trash" disabled></button>
-						</div>
-						
-					</div>
-					
-					<div id="tcaEditHolder" class="panel panel-default col-sm-6">
-						<div class="tab-content">
-							<div id="properties_tab" class="form-vertical">
-								<div>
-									<label class="control-label">Metric</label>
-									<div>
-										<select id="fieldPathM" name="fieldPathM"></select>
-									</div>
-								</div>
-								<div>
-									<label class="control-label">Operator</label>
-									<div>
-										<select id="operator" name="operator"></select>
-									</div>
-								</div>
-								<div>
-									<label class="control-label">Threshold</label>
-									<div>
-										<input type="text" maxlength="10" class="form-control" name="threshold" 
-										onkeypress="return isNumberKey(event)" id="threshold"></input>
-									</div>
-								</div>
-								<div>
-									<label class="control-label">Closed Loop Event Status</label>
-									<div>
-										<select id="closedLoopEventStatus" name="closedLoopEventStatus"></select>
-									</div>
-								</div>
-							</div>
-						</div>
-					</div>
-				</div>
-				
-			</div>		
-			</span>
-				
-		</div>
-	</div>
-</div>
-
-	<div class="modal-footer">
-		<!--<button ng-click="reset()" class="btn btn-primary" style="float:left">Reset</button>-->
-		<button id="savePropsBtn" class="btn btn-primary">Close</button>
-		<button ng-click="close(true)" id="close_button"
-			class="btn btn-primary">Cancel</button>
-	</div>
-	
-	<script language="javascript">
-    // helper that make jquery objects visibles or invisible
-    // to use instead of show to keep placeholder size correct
-    jQuery.fn.visible = function() {
-        return this.css('visibility', 'visible');
-    };
-    jQuery.fn.invisible = function() {
-        return this.css('visibility', 'hidden');
-    };
-
-		var generateTUUID = function(count){
-			var d = new Date().getTime();
-			var tuuid = 'xxxxxxxx-xxxx-txxx-xxxx-xxxxxxxxxxxx'.replace(/[x]/g, function(c){
-				var r = (d + Math.random()*16)%16 | 0;
-				d = Math.floor(d/16);
-				return (c == 'x' ? r : (r*0x3|0*8)).toString(16);
-			});
-			$("#formId" + count + " #tuuid").val(tuuid);
-		};
-
-
-    var propertiesToString = function(formIdNum) {
-      return $('#formId'+formIdNum+' #fieldPathM').find(':selected').text() + ' ' +
-				$('#formId'+formIdNum+' #operator').val() + ' ' +
-				$('#formId'+formIdNum+' #threshold').val() + ' ' +
-        $('#formId'+formIdNum+' #closedLoopEventStatus').val();
-    };
-
-		loadPropertyWindow("tca");
-
-		//load dropdown with policy options
- 		if (typeof allPolicies !== "undefined"){
-	       	$.each(Object.keys(allPolicies), function(val, text) {
-	       		$('#tcaPol').append($('<option></option>').val(text).html(text));
-	        });
-		} else if (typeof elementMap !== "undefined"){
-			for (key in elementMap){
-				if (key.indexOf("Policy")>-1){
-					$.each(Object.keys(elementMap[key]), function(val, text){
-						$('#tcaPol').append(
-							$('<option></option>').val(text).html(text)
-						);
-					});
-				}
-			}
-		}
-
-		var fieldPathMLabel2Value = function(label) {
-			return Object.keys(defaults_props['tca']['fieldPathM']).find(key => defaults_props['tca']['fieldPathM'][key] == label)
-		}
-		var fieldPathMValue2Label = function(value) {
-			return defaults_props['tca']['fieldPathM'][value];
-		}
-
-		setASDCFields();
-
-		var arr = elementMap[lastElementSelected];
-
-		if (arr !== undefined) {
-			for (var x in arr){
-				var num = add_one_more();
-				for (var i=0; i< arr[x].length; i++){
-					
-					if (arr[x][i].hasOwnProperty('serviceConfigurations')){
-						for (var j=0; j<arr[x][i]["serviceConfigurations"].length; j++){
-							$("#formId" + num + " #tcaTable").prepend("<tr><td>"
-									+fieldPathMValue2Label(arr[x][i]["serviceConfigurations"][j][0])+ " "
-									+(Object.keys(defaults_props['tca']['operator']).find(key => defaults_props['tca']['operator'][key] == (arr[x][i]["serviceConfigurations"][j][1])))+ " "
-									+arr[x][i]["serviceConfigurations"][j][2]+" "
-									+arr[x][i]["serviceConfigurations"][j][3]+" "
-									+arr[x][i]["serviceConfigurations"][j][4]+"</td></tr>");
-						}
-					} else {
-						$("#formId" + num + " #"+arr[x][i].name).val(arr[x][i].value);
-					}
-				}
-				$('#go_properties_tab'+num).text($('#formId' +num+ ' #tname').val());
-				$("#formId"+num + " #properties_tab").invisible();
-			}
-		} else {
-      var count = add_one_more();
-      generateTUUID(count);
-    }
-	
-		$("#savePropsBtn").click(function(event) {
-			var num = 1
-			if (($('#formId'+num+' #tcaTable .highlight').length > 0 ) &&
-					(!($('#formId'+num+' #threshold').val()) || !($('#formId'+num+' #fieldPathM').val())) ) {
-				$('#formId'+num+' #tcaError').show();
-				return;
-			} else {
-				$('#formId'+num+' .tcaErr').hide();
-				if ($('#formId'+num+' #tcaTable .highlight').length > 0){
-					$('#formId'+num+' #tcaTable .highlight td').text(propertiesToString(num));
-				}
-				var saveP = {};
-				$('.formId').each(function(){
-					var count = $(this).attr('id').slice(-1);
-					var header = $(this).find('.tcaParentItems').serializeArray();
-					var sconf = {};
-					var sconfa = [];
-					$('#formId' +count+' #tcaTable tr').each(function(){
-						$('td', this).each(function(){
-							var splitTd = $(this).text().split(' ');
-              splitTd[0]=fieldPathMLabel2Value(splitTd[0]);
-							splitTd[1]=defaults_props['tca']['operator'][splitTd[1]];
-							sconfa.push(splitTd);
-						});
-						
-					});
-					var polSel = $(this).find('.tcaParentItems #tcaPol').val();
-					$.grep(header, function(e,i){
-						if (e.name == "tcaPolId"){
-							if (polSel){
-								if (typeof allPolicies !== "undefined"){
-									header[i]["value"] = allPolicies[polSel][1]["value"];
-								} else if (typeof elementMap !== "undefined"){
-									for (key in elementMap){
-										if (key.indexOf("Policy")>-1){
-											header[i]["value"] = elementMap[key][polSel][1]["value"];
-										}
-									}
-								}
-							} else {
-								header[i]["value"]="";
-							}
-						}
-					});
-					
-					sconf["serviceConfigurations"]=sconfa;
-					header.push(sconf);
-					saveP[$(this).find('.tcaParentItems #tname').val()] = header;
-				});			
-				
-				saveProperties(saveP);
-				$("#close_button").click();
-			}
-		})
-		
-		function uniquet(arr) {
-		    var a = [];
-		    for (var i=0, l=arr.length; i<l; i++){
-		        if (a.indexOf(arr[i]) === -1 && arr[i] !== ''){ 
-		        	 a.push(arr[i]);
-		        }
-		    }
-		    if (a.length==arr.length){
-		    	return false;
-		    } else {
-		    	return true;
-		    }
-		}
-		
-		function add_one_more(){
-			$("#nav_Tabs li").removeClass("active");
-			var form=$($("#formSpan").children()[0]).clone();
-			var count=0;
-			if($(".formId").length>0){
-				var greatest=0;
-				var s=$(".formId");
-				for(var i=0;i<s.length; i++){
-					if(parseInt($(s[i]).attr("id").substring(6))>greatest){
-						greatest=parseInt($(s[i]).attr("id").substring(6))
-					}
-				}
-				count=greatest+1;
-				$("#panelHolder").append(('<span class="formId" id="formId'+count+'"></span>'));
-			}else{
-				count++;
-				$("#panelHolder").append('<span class="formId" id="formId1"></span>');
-			}
-			
-			$("#add_one_more").parent().before(' <li class="active"><a id="go_properties_tab'+count+'">New_Set</a><button id="tab_close'+count+'" type="button" class="close tab-close-popup" aria-hidden="true" style="margin-top: -30px;margin-right: 5px">&times;</button></li>');
-			$("#formId"+count).append(form);
-			$('#formId'+count+ ' #properties_tab').invisible();
-			$(".formId").not($("#formId"+count)).css("display","none");
-			addCustListen(count);
-			setMultiSelect();
-			return count;
-		}
-		
-		function isNumberKey(event){
-			var charCode = (event.which) ? event.which : event.keyCode
-			if (charCode > 31 && (charCode < 48 || charCode > 57)){
-				return false;
-			}
-			return true;
-		};
-		
-		function addCustListen(count) {			
-			$('#go_properties_tab' + count).click(function(event) {
-				if ($("#nav_Tabs li.active").length>0){
-					var oldCount = $("#nav_Tabs li.active").find("a").attr("id").slice(-1);
-					if (($('#formId'+oldCount+' #tcaTable .highlight').length > 0 ) &&
-							(!($('#formId'+oldCount+' #threshold').val()) || !($('#formId'+oldCount+' #fieldPathM').val())) ) {
-						$('#formId'+oldCount+' #tcaError').show();
-						return;
-					} else {
-						$('#formId'+oldCount+' .tcaErr').hide();
-						if ($('#formId'+oldCount+' #tcaTable .highlight').length > 0){
-							$('#formId'+oldCount+' #tcaTable .highlight td').text(propertiesToString(oldCount));
-						}
-						$("#formId"+oldCount+" #tcaTable .highlight").removeClass("highlight")
-					}
-				}
-				
-				$("#nav_Tabs li").removeClass("active");
-				$(this).parent().addClass("active");
-				$("#formId"+count).css("display","");
-				$(".formId").not($("#formId"+count)).css("display","none");
-			});
-			
-			$('#tab_close'+count).click(function(event){
-				$(this).parent().remove();
-				$("#formId"+count).remove();
-			});
-			
-			$('#formId'+count+' #tcaTable').on('click', 'tr', function(event){
-				if (($('#formId'+count+' #tcaTable .highlight').length > 0 ) &&
-						(!($('#formId'+count+' #threshold').val()) || !($('#formId'+count+' #fieldPathM').val())) ) {
-					$('#formId'+count+' #tcaError').show();
-					return;
-				} else {
-					$('#formId'+count+' .tcaErr').hide();
-					if ($('#formId'+count+' #tcaTable .highlight').length > 0){
-						$('#formId'+count+' #tcaTable .highlight td').text(propertiesToString(num));
-					}
-					//$('#formId'+count+' #tcaTable .highlight').text();
-					$(this).addClass('highlight').siblings().removeClass('highlight');
-					var str = $(this).text().split(' ');
-					$('#formId'+count + ' #properties_tab').visible();
-					if (str.length == 5){
-						$('#formId'+count+' #fieldPathM').val(fieldPathMLabel2Value(str[0])).multiselect('refresh');
-						$('#formId'+count+' #operator').val(str[1]).multiselect('refresh');
-						$('#formId'+count+' #threshold').val(str[2]);
-            $('#formId'+count+' #closedLoopEventStatus').val(str[3]).multiselect('refresh');
-					}
-
-					if ((!(readMOnly)) && ($('#formId'+count + ' #deleteThresh').prop('disabled'))) {
-						$('#formId'+count + ' #deleteThresh').prop('disabled', false);
-					}
-				}
-			});
-
-			$('#formId'+count+' #deleteThresh').on('click', function(){
-				$('#formId'+num+' .tcaErr').hide();
-				$('#formId'+count+ ' #properties_tab').invisible();
-				$('#formId'+count+ ' #tcaTable .highlight').remove();
-				$('#formId'+count+ ' #deleteThresh').prop('disabled', true);
-			});
-			
-			$('#formId'+count+' #createNewThresh').on('click', function(){
-				if (($('#formId'+count+' #tcaTable .highlight').length > 0 ) &&
-						(!($('#formId'+count+' #threshold').val()) || !($('#formId'+count+' #fieldPathM').val())) ){
-					$('#formId'+count+' #tcaError').show();
-					return;
-				} else {
-					$('#formId'+count+' .tcaErr').hide();
-					if ($('#formId'+count+' #tcaTable .highlight').length > 0){
-						$('#formId'+count+' #tcaTable .highlight td').text(propertiesToString(count));
-					}
-					$('#formId'+count+ ' #properties_tab').visible();
-					if (('#formId'+count+' #tcaTable .highlight').length > 0 ){
-						$('#formId'+count+' #tcaTable tr.highlight').removeClass('highlight');
-					}
-					$('#formId'+count+' #tcaTable').prepend('<tr class="highlight"><td>New Threshold</td></tr>');
-					$('#formId'+count+' #fieldPathM').prop("selectedIndex", 0).multiselect('refresh');
-					$('#formId'+count+' #operator').prop("selectedIndex", 0).multiselect('refresh');
-					$('#formId'+count+' #threshold').val("");
-					$('#formId'+count+' #closedLoopEventStatus').prop("selectedIndex", 0).multiselect('refresh');
-
-					if ($('#formId'+count + ' #deleteThresh').prop('disabled')) {
-						$('#formId'+count + ' #deleteThresh').prop('disabled', false);
-					}
-				}
-			});
-
-			$('#formId'+count+' #tname').on('change',function(){
-				$('#go_properties_tab'+count).text($('#formId'+count+' #tname').val())
-			});
-		}
-	</script>
-</div>
diff --git a/src/main/resources/META-INF/resources/designer/partials/portfolios/vesCollector_properties.html b/src/main/resources/META-INF/resources/designer/partials/portfolios/vesCollector_properties.html
deleted file mode 100644
index 97263d83..00000000
--- a/src/main/resources/META-INF/resources/designer/partials/portfolios/vesCollector_properties.html
+++ /dev/null
@@ -1,38 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  ONAP CLAMP
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights
-                              reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END============================================
-  ===================================================================
-  -->
-<style>
-</style>
-
-<div attribute-test="vescollectorproperties" id="configure-widgets"  >
-      <div attribute-test="cldsopentemplateh" class="modal-header">
-        <button type="button" class="close" ng-click="close(false)" aria-hidden="true" style="margin-top: -3px">&times;</button>
-        <h4>VES Collector</h4>
-      </div>
-
-      <div attribute-test="cldsopentemplateb" class="modal-body" style="height: 280px">
-        No parameter can be configured.
-      </div>
-
-      <div class="modal-footer">
-        <button ng-click="close(true)" id="close_button" class="btn btn-primary">Close</button>
-      </div>
-</div>
diff --git a/src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js b/src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js
index 0e44aec1..62ab5ab2 100644
--- a/src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js
+++ b/src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js
@@ -30,10 +30,9 @@ app
     '$rootScope',
     function(alertService, $http, $q, $rootScope) {
 
-	    function checkIfElementType(name, isSimple) {
+	    function checkIfElementType(name) {
 
         //This will open the methods located in the app.js
-	  	  if (isSimple){
 	  		  if (undefined == name) {
 	  			  return;
 	  		  }else if (name.toLowerCase().indexOf("policy") >= 0){
@@ -42,21 +41,6 @@ app
 	  			  $rootScope.selectedBoxName = name.toLowerCase();
 	  			  ToscaModelWindow();
 	  		  }
-	  	  } else {
-	  		  if (undefined == name) {
-	  			  return;
-	  		  }
-	  		mapping = {
-			        'tca' : TCAWindow,
-			        'policy' : PolicyWindow,
-			        'vescollector' : VesCollectorWindow,
-			        'holmes' : HolmesWindow,
-			    };
-			    key = name.split('_')[0].toLowerCase()
-			    if (key in mapping) {
-				    mapping[key]();
-			    }
-	  	  };
 	    }
 	    function handleQueryToBackend(def, svcAction, svcUrl, svcPayload) {
 
@@ -226,7 +210,7 @@ app
 			    document.getElementById(menuText).classList.add('ThisLink');
 		    }
 	    };
-	    this.processActionResponse = function(modelName, pars, simple) {
+	    this.processActionResponse = function(modelName, pars) {
 
 		    // populate control name (prefix and uuid here)
 		    var controlNamePrefix = pars.controlNamePrefix;
@@ -244,7 +228,7 @@ app
 		    document.getElementById("modeler_name").textContent = headerText;
 		    document.getElementById("templa_name").textContent = ("Template Used - " + selected_template);
 		    setStatus(pars)
-		    disableBPMNAddSVG(pars, simple);
+		    disableBPMNAddSVG(pars);
 		    this.enableDisableMenuOptions(pars);
 	    };
 	    this.processRefresh = function(pars) {
@@ -293,7 +277,7 @@ app
 		    '<span id="status_clds" style="position: absolute;  left: 61%;top: 151px; font-size:20px;">Status: '
 		    + statusMsg + '</span>');
 	    }
-	    function disableBPMNAddSVG(pars, simple) {
+	    function disableBPMNAddSVG(pars) {
 
 		    var svg = pars.imageText.substring(pars.imageText.indexOf("<svg"))
 		    if ($("#svgContainer").length > 0)
@@ -314,7 +298,7 @@ app
 			    var name = $($(event.target).parent()).attr("data-element-id")
 			    lastElementSelected = $($(event.target).parent()).attr(
 			    "data-element-id")
-			    checkIfElementType(name, simple)
+			    checkIfElementType(name)
 		    });
 	    }
 	    this.enableDisableMenuOptions = function(pars) {
diff --git a/src/main/resources/META-INF/resources/designer/scripts/CldsOpenModelCtrl.js b/src/main/resources/META-INF/resources/designer/scripts/CldsOpenModelCtrl.js
index 2b7c6258..111bb246 100644
--- a/src/main/resources/META-INF/resources/designer/scripts/CldsOpenModelCtrl.js
+++ b/src/main/resources/META-INF/resources/designer/scripts/CldsOpenModelCtrl.js
@@ -163,10 +163,8 @@ function($scope, $rootScope, $modalInstance, $window, $uibModalInstance, cldsMod
 			} else {
 				elementMap = JSON.parse(propText);
 			}
-			var simple = elementMap.simpleModel;
-			$rootScope.isSimpleModel = simple;
 			selected_model = modelName;
-			cldsModelService.processActionResponse(modelName, pars, simple);
+			cldsModelService.processActionResponse(modelName, pars);
 			// set model bpmn and open diagram
 			$rootScope.isPalette = true;
 		}, function(data) {
diff --git a/src/main/resources/META-INF/resources/designer/scripts/app.js b/src/main/resources/META-INF/resources/designer/scripts/app.js
index 54475688..100dda36 100644
--- a/src/main/resources/META-INF/resources/designer/scripts/app.js
+++ b/src/main/resources/META-INF/resources/designer/scripts/app.js
@@ -709,56 +709,6 @@ function($scope, $rootScope, $timeout, dialogs) {
 
 		    });
 	    }
-	    $scope.VesCollectorWindow = function(vesCollector) {
-
-		    var dlg = dialogs.create(
-		    'partials/portfolios/vesCollector_properties.html',
-		    'ImportSchemaCtrl', {
-		        closable : true,
-		        draggable : true
-		    }, {
-		        size : 'lg',
-		        keyboard : true,
-		        backdrop : 'static',
-		        windowClass : 'my-class'
-		    });
-		    dlg.result.then(function(name) {
-
-		    }, function() {
-
-		    });
-	    };
-	    $scope.HolmesWindow = function(holmes) {
-
-		    var partial = 'partials/portfolios/holmes_properties.html'
-		    var dlg = dialogs.create(partial, 'ImportSchemaCtrl', holmes, {
-		        closable : true,
-		        draggable : true
-		    }, {
-		        size : 'lg',
-		        keyboard : true,
-		        backdrop : 'static',
-		        windowClass : 'my-class'
-		    });
-	    };
-	    $scope.TCAWindow = function(tca) {
-
-		    var dlg = dialogs.create('partials/portfolios/tca_properties.html',
-		    'ImportSchemaCtrl', {
-		        closable : true,
-		        draggable : true
-		    }, {
-		        size : 'lg',
-		        keyboard : true,
-		        backdrop : 'static',
-		        windowClass : 'my-class'
-		    });
-		    dlg.result.then(function(name) {
-
-		    }, function() {
-
-		    });
-	    };
 	    $scope.ToscaModelWindow = function (tosca_model) {
 
 	    	var dlg = dialogs.create('partials/portfolios/tosca_model_properties.html','ToscaModelCtrl',{closable:true,draggable:true},{size:'lg',keyboard: true,backdrop: 'static',windowClass: 'my-class'});
@@ -872,24 +822,10 @@ function importshema() {
 
 	angular.element(document.getElementById('navbar')).scope().importSchema();
 }
-function VesCollectorWindow(vesCollectorWin) {
-
-	angular.element(document.getElementById('navbar')).scope()
-	.VesCollectorWindow(vesCollectorWin);
-}
-function HolmesWindow(holmesWin) {
-
-	angular.element(document.getElementById('navbar')).scope().HolmesWindow(
-	holmesWin);
-}
 function F5Window() {
 
 	angular.element(document.getElementById('navbar')).scope().F5Window();
 }
-function TCAWindow(tca) {
-
-	angular.element(document.getElementById('navbar')).scope().TCAWindow(tca);
-}
 function GOCWindow() {
 
 	angular.element(document.getElementById('navbar')).scope().GOCWindow();
-- 
2.16.6