diff --git a/e2etests/testdata/stable/dagger_grid/dagre/board.exp.json b/e2etests/testdata/stable/dagger_grid/dagre/board.exp.json
index bd49385e0..b438f9716 100644
--- a/e2etests/testdata/stable/dagger_grid/dagre/board.exp.json
+++ b/e2etests/testdata/stable/dagger_grid/dagre/board.exp.json
@@ -4,19 +4,19 @@
"fontFamily": "SourceSansPro",
"shapes": [
{
- "id": "todo root level grid",
+ "id": "flow",
"type": "rectangle",
"pos": {
"x": 0,
"y": 0
},
- "width": 1760,
- "height": 1040,
+ "width": 800,
+ "height": 200,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
"borderRadius": 0,
- "fill": "B4",
+ "fill": "cornflowerblue",
"stroke": "B1",
"shadow": false,
"3d": false,
@@ -30,35 +30,129 @@
"fields": null,
"methods": null,
"columns": null,
- "label": "todo root level grid",
- "fontSize": 28,
+ "label": "",
+ "fontSize": 16,
"fontFamily": "DEFAULT",
"language": "",
"color": "N1",
"italic": false,
- "bold": false,
+ "bold": true,
"underline": false,
- "labelWidth": 222,
- "labelHeight": 36,
+ "labelWidth": 0,
+ "labelHeight": 0,
+ "labelPosition": "INSIDE_MIDDLE_CENTER",
+ "zIndex": 0,
+ "level": 1
+ },
+ {
+ "id": "DAGGER ENGINE",
+ "type": "rectangle",
+ "pos": {
+ "x": 0,
+ "y": 240
+ },
+ "width": 800,
+ "height": 61,
+ "opacity": 1,
+ "strokeDash": 0,
+ "strokeWidth": 8,
+ "borderRadius": 0,
+ "fill": "beige",
+ "stroke": "darkcyan",
+ "shadow": false,
+ "3d": false,
+ "multiple": false,
+ "double-border": false,
+ "tooltip": "",
+ "link": "",
+ "icon": null,
+ "iconPosition": "",
+ "blend": false,
+ "fields": null,
+ "methods": null,
+ "columns": null,
+ "label": "DAGGER ENGINE",
+ "fontSize": 16,
+ "fontFamily": "DEFAULT",
+ "language": "",
+ "color": "blue",
+ "italic": false,
+ "bold": true,
+ "underline": false,
+ "labelWidth": 114,
+ "labelHeight": 21,
+ "labelPosition": "INSIDE_MIDDLE_CENTER",
+ "zIndex": 0,
+ "level": 1
+ },
+ {
+ "id": "ANY DOCKER COMPATIBLE RUNTIME",
+ "type": "rectangle",
+ "pos": {
+ "x": 0,
+ "y": 341
+ },
+ "width": 800,
+ "height": 87,
+ "opacity": 1,
+ "strokeDash": 0,
+ "strokeWidth": 8,
+ "borderRadius": 0,
+ "fill": "lightcyan",
+ "stroke": "darkcyan",
+ "shadow": false,
+ "3d": false,
+ "multiple": false,
+ "double-border": false,
+ "tooltip": "",
+ "link": "",
+ "icon": {
+ "Scheme": "https",
+ "Opaque": "",
+ "User": null,
+ "Host": "icons.terrastruct.com",
+ "Path": "/dev/docker.svg",
+ "RawPath": "/dev%2Fdocker.svg",
+ "OmitHost": false,
+ "ForceQuery": false,
+ "RawQuery": "",
+ "Fragment": "",
+ "RawFragment": ""
+ },
+ "iconPosition": "INSIDE_MIDDLE_CENTER",
+ "blend": false,
+ "fields": null,
+ "methods": null,
+ "columns": null,
+ "label": "ANY DOCKER COMPATIBLE RUNTIME",
+ "fontSize": 16,
+ "fontFamily": "DEFAULT",
+ "language": "",
+ "color": "black",
+ "italic": false,
+ "bold": true,
+ "underline": false,
+ "labelWidth": 255,
+ "labelHeight": 21,
"labelPosition": "INSIDE_TOP_CENTER",
"zIndex": 0,
"level": 1
},
{
- "id": "todo root level grid.flow",
+ "id": "ANY CI",
"type": "rectangle",
"pos": {
- "x": 60,
- "y": 60
+ "x": 0,
+ "y": 468
},
- "width": 800,
- "height": 200,
+ "width": 139,
+ "height": 66,
"opacity": 1,
"strokeDash": 0,
- "strokeWidth": 2,
+ "strokeWidth": 8,
"borderRadius": 0,
- "fill": "B5",
- "stroke": "B1",
+ "fill": "gold",
+ "stroke": "maroon",
"shadow": false,
"3d": false,
"multiple": false,
@@ -71,35 +165,35 @@
"fields": null,
"methods": null,
"columns": null,
- "label": "flow",
+ "label": "ANY CI",
"fontSize": 16,
"fontFamily": "DEFAULT",
"language": "",
- "color": "N1",
+ "color": "maroon",
"italic": false,
"bold": true,
"underline": false,
- "labelWidth": 32,
+ "labelWidth": 46,
"labelHeight": 21,
"labelPosition": "INSIDE_MIDDLE_CENTER",
"zIndex": 0,
- "level": 2
+ "level": 1
},
{
- "id": "todo root level grid.dagger engine",
+ "id": "WINDOWS",
"type": "rectangle",
"pos": {
- "x": 900,
- "y": 60
+ "x": 179,
+ "y": 468
},
- "width": 800,
- "height": 200,
+ "width": 117,
+ "height": 66,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
"borderRadius": 0,
- "fill": "B5",
- "stroke": "B1",
+ "fill": "darkcyan",
+ "stroke": "black",
"shadow": false,
"3d": false,
"multiple": false,
@@ -112,35 +206,35 @@
"fields": null,
"methods": null,
"columns": null,
- "label": "dagger engine",
+ "label": "WINDOWS",
"fontSize": 16,
"fontFamily": "DEFAULT",
"language": "",
- "color": "N1",
+ "color": "white",
"italic": false,
"bold": true,
"underline": false,
- "labelWidth": 101,
+ "labelWidth": 72,
"labelHeight": 21,
"labelPosition": "INSIDE_MIDDLE_CENTER",
"zIndex": 0,
- "level": 2
+ "level": 1
},
{
- "id": "todo root level grid.any docker compatible runtime",
+ "id": "LINUX",
"type": "rectangle",
"pos": {
- "x": 60,
- "y": 300
+ "x": 336,
+ "y": 468
},
- "width": 800,
- "height": 200,
+ "width": 139,
+ "height": 66,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
"borderRadius": 0,
- "fill": "B5",
- "stroke": "B1",
+ "fill": "darkcyan",
+ "stroke": "black",
"shadow": false,
"3d": false,
"multiple": false,
@@ -153,35 +247,35 @@
"fields": null,
"methods": null,
"columns": null,
- "label": "any docker compatible runtime",
+ "label": "LINUX",
"fontSize": 16,
"fontFamily": "DEFAULT",
"language": "",
- "color": "N1",
+ "color": "white",
"italic": false,
"bold": true,
"underline": false,
- "labelWidth": 222,
+ "labelWidth": 43,
"labelHeight": 21,
"labelPosition": "INSIDE_MIDDLE_CENTER",
"zIndex": 0,
- "level": 2
+ "level": 1
},
{
- "id": "todo root level grid.any ci",
+ "id": "MACOS",
"type": "rectangle",
"pos": {
- "x": 900,
- "y": 300
+ "x": 515,
+ "y": 468
},
- "width": 800,
- "height": 200,
+ "width": 106,
+ "height": 66,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
"borderRadius": 0,
- "fill": "B5",
- "stroke": "B1",
+ "fill": "darkcyan",
+ "stroke": "black",
"shadow": false,
"3d": false,
"multiple": false,
@@ -194,35 +288,35 @@
"fields": null,
"methods": null,
"columns": null,
- "label": "any ci",
+ "label": "MACOS",
"fontSize": 16,
"fontFamily": "DEFAULT",
"language": "",
- "color": "N1",
+ "color": "white",
"italic": false,
"bold": true,
"underline": false,
- "labelWidth": 41,
+ "labelWidth": 50,
"labelHeight": 21,
"labelPosition": "INSIDE_MIDDLE_CENTER",
"zIndex": 0,
- "level": 2
+ "level": 1
},
{
- "id": "todo root level grid.windows",
+ "id": "KUBERNETES",
"type": "rectangle",
"pos": {
- "x": 60,
- "y": 540
+ "x": 661,
+ "y": 468
},
- "width": 800,
- "height": 200,
+ "width": 139,
+ "height": 66,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
"borderRadius": 0,
- "fill": "B5",
- "stroke": "B1",
+ "fill": "darkcyan",
+ "stroke": "black",
"shadow": false,
"3d": false,
"multiple": false,
@@ -235,142 +329,19 @@
"fields": null,
"methods": null,
"columns": null,
- "label": "windows",
+ "label": "KUBERNETES",
"fontSize": 16,
"fontFamily": "DEFAULT",
"language": "",
- "color": "N1",
+ "color": "white",
"italic": false,
"bold": true,
"underline": false,
- "labelWidth": 64,
+ "labelWidth": 94,
"labelHeight": 21,
"labelPosition": "INSIDE_MIDDLE_CENTER",
"zIndex": 0,
- "level": 2
- },
- {
- "id": "todo root level grid.linux",
- "type": "rectangle",
- "pos": {
- "x": 900,
- "y": 540
- },
- "width": 800,
- "height": 200,
- "opacity": 1,
- "strokeDash": 0,
- "strokeWidth": 2,
- "borderRadius": 0,
- "fill": "B5",
- "stroke": "B1",
- "shadow": false,
- "3d": false,
- "multiple": false,
- "double-border": false,
- "tooltip": "",
- "link": "",
- "icon": null,
- "iconPosition": "",
- "blend": false,
- "fields": null,
- "methods": null,
- "columns": null,
- "label": "linux",
- "fontSize": 16,
- "fontFamily": "DEFAULT",
- "language": "",
- "color": "N1",
- "italic": false,
- "bold": true,
- "underline": false,
- "labelWidth": 35,
- "labelHeight": 21,
- "labelPosition": "INSIDE_MIDDLE_CENTER",
- "zIndex": 0,
- "level": 2
- },
- {
- "id": "todo root level grid.macos",
- "type": "rectangle",
- "pos": {
- "x": 60,
- "y": 780
- },
- "width": 800,
- "height": 200,
- "opacity": 1,
- "strokeDash": 0,
- "strokeWidth": 2,
- "borderRadius": 0,
- "fill": "B5",
- "stroke": "B1",
- "shadow": false,
- "3d": false,
- "multiple": false,
- "double-border": false,
- "tooltip": "",
- "link": "",
- "icon": null,
- "iconPosition": "",
- "blend": false,
- "fields": null,
- "methods": null,
- "columns": null,
- "label": "macos",
- "fontSize": 16,
- "fontFamily": "DEFAULT",
- "language": "",
- "color": "N1",
- "italic": false,
- "bold": true,
- "underline": false,
- "labelWidth": 45,
- "labelHeight": 21,
- "labelPosition": "INSIDE_MIDDLE_CENTER",
- "zIndex": 0,
- "level": 2
- },
- {
- "id": "todo root level grid.kubernetes",
- "type": "rectangle",
- "pos": {
- "x": 900,
- "y": 780
- },
- "width": 800,
- "height": 200,
- "opacity": 1,
- "strokeDash": 0,
- "strokeWidth": 2,
- "borderRadius": 0,
- "fill": "B5",
- "stroke": "B1",
- "shadow": false,
- "3d": false,
- "multiple": false,
- "double-border": false,
- "tooltip": "",
- "link": "",
- "icon": null,
- "iconPosition": "",
- "blend": false,
- "fields": null,
- "methods": null,
- "columns": null,
- "label": "kubernetes",
- "fontSize": 16,
- "fontFamily": "DEFAULT",
- "language": "",
- "color": "N1",
- "italic": false,
- "bold": true,
- "underline": false,
- "labelWidth": 80,
- "labelHeight": 21,
- "labelPosition": "INSIDE_MIDDLE_CENTER",
- "zIndex": 0,
- "level": 2
+ "level": 1
}
],
"connections": [],
@@ -387,7 +358,7 @@
"strokeDash": 0,
"strokeWidth": 0,
"borderRadius": 0,
- "fill": "N7",
+ "fill": "black",
"stroke": "",
"shadow": false,
"3d": false,
diff --git a/e2etests/testdata/stable/dagger_grid/dagre/sketch.exp.svg b/e2etests/testdata/stable/dagger_grid/dagre/sketch.exp.svg
index 298a9765e..2e9ae781c 100644
--- a/e2etests/testdata/stable/dagger_grid/dagre/sketch.exp.svg
+++ b/e2etests/testdata/stable/dagger_grid/dagre/sketch.exp.svg
@@ -1,17 +1,10 @@
-
\ No newline at end of file
diff --git a/e2etests/testdata/stable/dagger_grid/elk/board.exp.json b/e2etests/testdata/stable/dagger_grid/elk/board.exp.json
index 36716f307..b438f9716 100644
--- a/e2etests/testdata/stable/dagger_grid/elk/board.exp.json
+++ b/e2etests/testdata/stable/dagger_grid/elk/board.exp.json
@@ -4,19 +4,19 @@
"fontFamily": "SourceSansPro",
"shapes": [
{
- "id": "todo root level grid",
+ "id": "flow",
"type": "rectangle",
"pos": {
- "x": 12,
- "y": 12
+ "x": 0,
+ "y": 0
},
- "width": 1760,
- "height": 1040,
+ "width": 800,
+ "height": 200,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
"borderRadius": 0,
- "fill": "B4",
+ "fill": "cornflowerblue",
"stroke": "B1",
"shadow": false,
"3d": false,
@@ -30,35 +30,129 @@
"fields": null,
"methods": null,
"columns": null,
- "label": "todo root level grid",
- "fontSize": 28,
+ "label": "",
+ "fontSize": 16,
"fontFamily": "DEFAULT",
"language": "",
"color": "N1",
"italic": false,
- "bold": false,
+ "bold": true,
"underline": false,
- "labelWidth": 222,
- "labelHeight": 36,
+ "labelWidth": 0,
+ "labelHeight": 0,
+ "labelPosition": "INSIDE_MIDDLE_CENTER",
+ "zIndex": 0,
+ "level": 1
+ },
+ {
+ "id": "DAGGER ENGINE",
+ "type": "rectangle",
+ "pos": {
+ "x": 0,
+ "y": 240
+ },
+ "width": 800,
+ "height": 61,
+ "opacity": 1,
+ "strokeDash": 0,
+ "strokeWidth": 8,
+ "borderRadius": 0,
+ "fill": "beige",
+ "stroke": "darkcyan",
+ "shadow": false,
+ "3d": false,
+ "multiple": false,
+ "double-border": false,
+ "tooltip": "",
+ "link": "",
+ "icon": null,
+ "iconPosition": "",
+ "blend": false,
+ "fields": null,
+ "methods": null,
+ "columns": null,
+ "label": "DAGGER ENGINE",
+ "fontSize": 16,
+ "fontFamily": "DEFAULT",
+ "language": "",
+ "color": "blue",
+ "italic": false,
+ "bold": true,
+ "underline": false,
+ "labelWidth": 114,
+ "labelHeight": 21,
+ "labelPosition": "INSIDE_MIDDLE_CENTER",
+ "zIndex": 0,
+ "level": 1
+ },
+ {
+ "id": "ANY DOCKER COMPATIBLE RUNTIME",
+ "type": "rectangle",
+ "pos": {
+ "x": 0,
+ "y": 341
+ },
+ "width": 800,
+ "height": 87,
+ "opacity": 1,
+ "strokeDash": 0,
+ "strokeWidth": 8,
+ "borderRadius": 0,
+ "fill": "lightcyan",
+ "stroke": "darkcyan",
+ "shadow": false,
+ "3d": false,
+ "multiple": false,
+ "double-border": false,
+ "tooltip": "",
+ "link": "",
+ "icon": {
+ "Scheme": "https",
+ "Opaque": "",
+ "User": null,
+ "Host": "icons.terrastruct.com",
+ "Path": "/dev/docker.svg",
+ "RawPath": "/dev%2Fdocker.svg",
+ "OmitHost": false,
+ "ForceQuery": false,
+ "RawQuery": "",
+ "Fragment": "",
+ "RawFragment": ""
+ },
+ "iconPosition": "INSIDE_MIDDLE_CENTER",
+ "blend": false,
+ "fields": null,
+ "methods": null,
+ "columns": null,
+ "label": "ANY DOCKER COMPATIBLE RUNTIME",
+ "fontSize": 16,
+ "fontFamily": "DEFAULT",
+ "language": "",
+ "color": "black",
+ "italic": false,
+ "bold": true,
+ "underline": false,
+ "labelWidth": 255,
+ "labelHeight": 21,
"labelPosition": "INSIDE_TOP_CENTER",
"zIndex": 0,
"level": 1
},
{
- "id": "todo root level grid.flow",
+ "id": "ANY CI",
"type": "rectangle",
"pos": {
- "x": 72,
- "y": 72
+ "x": 0,
+ "y": 468
},
- "width": 800,
- "height": 200,
+ "width": 139,
+ "height": 66,
"opacity": 1,
"strokeDash": 0,
- "strokeWidth": 2,
+ "strokeWidth": 8,
"borderRadius": 0,
- "fill": "B5",
- "stroke": "B1",
+ "fill": "gold",
+ "stroke": "maroon",
"shadow": false,
"3d": false,
"multiple": false,
@@ -71,35 +165,35 @@
"fields": null,
"methods": null,
"columns": null,
- "label": "flow",
+ "label": "ANY CI",
"fontSize": 16,
"fontFamily": "DEFAULT",
"language": "",
- "color": "N1",
+ "color": "maroon",
"italic": false,
"bold": true,
"underline": false,
- "labelWidth": 32,
+ "labelWidth": 46,
"labelHeight": 21,
"labelPosition": "INSIDE_MIDDLE_CENTER",
"zIndex": 0,
- "level": 2
+ "level": 1
},
{
- "id": "todo root level grid.dagger engine",
+ "id": "WINDOWS",
"type": "rectangle",
"pos": {
- "x": 912,
- "y": 72
+ "x": 179,
+ "y": 468
},
- "width": 800,
- "height": 200,
+ "width": 117,
+ "height": 66,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
"borderRadius": 0,
- "fill": "B5",
- "stroke": "B1",
+ "fill": "darkcyan",
+ "stroke": "black",
"shadow": false,
"3d": false,
"multiple": false,
@@ -112,35 +206,35 @@
"fields": null,
"methods": null,
"columns": null,
- "label": "dagger engine",
+ "label": "WINDOWS",
"fontSize": 16,
"fontFamily": "DEFAULT",
"language": "",
- "color": "N1",
+ "color": "white",
"italic": false,
"bold": true,
"underline": false,
- "labelWidth": 101,
+ "labelWidth": 72,
"labelHeight": 21,
"labelPosition": "INSIDE_MIDDLE_CENTER",
"zIndex": 0,
- "level": 2
+ "level": 1
},
{
- "id": "todo root level grid.any docker compatible runtime",
+ "id": "LINUX",
"type": "rectangle",
"pos": {
- "x": 72,
- "y": 312
+ "x": 336,
+ "y": 468
},
- "width": 800,
- "height": 200,
+ "width": 139,
+ "height": 66,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
"borderRadius": 0,
- "fill": "B5",
- "stroke": "B1",
+ "fill": "darkcyan",
+ "stroke": "black",
"shadow": false,
"3d": false,
"multiple": false,
@@ -153,35 +247,35 @@
"fields": null,
"methods": null,
"columns": null,
- "label": "any docker compatible runtime",
+ "label": "LINUX",
"fontSize": 16,
"fontFamily": "DEFAULT",
"language": "",
- "color": "N1",
+ "color": "white",
"italic": false,
"bold": true,
"underline": false,
- "labelWidth": 222,
+ "labelWidth": 43,
"labelHeight": 21,
"labelPosition": "INSIDE_MIDDLE_CENTER",
"zIndex": 0,
- "level": 2
+ "level": 1
},
{
- "id": "todo root level grid.any ci",
+ "id": "MACOS",
"type": "rectangle",
"pos": {
- "x": 912,
- "y": 312
+ "x": 515,
+ "y": 468
},
- "width": 800,
- "height": 200,
+ "width": 106,
+ "height": 66,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
"borderRadius": 0,
- "fill": "B5",
- "stroke": "B1",
+ "fill": "darkcyan",
+ "stroke": "black",
"shadow": false,
"3d": false,
"multiple": false,
@@ -194,35 +288,35 @@
"fields": null,
"methods": null,
"columns": null,
- "label": "any ci",
+ "label": "MACOS",
"fontSize": 16,
"fontFamily": "DEFAULT",
"language": "",
- "color": "N1",
+ "color": "white",
"italic": false,
"bold": true,
"underline": false,
- "labelWidth": 41,
+ "labelWidth": 50,
"labelHeight": 21,
"labelPosition": "INSIDE_MIDDLE_CENTER",
"zIndex": 0,
- "level": 2
+ "level": 1
},
{
- "id": "todo root level grid.windows",
+ "id": "KUBERNETES",
"type": "rectangle",
"pos": {
- "x": 72,
- "y": 552
+ "x": 661,
+ "y": 468
},
- "width": 800,
- "height": 200,
+ "width": 139,
+ "height": 66,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
"borderRadius": 0,
- "fill": "B5",
- "stroke": "B1",
+ "fill": "darkcyan",
+ "stroke": "black",
"shadow": false,
"3d": false,
"multiple": false,
@@ -235,142 +329,19 @@
"fields": null,
"methods": null,
"columns": null,
- "label": "windows",
+ "label": "KUBERNETES",
"fontSize": 16,
"fontFamily": "DEFAULT",
"language": "",
- "color": "N1",
+ "color": "white",
"italic": false,
"bold": true,
"underline": false,
- "labelWidth": 64,
+ "labelWidth": 94,
"labelHeight": 21,
"labelPosition": "INSIDE_MIDDLE_CENTER",
"zIndex": 0,
- "level": 2
- },
- {
- "id": "todo root level grid.linux",
- "type": "rectangle",
- "pos": {
- "x": 912,
- "y": 552
- },
- "width": 800,
- "height": 200,
- "opacity": 1,
- "strokeDash": 0,
- "strokeWidth": 2,
- "borderRadius": 0,
- "fill": "B5",
- "stroke": "B1",
- "shadow": false,
- "3d": false,
- "multiple": false,
- "double-border": false,
- "tooltip": "",
- "link": "",
- "icon": null,
- "iconPosition": "",
- "blend": false,
- "fields": null,
- "methods": null,
- "columns": null,
- "label": "linux",
- "fontSize": 16,
- "fontFamily": "DEFAULT",
- "language": "",
- "color": "N1",
- "italic": false,
- "bold": true,
- "underline": false,
- "labelWidth": 35,
- "labelHeight": 21,
- "labelPosition": "INSIDE_MIDDLE_CENTER",
- "zIndex": 0,
- "level": 2
- },
- {
- "id": "todo root level grid.macos",
- "type": "rectangle",
- "pos": {
- "x": 72,
- "y": 792
- },
- "width": 800,
- "height": 200,
- "opacity": 1,
- "strokeDash": 0,
- "strokeWidth": 2,
- "borderRadius": 0,
- "fill": "B5",
- "stroke": "B1",
- "shadow": false,
- "3d": false,
- "multiple": false,
- "double-border": false,
- "tooltip": "",
- "link": "",
- "icon": null,
- "iconPosition": "",
- "blend": false,
- "fields": null,
- "methods": null,
- "columns": null,
- "label": "macos",
- "fontSize": 16,
- "fontFamily": "DEFAULT",
- "language": "",
- "color": "N1",
- "italic": false,
- "bold": true,
- "underline": false,
- "labelWidth": 45,
- "labelHeight": 21,
- "labelPosition": "INSIDE_MIDDLE_CENTER",
- "zIndex": 0,
- "level": 2
- },
- {
- "id": "todo root level grid.kubernetes",
- "type": "rectangle",
- "pos": {
- "x": 912,
- "y": 792
- },
- "width": 800,
- "height": 200,
- "opacity": 1,
- "strokeDash": 0,
- "strokeWidth": 2,
- "borderRadius": 0,
- "fill": "B5",
- "stroke": "B1",
- "shadow": false,
- "3d": false,
- "multiple": false,
- "double-border": false,
- "tooltip": "",
- "link": "",
- "icon": null,
- "iconPosition": "",
- "blend": false,
- "fields": null,
- "methods": null,
- "columns": null,
- "label": "kubernetes",
- "fontSize": 16,
- "fontFamily": "DEFAULT",
- "language": "",
- "color": "N1",
- "italic": false,
- "bold": true,
- "underline": false,
- "labelWidth": 80,
- "labelHeight": 21,
- "labelPosition": "INSIDE_MIDDLE_CENTER",
- "zIndex": 0,
- "level": 2
+ "level": 1
}
],
"connections": [],
@@ -387,7 +358,7 @@
"strokeDash": 0,
"strokeWidth": 0,
"borderRadius": 0,
- "fill": "N7",
+ "fill": "black",
"stroke": "",
"shadow": false,
"3d": false,
diff --git a/e2etests/testdata/stable/dagger_grid/elk/sketch.exp.svg b/e2etests/testdata/stable/dagger_grid/elk/sketch.exp.svg
index 8ae60a5db..2e9ae781c 100644
--- a/e2etests/testdata/stable/dagger_grid/elk/sketch.exp.svg
+++ b/e2etests/testdata/stable/dagger_grid/elk/sketch.exp.svg
@@ -1,17 +1,10 @@
-
\ No newline at end of file
diff --git a/e2etests/testdata/stable/teleport_grid/dagre/board.exp.json b/e2etests/testdata/stable/teleport_grid/dagre/board.exp.json
index d1ba12de3..b9acb9863 100644
--- a/e2etests/testdata/stable/teleport_grid/dagre/board.exp.json
+++ b/e2etests/testdata/stable/teleport_grid/dagre/board.exp.json
@@ -8,10 +8,10 @@
"type": "rectangle",
"pos": {
"x": 0,
- "y": 203
+ "y": 204
},
"width": 272,
- "height": 464,
+ "height": 461,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -90,10 +90,10 @@
"type": "rectangle",
"pos": {
"x": 1050,
- "y": 263
+ "y": 283
},
- "width": 764,
- "height": 344,
+ "width": 584,
+ "height": 303,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -130,10 +130,10 @@
"id": "jita",
"type": "rectangle",
"pos": {
- "x": 2316,
+ "x": 2136,
"y": 0
},
- "width": 920,
+ "width": 820,
"height": 212,
"opacity": 1,
"strokeDash": 0,
@@ -171,10 +171,10 @@
"id": "infra",
"type": "rectangle",
"pos": {
- "x": 2448,
+ "x": 2255,
"y": 232
},
- "width": 656,
+ "width": 582,
"height": 344,
"opacity": 1,
"strokeDash": 0,
@@ -212,7 +212,7 @@
"id": "identity provider",
"type": "rectangle",
"pos": {
- "x": 2676,
+ "x": 2446,
"y": 596
},
"width": 201,
@@ -266,7 +266,7 @@
"type": "oval",
"pos": {
"x": 60,
- "y": 263
+ "y": 264
},
"width": 152,
"height": 152,
@@ -319,10 +319,10 @@
"type": "oval",
"pos": {
"x": 60,
- "y": 455
+ "y": 456
},
"width": 152,
- "height": 152,
+ "height": 149,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -577,10 +577,10 @@
"type": "text",
"pos": {
"x": 1110,
- "y": 323
+ "y": 343
},
- "width": 302,
- "height": 92,
+ "width": 122,
+ "height": 51,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -617,11 +617,11 @@
"id": "teleport.inp",
"type": "text",
"pos": {
- "x": 1452,
- "y": 323
+ "x": 1272,
+ "y": 343
},
"width": 302,
- "height": 92,
+ "height": 51,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -659,9 +659,9 @@
"type": "rectangle",
"pos": {
"x": 1110,
- "y": 455
+ "y": 434
},
- "width": 302,
+ "width": 212,
"height": 92,
"opacity": 1,
"strokeDash": 0,
@@ -711,10 +711,10 @@
"id": "teleport.Cert Authority",
"type": "rectangle",
"pos": {
- "x": 1452,
- "y": 455
+ "x": 1362,
+ "y": 434
},
- "width": 302,
+ "width": 212,
"height": 92,
"opacity": 1,
"strokeDash": 0,
@@ -764,10 +764,10 @@
"id": "jita.Slack",
"type": "rectangle",
"pos": {
- "x": 2376,
+ "x": 2196,
"y": 60
},
- "width": 128,
+ "width": 110,
"height": 92,
"opacity": 1,
"strokeDash": 0,
@@ -817,7 +817,7 @@
"id": "jita.Mattermost",
"type": "rectangle",
"pos": {
- "x": 2544,
+ "x": 2346,
"y": 60
},
"width": 128,
@@ -858,10 +858,10 @@
"id": "jita.Jira",
"type": "rectangle",
"pos": {
- "x": 2712,
+ "x": 2514,
"y": 60
},
- "width": 128,
+ "width": 72,
"height": 92,
"opacity": 1,
"strokeDash": 0,
@@ -899,10 +899,10 @@
"id": "jita.Pagerduty",
"type": "rectangle",
"pos": {
- "x": 2880,
+ "x": 2626,
"y": 60
},
- "width": 128,
+ "width": 119,
"height": 92,
"opacity": 1,
"strokeDash": 0,
@@ -940,10 +940,10 @@
"id": "jita.Email",
"type": "rectangle",
"pos": {
- "x": 3048,
+ "x": 2785,
"y": 60
},
- "width": 128,
+ "width": 111,
"height": 92,
"opacity": 1,
"strokeDash": 0,
@@ -993,10 +993,10 @@
"id": "infra.ssh",
"type": "rectangle",
"pos": {
- "x": 2508,
+ "x": 2315,
"y": 292
},
- "width": 152,
+ "width": 108,
"height": 92,
"opacity": 1,
"strokeDash": 0,
@@ -1046,7 +1046,7 @@
"id": "infra.Kubernetes",
"type": "rectangle",
"pos": {
- "x": 2700,
+ "x": 2463,
"y": 292
},
"width": 152,
@@ -1099,10 +1099,10 @@
"id": "infra.My SQL",
"type": "rectangle",
"pos": {
- "x": 2892,
+ "x": 2655,
"y": 292
},
- "width": 152,
+ "width": 122,
"height": 92,
"opacity": 1,
"strokeDash": 0,
@@ -1152,10 +1152,10 @@
"id": "infra.MongoDB",
"type": "rectangle",
"pos": {
- "x": 2508,
+ "x": 2315,
"y": 424
},
- "width": 152,
+ "width": 138,
"height": 92,
"opacity": 1,
"strokeDash": 0,
@@ -1205,10 +1205,10 @@
"id": "infra.PSQL",
"type": "rectangle",
"pos": {
- "x": 2700,
+ "x": 2493,
"y": 424
},
- "width": 152,
+ "width": 108,
"height": 92,
"opacity": 1,
"strokeDash": 0,
@@ -1258,10 +1258,10 @@
"id": "infra.Windows",
"type": "rectangle",
"pos": {
- "x": 2892,
+ "x": 2641,
"y": 424
},
- "width": 152,
+ "width": 136,
"height": 92,
"opacity": 1,
"strokeDash": 0,
@@ -1434,19 +1434,19 @@
"labelPercentage": 0,
"route": [
{
- "x": 1763.433789954338,
- "y": 262.5
+ "x": 1592.4246575342465,
+ "y": 283
},
{
- "x": 2004.6867579908676,
- "y": 137.3
+ "x": 1826.4849315068493,
+ "y": 141.4
},
{
- "x": 2115.2,
+ "x": 1935.2,
"y": 106
},
{
- "x": 2316,
+ "x": 2136,
"y": 106
}
],
@@ -1483,19 +1483,19 @@
"labelPercentage": 0,
"route": [
{
- "x": 1814,
- "y": 416.09399684044234
+ "x": 1634,
+ "y": 418.0985267034991
},
{
- "x": 2014.8,
- "y": 406.41879936808846
+ "x": 1834.8,
+ "y": 406.81970534069984
},
{
- "x": 2141.6,
+ "x": 1959,
"y": 404
},
{
- "x": 2448,
+ "x": 2255,
"y": 404
}
],
@@ -1532,20 +1532,20 @@
"labelPercentage": 0,
"route": [
{
- "x": 1814,
- "y": 510.2361769352291
+ "x": 1634,
+ "y": 501.98802946593
},
{
- "x": 2014.8,
- "y": 550.0472353870458
+ "x": 1834.8,
+ "y": 548.397605893186
},
{
- "x": 2187.1,
- "y": 576.3143459915611
+ "x": 1997.1,
+ "y": 576.1111951588503
},
{
- "x": 2675.5,
- "y": 641.5717299578059
+ "x": 2445.5,
+ "y": 640.5559757942511
}
],
"isCurve": true,
@@ -1581,20 +1581,20 @@
"labelPercentage": 0,
"route": [
{
- "x": 1814,
- "y": 585.9723538704582
+ "x": 1634,
+ "y": 569.47605893186
},
{
- "x": 2014.8,
- "y": 665.5944707740916
+ "x": 1834.8,
+ "y": 662.295211786372
},
{
- "x": 2187.1,
- "y": 680.2622362869198
+ "x": 1997.1,
+ "y": 680.3274583963691
},
{
- "x": 2675.5,
- "y": 659.3111814345991
+ "x": 2445.5,
+ "y": 659.6372919818457
}
],
"isCurve": true,
diff --git a/e2etests/testdata/stable/teleport_grid/dagre/sketch.exp.svg b/e2etests/testdata/stable/teleport_grid/dagre/sketch.exp.svg
index f6a003864..8490082b2 100644
--- a/e2etests/testdata/stable/teleport_grid/dagre/sketch.exp.svg
+++ b/e2etests/testdata/stable/teleport_grid/dagre/sketch.exp.svg
@@ -1,23 +1,23 @@
-
\ No newline at end of file
diff --git a/e2etests/testdata/stable/teleport_grid/elk/board.exp.json b/e2etests/testdata/stable/teleport_grid/elk/board.exp.json
index 791027e81..bb00928e2 100644
--- a/e2etests/testdata/stable/teleport_grid/elk/board.exp.json
+++ b/e2etests/testdata/stable/teleport_grid/elk/board.exp.json
@@ -8,10 +8,10 @@
"type": "rectangle",
"pos": {
"x": 12,
- "y": 190
+ "y": 196
},
"width": 272,
- "height": 464,
+ "height": 461,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -49,7 +49,7 @@
"type": "rectangle",
"pos": {
"x": 354,
- "y": 117
+ "y": 122
},
"width": 236,
"height": 610,
@@ -90,10 +90,10 @@
"type": "rectangle",
"pos": {
"x": 660,
- "y": 250
+ "y": 275
},
- "width": 764,
- "height": 344,
+ "width": 584,
+ "height": 303,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -130,10 +130,10 @@
"id": "jita",
"type": "rectangle",
"pos": {
- "x": 2280,
+ "x": 2026,
"y": 12
},
- "width": 920,
+ "width": 820,
"height": 212,
"opacity": 1,
"strokeDash": 0,
@@ -171,10 +171,10 @@
"id": "infra",
"type": "rectangle",
"pos": {
- "x": 1554,
+ "x": 1374,
"y": 150
},
- "width": 656,
+ "width": 582,
"height": 344,
"opacity": 1,
"strokeDash": 0,
@@ -212,7 +212,7 @@
"id": "identity provider",
"type": "rectangle",
"pos": {
- "x": 1554,
+ "x": 1374,
"y": 514
},
"width": 201,
@@ -266,7 +266,7 @@
"type": "oval",
"pos": {
"x": 72,
- "y": 250
+ "y": 256
},
"width": 152,
"height": 152,
@@ -319,10 +319,10 @@
"type": "oval",
"pos": {
"x": 72,
- "y": 442
+ "y": 448
},
"width": 152,
- "height": 152,
+ "height": 149,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -372,7 +372,7 @@
"type": "rectangle",
"pos": {
"x": 414,
- "y": 177
+ "y": 182
},
"width": 116,
"height": 66,
@@ -413,7 +413,7 @@
"type": "rectangle",
"pos": {
"x": 414,
- "y": 283
+ "y": 288
},
"width": 116,
"height": 66,
@@ -454,7 +454,7 @@
"type": "rectangle",
"pos": {
"x": 414,
- "y": 389
+ "y": 394
},
"width": 116,
"height": 66,
@@ -495,7 +495,7 @@
"type": "rectangle",
"pos": {
"x": 414,
- "y": 495
+ "y": 500
},
"width": 116,
"height": 66,
@@ -536,7 +536,7 @@
"type": "rectangle",
"pos": {
"x": 414,
- "y": 601
+ "y": 606
},
"width": 116,
"height": 66,
@@ -577,10 +577,10 @@
"type": "text",
"pos": {
"x": 720,
- "y": 310
+ "y": 335
},
- "width": 302,
- "height": 92,
+ "width": 122,
+ "height": 51,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -617,11 +617,11 @@
"id": "teleport.inp",
"type": "text",
"pos": {
- "x": 1062,
- "y": 310
+ "x": 882,
+ "y": 335
},
"width": 302,
- "height": 92,
+ "height": 51,
"opacity": 1,
"strokeDash": 0,
"strokeWidth": 2,
@@ -659,9 +659,9 @@
"type": "rectangle",
"pos": {
"x": 720,
- "y": 442
+ "y": 426
},
- "width": 302,
+ "width": 212,
"height": 92,
"opacity": 1,
"strokeDash": 0,
@@ -711,10 +711,10 @@
"id": "teleport.Cert Authority",
"type": "rectangle",
"pos": {
- "x": 1062,
- "y": 442
+ "x": 972,
+ "y": 426
},
- "width": 302,
+ "width": 212,
"height": 92,
"opacity": 1,
"strokeDash": 0,
@@ -764,10 +764,10 @@
"id": "jita.Slack",
"type": "rectangle",
"pos": {
- "x": 2340,
+ "x": 2086,
"y": 72
},
- "width": 128,
+ "width": 110,
"height": 92,
"opacity": 1,
"strokeDash": 0,
@@ -817,7 +817,7 @@
"id": "jita.Mattermost",
"type": "rectangle",
"pos": {
- "x": 2508,
+ "x": 2236,
"y": 72
},
"width": 128,
@@ -858,10 +858,10 @@
"id": "jita.Jira",
"type": "rectangle",
"pos": {
- "x": 2676,
+ "x": 2404,
"y": 72
},
- "width": 128,
+ "width": 72,
"height": 92,
"opacity": 1,
"strokeDash": 0,
@@ -899,10 +899,10 @@
"id": "jita.Pagerduty",
"type": "rectangle",
"pos": {
- "x": 2844,
+ "x": 2516,
"y": 72
},
- "width": 128,
+ "width": 119,
"height": 92,
"opacity": 1,
"strokeDash": 0,
@@ -940,10 +940,10 @@
"id": "jita.Email",
"type": "rectangle",
"pos": {
- "x": 3012,
+ "x": 2675,
"y": 72
},
- "width": 128,
+ "width": 111,
"height": 92,
"opacity": 1,
"strokeDash": 0,
@@ -993,10 +993,10 @@
"id": "infra.ssh",
"type": "rectangle",
"pos": {
- "x": 1614,
+ "x": 1434,
"y": 210
},
- "width": 152,
+ "width": 108,
"height": 92,
"opacity": 1,
"strokeDash": 0,
@@ -1046,7 +1046,7 @@
"id": "infra.Kubernetes",
"type": "rectangle",
"pos": {
- "x": 1806,
+ "x": 1582,
"y": 210
},
"width": 152,
@@ -1099,10 +1099,10 @@
"id": "infra.My SQL",
"type": "rectangle",
"pos": {
- "x": 1998,
+ "x": 1774,
"y": 210
},
- "width": 152,
+ "width": 122,
"height": 92,
"opacity": 1,
"strokeDash": 0,
@@ -1152,10 +1152,10 @@
"id": "infra.MongoDB",
"type": "rectangle",
"pos": {
- "x": 1614,
+ "x": 1434,
"y": 342
},
- "width": 152,
+ "width": 138,
"height": 92,
"opacity": 1,
"strokeDash": 0,
@@ -1205,10 +1205,10 @@
"id": "infra.PSQL",
"type": "rectangle",
"pos": {
- "x": 1806,
+ "x": 1612,
"y": 342
},
- "width": 152,
+ "width": 108,
"height": 92,
"opacity": 1,
"strokeDash": 0,
@@ -1258,10 +1258,10 @@
"id": "infra.Windows",
"type": "rectangle",
"pos": {
- "x": 1998,
+ "x": 1760,
"y": 342
},
- "width": 152,
+ "width": 136,
"height": 92,
"opacity": 1,
"strokeDash": 0,
@@ -1337,11 +1337,11 @@
"route": [
{
"x": 284,
- "y": 422.93333333333334
+ "y": 427.0333333333333
},
{
"x": 354,
- "y": 422.93333333333334
+ "y": 427.0333333333333
}
],
"animated": false,
@@ -1377,11 +1377,11 @@
"route": [
{
"x": 590,
- "y": 422.93333333333334
+ "y": 427.0333333333333
},
{
"x": 660,
- "y": 422.93333333333334
+ "y": 427.0333333333333
}
],
"animated": false,
@@ -1416,19 +1416,19 @@
"labelPercentage": 0,
"route": [
{
- "x": 1424,
- "y": 319.73333333333335
+ "x": 1244,
+ "y": 336.1333333333333
},
{
- "x": 1464,
- "y": 319.73333333333335
+ "x": 1284,
+ "y": 336.1333333333333
},
{
- "x": 1464,
+ "x": 1284,
"y": 118
},
{
- "x": 2280,
+ "x": 2026,
"y": 118
}
],
@@ -1464,12 +1464,12 @@
"labelPercentage": 0,
"route": [
{
- "x": 1424,
- "y": 388.53333333333336
+ "x": 1244,
+ "y": 396.7333333333333
},
{
- "x": 1554,
- "y": 388.53333333333336
+ "x": 1374,
+ "y": 396.7333333333333
}
],
"animated": false,
@@ -1504,19 +1504,19 @@
"labelPercentage": 0,
"route": [
{
- "x": 1424,
+ "x": 1244,
"y": 457.3333333333333
},
{
- "x": 1514,
+ "x": 1334,
"y": 457.3333333333333
},
{
- "x": 1514,
+ "x": 1334,
"y": 553.3333333333333
},
{
- "x": 1554,
+ "x": 1374,
"y": 553.3333333333333
}
],
@@ -1552,20 +1552,20 @@
"labelPercentage": 0,
"route": [
{
- "x": 1424,
- "y": 526.1333333333333
+ "x": 1244,
+ "y": 517.9333333333333
},
{
- "x": 1464,
- "y": 526.1333333333333
+ "x": 1284,
+ "y": 517.9333333333333
},
{
- "x": 1464,
- "y": 592.6666666666667
+ "x": 1284,
+ "y": 592.6666666666666
},
{
- "x": 1554,
- "y": 592.6666666666667
+ "x": 1374,
+ "y": 592.6666666666666
}
],
"animated": false,
diff --git a/e2etests/testdata/stable/teleport_grid/elk/sketch.exp.svg b/e2etests/testdata/stable/teleport_grid/elk/sketch.exp.svg
index 1d5730d9b..0f29b7d25 100644
--- a/e2etests/testdata/stable/teleport_grid/elk/sketch.exp.svg
+++ b/e2etests/testdata/stable/teleport_grid/elk/sketch.exp.svg
@@ -1,23 +1,23 @@
-
\ No newline at end of file