MrBlake/mrb-netbox-topology-views
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix group boxes too small for multiline labels (#632)

Browse Source
This commit is contained in:
Mario
2025-05-11 11:43:11 +02:00
committed by GitHub
parent 607347ff18
commit 836d9f40d7
3 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
netbox_topology_views/static/netbox_topology_views/js/app.js
+7 -7
View File
File diff suppressed because one or more lines are too long
netbox_topology_views/static_dev/js/home.js
+13 -5
View File
@@ -333,7 +333,7 @@ const coordSaveCheckbox = document.querySelector('#id_save_coords')
// Extract node ids and node type ids from all nodes // Extract node ids and node type ids from all nodes
for (let [key, value] of nodes._data) { for (let [key, value] of nodes._data) {
if (value[typeId] != undefined) { if (value[typeId] != undefined) {
nodesArray.push([value.id, value[typeId], value[type]]); nodesArray.push([value.id, value[typeId], value[type], value.label_num_lines]);
} }
} }
// Split single array above into arrays grouped by node id // Split single array above into arrays grouped by node id
@@ -390,16 +390,24 @@ const coordSaveCheckbox = document.querySelector('#id_save_coords')
const rectangles = []; const rectangles = [];
const xValues = []; const xValues = [];
const yValues = []; const yValues = [];
const yValuesWithLabel = [];
const labelLineHeight = 16;
// Get coordinates for every node in a given group
for(let val of value[1]) { for(let val of value[1]) {
xValues.push(graph.getPosition(val[0]).x); xValues.push(graph.getPosition(val[0]).x);
yValues.push(graph.getPosition(val[0]).y); yValues.push(graph.getPosition(val[0]).y);
yValuesWithLabel.push(yValues[yValues.length -1] + val[3] * labelLineHeight);
} }
const rectX = Math.min(...xValues) - rectParams.paddingX; const minX = Math.min(...xValues);
const rectY = Math.min(...yValues) - rectParams.paddingY; const maxX = Math.max(...xValues);
const rectSizeX = Math.max(...xValues) - Math.min(...xValues) + 2*rectParams.paddingX; const minY = Math.min(...yValues);
const rectSizeY = Math.max(...yValues) - Math.min(...yValues) + 2*rectParams.paddingY; const maxY = Math.max(...yValuesWithLabel);
const rectX = minX - rectParams.paddingX;
const rectY = minY - rectParams.paddingY;
const rectSizeX = maxX - minX + 2*rectParams.paddingX;
const rectSizeY = maxY - minY + 2*rectParams.paddingY;
rectangles.push({ rectangles.push({
ctx: canvascontext, ctx: canvascontext,
netbox_topology_views/views.py
+1
View File
@@ -251,6 +251,7 @@ def create_node(
node["shape"] = "image" node["shape"] = "image"
node["href"] = device.get_absolute_url() node["href"] = device.get_absolute_url()
node["image"] = get_image_for_entity(device) node["image"] = get_image_for_entity(device)
node["label_num_lines"] = len(label_items)
return node return node