latest ui code fixes merged in opnfv repo

Change-Id: Ib6d7f81e4a85286b7b30d332c757f7eb1bb519f3
Signed-off-by: Koren Lev <korenlev@gmail.com>

41 files changed, 92 insertions, 327 deletions

diff --git a/ui/imports/api/environments/configuration-groups/amqp-configuration.js b/ui/imports/api/environments/configuration-groups/amqp-configuration.js
index 83a15cf..7b7ddaf 100644
--- a/ui/imports/api/environments/configuration-groups/amqp-configuration.js
+++ b/ui/imports/api/environments/configuration-groups/amqp-configuration.js
@@ -25,5 +25,5 @@ export const AMQPSchema = new SimpleSchema({
     type: String, 
     defaultValue: 'rabbitmquser'
   },
-  password: { type: String },
+  pwd: { type: String },
 });
diff --git a/ui/imports/api/environments/configuration-groups/mysql-configuration.js b/ui/imports/api/environments/configuration-groups/mysql-configuration.js
index 1921432..97eab29 100644
--- a/ui/imports/api/environments/configuration-groups/mysql-configuration.js
+++ b/ui/imports/api/environments/configuration-groups/mysql-configuration.js
@@ -19,7 +19,7 @@ export const MysqlSchema = new SimpleSchema({
     regEx: SimpleSchema.RegEx.IP,
     defaultValue: '10.0.0.1'
   },
-  password: { type: String },
+  pwd: { type: String },
   port: { 
     type: String,
     regEx: portRegEx,
diff --git a/ui/imports/api/scheduled-scans/methods.js b/ui/imports/api/scheduled-scans/methods.js
index 22f8110..06cdea7 100644
--- a/ui/imports/api/scheduled-scans/methods.js
+++ b/ui/imports/api/scheduled-scans/methods.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 import { ValidatedMethod } from 'meteor/mdg:validated-method';
 import * as R from 'ramda';
 
diff --git a/ui/imports/api/scheduled-scans/scheduled-scans.js b/ui/imports/api/scheduled-scans/scheduled-scans.js
index 66ae5d1..54d4565 100644
--- a/ui/imports/api/scheduled-scans/scheduled-scans.js
+++ b/ui/imports/api/scheduled-scans/scheduled-scans.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 import { Mongo } from 'meteor/mongo';
 import { SimpleSchema } from 'meteor/aldeed:simple-schema';
 import { Constants } from '/imports/api/constants/constants';
diff --git a/ui/imports/api/scheduled-scans/server/methods.js b/ui/imports/api/scheduled-scans/server/methods.js
index 17ed990..4a6c508 100644
--- a/ui/imports/api/scheduled-scans/server/methods.js
+++ b/ui/imports/api/scheduled-scans/server/methods.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 import { check } from 'meteor/check';
 import * as R from 'ramda';
 import { ScheduledScans } from '../scheduled-scans';
diff --git a/ui/imports/api/scheduled-scans/server/publications.js b/ui/imports/api/scheduled-scans/server/publications.js
index 97acc21..9359c20 100644
--- a/ui/imports/api/scheduled-scans/server/publications.js
+++ b/ui/imports/api/scheduled-scans/server/publications.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 import { Meteor } from 'meteor/meteor';
 import * as R from 'ramda';
 import { Counts } from 'meteor/tmeasday:publish-counts';
diff --git a/ui/imports/lib/images-for-node-type.js b/ui/imports/lib/images-for-node-type.js
index 5846f46..fb8e582 100644
--- a/ui/imports/lib/images-for-node-type.js
+++ b/ui/imports/lib/images-for-node-type.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 export let imagesForNodeType = {
   'instance': 'ic_computer_black_48dp_2x.png',
   'pnic': 'ic_dns_black_48dp_2x.png',
diff --git a/ui/imports/ui/actions/environment-panel.actions.js b/ui/imports/ui/actions/environment-panel.actions.js
index fb7350c..ca8489c 100644
--- a/ui/imports/ui/actions/environment-panel.actions.js
+++ b/ui/imports/ui/actions/environment-panel.actions.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 //import * as R from 'ramda';
 
 export const SET_ENV_NAME = 'SET_ENV_NAME';
diff --git a/ui/imports/ui/actions/graph-tooltip-window.actions.js b/ui/imports/ui/actions/graph-tooltip-window.actions.js
index 08c48b6..297cb7c 100644
--- a/ui/imports/ui/actions/graph-tooltip-window.actions.js
+++ b/ui/imports/ui/actions/graph-tooltip-window.actions.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 //import * as R from 'ramda';
 
 export const ACTIVATE_GRAPH_TOOLTIP_WINDOW = 'ACTIVATE_GRAPH_TOOLTIP_WINDOW';
diff --git a/ui/imports/ui/actions/main-app.actions.js b/ui/imports/ui/actions/main-app.actions.js
index 1daafa1..7d1a730 100644
--- a/ui/imports/ui/actions/main-app.actions.js
+++ b/ui/imports/ui/actions/main-app.actions.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 //import * as R from 'ramda';
 
 export const SET_MAIN_APP_SELECTED_ENVIRONMENT = 'SET_MAIN_APP_SELECTED_ENVIRONMENT';
diff --git a/ui/imports/ui/actions/navigation.js b/ui/imports/ui/actions/navigation.js
index 06b1501..f9c86b5 100644
--- a/ui/imports/ui/actions/navigation.js
+++ b/ui/imports/ui/actions/navigation.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 import * as R from 'ramda';
 
 const SET_CURRENT_NODE = 'SET_CURRENT_NODE';
diff --git a/ui/imports/ui/actions/search-interested-parties.js b/ui/imports/ui/actions/search-interested-parties.js
index 1eb9b78..98b413b 100644
--- a/ui/imports/ui/actions/search-interested-parties.js
+++ b/ui/imports/ui/actions/search-interested-parties.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 //import * as R from 'ramda';
 
 const ADD_SEARCH_INTERESTED_PARTY = 'ADD_SEARCH_INTERESTED_PARTY';
diff --git a/ui/imports/ui/actions/tree-node.actions.js b/ui/imports/ui/actions/tree-node.actions.js
index 0fad8c9..f463321 100644
--- a/ui/imports/ui/actions/tree-node.actions.js
+++ b/ui/imports/ui/actions/tree-node.actions.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 //import * as R from 'ramda';
 
 export const UPDATE_TREE_NODE_INFO = 'UPDATE_TREE_NODE_INFO';
diff --git a/ui/imports/ui/actions/vedge-info-window.actions.js b/ui/imports/ui/actions/vedge-info-window.actions.js
index 0431648..2ff3031 100644
--- a/ui/imports/ui/actions/vedge-info-window.actions.js
+++ b/ui/imports/ui/actions/vedge-info-window.actions.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 //import * as R from 'ramda';
 
 export const ACTIVATE_VEDGE_INFO_WINDOW = 'ACTIVATE_VEDGE_INFO_WINDOW';
diff --git a/ui/imports/ui/components/env-amqp-credentials-info/env-amqp-credentials-info.html b/ui/imports/ui/components/env-amqp-credentials-info/env-amqp-credentials-info.html
index b6187e6..02b923d 100644
--- a/ui/imports/ui/components/env-amqp-credentials-info/env-amqp-credentials-info.html
+++ b/ui/imports/ui/components/env-amqp-credentials-info/env-amqp-credentials-info.html
@@ -79,8 +79,8 @@
 
     <div class="col-sm-3">
       {{> InputModel(createInputArgs
-            value=model.password 
-            key="password"
+            value=model.pwd 
+            key="pwd"
             type="password"
             disabled=disabled
             placeholder="Password")
diff --git a/ui/imports/ui/components/env-open-stack-db-credentials-info/env-open-stack-db-credentials-info.html b/ui/imports/ui/components/env-open-stack-db-credentials-info/env-open-stack-db-credentials-info.html
index 11421a0..13967d5 100644
--- a/ui/imports/ui/components/env-open-stack-db-credentials-info/env-open-stack-db-credentials-info.html
+++ b/ui/imports/ui/components/env-open-stack-db-credentials-info/env-open-stack-db-credentials-info.html
@@ -79,8 +79,8 @@
 
     <div class="col-sm-3">
       {{> InputModel(createInputArgs
-            value=model.password 
-            key="password"
+            value=model.pwd 
+            key="pwd"
             type="password"
             disabled=disabled
             placeholder="Password")
diff --git a/ui/imports/ui/components/mt-input/mt-input.js b/ui/imports/ui/components/mt-input/mt-input.js
index f8192ef..729adb9 100644
--- a/ui/imports/ui/components/mt-input/mt-input.js
+++ b/ui/imports/ui/components/mt-input/mt-input.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 /*
  * Template Component: MtInput 
  */
diff --git a/ui/imports/ui/components/mt-radios/mt-radios.js b/ui/imports/ui/components/mt-radios/mt-radios.js
index e2c3169..a8f7f7c 100644
--- a/ui/imports/ui/components/mt-radios/mt-radios.js
+++ b/ui/imports/ui/components/mt-radios/mt-radios.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 /*
  * Template Component: MtRadios 
  */
diff --git a/ui/imports/ui/components/mt-select/mt-select.js b/ui/imports/ui/components/mt-select/mt-select.js
index 48a2141..95190e2 100644
--- a/ui/imports/ui/components/mt-select/mt-select.js
+++ b/ui/imports/ui/components/mt-select/mt-select.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 /*
  * Template Component: MtSelect 
  */
diff --git a/ui/imports/ui/components/network-graph-manager/network-graph-manager.js b/ui/imports/ui/components/network-graph-manager/network-graph-manager.js
index 7022bcc..16637ea 100644
--- a/ui/imports/ui/components/network-graph-manager/network-graph-manager.js
+++ b/ui/imports/ui/components/network-graph-manager/network-graph-manager.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 /*
  * Template Component: NetworkGraphManager 
  */
@@ -229,10 +221,14 @@ function addNodeToGraph(node, graphData) {
     name: node._id._str,
   };
 
-  newNode = R.ifElse(R.isNil, 
-    R.always(newNode),
-    R.assocPath(['_osmeta', 'host'], R.__, newNode)
-  )(node.host);
+  let groupMarkers = ['host', 'switch'];
+  let groupKey = R.find((key) => {
+    if (R.isNil(R.path([key], node))) { return false; }
+    return true;
+  })(groupMarkers);
+  if (groupKey) {
+    newNode = R.assocPath(['_osmeta', 'groupId'], node[groupKey], newNode);
+  }
 
   let nodes = R.unionWith(R.eqBy(R.prop('_osid')), graphData.nodes, [newNode]);
   let links = expandLinks(graphData.links, nodes);
@@ -253,18 +249,19 @@ function calcIsReady(graphData) {
 
 function calcGroups(nodes) {
   return R.reduce((accGroups, node) => {
-    let host = R.path(['_osmeta', 'host'], node);
-    if (R.isNil(host)) {
+    let groupId = R.path(['_osmeta', 'groupId'], node);
+    if (R.isNil(groupId)) {
       return accGroups;
     }
 
-    let groupIndex = R.findIndex(R.propEq('_osid', host), accGroups);
+    let groupIndex = R.findIndex(R.propEq('_osid', groupId), accGroups);
     let group = null;
     if (groupIndex < 0) {
       let group = { 
-        _osid: host,
+        _osid: groupId,
         leaves: [node],
         isExpanded: true,
+        name: groupId,
       };
       accGroups = R.append(group, accGroups);
 
diff --git a/ui/imports/ui/components/network-graph/network-graph.js b/ui/imports/ui/components/network-graph/network-graph.js
index 49e41a8..04a33b0 100644
--- a/ui/imports/ui/components/network-graph/network-graph.js
+++ b/ui/imports/ui/components/network-graph/network-graph.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 /*
  * Template Component: NetworkGraph 
  */
@@ -389,12 +381,22 @@ function renderView(force,
   function tickFn() {
     let svgGroups = mainEl.selectAll('.group');
     svgGroups
+      .attr('transform', function (d) {
+        let x = R.path(['bounds', 'x'], d);
+        let y = R.path(['bounds', 'y'], d);
+        return `translate(${x},${y})`;
+      })
+    ;
+    /*
       .attr('x', function (d) { 
         return R.path(['bounds', 'x'], d); 
       })
       .attr('y', function (d) { 
         return R.path(['bounds', 'y'], d);
       })
+      */
+
+    svgGroups.selectAll('.group-shape')
       .attr('width', function (d) { 
         if (d.bounds) { return d.bounds.width(); } 
       })
@@ -402,6 +404,15 @@ function renderView(force,
         if (d.bounds) { return d.bounds.height(); } 
       });
 
+    svgGroups.selectAll('.group-name')
+      .attr('x', function(d) { 
+        return (d.bounds.width() / 2);
+      })
+      .attr('y', function(_d) { 
+        return 30;
+      })
+    ;
+
     let svgNodes = mainEl.selectAll('.node');
     svgNodes.attr('transform', function(d) {
       return 'translate(' + d.x + ',' + d.y + ')';
@@ -470,20 +481,44 @@ function genSvgGroups(g, groups, drag, onRenderViewReq) {
   let svgGroups = g.selectAll('.group')
       .data(groups, (d) => d._osid);
 
-  //let rects = 
-  svgGroups.enter()
+  let enterGroups = svgGroups.enter();
+
+  let groupsContainers = 
+    enterGroups
+      .append('g')
+        .attr('class', 'group')
+        .attr('data-group-id', (d) => d._osid)
+        .call(drag)
+        .on('click', function (d) {
+          console.log('click', d);
+          d.isExpanded = !d.isExpanded;
+          onRenderViewReq();
+        });
+
+  groupsContainers
     .append('rect')
+      .attr('class', 'group-shape')
       .attr('rx', 8)
       .attr('ry', 8)
-      .attr('class', 'group')
-      .attr('data-group-id', (d) => d._osid)
       .style('fill', function (_d, _i) { return 'lightblue'; })
-      .call(drag)
-      .on('click', function (d) {
-        console.log('click', d);
-        d.isExpanded = !d.isExpanded;
-        onRenderViewReq();
-      });
+  ;
+
+  groupsContainers
+    .append('text')
+    .text(function(d) { 
+      return d.name;
+    })
+    .attr('class', 'group-name')
+    .attr('x', function(d) { 
+      return (d.bounds.width() / 2);
+    })
+    .attr('y', function(_d) { 
+      return 30;
+    })
+    .attr('dy', '.25em')
+    .attr('text-anchor', 'middle')
+    .attr('font-size', 20)
+  ;
 
   svgGroups.exit()
     .remove();
@@ -552,10 +587,10 @@ function calcClosedGroupsNodes(rejectedGroups, prevViewNodes) {
 function calcNodesAndRejectedNodes(originalNodes, originalGroups) {
   let rejectedNodes = [];
   let nodes = R.reject((node) => {
-    let host = R.path(['_osmeta', 'host'], node);
-    if (R.isNil(host)) { return false; }
+    let groupId = R.path(['_osmeta', 'groupId'], node);
+    if (R.isNil(groupId)) { return false; }
 
-    let group = R.find(R.propEq('_osid', host), originalGroups);
+    let group = R.find(R.propEq('_osid', groupId), originalGroups);
     if (R.isNil(group)) { return false; }
 
     if (group.isExpanded) { return false; } 
@@ -596,8 +631,8 @@ function calcLinksAndRejectedLinks(originalLinks, rejectedNodes) {
 
 function calcNewLinksForRejectedSource(rejectedSourceLinks, nodes, prevLinks) {
   let newLinksForRejectedSource = R.reduce((acc, link) => {
-    let host = R.path(['_osmeta', 'host'], link.source);
-    let groupNodeId = `${host}-group-node`;
+    let groupId = R.path(['_osmeta', 'groupId'], link.source);
+    let groupNodeId = `${groupId}-group-node`;
     let newSource = R.find(R.propEq('_osid', groupNodeId), nodes);
     if (R.isNil(newSource)) { 
       throw 'error in new links for rejected source function';
@@ -628,8 +663,8 @@ function calcNewLinksForRejectedSource(rejectedSourceLinks, nodes, prevLinks) {
 
 function calcNewLinksForRejectedTarget(rejectedLinks, nodes, prevLinks) {
   let newLinks = R.reduce((acc, link) => {
-    let host = R.path(['_osmeta', 'host'], link.target);
-    let groupNodeId = `${host}-group-node`;
+    let groupId = R.path(['_osmeta', 'groupId'], link.target);
+    let groupNodeId = `${groupId}-group-node`;
     let newTarget = R.find(R.propEq('_osid', groupNodeId), nodes);
     if (R.isNil(newTarget)) { 
       throw 'error in new links for rejected target function';
@@ -660,8 +695,8 @@ function calcNewLinksForRejectedTarget(rejectedLinks, nodes, prevLinks) {
 
 function calcNewLinksForRejectedBoth(rejectedLinks, nodes, prevLinks) {
   let newLinks = R.reduce((acc, link) => {
-    let targetHost = R.path(['_osmeta', 'host'], link.target);
-    let sourceHost = R.path(['_osmeta', 'host'], link.source);
+    let targetHost = R.path(['_osmeta', 'groupId'], link.target);
+    let sourceHost = R.path(['_osmeta', 'groupId'], link.source);
     let groupSourceNodeId = `${sourceHost}-group-node`;
     let groupTargetNodeId = `${targetHost}-group-node`;
 
diff --git a/ui/imports/ui/components/network-graph/network-graph.styl b/ui/imports/ui/components/network-graph/network-graph.styl
index 114cc96..d5f7ce2 100644
--- a/ui/imports/ui/components/network-graph/network-graph.styl
+++ b/ui/imports/ui/components/network-graph/network-graph.styl
@@ -6,13 +6,18 @@
     width: 100%;
     height: 100%;
     
-    .group {
-      stroke: #fff;
-      stroke-width: 1.5px;
-      cursor: move;
-      opacity: 0.7;
-    } 
+    .group 
+      .group-shape
+        stroke: #fff;
+        stroke-width: 1.5px;
+        cursor: move;
+        opacity: 0.7;
 
+      .group-name
+        fill: rgba(133, 133, 133, 0.52);
+        font-weight: 400;
+        line-height: 20px;
+        font-family: 'Helvetica', 'Arial', sans-serif;
 
     .link-group 
       text
diff --git a/ui/imports/ui/components/new-scanning/new-scanning.js b/ui/imports/ui/components/new-scanning/new-scanning.js
index 1995ded..891d2b3 100644
--- a/ui/imports/ui/components/new-scanning/new-scanning.js
+++ b/ui/imports/ui/components/new-scanning/new-scanning.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 /*
  * Template Component: NewScanning 
  */
diff --git a/ui/imports/ui/components/scheduled-scan/scheduled-scan.js b/ui/imports/ui/components/scheduled-scan/scheduled-scan.js
index 3bcc591..4092d00 100644
--- a/ui/imports/ui/components/scheduled-scan/scheduled-scan.js
+++ b/ui/imports/ui/components/scheduled-scan/scheduled-scan.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 /*
  * Template Component: ScheduledScan 
  */
diff --git a/ui/imports/ui/components/scheduled-scans-list/scheduled-scans-list.js b/ui/imports/ui/components/scheduled-scans-list/scheduled-scans-list.js
index 7aa76e9..bd85afd 100644
--- a/ui/imports/ui/components/scheduled-scans-list/scheduled-scans-list.js
+++ b/ui/imports/ui/components/scheduled-scans-list/scheduled-scans-list.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 /*
  * Template Component: ScheduledScansList 
  */
diff --git a/ui/imports/ui/components/selectable-ordered-input/selectable-ordered-input.js b/ui/imports/ui/components/selectable-ordered-input/selectable-ordered-input.js
index 30b740f..15c46fe 100644
--- a/ui/imports/ui/components/selectable-ordered-input/selectable-ordered-input.js
+++ b/ui/imports/ui/components/selectable-ordered-input/selectable-ordered-input.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 /*
  * Template Component: SelectableOrderedInput 
  */
diff --git a/ui/imports/ui/lib/environment-tree-node-behavior.js b/ui/imports/ui/lib/environment-tree-node-behavior.js
index 86286a4..12f0407 100644
--- a/ui/imports/ui/lib/environment-tree-node-behavior.js
+++ b/ui/imports/ui/lib/environment-tree-node-behavior.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 import { Inventory } from '/imports/api/inventories/inventories';
 
 export let EnvironmentTreeNodeBehavior = {
diff --git a/ui/imports/ui/lib/input-model.js b/ui/imports/ui/lib/input-model.js
index 5a5be84..a60f842 100644
--- a/ui/imports/ui/lib/input-model.js
+++ b/ui/imports/ui/lib/input-model.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 /*
  * file: input-model.js
  */
diff --git a/ui/imports/ui/lib/inventory-tree-node-behavior.js b/ui/imports/ui/lib/inventory-tree-node-behavior.js
index ecf9c60..c8bf4fd 100644
--- a/ui/imports/ui/lib/inventory-tree-node-behavior.js
+++ b/ui/imports/ui/lib/inventory-tree-node-behavior.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 import { Inventory } from '/imports/api/inventories/inventories';
 //import * as R from 'ramda';
 
diff --git a/ui/imports/ui/lib/select-model.js b/ui/imports/ui/lib/select-model.js
index da553b5..c902f93 100644
--- a/ui/imports/ui/lib/select-model.js
+++ b/ui/imports/ui/lib/select-model.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 import * as R from 'ramda'; 
 
 export const createSelectArgs = function (params) {
diff --git a/ui/imports/ui/reducers/environment-panel.reducer.js b/ui/imports/ui/reducers/environment-panel.reducer.js
index bac0e72..d06052f 100644
--- a/ui/imports/ui/reducers/environment-panel.reducer.js
+++ b/ui/imports/ui/reducers/environment-panel.reducer.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 import * as R from 'ramda';
 
 import * as actions from '/imports/ui/actions/environment-panel.actions';
diff --git a/ui/imports/ui/reducers/graph-tooltip-window.reducer.js b/ui/imports/ui/reducers/graph-tooltip-window.reducer.js
index 67f96f1..4489fb6 100644
--- a/ui/imports/ui/reducers/graph-tooltip-window.reducer.js
+++ b/ui/imports/ui/reducers/graph-tooltip-window.reducer.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 import * as R from 'ramda';
 
 import * as actions from '/imports/ui/actions/graph-tooltip-window.actions';
diff --git a/ui/imports/ui/reducers/i18n.reducer.js b/ui/imports/ui/reducers/i18n.reducer.js
index 8771aad..28815f7 100644
--- a/ui/imports/ui/reducers/i18n.reducer.js
+++ b/ui/imports/ui/reducers/i18n.reducer.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 //import * as R from 'ramda';
 
 const defaultState = { 
diff --git a/ui/imports/ui/reducers/index.js b/ui/imports/ui/reducers/index.js
index 6ee909d..936f68a 100644
--- a/ui/imports/ui/reducers/index.js
+++ b/ui/imports/ui/reducers/index.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 import { combineReducers } from 'redux';
 
 import { navigation } from './navigation';
diff --git a/ui/imports/ui/reducers/main-app.reducer.js b/ui/imports/ui/reducers/main-app.reducer.js
index abc4574..e5e1489 100644
--- a/ui/imports/ui/reducers/main-app.reducer.js
+++ b/ui/imports/ui/reducers/main-app.reducer.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 import * as R from 'ramda';
 
 import * as actions from '/imports/ui/actions/main-app.actions';
diff --git a/ui/imports/ui/reducers/navigation.js b/ui/imports/ui/reducers/navigation.js
index de78ee5..d7ab503 100644
--- a/ui/imports/ui/reducers/navigation.js
+++ b/ui/imports/ui/reducers/navigation.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 import * as R from 'ramda';
 
 import * as actions from '/imports/ui/actions/navigation';
diff --git a/ui/imports/ui/reducers/search-interested-parties.js b/ui/imports/ui/reducers/search-interested-parties.js
index 26220c2..f4963d2 100644
--- a/ui/imports/ui/reducers/search-interested-parties.js
+++ b/ui/imports/ui/reducers/search-interested-parties.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 import * as R from 'ramda';
 
 import * as actions from '/imports/ui/actions/search-interested-parties';
diff --git a/ui/imports/ui/reducers/tree-node.reducer.js b/ui/imports/ui/reducers/tree-node.reducer.js
index 0a6ec73..5e9420d 100644
--- a/ui/imports/ui/reducers/tree-node.reducer.js
+++ b/ui/imports/ui/reducers/tree-node.reducer.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 //import { Mongo } from 'meteor/mongo';
 import * as R from 'ramda';
 
diff --git a/ui/imports/ui/reducers/vedge-info-window.reducer.js b/ui/imports/ui/reducers/vedge-info-window.reducer.js
index d1be629..0cedc6a 100644
--- a/ui/imports/ui/reducers/vedge-info-window.reducer.js
+++ b/ui/imports/ui/reducers/vedge-info-window.reducer.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 import * as R from 'ramda';
 
 import * as actions from '/imports/ui/actions/vedge-info-window.actions';
diff --git a/ui/imports/ui/store/index.js b/ui/imports/ui/store/index.js
index fc5e2f5..af0813b 100644
--- a/ui/imports/ui/store/index.js
+++ b/ui/imports/ui/store/index.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 import { Store } from './store';
 
 export { Store };
diff --git a/ui/imports/ui/store/store.js b/ui/imports/ui/store/store.js
index 76da6a9..acefce2 100644
--- a/ui/imports/ui/store/store.js
+++ b/ui/imports/ui/store/store.js
@@ -1,11 +1,3 @@
-/////////////////////////////////////////////////////////////////////////////////////////
-// Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) and others /
-//                                                                                      /
-// All rights reserved. This program and the accompanying materials                     /
-// are made available under the terms of the Apache License, Version 2.0                /
-// which accompanies this distribution, and is available at                             /
-// http://www.apache.org/licenses/LICENSE-2.0                                           /
-/////////////////////////////////////////////////////////////////////////////////////////
 import { createStore, applyMiddleware, compose } from 'redux';
 import thunk from 'redux-thunk';
 import calipsoApp from '/imports/ui/reducers/index';