Skip to content

Commit

Permalink
[AIRFLOW-3887] Downgrade dagre-d3 to 0.4.18 (#4713)
Browse files Browse the repository at this point in the history
dagre-d3 v0.6.3 has a bug that causes this Javascript error when loading
the Graph View:

    TypeError: previousPaths.merge is not a function

The bug fix [1] has been merged to master, but hasn't been released to
npm yet. This change temporarily downgrades our version of dagre-d3
until dagre-d3 v0.6.4 is released [2]

I also fixed a bug I encountered in the `compile_assets.sh` where the
script would fail if the directory `airflow/www/static/dist/` exists but
is empty.

[1] dagrejs/dagre-d3#350
[2] https://github.com/dagrejs/dagre-d3/blob/5450627790ff42012ef50cef6b0e220199ae4fbe/package.json#L3

GitOrigin-RevId: fe9df7301575f54607715dee0b170a1daf5e5dcf
  • Loading branch information
astahlman authored and Cloud Composer Team committed Feb 11, 2021
1 parent 666b8be commit 8db7968
Show file tree
Hide file tree
Showing 3 changed files with 66 additions and 31 deletions.
2 changes: 1 addition & 1 deletion airflow/www_rbac/compile_assets.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ set -e

# first bump up package.json manually, commit and tag
if [ -d airflow/www_rbac/static/dist ]; then
rm airflow/www_rbac/static/dist/*
rm -f airflow/www_rbac/static/dist/*
fi

cd airflow/www_rbac/
Expand Down
93 changes: 64 additions & 29 deletions airflow/www_rbac/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion airflow/www_rbac/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"bootstrap-toggle": "^2.2.2",
"d3": "^3.4.4",
"d3-tip": "^0.9.1",
"dagre-d3": "^0.6.3",
"dagre-d3": "^0.4.18",
"datatables.net": "^1.10.19",
"datatables.net-bs": "^1.10.19",
"lodash": "^4.17.11",
Expand Down

0 comments on commit 8db7968

Please sign in to comment.