Resolved remove subscriber and increased font
diff --git a/views/ngXosViews/diagnostic/src/css/diagnostic.css b/views/ngXosViews/diagnostic/src/css/diagnostic.css
index d9d1470..5db9d7f 100644
--- a/views/ngXosViews/diagnostic/src/css/diagnostic.css
+++ b/views/ngXosViews/diagnostic/src/css/diagnostic.css
@@ -105,6 +105,10 @@
stroke-width: 1px;
}
+logic-topology .compute-node > text{
+ font-size: 16px;
+}
+
/* INSTANCE */
logic-topology .instance > rect{
@@ -203,6 +207,10 @@
}
.node text {
+ font: 18px sans-serif;
+}
+
+.node .instance text {
font: 12px sans-serif;
}
diff --git a/views/ngXosViews/diagnostic/src/js/chart_data_service.js b/views/ngXosViews/diagnostic/src/js/chart_data_service.js
index 5d65b2b..ff2d31b 100644
--- a/views/ngXosViews/diagnostic/src/js/chart_data_service.js
+++ b/views/ngXosViews/diagnostic/src/js/chart_data_service.js
@@ -81,6 +81,10 @@
serviceTopologyConfig.elWidths.pop();
}
+ //remove tags and ip
+ delete this.logicTopologyData.children[0].children[0].children[0].subscriberTag;
+ delete this.logicTopologyData.children[0].subscriberIP;
+
this.highlightInstances([]);
delete this.logicTopologyData.children[0].children[0].children[0].children[0].children;
}
diff --git a/views/ngXosViews/diagnostic/src/js/nodeDrawer.js b/views/ngXosViews/diagnostic/src/js/nodeDrawer.js
index 7649374..6828abb 100644
--- a/views/ngXosViews/diagnostic/src/js/nodeDrawer.js
+++ b/views/ngXosViews/diagnostic/src/js/nodeDrawer.js
@@ -14,10 +14,14 @@
var _this = this;
this.addNetworks = (nodes) => {
+
+ // clean childs
+ nodes.selectAll('*').remove();
+
nodes.append('path')
.attr({
d: shapes.cloud,
- transform: 'translate(-63, -52), scale(0.5)',
+ transform: 'translate(-100, -72), scale(0.7)',
class: 'cloud'
});
@@ -45,14 +49,14 @@
currentNode.append('text')
.attr({
'text-anchor': 'middle',
- y: 40
+ y: 50
})
.text(() => `C-Tag: ${n.subscriberTag.cTag}`);
currentNode.append('text')
.attr({
'text-anchor': 'middle',
- y: 60
+ y: 70
})
.text(() => `S-Tag: ${n.subscriberTag.sTag}`);
}
@@ -61,7 +65,7 @@
currentNode.append('text')
.attr({
'text-anchor': 'middle',
- y: 40
+ y: 50
})
.text(() => `Public IP: ${n.subscriberIP}`);
}
@@ -164,7 +168,7 @@
nodeContainer.append('text')
.attr({
'text-anchor': 'start',
- y: 15, //FIXME
+ y: 17, //FIXME
x: 10, //FIXME
opacity: 0
})
diff --git a/views/ngXosViews/diagnostic/src/js/serviceTopologyHelper.js b/views/ngXosViews/diagnostic/src/js/serviceTopologyHelper.js
index 61ec1e2..bb7ba5d 100644
--- a/views/ngXosViews/diagnostic/src/js/serviceTopologyHelper.js
+++ b/views/ngXosViews/diagnostic/src/js/serviceTopologyHelper.js
@@ -71,8 +71,13 @@
nodeEnter.append('text')
.attr({
- x: d => d.children ? -serviceTopologyConfig.circle.selectedRadius -3 : serviceTopologyConfig.circle.selectedRadius + 3,
+ x: d => d.children ? -serviceTopologyConfig.circle.selectedRadius -5 : serviceTopologyConfig.circle.selectedRadius + 5,
dy: '.35em',
+ y: d => {
+ if (d.children && d.parent){
+ return '-5';
+ }
+ },
transform: d => {
if (d.children && d.parent){
if(d.parent.x < d.x){