From 14b66478a7b6622f9249fc8e538f4afb6a501c71 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Ana=C3=ABl=20Closson?= <ac2550@intl.att.com>
Date: Mon, 4 Sep 2017 17:49:07 +0200
Subject: [PATCH] Add VES Collector GUI
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Add support for VES Collector in the GUI

Change-Id: Id1420844ccd882e440cd19098251943eb02c4184
Issue-Id: CLAMP-19
Signed-off-by: Anaël Closson <ac2550@intl.att.com>
---
 .../META-INF/resources/designer/css/app.css        |   1 +
 .../designer/images/clds-ves-collector-icon.png    | Bin 0 -> 513 bytes
 .../resources/META-INF/resources/designer/index.js |  88 +++++++++++++++++++--
 .../portfolios/vesCollector_properties.html        |  39 +++++++++
 .../resources/designer/scripts/CldsModelService.js |  22 +++---
 .../META-INF/resources/designer/scripts/app.js     |  53 +++++++++++++
 6 files changed, 187 insertions(+), 16 deletions(-)
 create mode 100644 src/main/resources/META-INF/resources/designer/images/clds-ves-collector-icon.png
 create mode 100644 src/main/resources/META-INF/resources/designer/partials/portfolios/vesCollector_properties.html

diff --git a/src/main/resources/META-INF/resources/designer/css/app.css b/src/main/resources/META-INF/resources/designer/css/app.css
index 95d5d5822..44733b6f2 100644
--- a/src/main/resources/META-INF/resources/designer/css/app.css
+++ b/src/main/resources/META-INF/resources/designer/css/app.css
@@ -181,6 +181,7 @@ svg:not(:root) {
 } /* 'î ¡' */
 .icon-initial-node:before{ content: url('../images/InitialProcess.png'); } /* 'î ¡' */
 .icon-collector-node:before{ content: url('../images/clds-collector-icon.png'); } /* 'î ¡' */
+.icon-ves-collector-node:before{ content: url('../images/clds-ves-collector-icon.png'); } /* 'î ¡' */
 .icon-stringmatch-node:before{ content: url('../images/clds-string-match-icon.png'); } /* 'î ¡' */
 .icon-tca-node:before{ content: url('../images/clds-tca-icon.png'); } /* 'î ¡' */
 .icon-policy-node:before{ content: url('../images/clds-policy-icon.png'); } /* 'î ¡' */
diff --git a/src/main/resources/META-INF/resources/designer/images/clds-ves-collector-icon.png b/src/main/resources/META-INF/resources/designer/images/clds-ves-collector-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..c96bf50594557780c25312a4b5ad3e78afdfc7e3
GIT binary patch
literal 513
zcmV+c0{;DpP)<h;3K|Lk000e1NJLTq001li001lq1ONa4w2hLA00002VoOIv0RM-N
z%)bBt010qNS#tmY3ljhU3ljkVnw%H_000McNliru;Ryr{2^lWW7kdBz0g_2XK~zY`
z?bg3*)NmNb@mDT^!r>tYq7EHIiVC9OP#1Bq9S#%(I~5N>aB%JJKcP4Umlgzdb?73U
z1QE1@D2Q4FQ9<OO7PU~lCJuK7b9Y+5LKn&BOUOf><elWn^CMKMROz>h3TsTWuy^<O
zAA@<THhM-<96ByFrUu64h`bAeW;R@Qe-K<Z;f2>Cxt*H2I-Uk#bNd}sA9l2K%^?;!
zBlBEM9I%+v)%uA`2405E{+7!E<6Anvwq03Kf&UWxSZ)$b%Dt7yi^VZZKKZ6&ITW1Y
zJZR&(ZogV15pJ7u)($OiLczCuHY*mJ_0^35Zxe?!ESm`he{s`ZQ>N{)V6~{RUMMbl
zCDrlF>F|%2qOC1=?U%;Y3&o-X_POG)g>di_56w7d(aRy<T_=37gtdQ3w^T#J)l$3Z
zg(7jsntL9&Fnn3EC3xQa$o_3qWUG??FTlyrZDN@iky<GSw$f(#A(PT*x#W~c?xe_s
z_Z|ff(`*!Y-HN)Spy4}qITASYR;+LP4@;#=mHwa~bHZk{<zMHr00000NkvXXu0mjf
DyAa&h

literal 0
HcmV?d00001

diff --git a/src/main/resources/META-INF/resources/designer/index.js b/src/main/resources/META-INF/resources/designer/index.js
index 15425dd04..a0e918734 100644
--- a/src/main/resources/META-INF/resources/designer/index.js
+++ b/src/main/resources/META-INF/resources/designer/index.js
@@ -1503,7 +1503,64 @@ function visibility_model()
 
 
                 },
-				 'bpmn:StringMatch': function(p, element) {
+                'bpmn:VesCollector': function(p, element) {
+                    var lane = renderer('bpmn:Lane')(p, element, {
+                        fill: 'White'
+                    });
+
+                    var expandedPool = DiUtil.isExpanded(element);
+
+                    if (expandedPool) {
+                       drawLine(p, [{
+                             x: element.width,
+                             y: 80
+                         }, {
+                             x: element.width,
+                             y: 20
+                         }]);
+
+                         drawLine(p, [{
+                             x: 20,
+                             y: 0
+                         }, {
+                             x: 20,
+                             y: element.height
+                         }]);
+
+                        textUtil.createText(p, "V", { align: 'left-top', 'padding': {top:0,  left:5, right:element.width - 20, bottom:0} });
+                        textUtil.createText(p, "E", { align: 'left-top', 'padding': {top:12, left:5, right:element.width - 20, bottom:0} });
+                        textUtil.createText(p, "S", { align: 'left-top', 'padding': {top:24, left:5, right:element.width - 20, bottom:0} });
+
+                         var text2 = getSemantic(element).name;
+                         if(text2 == undefined )
+                          {
+                            text2 = 'VesCollector';
+                          }
+
+                        renderLabel(p, text2, {
+                             box: element,
+                             align: 'center-middle'
+                         });
+
+                    } else {
+                        // Collapsed pool draw text inline
+                        var text2 = getSemantic(element).name;
+                        renderLabel(p, text2, {
+                            box: element,
+                            align: 'center-middle'
+                        });
+                    }
+
+                    var participantMultiplicity = !!(getSemantic(element).participantMultiplicity);
+
+                    if (participantMultiplicity) {
+                        renderer('ParticipantMultiplicityMarker')(p, element);
+                    }
+
+                    return lane;
+                },
+
+         'bpmn:StringMatch': function(p, element) {
                     var lane = renderer('bpmn:Lane')(p, element, {
                         fill: 'White'
                     });
@@ -1511,8 +1568,6 @@ function visibility_model()
                     var expandedPool = DiUtil.isExpanded(element);
 
                     if (expandedPool) {
-                    	 
-                    	 
 
                          drawLine(p, [{
                              x: 0,
@@ -1530,7 +1585,7 @@ function visibility_model()
                              box: element,
                              align: 'center-middle'
                          });
-                         
+
                     } else {
                         // Collapsed pool draw text inline
                         var text2 = getSemantic(element).name;
@@ -1549,7 +1604,8 @@ function visibility_model()
                     return lane;
 
 
-                },
+                   },
+
                 'bpmn:TCA': function(p, element) {
                     var lane = renderer('bpmn:Lane')(p, element, {
                         fill: 'White'
@@ -3764,7 +3820,8 @@ function visibility_model()
                         }
                     }
                 });
-            }
+      }
+            
  			if (bpmnElement.$instanceOf('bpmn:TCA')) {
                 assign(actions, {
                     'Properties': {
@@ -4897,7 +4954,14 @@ function visibility_model()
                     width: 120,
                     height: 80
                 };
+      }
+			if (semantic.$instanceOf('bpmn:VesCollector')) {
+                return {
+                    width: 120,
+                    height: 80
+                };
             }
+            
 			
 			if (semantic.$instanceOf('bpmn:TCA')) {
                 return {
@@ -6413,7 +6477,11 @@ function visibility_model()
                     ),
 					'create.String-Match': createAction(
                         'bpmn:StringMatch', 'event', 'icon-stringmatch-node', 'String Match'
+          ),
+					'create.ves-collector': createAction(
+                        'bpmn:VesCollector', 'event', 'icon-ves-collector-node', 'Ves Collector'
                     ),
+                
                     'create.TCA': createAction(
                     	'bpmn:TCA', 'event', 'icon-tca-node', 'TCA'
                     ),
@@ -14253,7 +14321,15 @@ function visibility_model()
                     "Activity",
                     "InteractionNode"
                 ]
+      },
+			{
+                "name": "VesCollector",
+                "superClass": [
+                    "Activity",
+                    "InteractionNode"
+                ]
             },
+                      
             {
                 "name": "TCA",
                 "superClass": [
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
new file mode 100644
index 000000000..eabe35cd3
--- /dev/null
+++ b/src/main/resources/META-INF/resources/designer/partials/portfolios/vesCollector_properties.html
@@ -0,0 +1,39 @@
+<!--
+  ============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============================================
+  ===================================================================
+  ECOMP is a trademark and service mark of AT&T Intellectual Property.
+  -->
+<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 c2b4f6733..86fedc9a2 100644
--- a/src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js
+++ b/src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js
@@ -24,17 +24,19 @@
 app.service('cldsModelService', ['alertService','$http', '$q', function (alertService,$http, $q) {
   
   function checkIfElementType(name){
+      //This will open the methods located in the app.js
+      mapping = {
+          'stringmatch': StringMatchWindow,
+          'tca': TCAWindow,
+          'policy': PolicyWindow,
+          'collector': CollectorsWindow,
+          'vescollector': VesCollectorWindow,
+      };
 
-    //This will open the methods located in the app.js
-	if (name.toLowerCase().indexOf("stringmatch")>=0)
-	    StringMatchWindow();
-	else if (name.toLowerCase().indexOf("tca")>=0)
-		TCAWindow();
-    else if(name.toLowerCase().indexOf("policy")>=0)
-    	PolicyWindow();
-    else if(name.toLowerCase().indexOf("collector")>=0)
-        CollectorsWindow();
-    
+      key = name.split('_')[0].toLowerCase()
+      if (key in mapping) {
+          mapping[key]();
+      }
   }
 
   this.toggleDeploy = function  (uiAction, modelName, controlNamePrefixIn, 
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 401489ca1..3b1ffe941 100644
--- a/src/main/resources/META-INF/resources/designer/scripts/app.js
+++ b/src/main/resources/META-INF/resources/designer/scripts/app.js
@@ -1412,6 +1412,55 @@ var app = angular.module('clds-app', ['ngRoute',
 
 								}
 							};
+							$scope.VesCollectorWindow = function(vesCollector) {
+
+								if (isTemplate) {
+									var dlg = dialogs
+											.create(
+													'partials/portfolios/Template_model.html',
+													'ImportSchemaCtrl',
+													vesCollector,
+													{
+														closable : true,
+														draggable : true
+													},
+													{
+														size : 'lg',
+														keyboard : true,
+														backdrop : 'static',
+														windowClass : 'my-class'
+													});
+									dlg.result.then(function(name) {
+
+									}, function() {
+
+
+									});
+								} else { // if (isTemplate)
+
+									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.TCAWindow = function(tca) {
 								if (isTemplate) {
@@ -1634,6 +1683,10 @@ function CollectorsWindow(collectorsWin) {
 			.CollectorsWindow(collectorsWin);
 
 }
+function VesCollectorWindow(vesCollectorWin) {
+    angular.element(document.getElementById('navbar')).scope()
+        .VesCollectorWindow(vesCollectorWin);
+}
 
 function F5Window() {
 
-- 
2.16.6