From 70b3ac95fc344e3243bcbb22669ddb3e3d0857af Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Wed, 16 Nov 2022 17:17:12 -0800 Subject: [PATCH 1/5] 2022-11-16 05:17:12PM --- .../container_child_edge/dagre/board.exp.json | 215 ++++++++++++++++++ .../container_child_edge/dagre/sketch.exp.svg | 37 +++ .../container_child_edge/elk/board.exp.json | 205 +++++++++++++++++ .../container_child_edge/elk/sketch.exp.svg | 37 +++ 4 files changed, 494 insertions(+) create mode 100644 e2etests/testdata/todo/container_child_edge/dagre/board.exp.json create mode 100644 e2etests/testdata/todo/container_child_edge/dagre/sketch.exp.svg create mode 100644 e2etests/testdata/todo/container_child_edge/elk/board.exp.json create mode 100644 e2etests/testdata/todo/container_child_edge/elk/sketch.exp.svg diff --git a/e2etests/testdata/todo/container_child_edge/dagre/board.exp.json b/e2etests/testdata/todo/container_child_edge/dagre/board.exp.json new file mode 100644 index 000000000..7dc266f6c --- /dev/null +++ b/e2etests/testdata/todo/container_child_edge/dagre/board.exp.json @@ -0,0 +1,215 @@ +{ + "name": "", + "shapes": [ + { + "id": "container", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 255, + "height": 452, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#E3E9FD", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "container", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 117, + "labelHeight": 41, + "labelPosition": "INSIDE_TOP_CENTER" + }, + { + "id": "container.first", + "type": "", + "pos": { + "x": 60, + "y": 50 + }, + "width": 135, + "height": 126, + "level": 2, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#EDF0FD", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "first", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 35, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER" + }, + { + "id": "container.second", + "type": "", + "pos": { + "x": 50, + "y": 276 + }, + "width": 155, + "height": 126, + "level": 2, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#EDF0FD", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "second", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 55, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER" + } + ], + "connections": [ + { + "id": "container.(first -> second)[0]", + "src": "container.first", + "srcArrow": "none", + "srcLabel": "", + "dst": "container.second", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "1->2", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 103.10840707964601, + "y": 176 + }, + { + "x": 87.6216814159292, + "y": 216 + }, + { + "x": 87.55, + "y": 236 + }, + { + "x": 102.75, + "y": 276 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null + }, + { + "id": "(container -> container.second)[0]", + "src": "container", + "srcArrow": "none", + "srcLabel": "", + "dst": "container.second", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "c->2", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 28, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 151.891592920354, + "y": 176 + }, + { + "x": 167.3783185840708, + "y": 216 + }, + { + "x": 167.45, + "y": 236 + }, + { + "x": 152.25, + "y": 276 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null + } + ] +} diff --git a/e2etests/testdata/todo/container_child_edge/dagre/sketch.exp.svg b/e2etests/testdata/todo/container_child_edge/dagre/sketch.exp.svg new file mode 100644 index 000000000..afb797bbf --- /dev/null +++ b/e2etests/testdata/todo/container_child_edge/dagre/sketch.exp.svg @@ -0,0 +1,37 @@ + +containerfirstsecond + + +1->2 + + +c->2 \ No newline at end of file diff --git a/e2etests/testdata/todo/container_child_edge/elk/board.exp.json b/e2etests/testdata/todo/container_child_edge/elk/board.exp.json new file mode 100644 index 000000000..b16ebab48 --- /dev/null +++ b/e2etests/testdata/todo/container_child_edge/elk/board.exp.json @@ -0,0 +1,205 @@ +{ + "name": "", + "shapes": [ + { + "id": "container", + "type": "", + "pos": { + "x": 12, + "y": 12 + }, + "width": 509, + "height": 321, + "level": 1, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#E3E9FD", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "container", + "fontSize": 28, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 117, + "labelHeight": 41, + "labelPosition": "INSIDE_TOP_CENTER" + }, + { + "id": "container.first", + "type": "", + "pos": { + "x": 87, + "y": 132 + }, + "width": 135, + "height": 126, + "level": 2, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#EDF0FD", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "first", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 35, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER" + }, + { + "id": "container.second", + "type": "", + "pos": { + "x": 291, + "y": 111 + }, + "width": 155, + "height": 126, + "level": 2, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "#EDF0FD", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "fields": null, + "methods": null, + "columns": null, + "label": "second", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 55, + "labelHeight": 26, + "labelPosition": "INSIDE_MIDDLE_CENTER" + } + ], + "connections": [ + { + "id": "container.(first -> second)[0]", + "src": "container.first", + "srcArrow": "none", + "srcLabel": "", + "dst": "container.second", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "1->2", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 222, + "y": 195 + }, + { + "x": 291, + "y": 195 + } + ], + "animated": false, + "tooltip": "", + "icon": null + }, + { + "id": "(container -> container.second)[0]", + "src": "container", + "srcArrow": "none", + "srcLabel": "", + "dst": "container.second", + "dstArrow": "triangle", + "dstLabel": "", + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "#0D32B2", + "label": "c->2", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#676C7E", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 28, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelPercentage": 0, + "route": [ + { + "x": 12, + "y": 111 + }, + { + "x": 281, + "y": 111 + }, + { + "x": 281, + "y": 153 + }, + { + "x": 291, + "y": 153 + } + ], + "animated": false, + "tooltip": "", + "icon": null + } + ] +} diff --git a/e2etests/testdata/todo/container_child_edge/elk/sketch.exp.svg b/e2etests/testdata/todo/container_child_edge/elk/sketch.exp.svg new file mode 100644 index 000000000..50247b20e --- /dev/null +++ b/e2etests/testdata/todo/container_child_edge/elk/sketch.exp.svg @@ -0,0 +1,37 @@ + +containerfirstsecond + + +1->2 + + +c->2 \ No newline at end of file From bdb2e36a645d7a48fabe6385367e209115a6952a Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Thu, 17 Nov 2022 11:30:42 -0800 Subject: [PATCH 2/5] 2022-11-17 11:30:42AM --- ci/release/_install.sh | 11 ++++++++++- install.sh | 15 ++++++++++++--- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/ci/release/_install.sh b/ci/release/_install.sh index 7406eca3f..4ac7fbbc6 100755 --- a/ci/release/_install.sh +++ b/ci/release/_install.sh @@ -181,8 +181,14 @@ install() { if [ -n "${TALA-}" ]; then log "tala-$TALA_VERSION-$OS-$ARCH has been successfully installed into $PREFIX" fi + log "Rerun this install script with --uninstall to uninstall" if ! echo "$PATH" | grep -qF "$PREFIX/bin"; then logcat >&2 <&2 <&2 - exit "$code" + return "$code" } echo_dur() { @@ -615,8 +615,14 @@ install() { if [ -n "${TALA-}" ]; then log "tala-$TALA_VERSION-$OS-$ARCH has been successfully installed into $PREFIX" fi + log "Rerun this install script with --uninstall to uninstall" if ! echo "$PATH" | grep -qF "$PREFIX/bin"; then logcat >&2 <&2 < Date: Thu, 17 Nov 2022 11:37:06 -0800 Subject: [PATCH 3/5] fix typo --- ci/release/_install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/release/_install.sh b/ci/release/_install.sh index 4ac7fbbc6..2dda110a2 100755 --- a/ci/release/_install.sh +++ b/ci/release/_install.sh @@ -318,7 +318,7 @@ uninstall_standalone_d2() { if [ ! -e "$INSTALL_DIR/d2-$INSTALLED_VERSION" ]; then warn "missing standalone install release directory $INSTALL_DIR/d2-$INSTALLED_VERSION" - warn "d2 have been installed via some other installation method." + warn "d2 has been installed via some other installation method." return 1 fi @@ -341,7 +341,7 @@ uninstall_standalone_tala() { if [ ! -e "$INSTALL_DIR/tala-$INSTALLED_VERSION" ]; then warn "missing standalone install release directory $INSTALL_DIR/tala-$INSTALLED_VERSION" - warn "tala have been installed via some other installation method." + warn "tala has been installed via some other installation method." return 1 fi From 52e12a8169a90413c6d8c10e827a24870e3e4818 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Thu, 17 Nov 2022 11:37:14 -0800 Subject: [PATCH 4/5] ge --- install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index 440d9a5f2..864a128f5 100755 --- a/install.sh +++ b/install.sh @@ -752,7 +752,7 @@ uninstall_standalone_d2() { if [ ! -e "$INSTALL_DIR/d2-$INSTALLED_VERSION" ]; then warn "missing standalone install release directory $INSTALL_DIR/d2-$INSTALLED_VERSION" - warn "d2 have been installed via some other installation method." + warn "d2 has been installed via some other installation method." return 1 fi @@ -775,7 +775,7 @@ uninstall_standalone_tala() { if [ ! -e "$INSTALL_DIR/tala-$INSTALLED_VERSION" ]; then warn "missing standalone install release directory $INSTALL_DIR/tala-$INSTALLED_VERSION" - warn "tala have been installed via some other installation method." + warn "tala has been installed via some other installation method." return 1 fi From 5a1f976df877a063734c38dce971a7ebf59a5c2a Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Thu, 17 Nov 2022 11:38:21 -0800 Subject: [PATCH 5/5] must have --- ci/release/_install.sh | 4 ++-- install.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/release/_install.sh b/ci/release/_install.sh index 2dda110a2..2917323ad 100755 --- a/ci/release/_install.sh +++ b/ci/release/_install.sh @@ -318,7 +318,7 @@ uninstall_standalone_d2() { if [ ! -e "$INSTALL_DIR/d2-$INSTALLED_VERSION" ]; then warn "missing standalone install release directory $INSTALL_DIR/d2-$INSTALLED_VERSION" - warn "d2 has been installed via some other installation method." + warn "d2 must have been installed via some other installation method." return 1 fi @@ -341,7 +341,7 @@ uninstall_standalone_tala() { if [ ! -e "$INSTALL_DIR/tala-$INSTALLED_VERSION" ]; then warn "missing standalone install release directory $INSTALL_DIR/tala-$INSTALLED_VERSION" - warn "tala has been installed via some other installation method." + warn "tala must have been installed via some other installation method." return 1 fi diff --git a/install.sh b/install.sh index 864a128f5..5cc51950f 100755 --- a/install.sh +++ b/install.sh @@ -752,7 +752,7 @@ uninstall_standalone_d2() { if [ ! -e "$INSTALL_DIR/d2-$INSTALLED_VERSION" ]; then warn "missing standalone install release directory $INSTALL_DIR/d2-$INSTALLED_VERSION" - warn "d2 has been installed via some other installation method." + warn "d2 must have been installed via some other installation method." return 1 fi @@ -775,7 +775,7 @@ uninstall_standalone_tala() { if [ ! -e "$INSTALL_DIR/tala-$INSTALLED_VERSION" ]; then warn "missing standalone install release directory $INSTALL_DIR/tala-$INSTALLED_VERSION" - warn "tala has been installed via some other installation method." + warn "tala must have been installed via some other installation method." return 1 fi