diff --git a/e2etests/testdata/themes/terminal/dagre/board.exp.json b/e2etests/testdata/themes/terminal/dagre/board.exp.json index aaff0b214..c252796b7 100644 --- a/e2etests/testdata/themes/terminal/dagre/board.exp.json +++ b/e2etests/testdata/themes/terminal/dagre/board.exp.json @@ -8,9 +8,9 @@ "type": "rectangle", "pos": { "x": 0, - "y": 275 + "y": 438 }, - "width": 410, + "width": 480, "height": 1225, "opacity": 1, "strokeDash": 0, @@ -50,9 +50,9 @@ "type": "rectangle", "pos": { "x": 96, - "y": 340 + "y": 503 }, - "width": 294, + "width": 364, "height": 317, "opacity": 1, "strokeDash": 0, @@ -91,8 +91,8 @@ "id": "network.cell tower.satellites", "type": "stored_data", "pos": { - "x": 163, - "y": 372 + "x": 136, + "y": 535 }, "width": 161, "height": 66, @@ -132,8 +132,8 @@ "id": "network.cell tower.transmitter", "type": "rectangle", "pos": { - "x": 168, - "y": 559 + "x": 238, + "y": 722 }, "width": 151, "height": 66, @@ -174,7 +174,7 @@ "type": "rectangle", "pos": { "x": 20, - "y": 1319 + "y": 1482 }, "width": 157, "height": 151, @@ -216,7 +216,7 @@ "type": "hexagon", "pos": { "x": 71, - "y": 1360 + "y": 1523 }, "width": 65, "height": 69, @@ -256,8 +256,8 @@ "id": "network.data processor", "type": "rectangle", "pos": { - "x": 147, - "y": 814 + "x": 218, + "y": 977 }, "width": 192, "height": 182, @@ -298,8 +298,8 @@ "id": "network.data processor.storage", "type": "cylinder", "pos": { - "x": 187, - "y": 846 + "x": 258, + "y": 1009 }, "width": 112, "height": 118, @@ -340,7 +340,7 @@ "type": "person", "pos": { "x": 82, - "y": 0 + "y": 82 }, "width": 130, "height": 87, @@ -380,8 +380,8 @@ "id": "api server", "type": "rectangle", "pos": { - "x": 450, - "y": 1076 + "x": 521, + "y": 1239 }, "width": 142, "height": 66, @@ -421,8 +421,8 @@ "id": "logs", "type": "page", "pos": { - "x": 480, - "y": 1313 + "x": 551, + "y": 1476 }, "width": 82, "height": 87, @@ -457,6 +457,294 @@ "labelPosition": "INSIDE_MIDDLE_CENTER", "zIndex": 0, "level": 1 + }, + { + "id": "users", + "type": "sql_table", + "pos": { + "x": 272, + "y": 30 + }, + "width": 262, + "height": 216, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": [ + { + "name": { + "label": "id", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 22, + "labelHeight": 26 + }, + "type": { + "label": "int", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 34, + "labelHeight": 26 + }, + "constraint": "", + "reference": "" + }, + { + "name": { + "label": "name", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 46, + "labelHeight": 26 + }, + "type": { + "label": "string", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 71, + "labelHeight": 26 + }, + "constraint": "", + "reference": "" + }, + { + "name": { + "label": "email", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 58, + "labelHeight": 26 + }, + "type": { + "label": "string", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 71, + "labelHeight": 26 + }, + "constraint": "", + "reference": "" + }, + { + "name": { + "label": "password", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 94, + "labelHeight": 26 + }, + "type": { + "label": "string", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 71, + "labelHeight": 26 + }, + "constraint": "", + "reference": "" + }, + { + "name": { + "label": "last_login", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 118, + "labelHeight": 26 + }, + "type": { + "label": "datetime", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 94, + "labelHeight": 26 + }, + "constraint": "", + "reference": "" + } + ], + "label": "USERS", + "fontSize": 20, + "fontFamily": "mono", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 71, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "products", + "type": "class", + "pos": { + "x": 594, + "y": 0 + }, + "width": 242, + "height": 276, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "N1", + "stroke": "N7", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": [ + { + "name": "id", + "type": "int", + "visibility": "public" + }, + { + "name": "price", + "type": "decimal", + "visibility": "public" + }, + { + "name": "sku", + "type": "string", + "visibility": "public" + }, + { + "name": "name", + "type": "string", + "visibility": "public" + } + ], + "methods": null, + "columns": null, + "label": "PRODUCTS", + "fontSize": 20, + "fontFamily": "mono", + "language": "", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 112, + "labelHeight": 31, + "zIndex": 0, + "level": 1, + "primaryAccentColor": "B2", + "secondaryAccentColor": "AA2", + "neutralAccentColor": "N2" + }, + { + "id": "markdown", + "type": "text", + "pos": { + "x": 896, + "y": 79 + }, + "width": 128, + "height": 119, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "transparent", + "stroke": "N1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "# A TALE\n- OF\n- TWO CITIES", + "fontSize": 16, + "fontFamily": "mono", + "language": "markdown", + "color": "N1", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 128, + "labelHeight": 119, + "zIndex": 0, + "level": 1 } ], "connections": [ @@ -486,20 +774,20 @@ "labelPercentage": 0, "route": [ { - "x": 218, - "y": 439 + "x": 201, + "y": 602 }, { - "x": 182.4, - "y": 487 + "x": 179, + "y": 650 }, { - "x": 182.5, - "y": 511.2 + "x": 191.7, + "y": 674.2 }, { - "x": 218.5, - "y": 560 + "x": 264.5, + "y": 723 } ], "isCurve": true, @@ -534,20 +822,20 @@ "labelPercentage": 0, "route": [ { - "x": 243, - "y": 439 + "x": 226, + "y": 602 }, { - "x": 243.2, - "y": 487 + "x": 239.8, + "y": 650 }, { - "x": 243.25, - "y": 511.2 + "x": 252.25, + "y": 674.2 }, { - "x": 243.25, - "y": 560 + "x": 288.25, + "y": 723 } ], "isCurve": true, @@ -582,20 +870,20 @@ "labelPercentage": 0, "route": [ { - "x": 268, - "y": 439 + "x": 290, + "y": 602 }, { - "x": 304, - "y": 487 + "x": 395.2, + "y": 650 }, { - "x": 304, - "y": 511.2 + "x": 407.5, + "y": 674.2 }, { - "x": 268, - "y": 560 + "x": 351.5, + "y": 723 } ], "isCurve": true, @@ -630,32 +918,32 @@ "labelPercentage": 0, "route": [ { - "x": 243.25, - "y": 625.5 + "x": 313.5, + "y": 788.5 }, { - "x": 243.25, - "y": 651.1 + "x": 313.5, + "y": 814.1 }, { - "x": 243.25, - "y": 669.6 + "x": 313.5, + "y": 832.6 }, { - "x": 243.25, - "y": 687.75 + "x": 313.5, + "y": 850.75 }, { - "x": 243.25, - "y": 705.9 + "x": 313.5, + "y": 868.9 }, { - "x": 243.2, - "y": 792.2 + "x": 313.6, + "y": 955.2 }, { - "x": 243, - "y": 847 + "x": 314, + "y": 1010 } ], "isCurve": true, @@ -690,20 +978,20 @@ "labelPercentage": 0, "route": [ { - "x": 172, - "y": 87 + "x": 157, + "y": 169 }, { - "x": 229, - "y": 156.2 + "x": 204.8, + "y": 303 }, { - "x": 243.25, - "y": 248.2 + "x": 216.75, + "y": 411.2 }, { - "x": 243.25, - "y": 305 + "x": 216.75, + "y": 468 } ], "isCurve": true, @@ -738,176 +1026,176 @@ "labelPercentage": 0, "route": [ { - "x": 128, - "y": 87 + "x": 136, + "y": 169 }, { - "x": 86.6, - "y": 156.2 + "x": 88.19999999999999, + "y": 303 }, { "x": 76.25, - "y": 185.6 + "y": 348.6 }, { "x": 76.25, - "y": 203.75 + "y": 366.75 }, { "x": 76.25, - "y": 221.9 + "y": 384.9 }, { "x": 76.25, - "y": 244 + "y": 407 }, { "x": 76.25, - "y": 259 + "y": 422 }, { "x": 76.25, - "y": 274 + "y": 437 }, { "x": 76.25, - "y": 300.6 + "y": 463.6 }, { "x": 76.25, - "y": 325.5 + "y": 488.5 }, { "x": 76.25, - "y": 350.4 + "y": 513.4 }, { "x": 76.25, - "y": 385.7 + "y": 548.7 }, { "x": 76.25, - "y": 413.75 + "y": 576.75 }, { "x": 76.25, - "y": 441.8 + "y": 604.8 }, { "x": 76.25, - "y": 479.2 + "y": 642.2 }, { "x": 76.25, - "y": 507.25 + "y": 670.25 }, { "x": 76.25, - "y": 535.3 + "y": 698.3 }, { "x": 76.25, - "y": 570.6 + "y": 733.6 }, { "x": 76.25, - "y": 595.5 + "y": 758.5 }, { "x": 76.25, - "y": 620.4 + "y": 783.4 }, { "x": 76.25, - "y": 649.1 + "y": 812.1 }, { "x": 76.25, - "y": 667.25 + "y": 830.25 }, { "x": 76.25, - "y": 685.4 + "y": 848.4 }, { "x": 76.25, - "y": 709.6 + "y": 872.6 }, { "x": 76.25, - "y": 727.75 + "y": 890.75 }, { "x": 76.25, - "y": 745.9 + "y": 908.9 }, { "x": 76.25, - "y": 779.8 + "y": 942.8 }, { "x": 76.25, - "y": 812.5 + "y": 975.5 }, { "x": 76.25, - "y": 845.2 + "y": 1008.2 }, { "x": 76.25, - "y": 888.8 + "y": 1051.8 }, { "x": 76.25, - "y": 921.5 + "y": 1084.5 }, { "x": 76.25, - "y": 954.2 + "y": 1117.2 }, { "x": 76.25, - "y": 986 + "y": 1149 }, { "x": 76.25, - "y": 1001 + "y": 1164 }, { "x": 76.25, - "y": 1016 + "y": 1179 }, { "x": 76.25, - "y": 1042.6 + "y": 1205.6 }, { "x": 76.25, - "y": 1067.5 + "y": 1230.5 }, { "x": 76.25, - "y": 1092.4 + "y": 1255.4 }, { "x": 76.25, - "y": 1127.7 + "y": 1290.7 }, { "x": 76.25, - "y": 1155.75 + "y": 1318.75 }, { "x": 76.25, - "y": 1183.8 + "y": 1346.8 }, { "x": 79.6, - "y": 1282.6 + "y": 1445.6 }, { "x": 93, - "y": 1361 + "y": 1524 } ], "isCurve": true, @@ -942,20 +1230,20 @@ "labelPercentage": 0, "route": [ { - "x": 450.25, - "y": 1126 + "x": 520.5, + "y": 1286.4080303852415 }, { - "x": 194.64999999999998, - "y": 1187.2 + "x": 208.7, + "y": 1349.6816060770484 }, { "x": 127.4, - "y": 1282.6 + "y": 1445.6 }, { "x": 114, - "y": 1361 + "y": 1524 } ], "isCurve": true, @@ -990,20 +1278,20 @@ "labelPercentage": 0, "route": [ { - "x": 521.25, - "y": 1142 + "x": 591.5, + "y": 1305 }, { - "x": 521.25, - "y": 1190.4 + "x": 591.5, + "y": 1353.4 }, { - "x": 521.2, - "y": 1273 + "x": 591.6, + "y": 1436 }, { - "x": 521, - "y": 1313 + "x": 592, + "y": 1476 } ], "isCurve": true, @@ -1038,20 +1326,20 @@ "labelPercentage": 0, "route": [ { - "x": 243.25, - "y": 996.5 + "x": 313.5, + "y": 1159.5 }, { - "x": 243.25, - "y": 1020.1 + "x": 313.5, + "y": 1183.1 }, { - "x": 284.65, - "y": 1038.4 + "x": 354.9, + "y": 1201.3604316546762 }, { - "x": 450.25, - "y": 1088 + "x": 520.5, + "y": 1250.8021582733813 } ], "isCurve": true, diff --git a/e2etests/testdata/themes/terminal/dagre/sketch.exp.svg b/e2etests/testdata/themes/terminal/dagre/sketch.exp.svg index f85057442..475d247c2 100644 --- a/e2etests/testdata/themes/terminal/dagre/sketch.exp.svg +++ b/e2etests/testdata/themes/terminal/dagre/sketch.exp.svg @@ -1,16 +1,23 @@ -