diff --git a/docs/src/resources/openapi.json b/docs/src/resources/openapi.json index b83e741f0b860..7181d3beca31c 100644 --- a/docs/src/resources/openapi.json +++ b/docs/src/resources/openapi.json @@ -730,13 +730,13 @@ "PT5M", "PT10M", "PT15M", - "PT0.5H", + "PT30M", "PT1H", "PT6H", "P1D", "P1W", "P1M", - "P0.25Y", + "P3M", "P1Y", "1969-12-28T00:00:00Z/P1W", "1969-12-29T00:00:00Z/P1W", @@ -998,13 +998,13 @@ "PT5M", "PT10M", "PT15M", - "PT0.5H", + "PT30M", "PT1H", "PT6H", "P1D", "P1W", "P1M", - "P0.25Y", + "P3M", "P1Y", "1969-12-28T00:00:00Z/P1W", "1969-12-29T00:00:00Z/P1W", diff --git a/superset-frontend/cypress-base/cypress/integration/explore/visualizations/table.test.ts b/superset-frontend/cypress-base/cypress/integration/explore/visualizations/table.test.ts index 2a4258b77c316..6361d93d1809a 100644 --- a/superset-frontend/cypress-base/cypress/integration/explore/visualizations/table.test.ts +++ b/superset-frontend/cypress-base/cypress/integration/explore/visualizations/table.test.ts @@ -62,7 +62,7 @@ describe('Visualization > Table', () => { ...VIZ_DEFAULTS, include_time: true, granularity_sqla: 'ds', - time_grain_sqla: 'P0.25Y', + time_grain_sqla: 'P3M', metrics: [NUM_METRIC, MAX_DS, MAX_STATE], }); // when format with smart_date, time column use format by granularity @@ -77,7 +77,7 @@ describe('Visualization > Table', () => { ...VIZ_DEFAULTS, include_time: true, granularity_sqla: 'ds', - time_grain_sqla: 'P0.25Y', + time_grain_sqla: 'P3M', table_timestamp_format: '%Y-%m-%d %H:%M', metrics: [NUM_METRIC, MAX_DS, MAX_STATE], }); @@ -111,7 +111,7 @@ describe('Visualization > Table', () => { ...VIZ_DEFAULTS, include_time: true, granularity_sqla: 'ds', - time_grain_sqla: 'P0.25Y', + time_grain_sqla: 'P3M', metrics: [NUM_METRIC, MAX_DS], groupby: ['name'], }); diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json index 7b89176b55427..d2c9bded7edac 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.10", - "@superset-ui/core": "^0.18.10", - "@superset-ui/legacy-plugin-chart-calendar": "^0.18.10", - "@superset-ui/legacy-plugin-chart-chord": "^0.18.10", - "@superset-ui/legacy-plugin-chart-country-map": "^0.18.10", - "@superset-ui/legacy-plugin-chart-event-flow": "^0.18.10", - "@superset-ui/legacy-plugin-chart-force-directed": "^0.18.10", - "@superset-ui/legacy-plugin-chart-heatmap": "^0.18.10", - "@superset-ui/legacy-plugin-chart-histogram": "^0.18.10", - "@superset-ui/legacy-plugin-chart-horizon": "^0.18.10", - "@superset-ui/legacy-plugin-chart-map-box": "^0.18.10", - "@superset-ui/legacy-plugin-chart-paired-t-test": "^0.18.10", - "@superset-ui/legacy-plugin-chart-parallel-coordinates": "^0.18.10", - "@superset-ui/legacy-plugin-chart-partition": "^0.18.10", - "@superset-ui/legacy-plugin-chart-pivot-table": "^0.18.10", - "@superset-ui/legacy-plugin-chart-rose": "^0.18.10", - "@superset-ui/legacy-plugin-chart-sankey": "^0.18.10", - "@superset-ui/legacy-plugin-chart-sankey-loop": "^0.18.10", - "@superset-ui/legacy-plugin-chart-sunburst": "^0.18.10", - "@superset-ui/legacy-plugin-chart-treemap": "^0.18.10", - "@superset-ui/legacy-plugin-chart-world-map": "^0.18.10", - "@superset-ui/legacy-preset-chart-big-number": "^0.18.10", + "@superset-ui/chart-controls": "^0.18.12", + "@superset-ui/core": "^0.18.12", + "@superset-ui/legacy-plugin-chart-calendar": "^0.18.12", + "@superset-ui/legacy-plugin-chart-chord": "^0.18.12", + "@superset-ui/legacy-plugin-chart-country-map": "^0.18.12", + "@superset-ui/legacy-plugin-chart-event-flow": "^0.18.12", + "@superset-ui/legacy-plugin-chart-force-directed": "^0.18.12", + "@superset-ui/legacy-plugin-chart-heatmap": "^0.18.12", + "@superset-ui/legacy-plugin-chart-histogram": "^0.18.12", + "@superset-ui/legacy-plugin-chart-horizon": "^0.18.12", + "@superset-ui/legacy-plugin-chart-map-box": "^0.18.12", + "@superset-ui/legacy-plugin-chart-paired-t-test": "^0.18.12", + "@superset-ui/legacy-plugin-chart-parallel-coordinates": "^0.18.12", + "@superset-ui/legacy-plugin-chart-partition": "^0.18.12", + "@superset-ui/legacy-plugin-chart-pivot-table": "^0.18.12", + "@superset-ui/legacy-plugin-chart-rose": "^0.18.12", + "@superset-ui/legacy-plugin-chart-sankey": "^0.18.12", + "@superset-ui/legacy-plugin-chart-sankey-loop": "^0.18.12", + "@superset-ui/legacy-plugin-chart-sunburst": "^0.18.12", + "@superset-ui/legacy-plugin-chart-treemap": "^0.18.12", + "@superset-ui/legacy-plugin-chart-world-map": "^0.18.12", + "@superset-ui/legacy-preset-chart-big-number": "^0.18.12", "@superset-ui/legacy-preset-chart-deckgl": "^0.4.12", - "@superset-ui/legacy-preset-chart-nvd3": "^0.18.10", - "@superset-ui/plugin-chart-echarts": "^0.18.10", - "@superset-ui/plugin-chart-pivot-table": "^0.18.10", - "@superset-ui/plugin-chart-table": "^0.18.10", - "@superset-ui/plugin-chart-word-cloud": "^0.18.10", - "@superset-ui/preset-chart-xy": "^0.18.10", + "@superset-ui/legacy-preset-chart-nvd3": "^0.18.12", + "@superset-ui/plugin-chart-echarts": "^0.18.12", + "@superset-ui/plugin-chart-pivot-table": "^0.18.12", + "@superset-ui/plugin-chart-table": "^0.18.12", + "@superset-ui/plugin-chart-word-cloud": "^0.18.12", + "@superset-ui/preset-chart-xy": "^0.18.12", "@vx/responsive": "^0.0.195", "abortcontroller-polyfill": "^1.1.9", "antd": "^4.9.4", @@ -11629,12 +11629,12 @@ } }, "node_modules/@superset-ui/chart-controls": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/chart-controls/-/chart-controls-0.18.10.tgz", - "integrity": "sha512-htY1Nd82DCT8sc45CSl++ZYRrRKi6r87rSx7dP5ZzW/V8kZhDa7eCR8gcP86Ood/14v3+I86cgD65DlLsw8uSw==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/chart-controls/-/chart-controls-0.18.12.tgz", + "integrity": "sha512-B7A7C/8ZZUa7XqcsWzGGQ+3tabDsttkIrD5gec2EczIn7983G7ipafQr6X+B3RIC8ABvLlhaohHehhEFRyRHGw==", "dependencies": { "@react-icons/all-files": "^4.1.0", - "@superset-ui/core": "0.18.10", + "@superset-ui/core": "0.18.12", "lodash": "^4.17.15", "prop-types": "^15.7.2" }, @@ -11646,9 +11646,9 @@ } }, "node_modules/@superset-ui/core": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.18.10.tgz", - "integrity": "sha512-S8Z1hL5UV7Cd1ysRG+nb0DuZ0sdNceJEr0ZsEBYWpM7FYIvhxiMIo5q6WH028QZPV+c6gaDcAplx6VTLwu2IPw==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.18.12.tgz", + "integrity": "sha512-NZ/pT+Wcgob5G1KGQyM2FpaoHXwbbcx94eO+ZKP3EVqWtm5QV4C2F2zLQOVDYsvlcUFWrH8eVlnRvk0dxydlAg==", "dependencies": { "@babel/runtime": "^7.1.2", "@types/d3-format": "^1.3.0", @@ -11733,12 +11733,12 @@ } }, "node_modules/@superset-ui/legacy-plugin-chart-calendar": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-calendar/-/legacy-plugin-chart-calendar-0.18.10.tgz", - "integrity": "sha512-T0uHyxWBMjqG7cXJYL3zudU7hXzqmcYOItgIulGTT23pq/mkY9aS1twhddv1AggWRn7OEH5U2CYeXRhZ+VzEdg==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-calendar/-/legacy-plugin-chart-calendar-0.18.12.tgz", + "integrity": "sha512-KrQOfrOGVL0MWrCmcMB+65wenQc3OM3AxEUVoUu7IDM0JT501HybUKTemJAfsNjuIui2Nn8ZUHOLdCXkJaD6DA==", "dependencies": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "d3-array": "^2.0.3", "d3-selection": "^1.4.0", "d3-tip": "^0.9.1", @@ -11757,24 +11757,24 @@ } }, "node_modules/@superset-ui/legacy-plugin-chart-chord": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-chord/-/legacy-plugin-chart-chord-0.18.10.tgz", - "integrity": "sha512-E7DHYbOU5WuawDT9wCS5tcX5km3eg2XyWZN1Vx5keLxjqRSCivFMW5PaZShGf+IJUh1aFI+kewJVMvJsqaLCVg==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-chord/-/legacy-plugin-chart-chord-0.18.12.tgz", + "integrity": "sha512-r0k6ZdlwbWhS3XmyUnW3bWxeXXzzh+kSM+MeO6a7PuguVwcHclwKLFzyRH9hORppz8V3Rbk2NOva/7RCSjrdYQ==", "dependencies": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "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.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-country-map/-/legacy-plugin-chart-country-map-0.18.10.tgz", - "integrity": "sha512-Q47WNeXgvWb/3vQQckmFah1/yjMdr5gw2waYdX7YAweJGhmg2VMA3RPrZV0xaTFhHbMQy72e0QodYTyxvTMwcg==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-country-map/-/legacy-plugin-chart-country-map-0.18.12.tgz", + "integrity": "sha512-vsUoOeREZ43C/g1ciqUZPU0w+n3I4LCmC+TKD2j88lK63BlAIHJ0SEfzS0DE0IJyC02B8AimQoLZUbjjgiWAzw==", "dependencies": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "d3": "^3.5.17", "d3-array": "^2.0.3", "prop-types": "^15.6.2" @@ -11789,13 +11789,13 @@ } }, "node_modules/@superset-ui/legacy-plugin-chart-event-flow": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-event-flow/-/legacy-plugin-chart-event-flow-0.18.10.tgz", - "integrity": "sha512-H2WIHlatrb7xvRSzFDquZgkEMR6HfoZBpVaYKi4APF590KbfBWYhnczLy6XISanIKB61sPjgnekv55AklPjOXA==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-event-flow/-/legacy-plugin-chart-event-flow-0.18.12.tgz", + "integrity": "sha512-TmZUzjs1sNjElhH34wdhLJ3jg5KqJO1X35d5L3L0RcqBx50pB1P2d2U4W1psp3yn4H10+tWP+2uDFoWdNeCnag==", "dependencies": { "@data-ui/event-flow": "^0.0.84", - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "prop-types": "^15.6.2" }, "peerDependencies": { @@ -11803,12 +11803,12 @@ } }, "node_modules/@superset-ui/legacy-plugin-chart-force-directed": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-force-directed/-/legacy-plugin-chart-force-directed-0.18.10.tgz", - "integrity": "sha512-7dNqWxwpTo/a+60cskso+UxfGgB0Kb2G5Ww0G5mb8/DFif4CUrZILar2PIMfa7vLrU94FT4Y3vLGZL/XP9oV/A==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-force-directed/-/legacy-plugin-chart-force-directed-0.18.12.tgz", + "integrity": "sha512-cmzSCZR9qVD2JekFU6AcW9aV2WxATU5PYNMwyNWcyKs0sKSxu0qPDjGY44dsbVZAC1PrtKGVIu4dH6URrPjtzA==", "dependencies": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "d3": "^3.5.17", "prop-types": "^15.7.2" }, @@ -11817,12 +11817,12 @@ } }, "node_modules/@superset-ui/legacy-plugin-chart-heatmap": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-heatmap/-/legacy-plugin-chart-heatmap-0.18.10.tgz", - "integrity": "sha512-d3pM5cF3iQTO0cZvmEJf9fcVkz0+yM4gs3qR97Q7iWLoG7V+5OakyTbOPX16XuAsNMc4iT0M6VZoF1JnC0Xyeg==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-heatmap/-/legacy-plugin-chart-heatmap-0.18.12.tgz", + "integrity": "sha512-DwjltXKBPKOAEmzjJc1ua0NVc36IA4UUsAdxy0LxUhklSpQEn43sYV/3YkpIeBzBPqg+7IRYFwIfv81SCMxpJQ==", "dependencies": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "d3": "^3.5.17", "d3-svg-legend": "^1.x", "d3-tip": "^0.9.1", @@ -11830,14 +11830,14 @@ } }, "node_modules/@superset-ui/legacy-plugin-chart-histogram": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-histogram/-/legacy-plugin-chart-histogram-0.18.10.tgz", - "integrity": "sha512-CemmKAvI/yJfMoQDlpo0a42fIFpRYmgmnyfbDXhzn4tX9A+V2HoT62DDuuMmUWsshK8n4BgmaOgZwSAL6q/UMA==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-histogram/-/legacy-plugin-chart-histogram-0.18.12.tgz", + "integrity": "sha512-KWHZ0eJi+kTaC/J9HJYW3SXYIJGNzu6ThbU9E+6sIQzx8Ojo4JxV3zIBREWofRnWmHFVc7/qGfHY6Aut6RA2vQ==", "dependencies": { "@data-ui/histogram": "^0.0.84", "@data-ui/theme": "^0.0.84", - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "@vx/legend": "^0.0.198", "@vx/responsive": "^0.0.199", "@vx/scale": "^0.0.197", @@ -11915,12 +11915,12 @@ } }, "node_modules/@superset-ui/legacy-plugin-chart-horizon": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-horizon/-/legacy-plugin-chart-horizon-0.18.10.tgz", - "integrity": "sha512-4rE1S9Abg/+9F1Oj5gl+CHNkgVQR2066oGFIUB2O0wJVwZS6ZRwZzW9EBrdwTmasY9pyiw296Fof5TurVl4u/g==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-horizon/-/legacy-plugin-chart-horizon-0.18.12.tgz", + "integrity": "sha512-mEtHiQe5t0nphAoHPNrFIzvG3C9je96uyDoJUkhHhALcwk+V2u8YWnCZBV1R+jsrkT7ClQtLLDtElL+4c/V0hg==", "dependencies": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "d3-array": "^2.0.3", "d3-scale": "^3.0.1", "prop-types": "^15.6.2" @@ -11958,12 +11958,12 @@ } }, "node_modules/@superset-ui/legacy-plugin-chart-map-box": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-map-box/-/legacy-plugin-chart-map-box-0.18.10.tgz", - "integrity": "sha512-MKUMOZC19CWScSTjLXTG+XnZ/1eCnpISQJufIP5nG0S1iWinp8wnTZclwTipMz8HKsQNqzuhsBHD432dNVEXvw==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-map-box/-/legacy-plugin-chart-map-box-0.18.12.tgz", + "integrity": "sha512-cp55kE2SwqDaLBiJCn1wr714aEzCla2htoNWOFUjTALbfOe0pRKV736jOHocXDSfTkvJwxDp4ztzEdWuwAXiiQ==", "dependencies": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "mapbox-gl": "^0.53.0", "prop-types": "^15.6.2", "react-map-gl": "^4.0.10", @@ -11975,12 +11975,12 @@ } }, "node_modules/@superset-ui/legacy-plugin-chart-paired-t-test": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-paired-t-test/-/legacy-plugin-chart-paired-t-test-0.18.10.tgz", - "integrity": "sha512-lv5+gaEFAOsg1szhWdJuvMZ178WeDmcfjDGnSsbX9PGXg2JyTedMpFr57lYvWjdi2dvXXQkWYMuiAEmTz/I/Xg==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-paired-t-test/-/legacy-plugin-chart-paired-t-test-0.18.12.tgz", + "integrity": "sha512-wDcfrA43B2uI6Kol+XOi4WGJW/NKv6foPHjwaCAnAeoE17f+IEzXU5zC7jX51wYAGfs2m1jUg8R1cv8qYIqSAg==", "dependencies": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "distributions": "^1.0.0", "prop-types": "^15.6.2", "reactable": "^1.1.0" @@ -11990,12 +11990,12 @@ } }, "node_modules/@superset-ui/legacy-plugin-chart-parallel-coordinates": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-parallel-coordinates/-/legacy-plugin-chart-parallel-coordinates-0.18.10.tgz", - "integrity": "sha512-zKVNHNO7eClBY5I51U6lgBuKcLF05wegkIw1iGqNQXcuHhiLEiHn4fY0kB0SAIzgPRXwo3jcYWG9UjsQAr5v4A==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-parallel-coordinates/-/legacy-plugin-chart-parallel-coordinates-0.18.12.tgz", + "integrity": "sha512-lY7Zvxvc4QybUYY5yovDEzC7F34/YlMJ6Yn5hU8bvV7q1BIy/zLHepGtnqH25tzX75xEb5J4OyABbA0fYP4p0Q==", "dependencies": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "d3": "^3.5.17", "prop-types": "^15.7.2" }, @@ -12004,12 +12004,12 @@ } }, "node_modules/@superset-ui/legacy-plugin-chart-partition": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-partition/-/legacy-plugin-chart-partition-0.18.10.tgz", - "integrity": "sha512-hdoIDr0T4+8cHFG278CeUqeNIqDMJA0B6YIqRbynwDXAY9vtwp6I7k6wDwvSP7NhKLnFj7u4OZfRICE6DcKt/Q==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-partition/-/legacy-plugin-chart-partition-0.18.12.tgz", + "integrity": "sha512-IDu/3VfMdg/5nGedKChht1z3K8vwumHY49Kgfqv9/B+/xUX4JRC81y8tfsZC00+aRv2LV8jPXUd1Xexklh+JaQ==", "dependencies": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "d3": "^3.5.17", "d3-hierarchy": "^1.1.8", "prop-types": "^15.6.2" @@ -12019,24 +12019,24 @@ } }, "node_modules/@superset-ui/legacy-plugin-chart-pivot-table": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-pivot-table/-/legacy-plugin-chart-pivot-table-0.18.10.tgz", - "integrity": "sha512-nN4LPES0FIAN+GPnyO+VYyIroXh3H/sTofaAq+Z1LbLjoYmYVRTc4Khr1S3oqpL67/HV4W8f0HbLobLrp+5+8g==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-pivot-table/-/legacy-plugin-chart-pivot-table-0.18.12.tgz", + "integrity": "sha512-O1yv1MOPfmQsi8qUPTh/YCZXIEBoxhbSlimDSAB0nlpLGRxIpgS06v5xeN8b/I+4hLQZzjAERkSazsLxC9SzHQ==", "dependencies": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "d3": "^3.5.17", "datatables.net-bs": "^1.10.15", "prop-types": "^15.6.2" } }, "node_modules/@superset-ui/legacy-plugin-chart-rose": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-rose/-/legacy-plugin-chart-rose-0.18.10.tgz", - "integrity": "sha512-txFLrelfKCSGMXfFCWMvf83HNEhHGc72ts4JQvX0bTRh6+VDp4ZM7e6ohdb9W6ryOztk7Nuh7ye3TvC+8J224g==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-rose/-/legacy-plugin-chart-rose-0.18.12.tgz", + "integrity": "sha512-fAC1weYIg2+Lrij0iIuEnBtqj8yrJZon8rPH1CcpKX4KI9paQRpKwTfjDppZmnELQFffyNaQOE+mB19grdDQtg==", "dependencies": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "d3": "^3.5.17", "nvd3": "1.8.6", "prop-types": "^15.6.2" @@ -12046,12 +12046,12 @@ } }, "node_modules/@superset-ui/legacy-plugin-chart-sankey": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sankey/-/legacy-plugin-chart-sankey-0.18.10.tgz", - "integrity": "sha512-m67924ZlPon+I0QDDAnsPvc1g5nyn96PSXmSX7LnEilyHbXFxGsQxG8dZ9ahILaeCzSjeZ0m/LnjtjqBjVeAzw==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sankey/-/legacy-plugin-chart-sankey-0.18.12.tgz", + "integrity": "sha512-uCBZY9vN0/maJfW+J2Vs4+45GwdmEcdHspZieKokbuT0tEeC7YRmJ8jeDwjBUIg2JS/Mmekus59U6/ptxKLWGw==", "dependencies": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "d3": "^3.5.17", "d3-sankey": "^0.4.2", "prop-types": "^15.6.2" @@ -12061,47 +12061,47 @@ } }, "node_modules/@superset-ui/legacy-plugin-chart-sankey-loop": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sankey-loop/-/legacy-plugin-chart-sankey-loop-0.18.10.tgz", - "integrity": "sha512-/iylrov+3LdfejQQndIaIjQh0YeZKlUCdvv6WaRKEYBKASVhfb+bzl5jNGZDBJ9WgmGLo65BWy6OOQ5yuCLsuw==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sankey-loop/-/legacy-plugin-chart-sankey-loop-0.18.12.tgz", + "integrity": "sha512-uP0ZkXtK+i/FWu4AtWyruEZS18Bt004J6mXyZi7m9nbIIv3w58TpXaQSgnmD0/PxnHZwkedZDJQQNfL+q6dLAA==", "dependencies": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "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.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sunburst/-/legacy-plugin-chart-sunburst-0.18.10.tgz", - "integrity": "sha512-cmncSlb213mJMDoHA7ooapfjPpjbldkRtAeeyLnpT21DIQhcaTtDrrViTpGosl9rjB35BwC9OpSpLAevaxWz9w==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sunburst/-/legacy-plugin-chart-sunburst-0.18.12.tgz", + "integrity": "sha512-nG9ZaaQZeTaZXaTIfWQy/UbM7skKEJlP7ATIWdlGckBo/dEBTe6+zKPTvUd3IO1dKd4f2Pbi6h1DbQwVZt+bYQ==", "dependencies": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "d3": "^3.5.17", "prop-types": "^15.6.2" } }, "node_modules/@superset-ui/legacy-plugin-chart-treemap": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-treemap/-/legacy-plugin-chart-treemap-0.18.10.tgz", - "integrity": "sha512-mgybOwD2jbbcoQGmItR2V1GA/Jf58ogCU6Y1BVrLr8/NLHUzOhOmDnEcHGVVep9F/TPuwz+2x00gICw68DbczQ==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-treemap/-/legacy-plugin-chart-treemap-0.18.12.tgz", + "integrity": "sha512-D2rj/8BvtY6XtCJ5S9cB++GQM2BuWanMTzbcOn+KaVJbPXYCNT3twc6dGqQcx/Z0mAyOp60aJA4Py4F6l2Gkgg==", "dependencies": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "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.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-world-map/-/legacy-plugin-chart-world-map-0.18.10.tgz", - "integrity": "sha512-N5wmEuDu8af6MbsZ9DEiCK95R1i80Tu6yfCCgKfxddgHpt1mwRr/bbToeS89BvgNg8X4VGKlvkjJL86vMApPhA==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-world-map/-/legacy-plugin-chart-world-map-0.18.12.tgz", + "integrity": "sha512-mHBIkyg3mdbzT+nSZqOjCWZphgs5gm+M/mSdxV7KDxW45TigR7p7zLOfuAXVtdkr82daqSzTfnnJiT8ZOGw3zA==", "dependencies": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "d3": "^3.5.17", "d3-array": "^2.4.0", "d3-color": "^1.4.1", @@ -12121,13 +12121,13 @@ } }, "node_modules/@superset-ui/legacy-preset-chart-big-number": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-big-number/-/legacy-preset-chart-big-number-0.18.10.tgz", - "integrity": "sha512-nC0WMesJ1T3Twig4IvvX3kv/M/jlCoGRQN8jnHsuA+FYuLoGdc0g8yrAGKumb7yF3x1QuEXUeSzcam2LSzQudw==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-big-number/-/legacy-preset-chart-big-number-0.18.12.tgz", + "integrity": "sha512-HdR67JhuCVR203mipPhhKO++3fLH4TLD1J/uZfWPTkw1U6Hv4l+shTuURUl0jqs5BopbHu+0OzqCUeINayWHvQ==", "dependencies": { "@data-ui/xy-chart": "^0.0.84", - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "@types/d3-color": "^1.2.2", "@types/shortid": "^0.0.29", "d3-color": "^1.2.3", @@ -12303,13 +12303,13 @@ } }, "node_modules/@superset-ui/legacy-preset-chart-nvd3": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-nvd3/-/legacy-preset-chart-nvd3-0.18.10.tgz", - "integrity": "sha512-MXQ5K7c3JP33sV1m15kWh7k+HlNGAUERVhASUMSHxdIhVBydpXAQyMV2TFOfmKcu9eXCXFF/c9ni1Yb0j+qDYw==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-nvd3/-/legacy-preset-chart-nvd3-0.18.12.tgz", + "integrity": "sha512-qgrXhjnNVRib56Q9MEtK6JeCJrn5yIELIxqxOZ+rDNbWjLNC8pWJYNv6MTJSu1kZ++uTc9BLrFyvgjnXbiNqEA==", "dependencies": { "@data-ui/xy-chart": "^0.0.84", - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "d3": "^3.5.17", "d3-tip": "^0.9.1", "dompurify": "^2.0.6", @@ -12325,12 +12325,12 @@ } }, "node_modules/@superset-ui/plugin-chart-echarts": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-echarts/-/plugin-chart-echarts-0.18.10.tgz", - "integrity": "sha512-AgZEc7zvyJU73xA7OpO5fHHNsoQLgUwGz1luJgM47SLz4npu06if8nunrBctJEhiwLlnbuniPWPG4OMrZLpFXA==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-echarts/-/plugin-chart-echarts-0.18.12.tgz", + "integrity": "sha512-v3IUuL+XD5+KWF7GIUZGxLOhmwdu/QsDVlo8eHlxAKgTL1xb0KELP2HgWzFEZe8UVMHt9tptgBLAW1He2Oxqhw==", "dependencies": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "d3-array": "^1.2.0", "echarts": "^5.2.1", "lodash": "^4.17.15" @@ -12340,12 +12340,12 @@ } }, "node_modules/@superset-ui/plugin-chart-pivot-table": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-pivot-table/-/plugin-chart-pivot-table-0.18.10.tgz", - "integrity": "sha512-BkDTUExhL58v1TARFa6H10OJBCSYqxUv9+OaK+0P3LiOhVnXpPgcGXZmDcG82G58JcWY/Hr8SATH9JoUeF1hFg==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-pivot-table/-/plugin-chart-pivot-table-0.18.12.tgz", + "integrity": "sha512-prnu1OjaPN6TsdQxJxlmPDfgHa0kHJWx461JJ+L5OI0DO8BqXh1Kwvnz4ifR4sJVLtObKR4GqVo0Ygd0r1og4g==", "dependencies": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "@superset-ui/react-pivottable": "^0.12.12" }, "peerDependencies": { @@ -12354,13 +12354,13 @@ } }, "node_modules/@superset-ui/plugin-chart-table": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-table/-/plugin-chart-table-0.18.10.tgz", - "integrity": "sha512-tEyYXyRV2xOFRqJoqBoZJ4aNJsFpKTt3UM1Wwip0EWsuSJgrxNKGvU+pT05EyOjtddMeQ2fnJSYoMgPxLIhEWg==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-table/-/plugin-chart-table-0.18.12.tgz", + "integrity": "sha512-8epg2PpE0yC29Qw2FpYDV6xk0BK2ZbOStkSybrovNjv5U2rRGnXoPInu8Iyzf0sAtpTEZxhrhpc3wtP+LfTxQw==", "dependencies": { "@react-icons/all-files": "^4.1.0", - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "@types/d3-array": "^2.9.0", "@types/react-table": "^7.0.29", "d3-array": "^2.4.0", @@ -12385,12 +12385,12 @@ } }, "node_modules/@superset-ui/plugin-chart-word-cloud": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-word-cloud/-/plugin-chart-word-cloud-0.18.10.tgz", - "integrity": "sha512-OUrsanvAxqVZ54/oZ4kSmolcxWkoOcxb9gacz9z5GTa+9X4YAp6PnXai+SrfxFp4gPO60V4D7+SsfBj6c+kbzw==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-word-cloud/-/plugin-chart-word-cloud-0.18.12.tgz", + "integrity": "sha512-nCFK3J3UM3gWeoCTFBYJBbuWINPm6V+O2P7sOeQuQOoXyYVIGcO49E3sp0HqJBic2v1Z+a+nrE6o993B2pGD2w==", "dependencies": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "@types/d3-cloud": "^1.2.1", "@types/d3-scale": "^2.0.2", "d3-cloud": "^1.2.5", @@ -12431,14 +12431,14 @@ } }, "node_modules/@superset-ui/preset-chart-xy": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/preset-chart-xy/-/preset-chart-xy-0.18.10.tgz", - "integrity": "sha512-VYXRM+l4yGyyJjyQ1E06TEtvcTUaZeBM1QwgTo/Qqx4C7yah/fhoML/CC1JkJ/Gu9bKfUYXYAgNKJUD/HYByYQ==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/preset-chart-xy/-/preset-chart-xy-0.18.12.tgz", + "integrity": "sha512-7GasMQ6DxdZWdWVVO/mmIoQT+LM5hl37/RBy6OYmNxG2803gdOZRNsSWc//qaofTm9iSd4kiRNcrO5VIYbS8OQ==", "dependencies": { "@data-ui/theme": "^0.0.84", "@data-ui/xy-chart": "^0.0.84", - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "@vx/axis": "^0.0.198", "@vx/legend": "^0.0.198", "@vx/scale": "^0.0.197", @@ -51851,20 +51851,20 @@ } }, "@superset-ui/chart-controls": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/chart-controls/-/chart-controls-0.18.10.tgz", - "integrity": "sha512-htY1Nd82DCT8sc45CSl++ZYRrRKi6r87rSx7dP5ZzW/V8kZhDa7eCR8gcP86Ood/14v3+I86cgD65DlLsw8uSw==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/chart-controls/-/chart-controls-0.18.12.tgz", + "integrity": "sha512-B7A7C/8ZZUa7XqcsWzGGQ+3tabDsttkIrD5gec2EczIn7983G7ipafQr6X+B3RIC8ABvLlhaohHehhEFRyRHGw==", "requires": { "@react-icons/all-files": "^4.1.0", - "@superset-ui/core": "0.18.10", + "@superset-ui/core": "0.18.12", "lodash": "^4.17.15", "prop-types": "^15.7.2" } }, "@superset-ui/core": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.18.10.tgz", - "integrity": "sha512-S8Z1hL5UV7Cd1ysRG+nb0DuZ0sdNceJEr0ZsEBYWpM7FYIvhxiMIo5q6WH028QZPV+c6gaDcAplx6VTLwu2IPw==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.18.12.tgz", + "integrity": "sha512-NZ/pT+Wcgob5G1KGQyM2FpaoHXwbbcx94eO+ZKP3EVqWtm5QV4C2F2zLQOVDYsvlcUFWrH8eVlnRvk0dxydlAg==", "requires": { "@babel/runtime": "^7.1.2", "@types/d3-format": "^1.3.0", @@ -51941,12 +51941,12 @@ } }, "@superset-ui/legacy-plugin-chart-calendar": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-calendar/-/legacy-plugin-chart-calendar-0.18.10.tgz", - "integrity": "sha512-T0uHyxWBMjqG7cXJYL3zudU7hXzqmcYOItgIulGTT23pq/mkY9aS1twhddv1AggWRn7OEH5U2CYeXRhZ+VzEdg==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-calendar/-/legacy-plugin-chart-calendar-0.18.12.tgz", + "integrity": "sha512-KrQOfrOGVL0MWrCmcMB+65wenQc3OM3AxEUVoUu7IDM0JT501HybUKTemJAfsNjuIui2Nn8ZUHOLdCXkJaD6DA==", "requires": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "d3-array": "^2.0.3", "d3-selection": "^1.4.0", "d3-tip": "^0.9.1", @@ -51964,24 +51964,24 @@ } }, "@superset-ui/legacy-plugin-chart-chord": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-chord/-/legacy-plugin-chart-chord-0.18.10.tgz", - "integrity": "sha512-E7DHYbOU5WuawDT9wCS5tcX5km3eg2XyWZN1Vx5keLxjqRSCivFMW5PaZShGf+IJUh1aFI+kewJVMvJsqaLCVg==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-chord/-/legacy-plugin-chart-chord-0.18.12.tgz", + "integrity": "sha512-r0k6ZdlwbWhS3XmyUnW3bWxeXXzzh+kSM+MeO6a7PuguVwcHclwKLFzyRH9hORppz8V3Rbk2NOva/7RCSjrdYQ==", "requires": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "d3": "^3.5.17", "prop-types": "^15.6.2", "react": "^16.13.1" } }, "@superset-ui/legacy-plugin-chart-country-map": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-country-map/-/legacy-plugin-chart-country-map-0.18.10.tgz", - "integrity": "sha512-Q47WNeXgvWb/3vQQckmFah1/yjMdr5gw2waYdX7YAweJGhmg2VMA3RPrZV0xaTFhHbMQy72e0QodYTyxvTMwcg==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-country-map/-/legacy-plugin-chart-country-map-0.18.12.tgz", + "integrity": "sha512-vsUoOeREZ43C/g1ciqUZPU0w+n3I4LCmC+TKD2j88lK63BlAIHJ0SEfzS0DE0IJyC02B8AimQoLZUbjjgiWAzw==", "requires": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "d3": "^3.5.17", "d3-array": "^2.0.3", "prop-types": "^15.6.2" @@ -51998,34 +51998,34 @@ } }, "@superset-ui/legacy-plugin-chart-event-flow": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-event-flow/-/legacy-plugin-chart-event-flow-0.18.10.tgz", - "integrity": "sha512-H2WIHlatrb7xvRSzFDquZgkEMR6HfoZBpVaYKi4APF590KbfBWYhnczLy6XISanIKB61sPjgnekv55AklPjOXA==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-event-flow/-/legacy-plugin-chart-event-flow-0.18.12.tgz", + "integrity": "sha512-TmZUzjs1sNjElhH34wdhLJ3jg5KqJO1X35d5L3L0RcqBx50pB1P2d2U4W1psp3yn4H10+tWP+2uDFoWdNeCnag==", "requires": { "@data-ui/event-flow": "^0.0.84", - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "prop-types": "^15.6.2" } }, "@superset-ui/legacy-plugin-chart-force-directed": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-force-directed/-/legacy-plugin-chart-force-directed-0.18.10.tgz", - "integrity": "sha512-7dNqWxwpTo/a+60cskso+UxfGgB0Kb2G5Ww0G5mb8/DFif4CUrZILar2PIMfa7vLrU94FT4Y3vLGZL/XP9oV/A==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-force-directed/-/legacy-plugin-chart-force-directed-0.18.12.tgz", + "integrity": "sha512-cmzSCZR9qVD2JekFU6AcW9aV2WxATU5PYNMwyNWcyKs0sKSxu0qPDjGY44dsbVZAC1PrtKGVIu4dH6URrPjtzA==", "requires": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "d3": "^3.5.17", "prop-types": "^15.7.2" } }, "@superset-ui/legacy-plugin-chart-heatmap": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-heatmap/-/legacy-plugin-chart-heatmap-0.18.10.tgz", - "integrity": "sha512-d3pM5cF3iQTO0cZvmEJf9fcVkz0+yM4gs3qR97Q7iWLoG7V+5OakyTbOPX16XuAsNMc4iT0M6VZoF1JnC0Xyeg==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-heatmap/-/legacy-plugin-chart-heatmap-0.18.12.tgz", + "integrity": "sha512-DwjltXKBPKOAEmzjJc1ua0NVc36IA4UUsAdxy0LxUhklSpQEn43sYV/3YkpIeBzBPqg+7IRYFwIfv81SCMxpJQ==", "requires": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "d3": "^3.5.17", "d3-svg-legend": "^1.x", "d3-tip": "^0.9.1", @@ -52033,14 +52033,14 @@ } }, "@superset-ui/legacy-plugin-chart-histogram": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-histogram/-/legacy-plugin-chart-histogram-0.18.10.tgz", - "integrity": "sha512-CemmKAvI/yJfMoQDlpo0a42fIFpRYmgmnyfbDXhzn4tX9A+V2HoT62DDuuMmUWsshK8n4BgmaOgZwSAL6q/UMA==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-histogram/-/legacy-plugin-chart-histogram-0.18.12.tgz", + "integrity": "sha512-KWHZ0eJi+kTaC/J9HJYW3SXYIJGNzu6ThbU9E+6sIQzx8Ojo4JxV3zIBREWofRnWmHFVc7/qGfHY6Aut6RA2vQ==", "requires": { "@data-ui/histogram": "^0.0.84", "@data-ui/theme": "^0.0.84", - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "@vx/legend": "^0.0.198", "@vx/responsive": "^0.0.199", "@vx/scale": "^0.0.197", @@ -52108,12 +52108,12 @@ } }, "@superset-ui/legacy-plugin-chart-horizon": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-horizon/-/legacy-plugin-chart-horizon-0.18.10.tgz", - "integrity": "sha512-4rE1S9Abg/+9F1Oj5gl+CHNkgVQR2066oGFIUB2O0wJVwZS6ZRwZzW9EBrdwTmasY9pyiw296Fof5TurVl4u/g==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-horizon/-/legacy-plugin-chart-horizon-0.18.12.tgz", + "integrity": "sha512-mEtHiQe5t0nphAoHPNrFIzvG3C9je96uyDoJUkhHhALcwk+V2u8YWnCZBV1R+jsrkT7ClQtLLDtElL+4c/V0hg==", "requires": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "d3-array": "^2.0.3", "d3-scale": "^3.0.1", "prop-types": "^15.6.2" @@ -52150,12 +52150,12 @@ } }, "@superset-ui/legacy-plugin-chart-map-box": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-map-box/-/legacy-plugin-chart-map-box-0.18.10.tgz", - "integrity": "sha512-MKUMOZC19CWScSTjLXTG+XnZ/1eCnpISQJufIP5nG0S1iWinp8wnTZclwTipMz8HKsQNqzuhsBHD432dNVEXvw==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-map-box/-/legacy-plugin-chart-map-box-0.18.12.tgz", + "integrity": "sha512-cp55kE2SwqDaLBiJCn1wr714aEzCla2htoNWOFUjTALbfOe0pRKV736jOHocXDSfTkvJwxDp4ztzEdWuwAXiiQ==", "requires": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "mapbox-gl": "^0.53.0", "prop-types": "^15.6.2", "react-map-gl": "^4.0.10", @@ -52164,118 +52164,118 @@ } }, "@superset-ui/legacy-plugin-chart-paired-t-test": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-paired-t-test/-/legacy-plugin-chart-paired-t-test-0.18.10.tgz", - "integrity": "sha512-lv5+gaEFAOsg1szhWdJuvMZ178WeDmcfjDGnSsbX9PGXg2JyTedMpFr57lYvWjdi2dvXXQkWYMuiAEmTz/I/Xg==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-paired-t-test/-/legacy-plugin-chart-paired-t-test-0.18.12.tgz", + "integrity": "sha512-wDcfrA43B2uI6Kol+XOi4WGJW/NKv6foPHjwaCAnAeoE17f+IEzXU5zC7jX51wYAGfs2m1jUg8R1cv8qYIqSAg==", "requires": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "distributions": "^1.0.0", "prop-types": "^15.6.2", "reactable": "^1.1.0" } }, "@superset-ui/legacy-plugin-chart-parallel-coordinates": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-parallel-coordinates/-/legacy-plugin-chart-parallel-coordinates-0.18.10.tgz", - "integrity": "sha512-zKVNHNO7eClBY5I51U6lgBuKcLF05wegkIw1iGqNQXcuHhiLEiHn4fY0kB0SAIzgPRXwo3jcYWG9UjsQAr5v4A==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-parallel-coordinates/-/legacy-plugin-chart-parallel-coordinates-0.18.12.tgz", + "integrity": "sha512-lY7Zvxvc4QybUYY5yovDEzC7F34/YlMJ6Yn5hU8bvV7q1BIy/zLHepGtnqH25tzX75xEb5J4OyABbA0fYP4p0Q==", "requires": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "d3": "^3.5.17", "prop-types": "^15.7.2" } }, "@superset-ui/legacy-plugin-chart-partition": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-partition/-/legacy-plugin-chart-partition-0.18.10.tgz", - "integrity": "sha512-hdoIDr0T4+8cHFG278CeUqeNIqDMJA0B6YIqRbynwDXAY9vtwp6I7k6wDwvSP7NhKLnFj7u4OZfRICE6DcKt/Q==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-partition/-/legacy-plugin-chart-partition-0.18.12.tgz", + "integrity": "sha512-IDu/3VfMdg/5nGedKChht1z3K8vwumHY49Kgfqv9/B+/xUX4JRC81y8tfsZC00+aRv2LV8jPXUd1Xexklh+JaQ==", "requires": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "d3": "^3.5.17", "d3-hierarchy": "^1.1.8", "prop-types": "^15.6.2" } }, "@superset-ui/legacy-plugin-chart-pivot-table": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-pivot-table/-/legacy-plugin-chart-pivot-table-0.18.10.tgz", - "integrity": "sha512-nN4LPES0FIAN+GPnyO+VYyIroXh3H/sTofaAq+Z1LbLjoYmYVRTc4Khr1S3oqpL67/HV4W8f0HbLobLrp+5+8g==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-pivot-table/-/legacy-plugin-chart-pivot-table-0.18.12.tgz", + "integrity": "sha512-O1yv1MOPfmQsi8qUPTh/YCZXIEBoxhbSlimDSAB0nlpLGRxIpgS06v5xeN8b/I+4hLQZzjAERkSazsLxC9SzHQ==", "requires": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "d3": "^3.5.17", "datatables.net-bs": "^1.10.15", "prop-types": "^15.6.2" } }, "@superset-ui/legacy-plugin-chart-rose": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-rose/-/legacy-plugin-chart-rose-0.18.10.tgz", - "integrity": "sha512-txFLrelfKCSGMXfFCWMvf83HNEhHGc72ts4JQvX0bTRh6+VDp4ZM7e6ohdb9W6ryOztk7Nuh7ye3TvC+8J224g==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-rose/-/legacy-plugin-chart-rose-0.18.12.tgz", + "integrity": "sha512-fAC1weYIg2+Lrij0iIuEnBtqj8yrJZon8rPH1CcpKX4KI9paQRpKwTfjDppZmnELQFffyNaQOE+mB19grdDQtg==", "requires": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "d3": "^3.5.17", "nvd3": "1.8.6", "prop-types": "^15.6.2" } }, "@superset-ui/legacy-plugin-chart-sankey": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sankey/-/legacy-plugin-chart-sankey-0.18.10.tgz", - "integrity": "sha512-m67924ZlPon+I0QDDAnsPvc1g5nyn96PSXmSX7LnEilyHbXFxGsQxG8dZ9ahILaeCzSjeZ0m/LnjtjqBjVeAzw==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sankey/-/legacy-plugin-chart-sankey-0.18.12.tgz", + "integrity": "sha512-uCBZY9vN0/maJfW+J2Vs4+45GwdmEcdHspZieKokbuT0tEeC7YRmJ8jeDwjBUIg2JS/Mmekus59U6/ptxKLWGw==", "requires": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "d3": "^3.5.17", "d3-sankey": "^0.4.2", "prop-types": "^15.6.2" } }, "@superset-ui/legacy-plugin-chart-sankey-loop": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sankey-loop/-/legacy-plugin-chart-sankey-loop-0.18.10.tgz", - "integrity": "sha512-/iylrov+3LdfejQQndIaIjQh0YeZKlUCdvv6WaRKEYBKASVhfb+bzl5jNGZDBJ9WgmGLo65BWy6OOQ5yuCLsuw==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sankey-loop/-/legacy-plugin-chart-sankey-loop-0.18.12.tgz", + "integrity": "sha512-uP0ZkXtK+i/FWu4AtWyruEZS18Bt004J6mXyZi7m9nbIIv3w58TpXaQSgnmD0/PxnHZwkedZDJQQNfL+q6dLAA==", "requires": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "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.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sunburst/-/legacy-plugin-chart-sunburst-0.18.10.tgz", - "integrity": "sha512-cmncSlb213mJMDoHA7ooapfjPpjbldkRtAeeyLnpT21DIQhcaTtDrrViTpGosl9rjB35BwC9OpSpLAevaxWz9w==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sunburst/-/legacy-plugin-chart-sunburst-0.18.12.tgz", + "integrity": "sha512-nG9ZaaQZeTaZXaTIfWQy/UbM7skKEJlP7ATIWdlGckBo/dEBTe6+zKPTvUd3IO1dKd4f2Pbi6h1DbQwVZt+bYQ==", "requires": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "d3": "^3.5.17", "prop-types": "^15.6.2" } }, "@superset-ui/legacy-plugin-chart-treemap": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-treemap/-/legacy-plugin-chart-treemap-0.18.10.tgz", - "integrity": "sha512-mgybOwD2jbbcoQGmItR2V1GA/Jf58ogCU6Y1BVrLr8/NLHUzOhOmDnEcHGVVep9F/TPuwz+2x00gICw68DbczQ==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-treemap/-/legacy-plugin-chart-treemap-0.18.12.tgz", + "integrity": "sha512-D2rj/8BvtY6XtCJ5S9cB++GQM2BuWanMTzbcOn+KaVJbPXYCNT3twc6dGqQcx/Z0mAyOp60aJA4Py4F6l2Gkgg==", "requires": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "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.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-world-map/-/legacy-plugin-chart-world-map-0.18.10.tgz", - "integrity": "sha512-N5wmEuDu8af6MbsZ9DEiCK95R1i80Tu6yfCCgKfxddgHpt1mwRr/bbToeS89BvgNg8X4VGKlvkjJL86vMApPhA==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-world-map/-/legacy-plugin-chart-world-map-0.18.12.tgz", + "integrity": "sha512-mHBIkyg3mdbzT+nSZqOjCWZphgs5gm+M/mSdxV7KDxW45TigR7p7zLOfuAXVtdkr82daqSzTfnnJiT8ZOGw3zA==", "requires": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "d3": "^3.5.17", "d3-array": "^2.4.0", "d3-color": "^1.4.1", @@ -52294,13 +52294,13 @@ } }, "@superset-ui/legacy-preset-chart-big-number": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-big-number/-/legacy-preset-chart-big-number-0.18.10.tgz", - "integrity": "sha512-nC0WMesJ1T3Twig4IvvX3kv/M/jlCoGRQN8jnHsuA+FYuLoGdc0g8yrAGKumb7yF3x1QuEXUeSzcam2LSzQudw==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-big-number/-/legacy-preset-chart-big-number-0.18.12.tgz", + "integrity": "sha512-HdR67JhuCVR203mipPhhKO++3fLH4TLD1J/uZfWPTkw1U6Hv4l+shTuURUl0jqs5BopbHu+0OzqCUeINayWHvQ==", "requires": { "@data-ui/xy-chart": "^0.0.84", - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "@types/d3-color": "^1.2.2", "@types/shortid": "^0.0.29", "d3-color": "^1.2.3", @@ -52455,13 +52455,13 @@ } }, "@superset-ui/legacy-preset-chart-nvd3": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-nvd3/-/legacy-preset-chart-nvd3-0.18.10.tgz", - "integrity": "sha512-MXQ5K7c3JP33sV1m15kWh7k+HlNGAUERVhASUMSHxdIhVBydpXAQyMV2TFOfmKcu9eXCXFF/c9ni1Yb0j+qDYw==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-nvd3/-/legacy-preset-chart-nvd3-0.18.12.tgz", + "integrity": "sha512-qgrXhjnNVRib56Q9MEtK6JeCJrn5yIELIxqxOZ+rDNbWjLNC8pWJYNv6MTJSu1kZ++uTc9BLrFyvgjnXbiNqEA==", "requires": { "@data-ui/xy-chart": "^0.0.84", - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "d3": "^3.5.17", "d3-tip": "^0.9.1", "dompurify": "^2.0.6", @@ -52474,35 +52474,35 @@ } }, "@superset-ui/plugin-chart-echarts": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-echarts/-/plugin-chart-echarts-0.18.10.tgz", - "integrity": "sha512-AgZEc7zvyJU73xA7OpO5fHHNsoQLgUwGz1luJgM47SLz4npu06if8nunrBctJEhiwLlnbuniPWPG4OMrZLpFXA==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-echarts/-/plugin-chart-echarts-0.18.12.tgz", + "integrity": "sha512-v3IUuL+XD5+KWF7GIUZGxLOhmwdu/QsDVlo8eHlxAKgTL1xb0KELP2HgWzFEZe8UVMHt9tptgBLAW1He2Oxqhw==", "requires": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "d3-array": "^1.2.0", "echarts": "^5.2.1", "lodash": "^4.17.15" } }, "@superset-ui/plugin-chart-pivot-table": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-pivot-table/-/plugin-chart-pivot-table-0.18.10.tgz", - "integrity": "sha512-BkDTUExhL58v1TARFa6H10OJBCSYqxUv9+OaK+0P3LiOhVnXpPgcGXZmDcG82G58JcWY/Hr8SATH9JoUeF1hFg==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-pivot-table/-/plugin-chart-pivot-table-0.18.12.tgz", + "integrity": "sha512-prnu1OjaPN6TsdQxJxlmPDfgHa0kHJWx461JJ+L5OI0DO8BqXh1Kwvnz4ifR4sJVLtObKR4GqVo0Ygd0r1og4g==", "requires": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "@superset-ui/react-pivottable": "^0.12.12" } }, "@superset-ui/plugin-chart-table": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-table/-/plugin-chart-table-0.18.10.tgz", - "integrity": "sha512-tEyYXyRV2xOFRqJoqBoZJ4aNJsFpKTt3UM1Wwip0EWsuSJgrxNKGvU+pT05EyOjtddMeQ2fnJSYoMgPxLIhEWg==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-table/-/plugin-chart-table-0.18.12.tgz", + "integrity": "sha512-8epg2PpE0yC29Qw2FpYDV6xk0BK2ZbOStkSybrovNjv5U2rRGnXoPInu8Iyzf0sAtpTEZxhrhpc3wtP+LfTxQw==", "requires": { "@react-icons/all-files": "^4.1.0", - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "@types/d3-array": "^2.9.0", "@types/react-table": "^7.0.29", "d3-array": "^2.4.0", @@ -52524,12 +52524,12 @@ } }, "@superset-ui/plugin-chart-word-cloud": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-word-cloud/-/plugin-chart-word-cloud-0.18.10.tgz", - "integrity": "sha512-OUrsanvAxqVZ54/oZ4kSmolcxWkoOcxb9gacz9z5GTa+9X4YAp6PnXai+SrfxFp4gPO60V4D7+SsfBj6c+kbzw==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-word-cloud/-/plugin-chart-word-cloud-0.18.12.tgz", + "integrity": "sha512-nCFK3J3UM3gWeoCTFBYJBbuWINPm6V+O2P7sOeQuQOoXyYVIGcO49E3sp0HqJBic2v1Z+a+nrE6o993B2pGD2w==", "requires": { - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "@types/d3-cloud": "^1.2.1", "@types/d3-scale": "^2.0.2", "d3-cloud": "^1.2.5", @@ -52568,14 +52568,14 @@ } }, "@superset-ui/preset-chart-xy": { - "version": "0.18.10", - "resolved": "https://registry.npmjs.org/@superset-ui/preset-chart-xy/-/preset-chart-xy-0.18.10.tgz", - "integrity": "sha512-VYXRM+l4yGyyJjyQ1E06TEtvcTUaZeBM1QwgTo/Qqx4C7yah/fhoML/CC1JkJ/Gu9bKfUYXYAgNKJUD/HYByYQ==", + "version": "0.18.12", + "resolved": "https://registry.npmjs.org/@superset-ui/preset-chart-xy/-/preset-chart-xy-0.18.12.tgz", + "integrity": "sha512-7GasMQ6DxdZWdWVVO/mmIoQT+LM5hl37/RBy6OYmNxG2803gdOZRNsSWc//qaofTm9iSd4kiRNcrO5VIYbS8OQ==", "requires": { "@data-ui/theme": "^0.0.84", "@data-ui/xy-chart": "^0.0.84", - "@superset-ui/chart-controls": "0.18.10", - "@superset-ui/core": "0.18.10", + "@superset-ui/chart-controls": "0.18.12", + "@superset-ui/core": "0.18.12", "@vx/axis": "^0.0.198", "@vx/legend": "^0.0.198", "@vx/scale": "^0.0.197", diff --git a/superset-frontend/package.json b/superset-frontend/package.json index 97f54ef526b84..15c3453e8895b 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.10", - "@superset-ui/core": "^0.18.10", - "@superset-ui/legacy-plugin-chart-calendar": "^0.18.10", - "@superset-ui/legacy-plugin-chart-chord": "^0.18.10", - "@superset-ui/legacy-plugin-chart-country-map": "^0.18.10", - "@superset-ui/legacy-plugin-chart-event-flow": "^0.18.10", - "@superset-ui/legacy-plugin-chart-force-directed": "^0.18.10", - "@superset-ui/legacy-plugin-chart-heatmap": "^0.18.10", - "@superset-ui/legacy-plugin-chart-histogram": "^0.18.10", - "@superset-ui/legacy-plugin-chart-horizon": "^0.18.10", - "@superset-ui/legacy-plugin-chart-map-box": "^0.18.10", - "@superset-ui/legacy-plugin-chart-paired-t-test": "^0.18.10", - "@superset-ui/legacy-plugin-chart-parallel-coordinates": "^0.18.10", - "@superset-ui/legacy-plugin-chart-partition": "^0.18.10", - "@superset-ui/legacy-plugin-chart-pivot-table": "^0.18.10", - "@superset-ui/legacy-plugin-chart-rose": "^0.18.10", - "@superset-ui/legacy-plugin-chart-sankey": "^0.18.10", - "@superset-ui/legacy-plugin-chart-sankey-loop": "^0.18.10", - "@superset-ui/legacy-plugin-chart-sunburst": "^0.18.10", - "@superset-ui/legacy-plugin-chart-treemap": "^0.18.10", - "@superset-ui/legacy-plugin-chart-world-map": "^0.18.10", - "@superset-ui/legacy-preset-chart-big-number": "^0.18.10", + "@superset-ui/chart-controls": "^0.18.12", + "@superset-ui/core": "^0.18.12", + "@superset-ui/legacy-plugin-chart-calendar": "^0.18.12", + "@superset-ui/legacy-plugin-chart-chord": "^0.18.12", + "@superset-ui/legacy-plugin-chart-country-map": "^0.18.12", + "@superset-ui/legacy-plugin-chart-event-flow": "^0.18.12", + "@superset-ui/legacy-plugin-chart-force-directed": "^0.18.12", + "@superset-ui/legacy-plugin-chart-heatmap": "^0.18.12", + "@superset-ui/legacy-plugin-chart-histogram": "^0.18.12", + "@superset-ui/legacy-plugin-chart-horizon": "^0.18.12", + "@superset-ui/legacy-plugin-chart-map-box": "^0.18.12", + "@superset-ui/legacy-plugin-chart-paired-t-test": "^0.18.12", + "@superset-ui/legacy-plugin-chart-parallel-coordinates": "^0.18.12", + "@superset-ui/legacy-plugin-chart-partition": "^0.18.12", + "@superset-ui/legacy-plugin-chart-pivot-table": "^0.18.12", + "@superset-ui/legacy-plugin-chart-rose": "^0.18.12", + "@superset-ui/legacy-plugin-chart-sankey": "^0.18.12", + "@superset-ui/legacy-plugin-chart-sankey-loop": "^0.18.12", + "@superset-ui/legacy-plugin-chart-sunburst": "^0.18.12", + "@superset-ui/legacy-plugin-chart-treemap": "^0.18.12", + "@superset-ui/legacy-plugin-chart-world-map": "^0.18.12", + "@superset-ui/legacy-preset-chart-big-number": "^0.18.12", "@superset-ui/legacy-preset-chart-deckgl": "^0.4.12", - "@superset-ui/legacy-preset-chart-nvd3": "^0.18.10", - "@superset-ui/plugin-chart-echarts": "^0.18.10", - "@superset-ui/plugin-chart-pivot-table": "^0.18.10", - "@superset-ui/plugin-chart-table": "^0.18.10", - "@superset-ui/plugin-chart-word-cloud": "^0.18.10", - "@superset-ui/preset-chart-xy": "^0.18.10", + "@superset-ui/legacy-preset-chart-nvd3": "^0.18.12", + "@superset-ui/plugin-chart-echarts": "^0.18.12", + "@superset-ui/plugin-chart-pivot-table": "^0.18.12", + "@superset-ui/plugin-chart-table": "^0.18.12", + "@superset-ui/plugin-chart-word-cloud": "^0.18.12", + "@superset-ui/preset-chart-xy": "^0.18.12", "@vx/responsive": "^0.0.195", "abortcontroller-polyfill": "^1.1.9", "antd": "^4.9.4", diff --git a/superset/db_engine_specs/ascend.py b/superset/db_engine_specs/ascend.py index ee7bab9facd16..759b78ad1c928 100644 --- a/superset/db_engine_specs/ascend.py +++ b/superset/db_engine_specs/ascend.py @@ -35,6 +35,6 @@ class AscendEngineSpec(ImpalaEngineSpec): "P1D": "DATE_TRUNC('day', {col})", "P1W": "DATE_TRUNC('week', {col})", "P1M": "DATE_TRUNC('month', {col})", - "P0.25Y": "DATE_TRUNC('quarter', {col})", + "P3M": "DATE_TRUNC('quarter', {col})", "P1Y": "DATE_TRUNC('year', {col})", } diff --git a/superset/db_engine_specs/athena.py b/superset/db_engine_specs/athena.py index 2952d8267772a..666049bac61f7 100644 --- a/superset/db_engine_specs/athena.py +++ b/superset/db_engine_specs/athena.py @@ -41,7 +41,7 @@ class AthenaEngineSpec(BaseEngineSpec): "P1D": "date_trunc('day', CAST({col} AS TIMESTAMP))", "P1W": "date_trunc('week', CAST({col} AS TIMESTAMP))", "P1M": "date_trunc('month', CAST({col} AS TIMESTAMP))", - "P0.25Y": "date_trunc('quarter', CAST({col} AS TIMESTAMP))", + "P3M": "date_trunc('quarter', CAST({col} AS TIMESTAMP))", "P1Y": "date_trunc('year', CAST({col} AS TIMESTAMP))", "P1W/1970-01-03T00:00:00Z": "date_add('day', 5, date_trunc('week', \ date_add('day', 1, CAST({col} AS TIMESTAMP))))", diff --git a/superset/db_engine_specs/base.py b/superset/db_engine_specs/base.py index 74b451ec2da62..ed3851efe6ce7 100644 --- a/superset/db_engine_specs/base.py +++ b/superset/db_engine_specs/base.py @@ -91,13 +91,13 @@ class TimeGrain(NamedTuple): "PT5M": __("5 minute"), "PT10M": __("10 minute"), "PT15M": __("15 minute"), - "PT0.5H": __("Half hour"), + "PT30M": __("30 minute"), "PT1H": __("Hour"), "PT6H": __("6 hour"), "P1D": __("Day"), "P1W": __("Week"), "P1M": __("Month"), - "P0.25Y": __("Quarter"), + "P3M": __("Quarter"), "P1Y": __("Year"), "1969-12-28T00:00:00Z/P1W": __("Week starting Sunday"), "1969-12-29T00:00:00Z/P1W": __("Week starting Monday"), diff --git a/superset/db_engine_specs/bigquery.py b/superset/db_engine_specs/bigquery.py index a862df58d9f35..5e1ff739cd2c8 100644 --- a/superset/db_engine_specs/bigquery.py +++ b/superset/db_engine_specs/bigquery.py @@ -131,14 +131,14 @@ class BigQueryEngineSpec(BaseEngineSpec): "PT15M": "CAST(TIMESTAMP_SECONDS(" "15*60 * DIV(UNIX_SECONDS(CAST({col} AS TIMESTAMP)), 15*60)" ") AS {type})", - "PT0.5H": "CAST(TIMESTAMP_SECONDS(" + "PT30M": "CAST(TIMESTAMP_SECONDS(" "30*60 * DIV(UNIX_SECONDS(CAST({col} AS TIMESTAMP)), 30*60)" ") AS {type})", "PT1H": "{func}({col}, HOUR)", "P1D": "{func}({col}, DAY)", "P1W": "{func}({col}, WEEK)", "P1M": "{func}({col}, MONTH)", - "P0.25Y": "{func}({col}, QUARTER)", + "P3M": "{func}({col}, QUARTER)", "P1Y": "{func}({col}, YEAR)", } diff --git a/superset/db_engine_specs/clickhouse.py b/superset/db_engine_specs/clickhouse.py index 60a3584baf46b..d9c218820612d 100644 --- a/superset/db_engine_specs/clickhouse.py +++ b/superset/db_engine_specs/clickhouse.py @@ -47,12 +47,12 @@ class ClickHouseEngineSpec(BaseEngineSpec): # pylint: disable=abstract-method "PT5M": "toDateTime(intDiv(toUInt32(toDateTime({col})), 300)*300)", "PT10M": "toDateTime(intDiv(toUInt32(toDateTime({col})), 600)*600)", "PT15M": "toDateTime(intDiv(toUInt32(toDateTime({col})), 900)*900)", - "PT0.5H": "toDateTime(intDiv(toUInt32(toDateTime({col})), 1800)*1800)", + "PT30M": "toDateTime(intDiv(toUInt32(toDateTime({col})), 1800)*1800)", "PT1H": "toStartOfHour(toDateTime({col}))", "P1D": "toStartOfDay(toDateTime({col}))", "P1W": "toMonday(toDateTime({col}))", "P1M": "toStartOfMonth(toDateTime({col}))", - "P0.25Y": "toStartOfQuarter(toDateTime({col}))", + "P3M": "toStartOfQuarter(toDateTime({col}))", "P1Y": "toStartOfYear(toDateTime({col}))", } diff --git a/superset/db_engine_specs/crate.py b/superset/db_engine_specs/crate.py index a55d72fd0632c..67d68c8349ee0 100644 --- a/superset/db_engine_specs/crate.py +++ b/superset/db_engine_specs/crate.py @@ -37,7 +37,7 @@ class CrateEngineSpec(BaseEngineSpec): "P1D": "DATE_TRUNC('day', {col})", "P1W": "DATE_TRUNC('week', {col})", "P1M": "DATE_TRUNC('month', {col})", - "P0.25Y": "DATE_TRUNC('quarter', {col})", + "P3M": "DATE_TRUNC('quarter', {col})", "P1Y": "DATE_TRUNC('year', {col})", } diff --git a/superset/db_engine_specs/db2.py b/superset/db_engine_specs/db2.py index 1179198bc4329..9288a069277d9 100644 --- a/superset/db_engine_specs/db2.py +++ b/superset/db_engine_specs/db2.py @@ -42,7 +42,7 @@ class Db2EngineSpec(BaseEngineSpec): " - MICROSECOND({col}) MICROSECONDS", "P1W": "{col} - (DAYOFWEEK({col})) DAYS", "P1M": "{col} - (DAY({col})-1) DAYS", - "P0.25Y": "{col} - (DAY({col})-1) DAYS" + "P3M": "{col} - (DAY({col})-1) DAYS" " - (MONTH({col})-1) MONTHS" " + ((QUARTER({col})-1) * 3) MONTHS", "P1Y": "{col} - (DAY({col})-1) DAYS" " - (MONTH({col})-1) MONTHS", diff --git a/superset/db_engine_specs/dremio.py b/superset/db_engine_specs/dremio.py index a76909bf3a8e9..0d69c8a0f6729 100644 --- a/superset/db_engine_specs/dremio.py +++ b/superset/db_engine_specs/dremio.py @@ -34,7 +34,7 @@ class DremioEngineSpec(BaseEngineSpec): "P1D": "DATE_TRUNC('day', {col})", "P1W": "DATE_TRUNC('week', {col})", "P1M": "DATE_TRUNC('month', {col})", - "P0.25Y": "DATE_TRUNC('quarter', {col})", + "P3M": "DATE_TRUNC('quarter', {col})", "P1Y": "DATE_TRUNC('year', {col})", } diff --git a/superset/db_engine_specs/drill.py b/superset/db_engine_specs/drill.py index 6578965778b69..806f5f2469e57 100644 --- a/superset/db_engine_specs/drill.py +++ b/superset/db_engine_specs/drill.py @@ -36,12 +36,12 @@ class DrillEngineSpec(BaseEngineSpec): "PT1S": "NEARESTDATE({col}, 'SECOND')", "PT1M": "NEARESTDATE({col}, 'MINUTE')", "PT15M": "NEARESTDATE({col}, 'QUARTER_HOUR')", - "PT0.5H": "NEARESTDATE({col}, 'HALF_HOUR')", + "PT30M": "NEARESTDATE({col}, 'HALF_HOUR')", "PT1H": "NEARESTDATE({col}, 'HOUR')", "P1D": "NEARESTDATE({col}, 'DAY')", "P1W": "NEARESTDATE({col}, 'WEEK_SUNDAY')", "P1M": "NEARESTDATE({col}, 'MONTH')", - "P0.25Y": "NEARESTDATE({col}, 'QUARTER')", + "P3M": "NEARESTDATE({col}, 'QUARTER')", "P1Y": "NEARESTDATE({col}, 'YEAR')", } diff --git a/superset/db_engine_specs/druid.py b/superset/db_engine_specs/druid.py index 76de48083d115..57cbfba7d101f 100644 --- a/superset/db_engine_specs/druid.py +++ b/superset/db_engine_specs/druid.py @@ -48,13 +48,13 @@ class DruidEngineSpec(BaseEngineSpec): "PT5M": "TIME_FLOOR({col}, 'PT5M')", "PT10M": "TIME_FLOOR({col}, 'PT10M')", "PT15M": "TIME_FLOOR({col}, 'PT15M')", - "PT0.5H": "TIME_FLOOR({col}, 'PT30M')", + "PT30M": "TIME_FLOOR({col}, 'PT30M')", "PT1H": "TIME_FLOOR({col}, 'PT1H')", "PT6H": "TIME_FLOOR({col}, 'PT6H')", "P1D": "TIME_FLOOR({col}, 'P1D')", "P1W": "TIME_FLOOR({col}, 'P1W')", "P1M": "TIME_FLOOR({col}, 'P1M')", - "P0.25Y": "TIME_FLOOR({col}, 'P3M')", + "P3M": "TIME_FLOOR({col}, 'P3M')", "P1Y": "TIME_FLOOR({col}, 'P1Y')", "P1W/1970-01-03T00:00:00Z": ( "TIME_SHIFT(TIME_FLOOR(TIME_SHIFT({col}, 'P1D', 1), 'P1W'), 'P1D', 5)" diff --git a/superset/db_engine_specs/exasol.py b/superset/db_engine_specs/exasol.py index 327cc3adbbeca..c06fbd826dfd3 100644 --- a/superset/db_engine_specs/exasol.py +++ b/superset/db_engine_specs/exasol.py @@ -35,7 +35,7 @@ class ExasolEngineSpec(BaseEngineSpec): # pylint: disable=abstract-method "P1D": "DATE_TRUNC('day', {col})", "P1W": "DATE_TRUNC('week', {col})", "P1M": "DATE_TRUNC('month', {col})", - "P0.25Y": "DATE_TRUNC('quarter', {col})", + "P3M": "DATE_TRUNC('quarter', {col})", "P1Y": "DATE_TRUNC('year', {col})", } diff --git a/superset/db_engine_specs/firebolt.py b/superset/db_engine_specs/firebolt.py index ea5091f69ffa0..acef2f26b0233 100644 --- a/superset/db_engine_specs/firebolt.py +++ b/superset/db_engine_specs/firebolt.py @@ -36,7 +36,7 @@ class FireboltEngineSpec(BaseEngineSpec): "P1D": "date_trunc('day', CAST({col} AS TIMESTAMP))", "P1W": "date_trunc('week', CAST({col} AS TIMESTAMP))", "P1M": "date_trunc('month', CAST({col} AS TIMESTAMP))", - "P0.25Y": "date_trunc('quarter', CAST({col} AS TIMESTAMP))", + "P3M": "date_trunc('quarter', CAST({col} AS TIMESTAMP))", "P1Y": "date_trunc('year', CAST({col} AS TIMESTAMP))", } diff --git a/superset/db_engine_specs/hana.py b/superset/db_engine_specs/hana.py index 11e49d1896ab2..b2247cf325394 100644 --- a/superset/db_engine_specs/hana.py +++ b/superset/db_engine_specs/hana.py @@ -36,7 +36,7 @@ class HanaEngineSpec(PostgresBaseEngineSpec): "PT1H": "TO_TIMESTAMP(SUBSTRING(TO_TIMESTAMP({col}),0,14) || '00:00')", "P1D": "TO_DATE({col})", "P1M": "TO_DATE(SUBSTRING(TO_DATE({col}),0,7)||'-01')", - "P0.25Y": "TO_DATE(SUBSTRING( \ + "P3M": "TO_DATE(SUBSTRING( \ TO_DATE({col}), 0, 5)|| LPAD(CAST((CAST(SUBSTRING(QUARTER( \ TO_DATE({col}), 1), 7, 1) as int)-1)*3 +1 as text),2,'0') ||'-01')", "P1Y": "TO_DATE(YEAR({col})||'-01-01')", diff --git a/superset/db_engine_specs/hive.py b/superset/db_engine_specs/hive.py index 061ab7f52373a..a695b11b62be1 100644 --- a/superset/db_engine_specs/hive.py +++ b/superset/db_engine_specs/hive.py @@ -105,7 +105,7 @@ class HiveEngineSpec(PrestoEngineSpec): "P1D": "from_unixtime(unix_timestamp({col}), 'yyyy-MM-dd 00:00:00')", "P1W": "date_format(date_sub({col}, CAST(7-from_unixtime(unix_timestamp({col}),'u') as int)), 'yyyy-MM-dd 00:00:00')", "P1M": "from_unixtime(unix_timestamp({col}), 'yyyy-MM-01 00:00:00')", - "P0.25Y": "date_format(add_months(trunc({col}, 'MM'), -(month({col})-1)%3), 'yyyy-MM-dd 00:00:00')", + "P3M": "date_format(add_months(trunc({col}, 'MM'), -(month({col})-1)%3), 'yyyy-MM-dd 00:00:00')", "P1Y": "from_unixtime(unix_timestamp({col}), 'yyyy-01-01 00:00:00')", "P1W/1970-01-03T00:00:00Z": "date_format(date_add({col}, INT(6-from_unixtime(unix_timestamp({col}), 'u'))), 'yyyy-MM-dd 00:00:00')", "1969-12-28T00:00:00Z/P1W": "date_format(date_add({col}, -INT(from_unixtime(unix_timestamp({col}), 'u'))), 'yyyy-MM-dd 00:00:00')", diff --git a/superset/db_engine_specs/impala.py b/superset/db_engine_specs/impala.py index 9d8dc91374f4e..f391289ac1d9f 100644 --- a/superset/db_engine_specs/impala.py +++ b/superset/db_engine_specs/impala.py @@ -36,7 +36,7 @@ class ImpalaEngineSpec(BaseEngineSpec): "P1D": "TRUNC({col}, 'DD')", "P1W": "TRUNC({col}, 'WW')", "P1M": "TRUNC({col}, 'MONTH')", - "P0.25Y": "TRUNC({col}, 'Q')", + "P3M": "TRUNC({col}, 'Q')", "P1Y": "TRUNC({col}, 'YYYY')", } diff --git a/superset/db_engine_specs/kylin.py b/superset/db_engine_specs/kylin.py index ffa7f105b43c7..2e59e3100c0f2 100644 --- a/superset/db_engine_specs/kylin.py +++ b/superset/db_engine_specs/kylin.py @@ -35,7 +35,7 @@ class KylinEngineSpec(BaseEngineSpec): # pylint: disable=abstract-method "P1D": "CAST(FLOOR(CAST({col} AS TIMESTAMP) TO DAY) AS DATE)", "P1W": "CAST(FLOOR(CAST({col} AS TIMESTAMP) TO WEEK) AS DATE)", "P1M": "CAST(FLOOR(CAST({col} AS TIMESTAMP) TO MONTH) AS DATE)", - "P0.25Y": "CAST(FLOOR(CAST({col} AS TIMESTAMP) TO QUARTER) AS DATE)", + "P3M": "CAST(FLOOR(CAST({col} AS TIMESTAMP) TO QUARTER) AS DATE)", "P1Y": "CAST(FLOOR(CAST({col} AS TIMESTAMP) TO YEAR) AS DATE)", } diff --git a/superset/db_engine_specs/mssql.py b/superset/db_engine_specs/mssql.py index ff6b5326d3934..0572319b2cffd 100644 --- a/superset/db_engine_specs/mssql.py +++ b/superset/db_engine_specs/mssql.py @@ -55,12 +55,12 @@ class MssqlEngineSpec(BaseEngineSpec): "PT5M": "DATEADD(minute, DATEDIFF(minute, 0, {col}) / 5 * 5, 0)", "PT10M": "DATEADD(minute, DATEDIFF(minute, 0, {col}) / 10 * 10, 0)", "PT15M": "DATEADD(minute, DATEDIFF(minute, 0, {col}) / 15 * 15, 0)", - "PT0.5H": "DATEADD(minute, DATEDIFF(minute, 0, {col}) / 30 * 30, 0)", + "PT30M": "DATEADD(minute, DATEDIFF(minute, 0, {col}) / 30 * 30, 0)", "PT1H": "DATEADD(hour, DATEDIFF(hour, 0, {col}), 0)", "P1D": "DATEADD(day, DATEDIFF(day, 0, {col}), 0)", "P1W": "DATEADD(week, DATEDIFF(week, 0, {col}), 0)", "P1M": "DATEADD(month, DATEDIFF(month, 0, {col}), 0)", - "P0.25Y": "DATEADD(quarter, DATEDIFF(quarter, 0, {col}), 0)", + "P3M": "DATEADD(quarter, DATEDIFF(quarter, 0, {col}), 0)", "P1Y": "DATEADD(year, DATEDIFF(year, 0, {col}), 0)", } diff --git a/superset/db_engine_specs/mysql.py b/superset/db_engine_specs/mysql.py index 2fb1e9737bb6e..fbac330696b7b 100644 --- a/superset/db_engine_specs/mysql.py +++ b/superset/db_engine_specs/mysql.py @@ -109,7 +109,7 @@ class MySQLEngineSpec(BaseEngineSpec, BasicParametersMixin): "P1D": "DATE({col})", "P1W": "DATE(DATE_SUB({col}, " "INTERVAL DAYOFWEEK({col}) - 1 DAY))", "P1M": "DATE(DATE_SUB({col}, " "INTERVAL DAYOFMONTH({col}) - 1 DAY))", - "P0.25Y": "MAKEDATE(YEAR({col}), 1) " + "P3M": "MAKEDATE(YEAR({col}), 1) " "+ INTERVAL QUARTER({col}) QUARTER - INTERVAL 1 QUARTER", "P1Y": "DATE(DATE_SUB({col}, " "INTERVAL DAYOFYEAR({col}) - 1 DAY))", "1969-12-29T00:00:00Z/P1W": "DATE(DATE_SUB({col}, " diff --git a/superset/db_engine_specs/netezza.py b/superset/db_engine_specs/netezza.py index 469ac4fa19849..9d3b5ec180c7b 100644 --- a/superset/db_engine_specs/netezza.py +++ b/superset/db_engine_specs/netezza.py @@ -31,7 +31,7 @@ class NetezzaEngineSpec(PostgresBaseEngineSpec): "P1D": "DATE_TRUNC('day', {col})", "P1W": "DATE_TRUNC('week', {col})", "P1M": "DATE_TRUNC('month', {col})", - "P0.25Y": "DATE_TRUNC('quarter', {col})", + "P3M": "DATE_TRUNC('quarter', {col})", "P1Y": "DATE_TRUNC('year', {col})", } diff --git a/superset/db_engine_specs/oracle.py b/superset/db_engine_specs/oracle.py index 47775973f11c8..d91ffb4fc9fcd 100644 --- a/superset/db_engine_specs/oracle.py +++ b/superset/db_engine_specs/oracle.py @@ -36,7 +36,7 @@ class OracleEngineSpec(BaseEngineSpec): "P1D": "TRUNC(CAST({col} as DATE), 'DDD')", "P1W": "TRUNC(CAST({col} as DATE), 'WW')", "P1M": "TRUNC(CAST({col} as DATE), 'MONTH')", - "P0.25Y": "TRUNC(CAST({col} as DATE), 'Q')", + "P3M": "TRUNC(CAST({col} as DATE), 'Q')", "P1Y": "TRUNC(CAST({col} as DATE), 'YEAR')", } diff --git a/superset/db_engine_specs/pinot.py b/superset/db_engine_specs/pinot.py index b07a6256d863e..051f42501f929 100644 --- a/superset/db_engine_specs/pinot.py +++ b/superset/db_engine_specs/pinot.py @@ -37,7 +37,7 @@ class PinotEngineSpec(BaseEngineSpec): # pylint: disable=abstract-method "P1D": "1:DAYS", "P1W": "week", "P1M": "month", - "P0.25Y": "quarter", + "P3MY": "quarter", "P1Y": "year", } @@ -57,7 +57,7 @@ class PinotEngineSpec(BaseEngineSpec): # pylint: disable=abstract-method "P1D": False, "P1W": True, "P1M": True, - "P0.25Y": True, + "P3M": True, "P1Y": True, } diff --git a/superset/db_engine_specs/postgres.py b/superset/db_engine_specs/postgres.py index 4d1936310d4d7..47cf874ccbc59 100644 --- a/superset/db_engine_specs/postgres.py +++ b/superset/db_engine_specs/postgres.py @@ -90,7 +90,7 @@ class FixedOffsetTimezone(_FixedOffset): class PostgresBaseEngineSpec(BaseEngineSpec): - """ Abstract class for Postgres 'like' databases """ + """Abstract class for Postgres 'like' databases""" engine = "" engine_name = "PostgreSQL" @@ -103,7 +103,7 @@ class PostgresBaseEngineSpec(BaseEngineSpec): "P1D": "DATE_TRUNC('day', {col})", "P1W": "DATE_TRUNC('week', {col})", "P1M": "DATE_TRUNC('month', {col})", - "P0.25Y": "DATE_TRUNC('quarter', {col})", + "P3M": "DATE_TRUNC('quarter', {col})", "P1Y": "DATE_TRUNC('year', {col})", } diff --git a/superset/db_engine_specs/presto.py b/superset/db_engine_specs/presto.py index 9be73045e4ed7..74364300a7fa6 100644 --- a/superset/db_engine_specs/presto.py +++ b/superset/db_engine_specs/presto.py @@ -158,7 +158,7 @@ class PrestoEngineSpec(BaseEngineSpec): # pylint: disable=too-many-public-metho "P1D": "date_trunc('day', CAST({col} AS TIMESTAMP))", "P1W": "date_trunc('week', CAST({col} AS TIMESTAMP))", "P1M": "date_trunc('month', CAST({col} AS TIMESTAMP))", - "P0.25Y": "date_trunc('quarter', CAST({col} AS TIMESTAMP))", + "P3M": "date_trunc('quarter', CAST({col} AS TIMESTAMP))", "P1Y": "date_trunc('year', CAST({col} AS TIMESTAMP))", "P1W/1970-01-03T00:00:00Z": "date_add('day', 5, date_trunc('week', " "date_add('day', 1, CAST({col} AS TIMESTAMP))))", diff --git a/superset/db_engine_specs/rockset.py b/superset/db_engine_specs/rockset.py index 7cb3fb0640f7e..5cbf7e686ba23 100644 --- a/superset/db_engine_specs/rockset.py +++ b/superset/db_engine_specs/rockset.py @@ -37,7 +37,7 @@ class RocksetEngineSpec(BaseEngineSpec): "P1D": "DATE_TRUNC('day', {col})", "P1W": "DATE_TRUNC('week', {col})", "P1M": "DATE_TRUNC('month', {col})", - "P0.25Y": "DATE_TRUNC('quarter', {col})", + "P3M": "DATE_TRUNC('quarter', {col})", "P1Y": "DATE_TRUNC('year', {col})", } diff --git a/superset/db_engine_specs/snowflake.py b/superset/db_engine_specs/snowflake.py index 6dd85706562bd..88ff0e20e092a 100644 --- a/superset/db_engine_specs/snowflake.py +++ b/superset/db_engine_specs/snowflake.py @@ -58,13 +58,13 @@ class SnowflakeEngineSpec(PostgresBaseEngineSpec): DATE_TRUNC('HOUR', {col}))", "PT15M": "DATEADD(MINUTE, FLOOR(DATE_PART(MINUTE, {col}) / 15) * 15, \ DATE_TRUNC('HOUR', {col}))", - "PT0.5H": "DATEADD(MINUTE, FLOOR(DATE_PART(MINUTE, {col}) / 30) * 30, \ + "PT30M": "DATEADD(MINUTE, FLOOR(DATE_PART(MINUTE, {col}) / 30) * 30, \ DATE_TRUNC('HOUR', {col}))", "PT1H": "DATE_TRUNC('HOUR', {col})", "P1D": "DATE_TRUNC('DAY', {col})", "P1W": "DATE_TRUNC('WEEK', {col})", "P1M": "DATE_TRUNC('MONTH', {col})", - "P0.25Y": "DATE_TRUNC('QUARTER', {col})", + "P3M": "DATE_TRUNC('QUARTER', {col})", "P1Y": "DATE_TRUNC('YEAR', {col})", } diff --git a/superset/db_engine_specs/sqlite.py b/superset/db_engine_specs/sqlite.py index d2b87a4889500..3b6d8b99ecf99 100644 --- a/superset/db_engine_specs/sqlite.py +++ b/superset/db_engine_specs/sqlite.py @@ -45,7 +45,7 @@ class SqliteEngineSpec(BaseEngineSpec): "P1D": "DATE({col})", "P1W": "DATE({col}, -strftime('%w', {col}) || ' days')", "P1M": "DATE({col}, -strftime('%d', {col}) || ' days', '+1 day')", - "P0.25Y": ( + "P3M": ( "DATETIME(STRFTIME('%Y-', {col}) || " # year "SUBSTR('00' || " # pad with zeros to 2 chars "((CAST(STRFTIME('%m', {col}) AS INTEGER)) - " # month as integer diff --git a/superset/db_engine_specs/teradata.py b/superset/db_engine_specs/teradata.py index 88bffa5a0752e..8fd1641064d6c 100644 --- a/superset/db_engine_specs/teradata.py +++ b/superset/db_engine_specs/teradata.py @@ -32,7 +32,7 @@ class TeradataEngineSpec(BaseEngineSpec): "P1D": "TRUNC(CAST({col} as DATE), 'DDD')", "P1W": "TRUNC(CAST({col} as DATE), 'WW')", "P1M": "TRUNC(CAST({col} as DATE), 'MONTH')", - "P0.25Y": "TRUNC(CAST({col} as DATE), 'Q')", + "P3M": "TRUNC(CAST({col} as DATE), 'Q')", "P1Y": "TRUNC(CAST({col} as DATE), 'YEAR')", } diff --git a/superset/db_engine_specs/trino.py b/superset/db_engine_specs/trino.py index 7d28cfbaa6047..6491e661ae9a8 100644 --- a/superset/db_engine_specs/trino.py +++ b/superset/db_engine_specs/trino.py @@ -37,7 +37,7 @@ class TrinoEngineSpec(BaseEngineSpec): "P1D": "date_trunc('day', CAST({col} AS TIMESTAMP))", "P1W": "date_trunc('week', CAST({col} AS TIMESTAMP))", "P1M": "date_trunc('month', CAST({col} AS TIMESTAMP))", - "P0.25Y": "date_trunc('quarter', CAST({col} AS TIMESTAMP))", + "P3M": "date_trunc('quarter', CAST({col} AS TIMESTAMP))", "P1Y": "date_trunc('year', CAST({col} AS TIMESTAMP))", # "1969-12-28T00:00:00Z/P1W", # Week starting Sunday # "1969-12-29T00:00:00Z/P1W", # Week starting Monday diff --git a/superset/examples/configs/charts/Quarterly_Sales.yaml b/superset/examples/configs/charts/Quarterly_Sales.yaml index 65553d5eff79c..dc224318ab01f 100644 --- a/superset/examples/configs/charts/Quarterly_Sales.yaml +++ b/superset/examples/configs/charts/Quarterly_Sales.yaml @@ -68,7 +68,7 @@ params: show_legend: false slice_id: 668 time_compare: null - time_grain_sqla: P0.25Y + time_grain_sqla: P3M time_range: No filter time_range_endpoints: - inclusive diff --git a/superset/examples/configs/charts/Quarterly_Sales_By_Product_Line.yaml b/superset/examples/configs/charts/Quarterly_Sales_By_Product_Line.yaml index 66d8733bf58eb..87fd1d6194422 100644 --- a/superset/examples/configs/charts/Quarterly_Sales_By_Product_Line.yaml +++ b/superset/examples/configs/charts/Quarterly_Sales_By_Product_Line.yaml @@ -71,7 +71,7 @@ params: show_legend: true slice_id: 2806 time_compare: null - time_grain_sqla: P0.25Y + time_grain_sqla: P3M time_range: No filter time_range_endpoints: - inclusive diff --git a/superset/migrations/versions/32646df09c64_update_time_grain_sqla.py b/superset/migrations/versions/32646df09c64_update_time_grain_sqla.py new file mode 100644 index 0000000000000..db1b87e546062 --- /dev/null +++ b/superset/migrations/versions/32646df09c64_update_time_grain_sqla.py @@ -0,0 +1,72 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +"""update time grain SQLA + +Revision ID: 32646df09c64 +Revises: 60dc453f4e2e +Create Date: 2021-10-12 11:15:25.559532 + +""" + +# revision identifiers, used by Alembic. +revision = "32646df09c64" +down_revision = "60dc453f4e2e" + +import json +from typing import Dict + +from alembic import op +from sqlalchemy import Column, Integer, Text +from sqlalchemy.ext.declarative import declarative_base + +from superset import db + +Base = declarative_base() + + +class Slice(Base): + __tablename__ = "slices" + + id = Column(Integer, primary_key=True) + params = Column(Text) + + +def migrate(mapping: Dict[str, str]) -> None: + bind = op.get_bind() + session = db.Session(bind=bind) + + for slc in session.query(Slice).all(): + try: + params = json.loads(slc.params) + time_grain_sqla = params.get("time_grain_sqla") + + if time_grain_sqla in mapping: + params["time_grain_sqla"] = mapping[time_grain_sqla] + slc.params = json.dumps(params, sort_keys=True) + except Exception: + pass + + session.commit() + session.close() + + +def upgrade(): + migrate(mapping={"PT0.5H": "PT30M", "P0.25Y": "P3M"}) + + +def downgrade(): + migrate(mapping={"PT30M": "PT0.5H", "P3M": "P0.25Y"}) diff --git a/superset/utils/pandas_postprocessing.py b/superset/utils/pandas_postprocessing.py index 65112ddc20433..8ad5099552ff6 100644 --- a/superset/utils/pandas_postprocessing.py +++ b/superset/utils/pandas_postprocessing.py @@ -90,12 +90,12 @@ "PT5M": "5min", "PT10M": "10min", "PT15M": "15min", - "PT0.5H": "30min", + "PT30M": "30min", "PT1H": "H", "P1D": "D", "P1W": "W", "P1M": "M", - "P0.25Y": "Q", + "P3M": "Q", "P1Y": "A", "1969-12-28T00:00:00Z/P1W": "W", "1969-12-29T00:00:00Z/P1W": "W", diff --git a/tests/integration_tests/db_engine_specs/base_engine_spec_tests.py b/tests/integration_tests/db_engine_specs/base_engine_spec_tests.py index 3b69a0729b5cd..275df7ba6545b 100644 --- a/tests/integration_tests/db_engine_specs/base_engine_spec_tests.py +++ b/tests/integration_tests/db_engine_specs/base_engine_spec_tests.py @@ -206,7 +206,7 @@ def test_get_time_grain_expressions(self): "P1D", "P1W", "P1M", - "P0.25Y", + "P3M", "P1Y", "1969-12-29T00:00:00Z/P1W", ], @@ -314,7 +314,7 @@ def test_time_grain_addons(): def test_get_time_grain_with_config(): - """ Should concatenate from configs and then sort in the proper order """ + """Should concatenate from configs and then sort in the proper order""" config = app.config.copy() app.config["TIME_GRAIN_ADDON_EXPRESSIONS"] = { @@ -345,7 +345,7 @@ def test_get_time_grain_with_config(): "P1D", "P1W", "P1M", - "P0.25Y", + "P3M", "P1Y", "1969-12-29T00:00:00Z/P1W", }