From e2a429b0c8042ba867f834f5dc5561d1e402289b Mon Sep 17 00:00:00 2001 From: Ville Brofeldt <33317356+villebro@users.noreply.github.com> Date: Mon, 15 Nov 2021 12:50:08 +0200 Subject: [PATCH] feat(explore): adhoc column expressions [ID-3] (#17379) * add support for adhoc columns to api and sqla model * fix some types * fix duplicates in column names * fix more lint * fix schema and dedup * clean up some logic * first pass at fixing viz.py * Add frontend support for adhoc columns * Add title edit * Fix showing custom title * Use column name as default value in sql editor * fix: Adds a loading message when needed in the Select component (#16531) * fix(tests): make parquet select deterministic with order by (#16570) * bump emotion to help with cache clobbering (#16559) * fix: Support Jinja template functions in global async queries (#16412) * Support Jinja template functions in async queries * Pylint * Add tests for async tasks * Remove redundant has_request_context check * fix: impersonate user label/tooltip (#16573) * docs: update for small typos (#16568) * feat: Add Aurora Data API engine spec (#16535) * feat: Add Aurora Data API engine spec * Fix lint * refactor: sql_json view endpoint: encapsulate ctas parameters (#16548) * refactor sql_json view endpoint: encapsulate ctas parameters * fix failed tests * fix failed tests and ci issues * refactor sql_json view endpoint: separate concern into ad hod method (#16595) * feat: Experimental cross-filter plugins (#16594) * fix:fix get permission function * feat: add cross filter chart in charts gallery under FF * chore(deps): bump superset-ui to 0.18.2 (#16601) * update type guard references * fix imports * update series_columns schema * Add changes that got lost in rebase * Use current columns name or expression as sql editor init value * add integration test and do minor fixes * Bump superset-ui * fix linting issue * bump superset-ui to 0.18.22 * resolve merge conflict * lint * fix select filter infinite loop * bump superset-ui to 0.18.23 * Fix auto setting column popover title * Enable adhoc columns only if UX_BETA enabled * put back removed test * Move popover height and width to constants * Refactor big ternary expression Co-authored-by: Kamil Gabryjelski Co-authored-by: Michael S. Molina <70410625+michael-s-molina@users.noreply.github.com> Co-authored-by: Elizabeth Thompson Co-authored-by: Rob DiCiuccio Co-authored-by: Beto Dealmeida Co-authored-by: joeADSP <75027008+joeADSP@users.noreply.github.com> Co-authored-by: ofekisr <35701650+ofekisr@users.noreply.github.com> Co-authored-by: simcha90 <56388545+simcha90@users.noreply.github.com> --- superset-frontend/package-lock.json | 772 +++++++++--------- superset-frontend/package.json | 56 +- .../ColumnSelectPopover.tsx | 170 +++- .../ColumnSelectPopoverTrigger.tsx | 73 +- .../DndColumnSelect.tsx | 29 +- .../DndColumnSelectPopoverTitle.jsx | 96 +++ .../DndColumnSelectControl/OptionWrapper.tsx | 24 +- .../controls/DndColumnSelectControl/types.ts | 4 +- .../utils/optionSelector.ts | 60 +- .../AdhocFilterEditPopover/index.jsx | 15 +- .../AdhocMetricEditPopover/index.jsx | 17 +- superset-frontend/src/explore/constants.ts | 3 + .../GroupBy/GroupByFilterPlugin.tsx | 18 +- .../components/Range/RangeFilterPlugin.tsx | 4 +- .../components/Select/SelectFilterPlugin.tsx | 6 +- .../filters/components/Select/buildQuery.ts | 9 +- superset/charts/schemas.py | 14 +- superset/common/query_actions.py | 10 +- superset/common/query_context.py | 3 +- superset/common/query_object.py | 21 +- superset/connectors/base/models.py | 2 +- superset/connectors/sqla/models.py | 99 ++- superset/typing.py | 8 + superset/utils/core.py | 59 +- superset/viz.py | 127 +-- tests/integration_tests/charts/api_tests.py | 2 +- .../charts/data/api_tests.py | 27 + 27 files changed, 1122 insertions(+), 606 deletions(-) create mode 100644 superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndColumnSelectPopoverTitle.jsx diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json index 9ed9815397..c36e110e15 100644 --- a/superset-frontend/package-lock.json +++ b/superset-frontend/package-lock.json @@ -16,35 +16,35 @@ "@emotion/cache": "^11.4.0", "@emotion/react": "^11.4.1", "@emotion/styled": "^11.3.0", - "@superset-ui/chart-controls": "^0.18.20", - "@superset-ui/core": "^0.18.20", - "@superset-ui/legacy-plugin-chart-calendar": "^0.18.20", - "@superset-ui/legacy-plugin-chart-chord": "^0.18.20", - "@superset-ui/legacy-plugin-chart-country-map": "^0.18.20", - "@superset-ui/legacy-plugin-chart-event-flow": "^0.18.20", - "@superset-ui/legacy-plugin-chart-force-directed": "^0.18.20", - "@superset-ui/legacy-plugin-chart-heatmap": "^0.18.20", - "@superset-ui/legacy-plugin-chart-histogram": "^0.18.20", - "@superset-ui/legacy-plugin-chart-horizon": "^0.18.20", - "@superset-ui/legacy-plugin-chart-map-box": "^0.18.20", - "@superset-ui/legacy-plugin-chart-paired-t-test": "^0.18.20", - "@superset-ui/legacy-plugin-chart-parallel-coordinates": "^0.18.20", - "@superset-ui/legacy-plugin-chart-partition": "^0.18.20", - "@superset-ui/legacy-plugin-chart-pivot-table": "^0.18.20", - "@superset-ui/legacy-plugin-chart-rose": "^0.18.20", - "@superset-ui/legacy-plugin-chart-sankey": "^0.18.20", - "@superset-ui/legacy-plugin-chart-sankey-loop": "^0.18.20", - "@superset-ui/legacy-plugin-chart-sunburst": "^0.18.20", - "@superset-ui/legacy-plugin-chart-treemap": "^0.18.20", - "@superset-ui/legacy-plugin-chart-world-map": "^0.18.20", - "@superset-ui/legacy-preset-chart-big-number": "^0.18.20", + "@superset-ui/chart-controls": "^0.18.23", + "@superset-ui/core": "^0.18.23", + "@superset-ui/legacy-plugin-chart-calendar": "^0.18.23", + "@superset-ui/legacy-plugin-chart-chord": "^0.18.23", + "@superset-ui/legacy-plugin-chart-country-map": "^0.18.23", + "@superset-ui/legacy-plugin-chart-event-flow": "^0.18.23", + "@superset-ui/legacy-plugin-chart-force-directed": "^0.18.23", + "@superset-ui/legacy-plugin-chart-heatmap": "^0.18.23", + "@superset-ui/legacy-plugin-chart-histogram": "^0.18.23", + "@superset-ui/legacy-plugin-chart-horizon": "^0.18.23", + "@superset-ui/legacy-plugin-chart-map-box": "^0.18.23", + "@superset-ui/legacy-plugin-chart-paired-t-test": "^0.18.23", + "@superset-ui/legacy-plugin-chart-parallel-coordinates": "^0.18.23", + "@superset-ui/legacy-plugin-chart-partition": "^0.18.23", + "@superset-ui/legacy-plugin-chart-pivot-table": "^0.18.23", + "@superset-ui/legacy-plugin-chart-rose": "^0.18.23", + "@superset-ui/legacy-plugin-chart-sankey": "^0.18.23", + "@superset-ui/legacy-plugin-chart-sankey-loop": "^0.18.23", + "@superset-ui/legacy-plugin-chart-sunburst": "^0.18.23", + "@superset-ui/legacy-plugin-chart-treemap": "^0.18.23", + "@superset-ui/legacy-plugin-chart-world-map": "^0.18.23", + "@superset-ui/legacy-preset-chart-big-number": "^0.18.23", "@superset-ui/legacy-preset-chart-deckgl": "^0.4.13", - "@superset-ui/legacy-preset-chart-nvd3": "^0.18.20", - "@superset-ui/plugin-chart-echarts": "^0.18.20", - "@superset-ui/plugin-chart-pivot-table": "^0.18.20", - "@superset-ui/plugin-chart-table": "^0.18.20", - "@superset-ui/plugin-chart-word-cloud": "^0.18.20", - "@superset-ui/preset-chart-xy": "^0.18.20", + "@superset-ui/legacy-preset-chart-nvd3": "^0.18.23", + "@superset-ui/plugin-chart-echarts": "^0.18.23", + "@superset-ui/plugin-chart-pivot-table": "^0.18.23", + "@superset-ui/plugin-chart-table": "^0.18.23", + "@superset-ui/plugin-chart-word-cloud": "^0.18.23", + "@superset-ui/preset-chart-xy": "^0.18.23", "@vx/responsive": "^0.0.195", "abortcontroller-polyfill": "^1.1.9", "antd": "^4.9.4", @@ -19997,12 +19997,12 @@ } }, "node_modules/@superset-ui/chart-controls": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/chart-controls/-/chart-controls-0.18.20.tgz", - "integrity": "sha512-U24yTDkKs8ym4Fjhyu4ruO9w/dh6EBB5P8FXRw+oER0PMFyl1grQfaJh2hhLCdMGz5+eXpPybdfmBedvrQ1zHg==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/chart-controls/-/chart-controls-0.18.23.tgz", + "integrity": "sha512-ankVQLYns7qhwUJVpGQRhBj3C0Nn66TNRzBftVU1PnMtecUN1+g6oO1ut+tCvxu/4mX1B5blyyubO0hLZshBRA==", "dependencies": { "@react-icons/all-files": "^4.1.0", - "@superset-ui/core": "0.18.20", + "@superset-ui/core": "0.18.23", "lodash": "^4.17.15", "prop-types": "^15.7.2" }, @@ -20015,9 +20015,9 @@ } }, "node_modules/@superset-ui/core": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.18.20.tgz", - "integrity": "sha512-DMfeejk99swQ011AUKbvBG36wOYAR61nNrSlvW55VBi+maMn2aq+QYZDtz6X275RK5l86VgB6I4iRqAbilK1EA==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.18.23.tgz", + "integrity": "sha512-i0rn7eOmQGaXuimMEn/AsgUulERrp3oHP5NUSpPUtJ2KABXQLA6LwiiEe2rTt4TybgN6jNE0+y4FK6CL6GAO3g==", "dependencies": { "@babel/runtime": "^7.1.2", "@types/d3-format": "^1.3.0", @@ -20102,12 +20102,12 @@ } }, "node_modules/@superset-ui/legacy-plugin-chart-calendar": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-calendar/-/legacy-plugin-chart-calendar-0.18.20.tgz", - "integrity": "sha512-nd9p/5hPh/MWABn7XSTqfaoYv01uO5cM9LOa2QQj8NkVlJTdkdwiqGMRWfmzB96P0IqKQ3MaSxDkX/x6bYjHcQ==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-calendar/-/legacy-plugin-chart-calendar-0.18.23.tgz", + "integrity": "sha512-bUM4SaACUOjbqYBGe0iKz9Rr5ungKovs3k85JHRhFTC5BCuyfRAbqykcdsvuWQdx/+sU2Gi0Qod7L1eTO6+6gw==", "dependencies": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "d3-array": "^2.0.3", "d3-selection": "^1.4.0", "d3-tip": "^0.9.1", @@ -20126,24 +20126,24 @@ } }, "node_modules/@superset-ui/legacy-plugin-chart-chord": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-chord/-/legacy-plugin-chart-chord-0.18.20.tgz", - "integrity": "sha512-ky0GQRUNQhhnCNCnf5NO1RBED06ee9UMhWoeIPkpwNsjUXLlLOZRam7WqFgPIbwSliHMw9drmmZkaB9ZeMUjHQ==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-chord/-/legacy-plugin-chart-chord-0.18.23.tgz", + "integrity": "sha512-XBFE2X/RT+TlkbKKDi8tFCO20VFmUQiSLamqW8FiRhaGmlt+jTxG1GMaITpeJtxxwJF15D+vV02vw25ZSf/7JQ==", "dependencies": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "d3": "^3.5.17", "prop-types": "^15.6.2", "react": "^16.13.1" } }, "node_modules/@superset-ui/legacy-plugin-chart-country-map": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-country-map/-/legacy-plugin-chart-country-map-0.18.20.tgz", - "integrity": "sha512-hoK5KdeVEyjYMhmpA2IcgjpR7Eq+mlSKCQBLEBYAOmxKgzGkQZIBGtzmF/mK77AF87IXqDuTyuSFE6IBqvLBQQ==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-country-map/-/legacy-plugin-chart-country-map-0.18.23.tgz", + "integrity": "sha512-fB/x7cfjFrac2tfP4z28UhCnu+8278NTye87d4chRrAdFUeIQzWPjPG8Z112lqbTXNy3Jpd6cp7vPi32PdxiBA==", "dependencies": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "d3": "^3.5.17", "d3-array": "^2.0.3", "prop-types": "^15.6.2" @@ -20158,13 +20158,13 @@ } }, "node_modules/@superset-ui/legacy-plugin-chart-event-flow": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-event-flow/-/legacy-plugin-chart-event-flow-0.18.20.tgz", - "integrity": "sha512-LRisy6n32vPFaDEpvNebxofPTpXgVn6rQk2yBw5CucEhCS22QIBOuYdycHlumSWQXcmr68c4nYFTCSyt1aLcNQ==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-event-flow/-/legacy-plugin-chart-event-flow-0.18.23.tgz", + "integrity": "sha512-rBKPW5B4a/8rde6oY+08cdiau7XCR6G5XMDmPF9XW+5Lpe8lq9wLHFS5nmPa7D4xEBn+PSApJR+s1FvcaZg95w==", "dependencies": { "@data-ui/event-flow": "^0.0.84", - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "prop-types": "^15.6.2" }, "peerDependencies": { @@ -20172,12 +20172,12 @@ } }, "node_modules/@superset-ui/legacy-plugin-chart-force-directed": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-force-directed/-/legacy-plugin-chart-force-directed-0.18.20.tgz", - "integrity": "sha512-Oe15Km8vVuIio7dflmpCzsmMdFwqDkERsNCmZhFZ67xujGuh4Fp9bqj2okvqsKXa5B+gGkmDjGXPbaXokmHF4Q==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-force-directed/-/legacy-plugin-chart-force-directed-0.18.23.tgz", + "integrity": "sha512-y5rI9EX2V4PcfoWXnHXk+xBYcW8kUVJagqO7fzRRKRG7dKCrrqgNKIqyqpALtZnFRPv6bRG0YirWwjDxVNmjGA==", "dependencies": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "d3": "^3.5.17", "prop-types": "^15.7.2" }, @@ -20186,12 +20186,12 @@ } }, "node_modules/@superset-ui/legacy-plugin-chart-heatmap": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-heatmap/-/legacy-plugin-chart-heatmap-0.18.20.tgz", - "integrity": "sha512-y8gzA689dv6Ko1mQemoPatSwIwIW8c1T5CVIu5v0h32aGb4/q9B09ZflxYaYFfjkt92wMPMZA7/C5npbXll7vA==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-heatmap/-/legacy-plugin-chart-heatmap-0.18.23.tgz", + "integrity": "sha512-iMsjhYeBooYPNiquEsiqInXWLSLwnU5MApWBzjMz9OxnX4aCetJV1O49OdmeshTqPZ14yISjQirA34vuErzW3w==", "dependencies": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "d3": "^3.5.17", "d3-svg-legend": "^1.x", "d3-tip": "^0.9.1", @@ -20199,14 +20199,14 @@ } }, "node_modules/@superset-ui/legacy-plugin-chart-histogram": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-histogram/-/legacy-plugin-chart-histogram-0.18.20.tgz", - "integrity": "sha512-KM/W9Gie37tZ4ujpVboMdUYciuTRmqlklQ2A9PxM0DX8rsC7bXu26VUkqsSfPRdNsRRnfFLYBF6zV6eO3TxIPw==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-histogram/-/legacy-plugin-chart-histogram-0.18.23.tgz", + "integrity": "sha512-gTN1CjXf2i68js2MvdxP1cKT5z/5V28Hy+wPgzcTQLj/s0/E+C2nEnlQdVM7yMfhRsfMP4Ei53rYSkax8xRziQ==", "dependencies": { "@data-ui/histogram": "^0.0.84", "@data-ui/theme": "^0.0.84", - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "@vx/legend": "^0.0.198", "@vx/responsive": "^0.0.199", "@vx/scale": "^0.0.197", @@ -20284,12 +20284,12 @@ } }, "node_modules/@superset-ui/legacy-plugin-chart-horizon": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-horizon/-/legacy-plugin-chart-horizon-0.18.20.tgz", - "integrity": "sha512-D7Z1ANYBOtNqKPPJP4y2JQujI0sO9YSuW7HI7Nyz9/efj0/0CJ/NXJ4h3nC6Ey7OUowRZcOt+l41dB1cuxg1xQ==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-horizon/-/legacy-plugin-chart-horizon-0.18.23.tgz", + "integrity": "sha512-b2Rs6BV/Nr5tFDF6gdh69wj1FrEIkIXqcCbvTqE0YqMgoLf14Ztc3UA62psU2ixeNwoCGI4fHOC3dHwq1uCTBw==", "dependencies": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "d3-array": "^2.0.3", "d3-scale": "^3.0.1", "prop-types": "^15.6.2" @@ -20327,12 +20327,12 @@ } }, "node_modules/@superset-ui/legacy-plugin-chart-map-box": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-map-box/-/legacy-plugin-chart-map-box-0.18.20.tgz", - "integrity": "sha512-nrrrDRhTNUocW1wHvI2FKaZReTRdgqixEyeqbac+jQyvT4rgYWI7X/MDR+79E60oI79ymZMWqNswlMB6m+QTYA==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-map-box/-/legacy-plugin-chart-map-box-0.18.23.tgz", + "integrity": "sha512-O3BoyGPRE9ldALJxN4ppPyd4aWat8Q1jrEcMrEF0GeE+jHdXKX4Xb37N85scw3M9GY4qcJ65OROMLsbF/u3iSA==", "dependencies": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "mapbox-gl": "^0.53.0", "prop-types": "^15.6.2", "react-map-gl": "^4.0.10", @@ -20344,12 +20344,12 @@ } }, "node_modules/@superset-ui/legacy-plugin-chart-paired-t-test": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-paired-t-test/-/legacy-plugin-chart-paired-t-test-0.18.20.tgz", - "integrity": "sha512-q7Ecv7nM0SKiCNxQeFRZ0d7JEBBsbvgD+UgdcahbD3mze+Y1RrbZ7L3T3zTR5GJZUpqbqYjNNdi/4965YB6MVw==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-paired-t-test/-/legacy-plugin-chart-paired-t-test-0.18.23.tgz", + "integrity": "sha512-XmaTcWLJQxq4HkJMoeZ9u1siKmksWiJXLYymoAjkXF/Qz6iTjfQgrKiAWA1C77M4KCc2bvynjcy7r9Lf/Vr/9g==", "dependencies": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "distributions": "^1.0.0", "prop-types": "^15.6.2", "reactable": "^1.1.0" @@ -20359,12 +20359,12 @@ } }, "node_modules/@superset-ui/legacy-plugin-chart-parallel-coordinates": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-parallel-coordinates/-/legacy-plugin-chart-parallel-coordinates-0.18.20.tgz", - "integrity": "sha512-4tgQTDmhMseaLsUiaR3I5Ur2WiS/+5CDGbwf9TgX/mImbfURz8C3UZqPCpdpasabnj5EwwuOM5MO849NVnxdCg==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-parallel-coordinates/-/legacy-plugin-chart-parallel-coordinates-0.18.23.tgz", + "integrity": "sha512-AivwNObViUAoBiESUyoL5l78naMO3/hByvT5ys8KJ3/rCPZcKUBd3IVJp19Z8Nmtse5B7SMxpzeWDpS17q5xwA==", "dependencies": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "d3": "^3.5.17", "prop-types": "^15.7.2" }, @@ -20373,12 +20373,12 @@ } }, "node_modules/@superset-ui/legacy-plugin-chart-partition": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-partition/-/legacy-plugin-chart-partition-0.18.20.tgz", - "integrity": "sha512-LFZ6lnrjxbT+XF8DjkNBy8vs2HyCFf+4b7vbqgIlTpM5W4zwJjQS6jGMhotkqie/QABWyb5QyRR4k/meRMCIZg==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-partition/-/legacy-plugin-chart-partition-0.18.23.tgz", + "integrity": "sha512-Fm121ceDUeugTqJDlPvjKWj44VrgnMMCpnFrq0qstrl7Rq5EBq63FQdBgHOBrIVu8DNBE+HMmZm+8Bpw66zovQ==", "dependencies": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "d3": "^3.5.17", "d3-hierarchy": "^1.1.8", "prop-types": "^15.6.2" @@ -20388,24 +20388,24 @@ } }, "node_modules/@superset-ui/legacy-plugin-chart-pivot-table": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-pivot-table/-/legacy-plugin-chart-pivot-table-0.18.20.tgz", - "integrity": "sha512-sSXrIjnmhzIpSMhhxzhVYtLvwIL+I85h7SUEb6B7zAjVtQpXSpQ4oMjNLnkQC/jo6PN6ojvByE19l4+rQNT3Lg==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-pivot-table/-/legacy-plugin-chart-pivot-table-0.18.23.tgz", + "integrity": "sha512-aHkOETdJii7+ewjtzTNlDyc0yJ0FUYEnc2+mQRH1aiXn2e87fB9Id8mTixpmx+7Ho5bkcJIamY4dM5PMOGhxfQ==", "dependencies": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "d3": "^3.5.17", "datatables.net-bs": "^1.11.3", "prop-types": "^15.6.2" } }, "node_modules/@superset-ui/legacy-plugin-chart-rose": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-rose/-/legacy-plugin-chart-rose-0.18.20.tgz", - "integrity": "sha512-siM30v7QHdmanOcD3lc6eFQ8Wlo+rMv0BhdN45RoxNx2d+pTzKPI5qTJSAYPPL083mFW4uw/yRfnv6pE2MvkQA==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-rose/-/legacy-plugin-chart-rose-0.18.23.tgz", + "integrity": "sha512-pkZz87jaE6jVmjLIxIMkrHmq8jdoT58COn1cyarujRNGpXq1UumFsBEO6+DR4B9v0TJUc6FEdJ7Fbi6QUVK7JA==", "dependencies": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "d3": "^3.5.17", "nvd3": "1.8.6", "prop-types": "^15.6.2" @@ -20415,12 +20415,12 @@ } }, "node_modules/@superset-ui/legacy-plugin-chart-sankey": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sankey/-/legacy-plugin-chart-sankey-0.18.20.tgz", - "integrity": "sha512-bYqkaVvGqdv0Ds9AdnS2kxLir2R4JXmx0ggAu5tUBC2rJMKfA+5s4h4kBZFfDPDgvUZtwF8fbPdtkhqsGzIvaw==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sankey/-/legacy-plugin-chart-sankey-0.18.23.tgz", + "integrity": "sha512-Qm+TbPoq0h4LB2CpqEMgDAlHgJoshQIeeBq8DqvimBQlrpOkCCzNHgnotNSUFze7hNaKS3mhXLeaCEU5Z5LNfg==", "dependencies": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "d3": "^3.5.17", "d3-sankey": "^0.4.2", "prop-types": "^15.6.2" @@ -20430,47 +20430,47 @@ } }, "node_modules/@superset-ui/legacy-plugin-chart-sankey-loop": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sankey-loop/-/legacy-plugin-chart-sankey-loop-0.18.20.tgz", - "integrity": "sha512-uheqqNqFMCIILv/IDSsQSbGyWfLMo+onY5R8+irjra+HJf1ULcCRFFnWEwVq6Aa5mbo6AsWeEHur9WiHRohYKQ==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sankey-loop/-/legacy-plugin-chart-sankey-loop-0.18.23.tgz", + "integrity": "sha512-oan8A2o926okxJY5fmsBarvHbE0XpbLSA4vEGqMZ/6LuIETirw/uwgsnfzSdIsnTGQthO9p/gOKpcrI4fzIiUQ==", "dependencies": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "d3-sankey-diagram": "^0.7.3", "d3-selection": "^1.4.0", "prop-types": "^15.6.2" } }, "node_modules/@superset-ui/legacy-plugin-chart-sunburst": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sunburst/-/legacy-plugin-chart-sunburst-0.18.20.tgz", - "integrity": "sha512-1jfKVMjF6EysODOphmQEBExqSepxb8TUczjRPfeir/eDELJCTvLCFcXLGu4+VAYEvQp19Fa2RVcKIgQryOgs0A==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sunburst/-/legacy-plugin-chart-sunburst-0.18.23.tgz", + "integrity": "sha512-vfOYxF/qOv/LT3vbnuhG2XXv9kZFwgmY6r+aKNkS+OOLb8IhNWc37LO8q3TMCyrPNrkJF2UwHQVUizOYDj6Jsg==", "dependencies": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "d3": "^3.5.17", "prop-types": "^15.6.2" } }, "node_modules/@superset-ui/legacy-plugin-chart-treemap": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-treemap/-/legacy-plugin-chart-treemap-0.18.20.tgz", - "integrity": "sha512-I8J0TV+rqfeeIkE9j+sHTedVDiJOl72111DzDYHEJHgn0DNGZITwkRKHChFOmrdK7EGs4YbaxtO3BH+AbpK+pQ==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-treemap/-/legacy-plugin-chart-treemap-0.18.23.tgz", + "integrity": "sha512-50J7hi+mCeJs4jE+QOsZFK5Q7IoFu8nUqzTBb6E9GeQE4VRRjg0yGG/o8t9/GRAv345Ll4T27YY8fJCj9l0HJQ==", "dependencies": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "d3-hierarchy": "^1.1.8", "d3-selection": "^1.4.0", "prop-types": "^15.6.2" } }, "node_modules/@superset-ui/legacy-plugin-chart-world-map": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-world-map/-/legacy-plugin-chart-world-map-0.18.20.tgz", - "integrity": "sha512-7kTNq4TD4410GO/QSYSZQJC4cfNqRy1FP3KACBZJ5N20VrXT7tMYIt1jzvpyXasIz38GUH+OqJiCXoAr8e5aww==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-world-map/-/legacy-plugin-chart-world-map-0.18.23.tgz", + "integrity": "sha512-NcaxTHnvfky2gMXmq2ORpmkpXL6fD4PnwQX3kaSspB0nIvS38TM3pKdYtiXbRcHI98q0T/bTwiXWTqz5fXdaOA==", "dependencies": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "d3": "^3.5.17", "d3-array": "^2.4.0", "d3-color": "^1.4.1", @@ -20490,13 +20490,13 @@ } }, "node_modules/@superset-ui/legacy-preset-chart-big-number": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-big-number/-/legacy-preset-chart-big-number-0.18.20.tgz", - "integrity": "sha512-xH0U1a7VhLt03A9WjhJe5NuV3wDqA4kmiBBElWq8DYsBrHtzB65G5yQtf6TdgTV6Vaxzro6UemB/X5mKOahx/g==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-big-number/-/legacy-preset-chart-big-number-0.18.23.tgz", + "integrity": "sha512-XZuX8NdO+0u0ySwJL/2xceVeEoiO/VPM3xdeEnIpDhg7XES8jrPzLfOnUe5zI8VHWQI8hnAs05ebkZNilxDJ2w==", "dependencies": { "@data-ui/xy-chart": "^0.0.84", - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "@types/d3-color": "^1.2.2", "@types/shortid": "^0.0.29", "d3-color": "^1.2.3", @@ -20672,13 +20672,13 @@ } }, "node_modules/@superset-ui/legacy-preset-chart-nvd3": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-nvd3/-/legacy-preset-chart-nvd3-0.18.20.tgz", - "integrity": "sha512-CjqNh+YZjpvthV7BP9yHUzTN26wpdohgfZVil93U4qIC7eO3/htXMBmnYSt8YfgSp8C3qt/vNtJE/HFtmdnnnw==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-nvd3/-/legacy-preset-chart-nvd3-0.18.23.tgz", + "integrity": "sha512-23hm9X/CZOEmzb8M42eYDbYB/Hl98Yu0OOxbLw6ubh43kpZjXjmk83dK+OfNQjUvOSrNGtXFa4tF7vObcNEbEA==", "dependencies": { "@data-ui/xy-chart": "^0.0.84", - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "d3": "^3.5.17", "d3-tip": "^0.9.1", "dompurify": "^2.0.6", @@ -20694,12 +20694,12 @@ } }, "node_modules/@superset-ui/plugin-chart-echarts": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-echarts/-/plugin-chart-echarts-0.18.20.tgz", - "integrity": "sha512-pgzq+wtl+MI748kEIEgcsrxSCStwlRXnJj2qn9ZVnt01+Rd2oxuHIUiB4glKMFrQqtsimPnfLpB7sl+Lf8T/DQ==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-echarts/-/plugin-chart-echarts-0.18.23.tgz", + "integrity": "sha512-FKyWC3U5xEjAYy+19EB99rp7NWrJapSd1GqjspSZuAeJfpMsYK1x8ekkrthcIZQ8jSkBV1uuLrzD4ONqF8ZGIQ==", "dependencies": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "d3-array": "^1.2.0", "echarts": "^5.2.2", "lodash": "^4.17.15" @@ -20709,12 +20709,12 @@ } }, "node_modules/@superset-ui/plugin-chart-pivot-table": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-pivot-table/-/plugin-chart-pivot-table-0.18.20.tgz", - "integrity": "sha512-8FdHiTqlA6E3XQIbWEY4SwkhlxChA6alBhCXxrzhWWqZgicb9SOscBnV82Pozw9lbHPJubc/rQ39w4g/sZzaBQ==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-pivot-table/-/plugin-chart-pivot-table-0.18.23.tgz", + "integrity": "sha512-vSAg03+5kO2l+KBelB8G+rNyAijLscmaBP2rmHuTg0vi3Zb6qlz+jo6trFdNj8Tq7Ghfl3LP3gXENqDOvT6cxQ==", "dependencies": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "@superset-ui/react-pivottable": "^0.12.12" }, "peerDependencies": { @@ -20724,13 +20724,13 @@ } }, "node_modules/@superset-ui/plugin-chart-table": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-table/-/plugin-chart-table-0.18.20.tgz", - "integrity": "sha512-xj6q0kQqh0nsz7TZTW3kmHJLTlGfRtVXagm3yxj6ShW9vSZtS+Ph158Zuy3QniddBU3SpPG5RzuIrDgHjt9lhA==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-table/-/plugin-chart-table-0.18.23.tgz", + "integrity": "sha512-b6TayE438I6Ov8IhZgbA9d30TO4oZPcjHDMvBdJijHrIG9aIc3RZ6YsY6MHRI7vuosrpuywlpzy5YrHHLcEwAA==", "dependencies": { "@react-icons/all-files": "^4.1.0", - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "@types/d3-array": "^2.9.0", "@types/react-table": "^7.0.29", "d3-array": "^2.4.0", @@ -20755,12 +20755,12 @@ } }, "node_modules/@superset-ui/plugin-chart-word-cloud": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-word-cloud/-/plugin-chart-word-cloud-0.18.20.tgz", - "integrity": "sha512-/gQeSAVO7K+wI1N5RKkXy0Apn23nRlwhU8BoPT1uSHuRce4y+ZhCSt2iqHgUs4+f0KPcMFd4BZo15opStxSG8A==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-word-cloud/-/plugin-chart-word-cloud-0.18.23.tgz", + "integrity": "sha512-AB/OMwkQWJ4UxNAX6ssZdm0tkXW17dAbuBy7Z/fmb6VpphnffZ8yrtMt3Oi3WkV4/zk1imQgp9Ubcx8TnMyRgA==", "dependencies": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "@types/d3-cloud": "^1.2.1", "@types/d3-scale": "^2.0.2", "d3-cloud": "^1.2.5", @@ -20801,14 +20801,14 @@ } }, "node_modules/@superset-ui/preset-chart-xy": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/preset-chart-xy/-/preset-chart-xy-0.18.20.tgz", - "integrity": "sha512-CA79RqPaoAlnINqWQqNHcT6ic6Pv1Xe2j7E8cAYR1ozSjoTVDBN++WH+EOpa/2GHl8uxbeqERGtZebD9l9ZBiA==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/preset-chart-xy/-/preset-chart-xy-0.18.23.tgz", + "integrity": "sha512-BGRlG7VWBRAJMM6qdmnDC3Ahjlzx3ooa0s7flboXyERkr8FBEZnGS9GXWO+126E8wz+VY7zFiYn7LjBmg3wXow==", "dependencies": { "@data-ui/theme": "^0.0.84", "@data-ui/xy-chart": "^0.0.84", - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "@vx/axis": "^0.0.198", "@vx/legend": "^0.0.198", "@vx/scale": "^0.0.197", @@ -22388,13 +22388,13 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.3.0.tgz", - "integrity": "sha512-ARUEJHJrq85aaiCqez7SANeahDsJTD3AEua34EoQN9pHS6S5Bq9emcIaGGySt/4X2zSi+vF5hAH52sEen7IO7g==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.3.1.tgz", + "integrity": "sha512-cFImaoIr5Ojj358xI/SDhjog57OK2NqlpxwdcgyxDA3bJlZcJq5CPzUXtpD7CxI2Hm6ATU7w5fQnnkVnmwpHqw==", "dev": true, "dependencies": { - "@typescript-eslint/experimental-utils": "5.3.0", - "@typescript-eslint/scope-manager": "5.3.0", + "@typescript-eslint/experimental-utils": "5.3.1", + "@typescript-eslint/scope-manager": "5.3.1", "debug": "^4.3.2", "functional-red-black-tree": "^1.0.1", "ignore": "^5.1.8", @@ -22420,15 +22420,15 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/experimental-utils": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.3.0.tgz", - "integrity": "sha512-NFVxYTjKj69qB0FM+piah1x3G/63WB8vCBMnlnEHUsiLzXSTWb9FmFn36FD9Zb4APKBLY3xRArOGSMQkuzTF1w==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.3.1.tgz", + "integrity": "sha512-RgFn5asjZ5daUhbK5Sp0peq0SSMytqcrkNfU4pnDma2D8P3ElZ6JbYjY8IMSFfZAJ0f3x3tnO3vXHweYg0g59w==", "dev": true, "dependencies": { "@types/json-schema": "^7.0.9", - "@typescript-eslint/scope-manager": "5.3.0", - "@typescript-eslint/types": "5.3.0", - "@typescript-eslint/typescript-estree": "5.3.0", + "@typescript-eslint/scope-manager": "5.3.1", + "@typescript-eslint/types": "5.3.1", + "@typescript-eslint/typescript-estree": "5.3.1", "eslint-scope": "^5.1.1", "eslint-utils": "^3.0.0" }, @@ -22462,13 +22462,13 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/@typescript-eslint/typescript-estree": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.3.0.tgz", - "integrity": "sha512-FJ0nqcaUOpn/6Z4Jwbtf+o0valjBLkqc3MWkMvrhA2TvzFXtcclIM8F4MBEmYa2kgcI8EZeSAzwoSrIC8JYkug==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.3.1.tgz", + "integrity": "sha512-PwFbh/PKDVo/Wct6N3w+E4rLZxUDgsoII/GrWM2A62ETOzJd4M6s0Mu7w4CWsZraTbaC5UQI+dLeyOIFF1PquQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.3.0", - "@typescript-eslint/visitor-keys": "5.3.0", + "@typescript-eslint/types": "5.3.1", + "@typescript-eslint/visitor-keys": "5.3.1", "debug": "^4.3.2", "globby": "^11.0.4", "is-glob": "^4.0.3", @@ -22672,14 +22672,14 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.3.0.tgz", - "integrity": "sha512-rKu/yAReip7ovx8UwOAszJVO5MgBquo8WjIQcp1gx4pYQCwYzag+I5nVNHO4MqyMkAo0gWt2gWUi+36gWAVKcw==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.3.1.tgz", + "integrity": "sha512-TD+ONlx5c+Qhk21x9gsJAMRohWAUMavSOmJgv3JGy9dgPhuBd5Wok0lmMClZDyJNLLZK1JRKiATzCKZNUmoyfw==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.3.0", - "@typescript-eslint/types": "5.3.0", - "@typescript-eslint/typescript-estree": "5.3.0", + "@typescript-eslint/scope-manager": "5.3.1", + "@typescript-eslint/types": "5.3.1", + "@typescript-eslint/typescript-estree": "5.3.1", "debug": "^4.3.2" }, "engines": { @@ -22699,13 +22699,13 @@ } }, "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.3.0.tgz", - "integrity": "sha512-FJ0nqcaUOpn/6Z4Jwbtf+o0valjBLkqc3MWkMvrhA2TvzFXtcclIM8F4MBEmYa2kgcI8EZeSAzwoSrIC8JYkug==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.3.1.tgz", + "integrity": "sha512-PwFbh/PKDVo/Wct6N3w+E4rLZxUDgsoII/GrWM2A62ETOzJd4M6s0Mu7w4CWsZraTbaC5UQI+dLeyOIFF1PquQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.3.0", - "@typescript-eslint/visitor-keys": "5.3.0", + "@typescript-eslint/types": "5.3.1", + "@typescript-eslint/visitor-keys": "5.3.1", "debug": "^4.3.2", "globby": "^11.0.4", "is-glob": "^4.0.3", @@ -22820,13 +22820,13 @@ "dev": true }, "node_modules/@typescript-eslint/scope-manager": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.3.0.tgz", - "integrity": "sha512-22Uic9oRlTsPppy5Tcwfj+QET5RWEnZ5414Prby465XxQrQFZ6nnm5KnXgnsAJefG4hEgMnaxTB3kNEyjdjj6A==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.3.1.tgz", + "integrity": "sha512-XksFVBgAq0Y9H40BDbuPOTUIp7dn4u8oOuhcgGq7EoDP50eqcafkMVGrypyVGvDYHzjhdUCUwuwVUK4JhkMAMg==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.3.0", - "@typescript-eslint/visitor-keys": "5.3.0" + "@typescript-eslint/types": "5.3.1", + "@typescript-eslint/visitor-keys": "5.3.1" }, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -22837,9 +22837,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.3.0.tgz", - "integrity": "sha512-fce5pG41/w8O6ahQEhXmMV+xuh4+GayzqEogN24EK+vECA3I6pUwKuLi5QbXO721EMitpQne5VKXofPonYlAQg==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.3.1.tgz", + "integrity": "sha512-bG7HeBLolxKHtdHG54Uac750eXuQQPpdJfCYuw4ZI3bZ7+GgKClMWM8jExBtp7NSP4m8PmLRM8+lhzkYnSmSxQ==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -23104,12 +23104,12 @@ "dev": true }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.3.0.tgz", - "integrity": "sha512-oVIAfIQuq0x2TFDNLVavUn548WL+7hdhxYn+9j3YdJJXB7mH9dAmZNJsPDa7Jc+B9WGqoiex7GUDbyMxV0a/aw==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.3.1.tgz", + "integrity": "sha512-3cHUzUuVTuNHx0Gjjt5pEHa87+lzyqOiHXy/Gz+SJOCW1mpw9xQHIIEwnKn+Thph1mgWyZ90nboOcSuZr/jTTQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.3.0", + "@typescript-eslint/types": "5.3.1", "eslint-visitor-keys": "^3.0.0" }, "engines": { @@ -32745,9 +32745,9 @@ } }, "node_modules/eslint-visitor-keys": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.0.0.tgz", - "integrity": "sha512-mJOZa35trBTb3IyRmo8xmKBZlxf+N7OnUl4+ZhJHs/r+0770Wh/LEACE2pqMGMe27G/4y8P2bYGk4J70IC5k1Q==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz", + "integrity": "sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -70289,20 +70289,20 @@ } }, "@superset-ui/chart-controls": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/chart-controls/-/chart-controls-0.18.20.tgz", - "integrity": "sha512-U24yTDkKs8ym4Fjhyu4ruO9w/dh6EBB5P8FXRw+oER0PMFyl1grQfaJh2hhLCdMGz5+eXpPybdfmBedvrQ1zHg==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/chart-controls/-/chart-controls-0.18.23.tgz", + "integrity": "sha512-ankVQLYns7qhwUJVpGQRhBj3C0Nn66TNRzBftVU1PnMtecUN1+g6oO1ut+tCvxu/4mX1B5blyyubO0hLZshBRA==", "requires": { "@react-icons/all-files": "^4.1.0", - "@superset-ui/core": "0.18.20", + "@superset-ui/core": "0.18.23", "lodash": "^4.17.15", "prop-types": "^15.7.2" } }, "@superset-ui/core": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.18.20.tgz", - "integrity": "sha512-DMfeejk99swQ011AUKbvBG36wOYAR61nNrSlvW55VBi+maMn2aq+QYZDtz6X275RK5l86VgB6I4iRqAbilK1EA==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.18.23.tgz", + "integrity": "sha512-i0rn7eOmQGaXuimMEn/AsgUulERrp3oHP5NUSpPUtJ2KABXQLA6LwiiEe2rTt4TybgN6jNE0+y4FK6CL6GAO3g==", "requires": { "@babel/runtime": "^7.1.2", "@types/d3-format": "^1.3.0", @@ -70379,12 +70379,12 @@ } }, "@superset-ui/legacy-plugin-chart-calendar": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-calendar/-/legacy-plugin-chart-calendar-0.18.20.tgz", - "integrity": "sha512-nd9p/5hPh/MWABn7XSTqfaoYv01uO5cM9LOa2QQj8NkVlJTdkdwiqGMRWfmzB96P0IqKQ3MaSxDkX/x6bYjHcQ==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-calendar/-/legacy-plugin-chart-calendar-0.18.23.tgz", + "integrity": "sha512-bUM4SaACUOjbqYBGe0iKz9Rr5ungKovs3k85JHRhFTC5BCuyfRAbqykcdsvuWQdx/+sU2Gi0Qod7L1eTO6+6gw==", "requires": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "d3-array": "^2.0.3", "d3-selection": "^1.4.0", "d3-tip": "^0.9.1", @@ -70402,24 +70402,24 @@ } }, "@superset-ui/legacy-plugin-chart-chord": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-chord/-/legacy-plugin-chart-chord-0.18.20.tgz", - "integrity": "sha512-ky0GQRUNQhhnCNCnf5NO1RBED06ee9UMhWoeIPkpwNsjUXLlLOZRam7WqFgPIbwSliHMw9drmmZkaB9ZeMUjHQ==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-chord/-/legacy-plugin-chart-chord-0.18.23.tgz", + "integrity": "sha512-XBFE2X/RT+TlkbKKDi8tFCO20VFmUQiSLamqW8FiRhaGmlt+jTxG1GMaITpeJtxxwJF15D+vV02vw25ZSf/7JQ==", "requires": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "d3": "^3.5.17", "prop-types": "^15.6.2", "react": "^16.13.1" } }, "@superset-ui/legacy-plugin-chart-country-map": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-country-map/-/legacy-plugin-chart-country-map-0.18.20.tgz", - "integrity": "sha512-hoK5KdeVEyjYMhmpA2IcgjpR7Eq+mlSKCQBLEBYAOmxKgzGkQZIBGtzmF/mK77AF87IXqDuTyuSFE6IBqvLBQQ==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-country-map/-/legacy-plugin-chart-country-map-0.18.23.tgz", + "integrity": "sha512-fB/x7cfjFrac2tfP4z28UhCnu+8278NTye87d4chRrAdFUeIQzWPjPG8Z112lqbTXNy3Jpd6cp7vPi32PdxiBA==", "requires": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "d3": "^3.5.17", "d3-array": "^2.0.3", "prop-types": "^15.6.2" @@ -70436,34 +70436,34 @@ } }, "@superset-ui/legacy-plugin-chart-event-flow": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-event-flow/-/legacy-plugin-chart-event-flow-0.18.20.tgz", - "integrity": "sha512-LRisy6n32vPFaDEpvNebxofPTpXgVn6rQk2yBw5CucEhCS22QIBOuYdycHlumSWQXcmr68c4nYFTCSyt1aLcNQ==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-event-flow/-/legacy-plugin-chart-event-flow-0.18.23.tgz", + "integrity": "sha512-rBKPW5B4a/8rde6oY+08cdiau7XCR6G5XMDmPF9XW+5Lpe8lq9wLHFS5nmPa7D4xEBn+PSApJR+s1FvcaZg95w==", "requires": { "@data-ui/event-flow": "^0.0.84", - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "prop-types": "^15.6.2" } }, "@superset-ui/legacy-plugin-chart-force-directed": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-force-directed/-/legacy-plugin-chart-force-directed-0.18.20.tgz", - "integrity": "sha512-Oe15Km8vVuIio7dflmpCzsmMdFwqDkERsNCmZhFZ67xujGuh4Fp9bqj2okvqsKXa5B+gGkmDjGXPbaXokmHF4Q==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-force-directed/-/legacy-plugin-chart-force-directed-0.18.23.tgz", + "integrity": "sha512-y5rI9EX2V4PcfoWXnHXk+xBYcW8kUVJagqO7fzRRKRG7dKCrrqgNKIqyqpALtZnFRPv6bRG0YirWwjDxVNmjGA==", "requires": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "d3": "^3.5.17", "prop-types": "^15.7.2" } }, "@superset-ui/legacy-plugin-chart-heatmap": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-heatmap/-/legacy-plugin-chart-heatmap-0.18.20.tgz", - "integrity": "sha512-y8gzA689dv6Ko1mQemoPatSwIwIW8c1T5CVIu5v0h32aGb4/q9B09ZflxYaYFfjkt92wMPMZA7/C5npbXll7vA==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-heatmap/-/legacy-plugin-chart-heatmap-0.18.23.tgz", + "integrity": "sha512-iMsjhYeBooYPNiquEsiqInXWLSLwnU5MApWBzjMz9OxnX4aCetJV1O49OdmeshTqPZ14yISjQirA34vuErzW3w==", "requires": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "d3": "^3.5.17", "d3-svg-legend": "^1.x", "d3-tip": "^0.9.1", @@ -70471,14 +70471,14 @@ } }, "@superset-ui/legacy-plugin-chart-histogram": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-histogram/-/legacy-plugin-chart-histogram-0.18.20.tgz", - "integrity": "sha512-KM/W9Gie37tZ4ujpVboMdUYciuTRmqlklQ2A9PxM0DX8rsC7bXu26VUkqsSfPRdNsRRnfFLYBF6zV6eO3TxIPw==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-histogram/-/legacy-plugin-chart-histogram-0.18.23.tgz", + "integrity": "sha512-gTN1CjXf2i68js2MvdxP1cKT5z/5V28Hy+wPgzcTQLj/s0/E+C2nEnlQdVM7yMfhRsfMP4Ei53rYSkax8xRziQ==", "requires": { "@data-ui/histogram": "^0.0.84", "@data-ui/theme": "^0.0.84", - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "@vx/legend": "^0.0.198", "@vx/responsive": "^0.0.199", "@vx/scale": "^0.0.197", @@ -70546,12 +70546,12 @@ } }, "@superset-ui/legacy-plugin-chart-horizon": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-horizon/-/legacy-plugin-chart-horizon-0.18.20.tgz", - "integrity": "sha512-D7Z1ANYBOtNqKPPJP4y2JQujI0sO9YSuW7HI7Nyz9/efj0/0CJ/NXJ4h3nC6Ey7OUowRZcOt+l41dB1cuxg1xQ==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-horizon/-/legacy-plugin-chart-horizon-0.18.23.tgz", + "integrity": "sha512-b2Rs6BV/Nr5tFDF6gdh69wj1FrEIkIXqcCbvTqE0YqMgoLf14Ztc3UA62psU2ixeNwoCGI4fHOC3dHwq1uCTBw==", "requires": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "d3-array": "^2.0.3", "d3-scale": "^3.0.1", "prop-types": "^15.6.2" @@ -70588,12 +70588,12 @@ } }, "@superset-ui/legacy-plugin-chart-map-box": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-map-box/-/legacy-plugin-chart-map-box-0.18.20.tgz", - "integrity": "sha512-nrrrDRhTNUocW1wHvI2FKaZReTRdgqixEyeqbac+jQyvT4rgYWI7X/MDR+79E60oI79ymZMWqNswlMB6m+QTYA==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-map-box/-/legacy-plugin-chart-map-box-0.18.23.tgz", + "integrity": "sha512-O3BoyGPRE9ldALJxN4ppPyd4aWat8Q1jrEcMrEF0GeE+jHdXKX4Xb37N85scw3M9GY4qcJ65OROMLsbF/u3iSA==", "requires": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "mapbox-gl": "^0.53.0", "prop-types": "^15.6.2", "react-map-gl": "^4.0.10", @@ -70602,118 +70602,118 @@ } }, "@superset-ui/legacy-plugin-chart-paired-t-test": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-paired-t-test/-/legacy-plugin-chart-paired-t-test-0.18.20.tgz", - "integrity": "sha512-q7Ecv7nM0SKiCNxQeFRZ0d7JEBBsbvgD+UgdcahbD3mze+Y1RrbZ7L3T3zTR5GJZUpqbqYjNNdi/4965YB6MVw==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-paired-t-test/-/legacy-plugin-chart-paired-t-test-0.18.23.tgz", + "integrity": "sha512-XmaTcWLJQxq4HkJMoeZ9u1siKmksWiJXLYymoAjkXF/Qz6iTjfQgrKiAWA1C77M4KCc2bvynjcy7r9Lf/Vr/9g==", "requires": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "distributions": "^1.0.0", "prop-types": "^15.6.2", "reactable": "^1.1.0" } }, "@superset-ui/legacy-plugin-chart-parallel-coordinates": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-parallel-coordinates/-/legacy-plugin-chart-parallel-coordinates-0.18.20.tgz", - "integrity": "sha512-4tgQTDmhMseaLsUiaR3I5Ur2WiS/+5CDGbwf9TgX/mImbfURz8C3UZqPCpdpasabnj5EwwuOM5MO849NVnxdCg==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-parallel-coordinates/-/legacy-plugin-chart-parallel-coordinates-0.18.23.tgz", + "integrity": "sha512-AivwNObViUAoBiESUyoL5l78naMO3/hByvT5ys8KJ3/rCPZcKUBd3IVJp19Z8Nmtse5B7SMxpzeWDpS17q5xwA==", "requires": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "d3": "^3.5.17", "prop-types": "^15.7.2" } }, "@superset-ui/legacy-plugin-chart-partition": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-partition/-/legacy-plugin-chart-partition-0.18.20.tgz", - "integrity": "sha512-LFZ6lnrjxbT+XF8DjkNBy8vs2HyCFf+4b7vbqgIlTpM5W4zwJjQS6jGMhotkqie/QABWyb5QyRR4k/meRMCIZg==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-partition/-/legacy-plugin-chart-partition-0.18.23.tgz", + "integrity": "sha512-Fm121ceDUeugTqJDlPvjKWj44VrgnMMCpnFrq0qstrl7Rq5EBq63FQdBgHOBrIVu8DNBE+HMmZm+8Bpw66zovQ==", "requires": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "d3": "^3.5.17", "d3-hierarchy": "^1.1.8", "prop-types": "^15.6.2" } }, "@superset-ui/legacy-plugin-chart-pivot-table": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-pivot-table/-/legacy-plugin-chart-pivot-table-0.18.20.tgz", - "integrity": "sha512-sSXrIjnmhzIpSMhhxzhVYtLvwIL+I85h7SUEb6B7zAjVtQpXSpQ4oMjNLnkQC/jo6PN6ojvByE19l4+rQNT3Lg==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-pivot-table/-/legacy-plugin-chart-pivot-table-0.18.23.tgz", + "integrity": "sha512-aHkOETdJii7+ewjtzTNlDyc0yJ0FUYEnc2+mQRH1aiXn2e87fB9Id8mTixpmx+7Ho5bkcJIamY4dM5PMOGhxfQ==", "requires": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "d3": "^3.5.17", "datatables.net-bs": "^1.11.3", "prop-types": "^15.6.2" } }, "@superset-ui/legacy-plugin-chart-rose": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-rose/-/legacy-plugin-chart-rose-0.18.20.tgz", - "integrity": "sha512-siM30v7QHdmanOcD3lc6eFQ8Wlo+rMv0BhdN45RoxNx2d+pTzKPI5qTJSAYPPL083mFW4uw/yRfnv6pE2MvkQA==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-rose/-/legacy-plugin-chart-rose-0.18.23.tgz", + "integrity": "sha512-pkZz87jaE6jVmjLIxIMkrHmq8jdoT58COn1cyarujRNGpXq1UumFsBEO6+DR4B9v0TJUc6FEdJ7Fbi6QUVK7JA==", "requires": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "d3": "^3.5.17", "nvd3": "1.8.6", "prop-types": "^15.6.2" } }, "@superset-ui/legacy-plugin-chart-sankey": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sankey/-/legacy-plugin-chart-sankey-0.18.20.tgz", - "integrity": "sha512-bYqkaVvGqdv0Ds9AdnS2kxLir2R4JXmx0ggAu5tUBC2rJMKfA+5s4h4kBZFfDPDgvUZtwF8fbPdtkhqsGzIvaw==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sankey/-/legacy-plugin-chart-sankey-0.18.23.tgz", + "integrity": "sha512-Qm+TbPoq0h4LB2CpqEMgDAlHgJoshQIeeBq8DqvimBQlrpOkCCzNHgnotNSUFze7hNaKS3mhXLeaCEU5Z5LNfg==", "requires": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "d3": "^3.5.17", "d3-sankey": "^0.4.2", "prop-types": "^15.6.2" } }, "@superset-ui/legacy-plugin-chart-sankey-loop": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sankey-loop/-/legacy-plugin-chart-sankey-loop-0.18.20.tgz", - "integrity": "sha512-uheqqNqFMCIILv/IDSsQSbGyWfLMo+onY5R8+irjra+HJf1ULcCRFFnWEwVq6Aa5mbo6AsWeEHur9WiHRohYKQ==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sankey-loop/-/legacy-plugin-chart-sankey-loop-0.18.23.tgz", + "integrity": "sha512-oan8A2o926okxJY5fmsBarvHbE0XpbLSA4vEGqMZ/6LuIETirw/uwgsnfzSdIsnTGQthO9p/gOKpcrI4fzIiUQ==", "requires": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "d3-sankey-diagram": "^0.7.3", "d3-selection": "^1.4.0", "prop-types": "^15.6.2" } }, "@superset-ui/legacy-plugin-chart-sunburst": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sunburst/-/legacy-plugin-chart-sunburst-0.18.20.tgz", - "integrity": "sha512-1jfKVMjF6EysODOphmQEBExqSepxb8TUczjRPfeir/eDELJCTvLCFcXLGu4+VAYEvQp19Fa2RVcKIgQryOgs0A==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sunburst/-/legacy-plugin-chart-sunburst-0.18.23.tgz", + "integrity": "sha512-vfOYxF/qOv/LT3vbnuhG2XXv9kZFwgmY6r+aKNkS+OOLb8IhNWc37LO8q3TMCyrPNrkJF2UwHQVUizOYDj6Jsg==", "requires": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "d3": "^3.5.17", "prop-types": "^15.6.2" } }, "@superset-ui/legacy-plugin-chart-treemap": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-treemap/-/legacy-plugin-chart-treemap-0.18.20.tgz", - "integrity": "sha512-I8J0TV+rqfeeIkE9j+sHTedVDiJOl72111DzDYHEJHgn0DNGZITwkRKHChFOmrdK7EGs4YbaxtO3BH+AbpK+pQ==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-treemap/-/legacy-plugin-chart-treemap-0.18.23.tgz", + "integrity": "sha512-50J7hi+mCeJs4jE+QOsZFK5Q7IoFu8nUqzTBb6E9GeQE4VRRjg0yGG/o8t9/GRAv345Ll4T27YY8fJCj9l0HJQ==", "requires": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "d3-hierarchy": "^1.1.8", "d3-selection": "^1.4.0", "prop-types": "^15.6.2" } }, "@superset-ui/legacy-plugin-chart-world-map": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-world-map/-/legacy-plugin-chart-world-map-0.18.20.tgz", - "integrity": "sha512-7kTNq4TD4410GO/QSYSZQJC4cfNqRy1FP3KACBZJ5N20VrXT7tMYIt1jzvpyXasIz38GUH+OqJiCXoAr8e5aww==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-world-map/-/legacy-plugin-chart-world-map-0.18.23.tgz", + "integrity": "sha512-NcaxTHnvfky2gMXmq2ORpmkpXL6fD4PnwQX3kaSspB0nIvS38TM3pKdYtiXbRcHI98q0T/bTwiXWTqz5fXdaOA==", "requires": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "d3": "^3.5.17", "d3-array": "^2.4.0", "d3-color": "^1.4.1", @@ -70732,13 +70732,13 @@ } }, "@superset-ui/legacy-preset-chart-big-number": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-big-number/-/legacy-preset-chart-big-number-0.18.20.tgz", - "integrity": "sha512-xH0U1a7VhLt03A9WjhJe5NuV3wDqA4kmiBBElWq8DYsBrHtzB65G5yQtf6TdgTV6Vaxzro6UemB/X5mKOahx/g==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-big-number/-/legacy-preset-chart-big-number-0.18.23.tgz", + "integrity": "sha512-XZuX8NdO+0u0ySwJL/2xceVeEoiO/VPM3xdeEnIpDhg7XES8jrPzLfOnUe5zI8VHWQI8hnAs05ebkZNilxDJ2w==", "requires": { "@data-ui/xy-chart": "^0.0.84", - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "@types/d3-color": "^1.2.2", "@types/shortid": "^0.0.29", "d3-color": "^1.2.3", @@ -70893,13 +70893,13 @@ } }, "@superset-ui/legacy-preset-chart-nvd3": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-nvd3/-/legacy-preset-chart-nvd3-0.18.20.tgz", - "integrity": "sha512-CjqNh+YZjpvthV7BP9yHUzTN26wpdohgfZVil93U4qIC7eO3/htXMBmnYSt8YfgSp8C3qt/vNtJE/HFtmdnnnw==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-nvd3/-/legacy-preset-chart-nvd3-0.18.23.tgz", + "integrity": "sha512-23hm9X/CZOEmzb8M42eYDbYB/Hl98Yu0OOxbLw6ubh43kpZjXjmk83dK+OfNQjUvOSrNGtXFa4tF7vObcNEbEA==", "requires": { "@data-ui/xy-chart": "^0.0.84", - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "d3": "^3.5.17", "d3-tip": "^0.9.1", "dompurify": "^2.0.6", @@ -70912,35 +70912,35 @@ } }, "@superset-ui/plugin-chart-echarts": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-echarts/-/plugin-chart-echarts-0.18.20.tgz", - "integrity": "sha512-pgzq+wtl+MI748kEIEgcsrxSCStwlRXnJj2qn9ZVnt01+Rd2oxuHIUiB4glKMFrQqtsimPnfLpB7sl+Lf8T/DQ==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-echarts/-/plugin-chart-echarts-0.18.23.tgz", + "integrity": "sha512-FKyWC3U5xEjAYy+19EB99rp7NWrJapSd1GqjspSZuAeJfpMsYK1x8ekkrthcIZQ8jSkBV1uuLrzD4ONqF8ZGIQ==", "requires": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "d3-array": "^1.2.0", "echarts": "^5.2.2", "lodash": "^4.17.15" } }, "@superset-ui/plugin-chart-pivot-table": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-pivot-table/-/plugin-chart-pivot-table-0.18.20.tgz", - "integrity": "sha512-8FdHiTqlA6E3XQIbWEY4SwkhlxChA6alBhCXxrzhWWqZgicb9SOscBnV82Pozw9lbHPJubc/rQ39w4g/sZzaBQ==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-pivot-table/-/plugin-chart-pivot-table-0.18.23.tgz", + "integrity": "sha512-vSAg03+5kO2l+KBelB8G+rNyAijLscmaBP2rmHuTg0vi3Zb6qlz+jo6trFdNj8Tq7Ghfl3LP3gXENqDOvT6cxQ==", "requires": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "@superset-ui/react-pivottable": "^0.12.12" } }, "@superset-ui/plugin-chart-table": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-table/-/plugin-chart-table-0.18.20.tgz", - "integrity": "sha512-xj6q0kQqh0nsz7TZTW3kmHJLTlGfRtVXagm3yxj6ShW9vSZtS+Ph158Zuy3QniddBU3SpPG5RzuIrDgHjt9lhA==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-table/-/plugin-chart-table-0.18.23.tgz", + "integrity": "sha512-b6TayE438I6Ov8IhZgbA9d30TO4oZPcjHDMvBdJijHrIG9aIc3RZ6YsY6MHRI7vuosrpuywlpzy5YrHHLcEwAA==", "requires": { "@react-icons/all-files": "^4.1.0", - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "@types/d3-array": "^2.9.0", "@types/react-table": "^7.0.29", "d3-array": "^2.4.0", @@ -70962,12 +70962,12 @@ } }, "@superset-ui/plugin-chart-word-cloud": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-word-cloud/-/plugin-chart-word-cloud-0.18.20.tgz", - "integrity": "sha512-/gQeSAVO7K+wI1N5RKkXy0Apn23nRlwhU8BoPT1uSHuRce4y+ZhCSt2iqHgUs4+f0KPcMFd4BZo15opStxSG8A==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-word-cloud/-/plugin-chart-word-cloud-0.18.23.tgz", + "integrity": "sha512-AB/OMwkQWJ4UxNAX6ssZdm0tkXW17dAbuBy7Z/fmb6VpphnffZ8yrtMt3Oi3WkV4/zk1imQgp9Ubcx8TnMyRgA==", "requires": { - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "@types/d3-cloud": "^1.2.1", "@types/d3-scale": "^2.0.2", "d3-cloud": "^1.2.5", @@ -71006,14 +71006,14 @@ } }, "@superset-ui/preset-chart-xy": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@superset-ui/preset-chart-xy/-/preset-chart-xy-0.18.20.tgz", - "integrity": "sha512-CA79RqPaoAlnINqWQqNHcT6ic6Pv1Xe2j7E8cAYR1ozSjoTVDBN++WH+EOpa/2GHl8uxbeqERGtZebD9l9ZBiA==", + "version": "0.18.23", + "resolved": "https://registry.npmjs.org/@superset-ui/preset-chart-xy/-/preset-chart-xy-0.18.23.tgz", + "integrity": "sha512-BGRlG7VWBRAJMM6qdmnDC3Ahjlzx3ooa0s7flboXyERkr8FBEZnGS9GXWO+126E8wz+VY7zFiYn7LjBmg3wXow==", "requires": { "@data-ui/theme": "^0.0.84", "@data-ui/xy-chart": "^0.0.84", - "@superset-ui/chart-controls": "0.18.20", - "@superset-ui/core": "0.18.20", + "@superset-ui/chart-controls": "0.18.23", + "@superset-ui/core": "0.18.23", "@vx/axis": "^0.0.198", "@vx/legend": "^0.0.198", "@vx/scale": "^0.0.197", @@ -72375,13 +72375,13 @@ } }, "@typescript-eslint/eslint-plugin": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.3.0.tgz", - "integrity": "sha512-ARUEJHJrq85aaiCqez7SANeahDsJTD3AEua34EoQN9pHS6S5Bq9emcIaGGySt/4X2zSi+vF5hAH52sEen7IO7g==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.3.1.tgz", + "integrity": "sha512-cFImaoIr5Ojj358xI/SDhjog57OK2NqlpxwdcgyxDA3bJlZcJq5CPzUXtpD7CxI2Hm6ATU7w5fQnnkVnmwpHqw==", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "5.3.0", - "@typescript-eslint/scope-manager": "5.3.0", + "@typescript-eslint/experimental-utils": "5.3.1", + "@typescript-eslint/scope-manager": "5.3.1", "debug": "^4.3.2", "functional-red-black-tree": "^1.0.1", "ignore": "^5.1.8", @@ -72391,15 +72391,15 @@ }, "dependencies": { "@typescript-eslint/experimental-utils": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.3.0.tgz", - "integrity": "sha512-NFVxYTjKj69qB0FM+piah1x3G/63WB8vCBMnlnEHUsiLzXSTWb9FmFn36FD9Zb4APKBLY3xRArOGSMQkuzTF1w==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.3.1.tgz", + "integrity": "sha512-RgFn5asjZ5daUhbK5Sp0peq0SSMytqcrkNfU4pnDma2D8P3ElZ6JbYjY8IMSFfZAJ0f3x3tnO3vXHweYg0g59w==", "dev": true, "requires": { "@types/json-schema": "^7.0.9", - "@typescript-eslint/scope-manager": "5.3.0", - "@typescript-eslint/types": "5.3.0", - "@typescript-eslint/typescript-estree": "5.3.0", + "@typescript-eslint/scope-manager": "5.3.1", + "@typescript-eslint/types": "5.3.1", + "@typescript-eslint/typescript-estree": "5.3.1", "eslint-scope": "^5.1.1", "eslint-utils": "^3.0.0" }, @@ -72416,13 +72416,13 @@ } }, "@typescript-eslint/typescript-estree": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.3.0.tgz", - "integrity": "sha512-FJ0nqcaUOpn/6Z4Jwbtf+o0valjBLkqc3MWkMvrhA2TvzFXtcclIM8F4MBEmYa2kgcI8EZeSAzwoSrIC8JYkug==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.3.1.tgz", + "integrity": "sha512-PwFbh/PKDVo/Wct6N3w+E4rLZxUDgsoII/GrWM2A62ETOzJd4M6s0Mu7w4CWsZraTbaC5UQI+dLeyOIFF1PquQ==", "dev": true, "requires": { - "@typescript-eslint/types": "5.3.0", - "@typescript-eslint/visitor-keys": "5.3.0", + "@typescript-eslint/types": "5.3.1", + "@typescript-eslint/visitor-keys": "5.3.1", "debug": "^4.3.2", "globby": "^11.0.4", "is-glob": "^4.0.3", @@ -72552,25 +72552,25 @@ } }, "@typescript-eslint/parser": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.3.0.tgz", - "integrity": "sha512-rKu/yAReip7ovx8UwOAszJVO5MgBquo8WjIQcp1gx4pYQCwYzag+I5nVNHO4MqyMkAo0gWt2gWUi+36gWAVKcw==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.3.1.tgz", + "integrity": "sha512-TD+ONlx5c+Qhk21x9gsJAMRohWAUMavSOmJgv3JGy9dgPhuBd5Wok0lmMClZDyJNLLZK1JRKiATzCKZNUmoyfw==", "dev": true, "requires": { - "@typescript-eslint/scope-manager": "5.3.0", - "@typescript-eslint/types": "5.3.0", - "@typescript-eslint/typescript-estree": "5.3.0", + "@typescript-eslint/scope-manager": "5.3.1", + "@typescript-eslint/types": "5.3.1", + "@typescript-eslint/typescript-estree": "5.3.1", "debug": "^4.3.2" }, "dependencies": { "@typescript-eslint/typescript-estree": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.3.0.tgz", - "integrity": "sha512-FJ0nqcaUOpn/6Z4Jwbtf+o0valjBLkqc3MWkMvrhA2TvzFXtcclIM8F4MBEmYa2kgcI8EZeSAzwoSrIC8JYkug==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.3.1.tgz", + "integrity": "sha512-PwFbh/PKDVo/Wct6N3w+E4rLZxUDgsoII/GrWM2A62ETOzJd4M6s0Mu7w4CWsZraTbaC5UQI+dLeyOIFF1PquQ==", "dev": true, "requires": { - "@typescript-eslint/types": "5.3.0", - "@typescript-eslint/visitor-keys": "5.3.0", + "@typescript-eslint/types": "5.3.1", + "@typescript-eslint/visitor-keys": "5.3.1", "debug": "^4.3.2", "globby": "^11.0.4", "is-glob": "^4.0.3", @@ -72646,19 +72646,19 @@ } }, "@typescript-eslint/scope-manager": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.3.0.tgz", - "integrity": "sha512-22Uic9oRlTsPppy5Tcwfj+QET5RWEnZ5414Prby465XxQrQFZ6nnm5KnXgnsAJefG4hEgMnaxTB3kNEyjdjj6A==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.3.1.tgz", + "integrity": "sha512-XksFVBgAq0Y9H40BDbuPOTUIp7dn4u8oOuhcgGq7EoDP50eqcafkMVGrypyVGvDYHzjhdUCUwuwVUK4JhkMAMg==", "dev": true, "requires": { - "@typescript-eslint/types": "5.3.0", - "@typescript-eslint/visitor-keys": "5.3.0" + "@typescript-eslint/types": "5.3.1", + "@typescript-eslint/visitor-keys": "5.3.1" } }, "@typescript-eslint/types": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.3.0.tgz", - "integrity": "sha512-fce5pG41/w8O6ahQEhXmMV+xuh4+GayzqEogN24EK+vECA3I6pUwKuLi5QbXO721EMitpQne5VKXofPonYlAQg==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.3.1.tgz", + "integrity": "sha512-bG7HeBLolxKHtdHG54Uac750eXuQQPpdJfCYuw4ZI3bZ7+GgKClMWM8jExBtp7NSP4m8PmLRM8+lhzkYnSmSxQ==", "dev": true }, "@typescript-eslint/typescript-estree": { @@ -72836,12 +72836,12 @@ } }, "@typescript-eslint/visitor-keys": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.3.0.tgz", - "integrity": "sha512-oVIAfIQuq0x2TFDNLVavUn548WL+7hdhxYn+9j3YdJJXB7mH9dAmZNJsPDa7Jc+B9WGqoiex7GUDbyMxV0a/aw==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.3.1.tgz", + "integrity": "sha512-3cHUzUuVTuNHx0Gjjt5pEHa87+lzyqOiHXy/Gz+SJOCW1mpw9xQHIIEwnKn+Thph1mgWyZ90nboOcSuZr/jTTQ==", "dev": true, "requires": { - "@typescript-eslint/types": "5.3.0", + "@typescript-eslint/types": "5.3.1", "eslint-visitor-keys": "^3.0.0" } }, @@ -80690,9 +80690,9 @@ } }, "eslint-visitor-keys": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.0.0.tgz", - "integrity": "sha512-mJOZa35trBTb3IyRmo8xmKBZlxf+N7OnUl4+ZhJHs/r+0770Wh/LEACE2pqMGMe27G/4y8P2bYGk4J70IC5k1Q==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz", + "integrity": "sha512-yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA==", "dev": true }, "esm": { diff --git a/superset-frontend/package.json b/superset-frontend/package.json index f210b7f0c5..50f10becbe 100644 --- a/superset-frontend/package.json +++ b/superset-frontend/package.json @@ -68,35 +68,35 @@ "@emotion/cache": "^11.4.0", "@emotion/react": "^11.4.1", "@emotion/styled": "^11.3.0", - "@superset-ui/chart-controls": "^0.18.20", - "@superset-ui/core": "^0.18.20", - "@superset-ui/legacy-plugin-chart-calendar": "^0.18.20", - "@superset-ui/legacy-plugin-chart-chord": "^0.18.20", - "@superset-ui/legacy-plugin-chart-country-map": "^0.18.20", - "@superset-ui/legacy-plugin-chart-event-flow": "^0.18.20", - "@superset-ui/legacy-plugin-chart-force-directed": "^0.18.20", - "@superset-ui/legacy-plugin-chart-heatmap": "^0.18.20", - "@superset-ui/legacy-plugin-chart-histogram": "^0.18.20", - "@superset-ui/legacy-plugin-chart-horizon": "^0.18.20", - "@superset-ui/legacy-plugin-chart-map-box": "^0.18.20", - "@superset-ui/legacy-plugin-chart-paired-t-test": "^0.18.20", - "@superset-ui/legacy-plugin-chart-parallel-coordinates": "^0.18.20", - "@superset-ui/legacy-plugin-chart-partition": "^0.18.20", - "@superset-ui/legacy-plugin-chart-pivot-table": "^0.18.20", - "@superset-ui/legacy-plugin-chart-rose": "^0.18.20", - "@superset-ui/legacy-plugin-chart-sankey": "^0.18.20", - "@superset-ui/legacy-plugin-chart-sankey-loop": "^0.18.20", - "@superset-ui/legacy-plugin-chart-sunburst": "^0.18.20", - "@superset-ui/legacy-plugin-chart-treemap": "^0.18.20", - "@superset-ui/legacy-plugin-chart-world-map": "^0.18.20", - "@superset-ui/legacy-preset-chart-big-number": "^0.18.20", + "@superset-ui/chart-controls": "^0.18.23", + "@superset-ui/core": "^0.18.23", + "@superset-ui/legacy-plugin-chart-calendar": "^0.18.23", + "@superset-ui/legacy-plugin-chart-chord": "^0.18.23", + "@superset-ui/legacy-plugin-chart-country-map": "^0.18.23", + "@superset-ui/legacy-plugin-chart-event-flow": "^0.18.23", + "@superset-ui/legacy-plugin-chart-force-directed": "^0.18.23", + "@superset-ui/legacy-plugin-chart-heatmap": "^0.18.23", + "@superset-ui/legacy-plugin-chart-histogram": "^0.18.23", + "@superset-ui/legacy-plugin-chart-horizon": "^0.18.23", + "@superset-ui/legacy-plugin-chart-map-box": "^0.18.23", + "@superset-ui/legacy-plugin-chart-paired-t-test": "^0.18.23", + "@superset-ui/legacy-plugin-chart-parallel-coordinates": "^0.18.23", + "@superset-ui/legacy-plugin-chart-partition": "^0.18.23", + "@superset-ui/legacy-plugin-chart-pivot-table": "^0.18.23", + "@superset-ui/legacy-plugin-chart-rose": "^0.18.23", + "@superset-ui/legacy-plugin-chart-sankey": "^0.18.23", + "@superset-ui/legacy-plugin-chart-sankey-loop": "^0.18.23", + "@superset-ui/legacy-plugin-chart-sunburst": "^0.18.23", + "@superset-ui/legacy-plugin-chart-treemap": "^0.18.23", + "@superset-ui/legacy-plugin-chart-world-map": "^0.18.23", + "@superset-ui/legacy-preset-chart-big-number": "^0.18.23", "@superset-ui/legacy-preset-chart-deckgl": "^0.4.13", - "@superset-ui/legacy-preset-chart-nvd3": "^0.18.20", - "@superset-ui/plugin-chart-echarts": "^0.18.20", - "@superset-ui/plugin-chart-pivot-table": "^0.18.20", - "@superset-ui/plugin-chart-table": "^0.18.20", - "@superset-ui/plugin-chart-word-cloud": "^0.18.20", - "@superset-ui/preset-chart-xy": "^0.18.20", + "@superset-ui/legacy-preset-chart-nvd3": "^0.18.23", + "@superset-ui/plugin-chart-echarts": "^0.18.23", + "@superset-ui/plugin-chart-pivot-table": "^0.18.23", + "@superset-ui/plugin-chart-table": "^0.18.23", + "@superset-ui/plugin-chart-word-cloud": "^0.18.23", + "@superset-ui/preset-chart-xy": "^0.18.23", "@vx/responsive": "^0.0.195", "abortcontroller-polyfill": "^1.1.9", "antd": "^4.9.4", diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx index bfffe94b2a..597b9964e6 100644 --- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx +++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx @@ -17,15 +17,27 @@ * under the License. */ /* eslint-disable camelcase */ -import React, { useCallback, useMemo, useState } from 'react'; +import React, { + useCallback, + useEffect, + useMemo, + useRef, + useState, +} from 'react'; +import { AdhocColumn, t, styled, css } from '@superset-ui/core'; +import { + ColumnMeta, + isAdhocColumn, + isSavedExpression, +} from '@superset-ui/chart-controls'; import Tabs from 'src/components/Tabs'; import Button from 'src/components/Button'; import { Select } from 'src/components'; -import { t, styled } from '@superset-ui/core'; import { Form, FormItem } from 'src/components/Form'; +import { SQLEditor } from 'src/components/AsyncAceEditor'; import { StyledColumnOption } from 'src/explore/components/optionRenderers'; -import { ColumnMeta } from '@superset-ui/chart-controls'; +import { POPOVER_INITIAL_HEIGHT } from 'src/explore/constants'; const StyledSelect = styled(Select)` .metric-option { @@ -41,29 +53,58 @@ const StyledSelect = styled(Select)` interface ColumnSelectPopoverProps { columns: ColumnMeta[]; - editedColumn?: ColumnMeta; - onChange: (column: ColumnMeta) => void; + editedColumn?: ColumnMeta | AdhocColumn; + onChange: (column: ColumnMeta | AdhocColumn) => void; onClose: () => void; + setLabel: (title: string) => void; + getCurrentTab: (tab: string) => void; + label: string; + isAdhocColumnsEnabled: boolean; } +const getInitialColumnValues = ( + editedColumn?: ColumnMeta | AdhocColumn, +): [AdhocColumn?, ColumnMeta?, ColumnMeta?] => { + if (!editedColumn) { + return [undefined, undefined, undefined]; + } + if (isAdhocColumn(editedColumn)) { + return [editedColumn, undefined, undefined]; + } + if (isSavedExpression(editedColumn)) { + return [undefined, editedColumn, undefined]; + } + return [undefined, undefined, editedColumn]; +}; + const ColumnSelectPopover = ({ columns, editedColumn, onChange, onClose, + setLabel, + getCurrentTab, + label, + isAdhocColumnsEnabled, }: ColumnSelectPopoverProps) => { + const [initialLabel] = useState(label); const [ + initialAdhocColumn, initialCalculatedColumn, initialSimpleColumn, - ] = editedColumn?.expression - ? [editedColumn, undefined] - : [undefined, editedColumn]; - const [selectedCalculatedColumn, setSelectedCalculatedColumn] = useState( - initialCalculatedColumn, - ); - const [selectedSimpleColumn, setSelectedSimpleColumn] = useState( - initialSimpleColumn, + ] = getInitialColumnValues(editedColumn); + + const [adhocColumn, setAdhocColumn] = useState( + initialAdhocColumn, ); + const [selectedCalculatedColumn, setSelectedCalculatedColumn] = useState< + ColumnMeta | undefined + >(initialCalculatedColumn); + const [selectedSimpleColumn, setSelectedSimpleColumn] = useState< + ColumnMeta | undefined + >(initialSimpleColumn); + + const sqlEditorRef = useRef(null); const [calculatedColumns, simpleColumns] = useMemo( () => @@ -81,6 +122,15 @@ const ColumnSelectPopover = ({ [columns], ); + const onSqlExpressionChange = useCallback( + sqlExpression => { + setAdhocColumn({ label, sqlExpression } as AdhocColumn); + setSelectedSimpleColumn(undefined); + setSelectedCalculatedColumn(undefined); + }, + [label], + ); + const onCalculatedColumnChange = useCallback( selectedColumnName => { const selectedColumn = calculatedColumns.find( @@ -88,8 +138,12 @@ const ColumnSelectPopover = ({ ); setSelectedCalculatedColumn(selectedColumn); setSelectedSimpleColumn(undefined); + setAdhocColumn(undefined); + setLabel( + selectedColumn?.verbose_name || selectedColumn?.column_name || '', + ); }, - [calculatedColumns], + [calculatedColumns, setLabel], ); const onSimpleColumnChange = useCallback( @@ -99,33 +153,79 @@ const ColumnSelectPopover = ({ ); setSelectedCalculatedColumn(undefined); setSelectedSimpleColumn(selectedColumn); + setAdhocColumn(undefined); + setLabel( + selectedColumn?.verbose_name || selectedColumn?.column_name || '', + ); }, - [simpleColumns], + [setLabel, simpleColumns], ); - const defaultActiveTabKey = - initialSimpleColumn || calculatedColumns.length === 0 ? 'simple' : 'saved'; + const defaultActiveTabKey = initialAdhocColumn + ? 'sqlExpression' + : initialSimpleColumn || calculatedColumns.length === 0 + ? 'simple' + : 'saved'; + + useEffect(() => { + getCurrentTab(defaultActiveTabKey); + }, [defaultActiveTabKey, getCurrentTab]); const onSave = useCallback(() => { - const selectedColumn = selectedCalculatedColumn || selectedSimpleColumn; + if (adhocColumn && adhocColumn.label !== label) { + adhocColumn.label = label; + } + const selectedColumn = + adhocColumn || selectedCalculatedColumn || selectedSimpleColumn; if (!selectedColumn) { return; } onChange(selectedColumn); onClose(); - }, [onChange, onClose, selectedCalculatedColumn, selectedSimpleColumn]); + }, [ + adhocColumn, + label, + onChange, + onClose, + selectedCalculatedColumn, + selectedSimpleColumn, + ]); const onResetStateAndClose = useCallback(() => { setSelectedCalculatedColumn(initialCalculatedColumn); setSelectedSimpleColumn(initialSimpleColumn); + setAdhocColumn(initialAdhocColumn); onClose(); - }, [initialCalculatedColumn, initialSimpleColumn, onClose]); + }, [ + initialAdhocColumn, + initialCalculatedColumn, + initialSimpleColumn, + onClose, + ]); - const stateIsValid = selectedCalculatedColumn || selectedSimpleColumn; + const onTabChange = useCallback( + tab => { + getCurrentTab(tab); + // @ts-ignore + sqlEditorRef.current?.editor.focus(); + }, + [getCurrentTab], + ); + + const onSqlEditorFocus = useCallback(() => { + // @ts-ignore + sqlEditorRef.current?.editor.resize(); + }, []); + + const stateIsValid = + adhocColumn || selectedCalculatedColumn || selectedSimpleColumn; const hasUnsavedChanges = + initialLabel !== label || selectedCalculatedColumn?.column_name !== initialCalculatedColumn?.column_name || - selectedSimpleColumn?.column_name !== initialSimpleColumn?.column_name; + selectedSimpleColumn?.column_name !== initialSimpleColumn?.column_name || + adhocColumn?.sqlExpression !== initialAdhocColumn?.sqlExpression; + const savedExpressionsLabel = t('Saved expressions'); const simpleColumnsLabel = t('Column'); @@ -134,8 +234,12 @@ const ColumnSelectPopover = ({ @@ -178,6 +282,28 @@ const ColumnSelectPopover = ({ /> + {isAdhocColumnsEnabled && ( + + + + )}