From d5454ceeb043db0e58318cb8c85a715fb07db2d2 Mon Sep 17 00:00:00 2001 From: Conglei Shi Date: Wed, 13 Nov 2019 11:00:10 -0800 Subject: [PATCH] switch to new table --- superset/assets/package-lock.json | 115 ++++++++++-------- superset/assets/package.json | 2 +- .../src/visualizations/presets/MainPreset.js | 2 +- 3 files changed, 68 insertions(+), 51 deletions(-) diff --git a/superset/assets/package-lock.json b/superset/assets/package-lock.json index 743952cdeea07..6e70a947fb0a1 100644 --- a/superset/assets/package-lock.json +++ b/superset/assets/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "@airbnb/lunar": { - "version": "2.38.1", - "resolved": "https://registry.npmjs.org/@airbnb/lunar/-/lunar-2.38.1.tgz", - "integrity": "sha512-KIU/tzvRyYfaA5Qlh/jTbIt1PuIsTP1Nl1uKJjJIdU/1dV5O4V/G+O66D8T3WodK/h0plgOoiqTmX63K/Zve7w==", + "version": "2.41.0", + "resolved": "https://registry.npmjs.org/@airbnb/lunar/-/lunar-2.41.0.tgz", + "integrity": "sha512-pijDKAMg3Du05IM1riJqTMEFdAurJN0vPKyHrHSvXubadPegckm3KU2JPaU6hAYq5rZzxwaDHpAY64iUc8OchQ==", "requires": { "@types/airbnb-prop-types": "*", "@types/hoist-non-react-statics": "*", @@ -28,12 +28,12 @@ "emojibase-regex": "^3.1.0", "fuse.js": "^3.4.5", "hoist-non-react-statics": "^3.3.0", - "interweave": "^12.0.0", + "interweave": "^12.1.0", "interweave-autolink": "^4.0.0", - "interweave-emoji": "^5.0.0", + "interweave-emoji": "^5.1.0", "interweave-emoji-picker": "^5.0.0", "lodash": "^4.17.15", - "luxon": "^1.21.0", + "luxon": "^1.21.1", "ms": "^2.1.2", "prop-types": "^15.7.2", "react-day-picker": "7.3.2", @@ -42,6 +42,14 @@ "uuid": "^3.3.3" }, "dependencies": { + "@babel/runtime": { + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.7.2.tgz", + "integrity": "sha512-JONRbXbTXc9WQE2mAZd1p0Z3DZ/6vaQIkgYMSTP3KjRCyd7rCZCcfhCyX+YjwcKxcZ82UrxbRD358bpExNgrjw==", + "requires": { + "regenerator-runtime": "^0.13.2" + } + }, "aphrodite": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/aphrodite/-/aphrodite-2.4.0.tgz", @@ -52,6 +60,20 @@ "string-hash": "^1.1.3" } }, + "csstype": { + "version": "2.6.7", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.7.tgz", + "integrity": "sha512-9Mcn9sFbGBAdmimWb2gLVDtFJzeKtDGIr76TUqmjZrw9LFXBMSU70lcs+C0/7fyCd6iBDqmksUcCOUIkisPHsQ==" + }, + "dom-helpers": { + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.1.3.tgz", + "integrity": "sha512-nZD1OtwfWGRBWlpANxacBEZrEuLa16o1nh7YopFWeoF68Zt8GGEmzHu6Xv4F3XaFIC+YXtTLrzgqKxFgLEe4jw==", + "requires": { + "@babel/runtime": "^7.6.3", + "csstype": "^2.6.7" + } + }, "fuse.js": { "version": "3.4.5", "resolved": "https://registry.npmjs.org/fuse.js/-/fuse.js-3.4.5.tgz", @@ -74,9 +96,9 @@ } }, "interweave": { - "version": "12.0.0", - "resolved": "https://registry.npmjs.org/interweave/-/interweave-12.0.0.tgz", - "integrity": "sha512-dTdsi/SelaErA9Z8gxQKkB3MTYh5rI3i3/cqSs7bAn4ieVcBX8+cNUM3+Wx77B3KuLR6hyqetuPPaYRdY4shjw==", + "version": "12.1.0", + "resolved": "https://registry.npmjs.org/interweave/-/interweave-12.1.0.tgz", + "integrity": "sha512-+l0GzUgb5Yn4QAG75VtffhUQR58swg093EaplLNznq4V4xKBDgVi8xHGoCwaeeQjU650A6/Lx5F0dZ9nLptHNw==", "requires": { "@types/react": "*", "escape-html": "^1.0.3", @@ -104,14 +126,13 @@ "integrity": "sha512-gbBVYR2p8mnriqAwWx9LbuUrShnAuSCNnuPGyc7GJrMVQtPDAh8iLpv7FRuMPFb56KkaVZIYSz1PrjI9q0QPCw==" }, "react-virtualized": { - "version": "9.21.1", - "resolved": "https://registry.npmjs.org/react-virtualized/-/react-virtualized-9.21.1.tgz", - "integrity": "sha512-E53vFjRRMCyUTEKuDLuGH1ld/9TFzjf/fFW816PE4HFXWZorESbSTYtiZz1oAjra0MminaUU1EnvUxoGuEFFPA==", + "version": "9.21.2", + "resolved": "https://registry.npmjs.org/react-virtualized/-/react-virtualized-9.21.2.tgz", + "integrity": "sha512-oX7I7KYiUM7lVXQzmhtF4Xg/4UA5duSA+/ZcAvdWlTLFCoFYq1SbauJT5gZK9cZS/wdYR6TPGpX/dqzvTqQeBA==", "requires": { "babel-runtime": "^6.26.0", "clsx": "^1.0.1", - "dom-helpers": "^2.4.0 || ^3.0.0", - "linear-layout-vector": "0.0.1", + "dom-helpers": "^5.0.0", "loose-envify": "^1.3.0", "prop-types": "^15.6.0", "react-lifecycles-compat": "^3.0.4" @@ -125,9 +146,9 @@ } }, "@airbnb/lunar-icons": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/@airbnb/lunar-icons/-/lunar-icons-2.5.1.tgz", - "integrity": "sha512-pE6oQxg4B5p59GLAIg7+0iVlD7+lfMp/lreOy1tRr5FK5NDPdpByv4xj3YmjlkeRJML6tC/sge3yq2/B/Y7ctA==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@airbnb/lunar-icons/-/lunar-icons-2.6.0.tgz", + "integrity": "sha512-UW23hysVyoExjT4T+Lr+n3ljQ9PTEPv32z8Z3LGYRsa/OnsYFM/GS36BLFvIYWMV7643SWHMqQTXMXN2Bmw7jA==", "requires": { "@types/react": "*" } @@ -4245,22 +4266,15 @@ } }, "@superset-ui/plugin-chart-table": { - "version": "0.11.4", - "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-table/-/plugin-chart-table-0.11.4.tgz", - "integrity": "sha512-c9V6Z3MLobRaDN3MoFvllwtrHvRyU5GEmHf9/GWaElhcDNHNzpxXDnyN91j5L7LYTs613vBFCWT+3mJiJAqqVw==", + "version": "0.11.6", + "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-table/-/plugin-chart-table-0.11.6.tgz", + "integrity": "sha512-Tnmfdz+QK2v/O89ifUP9AgrqhFP/IAeMf1XR0KGa/BfpPsFZBptnKvD1L7pxLIzfynJyhFOUmmShpzA0pEThsQ==", "requires": { "@airbnb/lunar": "^2.35.0", "@airbnb/lunar-icons": "^2.1.4", - "@types/dompurify": "^0.0.33", + "@types/dompurify": "^2.0.0", "dompurify": "^2.0.6", "reselect": "^4.0.0" - }, - "dependencies": { - "dompurify": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-2.0.7.tgz", - "integrity": "sha512-S3O0lk6rFJtO01ZTzMollCOGg+WAtCwS3U5E2WSDY/x/sy7q70RjEC4Dmrih5/UqzLLB9XoKJ8KqwBxaNvBu4A==" - } } }, "@superset-ui/preset-chart-xy": { @@ -4554,9 +4568,12 @@ "integrity": "sha512-tJSyXta8ZyJ52wDDHA96JEsvkbL6jl7wowGmuf45+fAkj5Y+SQOnz0N7/H68OWmPshPsAaWMQh+GAws44IzH3g==" }, "@types/dompurify": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/@types/dompurify/-/dompurify-0.0.33.tgz", - "integrity": "sha512-lUN9iC6b4txeaEef2PW7zIdhEKAp0Sw9bymOcXXZ7BaepB0nsDJYcLIrFfgpIkRSoZWBJ8IcYunB2hAXuHL1NA==" + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@types/dompurify/-/dompurify-2.0.0.tgz", + "integrity": "sha512-g/ilp+Bo6Ljy60i5LnjkGw00X7EIoFjoPGlxqZhV8TJ9fWEzXheioU1O+U/UzCzUA7pUDy/JNMytTQDJctpUHg==", + "requires": { + "@types/trusted-types": "*" + } }, "@types/fast-json-stable-stringify": { "version": "2.0.0", @@ -4619,9 +4636,9 @@ "dev": true }, "@types/lodash": { - "version": "4.14.144", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.144.tgz", - "integrity": "sha512-ogI4g9W5qIQQUhXAclq6zhqgqNUr7UlFaqDHbch7WLSLeeM/7d3CRaw7GLajxvyFvhJqw4Rpcz5bhoaYtIx6Tg==" + "version": "4.14.146", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.146.tgz", + "integrity": "sha512-JzJcmQ/ikHSv7pbvrVNKJU5j9jL9VLf3/gqs048CEnBVVVEv4kve3vLxoPHGvclutS+Il4SBIuQQ087m1eHffw==" }, "@types/luxon": { "version": "1.15.2", @@ -4711,6 +4728,11 @@ "resolved": "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.4.tgz", "integrity": "sha512-78AdXtlhpCHT0K3EytMpn4JNxaf5tbqbLcbIRoQIHzpTIyjpxLQKRoxU55ujBXAtg3Nl2h/XWvfDa9dsMOd0pQ==" }, + "@types/trusted-types": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-1.0.4.tgz", + "integrity": "sha512-6jtHrHpmiXOXoJ31Cg9R+iEVwuEKPf0XHwFUI93eEPXx492/J2JHyafkleKE2EYzZprayk9FSjTyK1GDqcwDng==" + }, "@types/uglify-js": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.0.4.tgz", @@ -10747,7 +10769,7 @@ "dependencies": { "core-js": { "version": "1.2.7", - "resolved": "http://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=" } } @@ -13331,9 +13353,9 @@ } }, "interweave-emoji": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/interweave-emoji/-/interweave-emoji-5.0.0.tgz", - "integrity": "sha512-phcf/Z9KsXx6n/cF0Z7H1UHDyr3jSLCEU0RR8aaRudOtr/zcgEJlYS12kKuUPWhiU8T4JGS+YCravWaXy7p1rQ==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/interweave-emoji/-/interweave-emoji-5.1.0.tgz", + "integrity": "sha512-r8Lw/wOVZ5voQWV1tFUA0C21dILNwgA38kWuQm41X9sGmlAOMmhiE33SKjd130t7JYkUCvzVVJ4dp2TxxrrxMA==", "requires": { "@types/react": "*", "emojibase-regex": "^3.1.0", @@ -15928,11 +15950,6 @@ "type-check": "~0.3.2" } }, - "linear-layout-vector": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/linear-layout-vector/-/linear-layout-vector-0.0.1.tgz", - "integrity": "sha1-OYEU1zA7bsx/1rJzr3uEAdi6nHA=" - }, "load-bmfont": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/load-bmfont/-/load-bmfont-1.4.0.tgz", @@ -16143,9 +16160,9 @@ } }, "luxon": { - "version": "1.21.0", - "resolved": "https://registry.npmjs.org/luxon/-/luxon-1.21.0.tgz", - "integrity": "sha512-GkS6D9prDlacKi062DW/OxVI7i+CKgfBc2uDqI//UH1VwPPlgYiMwfoP5uHK3UfzdjXgbwmEwZHWIGgLcg/APg==" + "version": "1.21.1", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-1.21.1.tgz", + "integrity": "sha512-3zxaKX7mj7eA80TU0sm4CfNEtiUZ2QXGjMc80rfG4d1dOnnOOWz63U9j4nYR7+1w716DYtWfdOeVhDXYlH+D4w==" }, "magic-string": { "version": "0.22.5", @@ -24366,9 +24383,9 @@ } }, "utility-types": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/utility-types/-/utility-types-3.9.0.tgz", - "integrity": "sha512-bUUsGr7NuI1p/6GpDCI/PUCJ1y5KWO4xul8RWOcmUwXSjLoi6WoV9YLNqBF7lH4RRy/jgmhYCE49eM0bnaijMQ==" + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/utility-types/-/utility-types-3.10.0.tgz", + "integrity": "sha512-O11mqxmi7wMKCo6HKFt5AhO4BwY3VV68YU07tgxfz8zJTIxr4BpsezN49Ffwy9j3ZpwwJp4fkRwjRzq3uWE6Rg==" }, "utils-merge": { "version": "1.0.1", diff --git a/superset/assets/package.json b/superset/assets/package.json index c286ee7335cfb..8cacbe68160c2 100644 --- a/superset/assets/package.json +++ b/superset/assets/package.json @@ -79,7 +79,7 @@ "@superset-ui/legacy-preset-chart-deckgl": "^0.1.0", "@superset-ui/legacy-preset-chart-nvd3": "^0.11.4", "@superset-ui/number-format": "^0.12.1", - "@superset-ui/plugin-chart-table": "^0.11.4", + "@superset-ui/plugin-chart-table": "^0.11.6", "@superset-ui/preset-chart-xy": "^0.11.0", "@superset-ui/query": "^0.12.2", "@superset-ui/time-format": "^0.12.4", diff --git a/superset/assets/src/visualizations/presets/MainPreset.js b/superset/assets/src/visualizations/presets/MainPreset.js index 3ea5592339c16..43e7673bfb615 100644 --- a/superset/assets/src/visualizations/presets/MainPreset.js +++ b/superset/assets/src/visualizations/presets/MainPreset.js @@ -36,7 +36,7 @@ import PivotTableChartPlugin from '@superset-ui/legacy-plugin-chart-pivot-table' import RoseChartPlugin from '@superset-ui/legacy-plugin-chart-rose'; import SankeyChartPlugin from '@superset-ui/legacy-plugin-chart-sankey'; import SunburstChartPlugin from '@superset-ui/legacy-plugin-chart-sunburst'; -import TableChartPlugin from '@superset-ui/legacy-plugin-chart-table'; +import TableChartPlugin from '@superset-ui/plugin-chart-table/esm/legacy'; import TreemapChartPlugin from '@superset-ui/legacy-plugin-chart-treemap'; import WordCloudChartPlugin from '@superset-ui/legacy-plugin-chart-word-cloud'; import WorldMapChartPlugin from '@superset-ui/legacy-plugin-chart-world-map';