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 061fe2dbfb..20ba9bb26c 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 @@ -47,7 +47,7 @@ describe('Visualization > Table', () => { cy.get('.chart-container td:nth-child(1)').contains('2008 Q1'); // other column with timestamp use raw timestamp cy.get('.chart-container td:nth-child(3)').contains('2008-01-01T00:00:00'); - cy.get('.chart-container td').contains('other'); + cy.get('.chart-container td:nth-child(4)').contains('other'); }); it('Format with table_timestamp_format', () => { @@ -74,7 +74,7 @@ describe('Visualization > Table', () => { it('Test table with groupby', () => { cy.visitChartByParams({ ...VIZ_DEFAULTS, - metrics: NUM_METRIC, + metrics: [NUM_METRIC, MAX_DS], groupby: ['name'], }); cy.verifySliceSuccess({ @@ -84,6 +84,29 @@ describe('Visualization > Table', () => { }); }); + it('Test table with groupby + time column', () => { + cy.visitChartByParams({ + ...VIZ_DEFAULTS, + include_time: true, + granularity_sqla: 'ds', + time_grain_sqla: 'P0.25Y', + metrics: [NUM_METRIC, MAX_DS], + groupby: ['name'], + }); + cy.verifySliceSuccess({ + waitAlias: '@getJson', + querySubstring: /groupby.*name/, + chartSelector: 'table', + }); + }); + + it('Handle sorting correctly', () => { + cy.get('.chart-container th').contains('name').click(); + cy.get('.chart-container td:nth-child(2):eq(0)').contains('Aaron'); + cy.get('.chart-container th').contains('Time').click().click(); + cy.get('.chart-container td:nth-child(1):eq(0)').contains('2008'); + }); + it('Test table with percent metrics and groupby', () => { const formData = { ...VIZ_DEFAULTS, diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json index b28d042bb9..b5c4dad786 100644 --- a/superset-frontend/package-lock.json +++ b/superset-frontend/package-lock.json @@ -2794,9 +2794,9 @@ } }, "@babel/polyfill": { - "version": "7.10.1", - "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.10.1.tgz", - "integrity": "sha512-TviueJ4PBW5p48ra8IMtLXVkDucrlOZAIZ+EXqS3Ot4eukHbWiqcn7DcqpA1k5PcKtmJ4Xl9xwdv6yQvvcA+3g==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.10.4.tgz", + "integrity": "sha512-8BYcnVqQ5kMD2HXoHInBH7H1b/uP3KdnwCYXOqFnXqguOyuu443WXusbIUbWEfY3Z0Txk0M1uG/8YuAMhNl6zg==", "requires": { "core-js": "^2.6.5", "regenerator-runtime": "^0.13.4" @@ -4236,9 +4236,9 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.10.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.2.tgz", - "integrity": "sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.4.tgz", + "integrity": "sha512-UpTN5yUJr9b4EX2CnGNWIvER7Ab83ibv0pcvvHc4UOdrBI5jb8bj+32cCwPX6xu0mt2daFNjYhoi+X7beH0RSw==", "requires": { "regenerator-runtime": "^0.13.4" } @@ -5654,9 +5654,9 @@ "dev": true }, "@superset-ui/chart": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/@superset-ui/chart/-/chart-0.14.1.tgz", - "integrity": "sha512-mH72Km3QAGistIkw72/aeXByGl/Sn3lJgST+XR9vLbf8JW3khI1/7qqy7JBJl9EQqHsL0Hzlt10bE8EiDvbtJQ==", + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/chart/-/chart-0.14.9.tgz", + "integrity": "sha512-obPirk+QqK+kRb5goXV3bkAkrjaxm4bV3FJe6rml3aTvheM1B0o+SAPD/NjVmqB9W4zwc8HUutW0XPUyT3pOlA==", "requires": { "@types/react": "^16.9.38", "@types/react-loadable": "^5.4.2", @@ -5682,9 +5682,9 @@ } }, "@superset-ui/chart-composition": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/@superset-ui/chart-composition/-/chart-composition-0.14.1.tgz", - "integrity": "sha512-smNTXw3rSOanVQzLwrUmGYbF5T4RaXfbg2yuWdEfQws/9dHvIJHgE9CXi6MdEqD7cKEUJbFJ1cZCR1jABq5UYQ==", + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/chart-composition/-/chart-composition-0.14.9.tgz", + "integrity": "sha512-oRfVzbUtWSOCo2Qhfqw88XT1olSxUhyFLIoYFf1HTT2ZTqoyJmdildc+hVjSWgZNlUu7EdkESyGcVfIGO1OI4A==", "requires": { "@types/react": "^16.9.38", "@vx/responsive": "^0.0.197", @@ -5706,9 +5706,9 @@ } }, "@superset-ui/chart-controls": { - "version": "0.14.2", - "resolved": "https://registry.npmjs.org/@superset-ui/chart-controls/-/chart-controls-0.14.2.tgz", - "integrity": "sha512-XXpRNBBfnNFNCAA/rGJ8+koXKIIqsqXRXciIIaNdj8BP+hfzai/QmSNRTdBYQXGghcOWaSsNEssk+5ldALaYzg==", + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/chart-controls/-/chart-controls-0.14.9.tgz", + "integrity": "sha512-Yl8z32bsRL7UBSZpMGPVQ66TSHIbdYvpR4fsvw3TGdqEPnp1Bi5L8ae7I6Go4OXj5mwtuA5lwGkePR2/wI1E7A==", "requires": { "@types/react-bootstrap": "0.32.21", "lodash": "^4.17.15", @@ -5717,9 +5717,9 @@ } }, "@superset-ui/color": { - "version": "0.14.2", - "resolved": "https://registry.npmjs.org/@superset-ui/color/-/color-0.14.2.tgz", - "integrity": "sha512-jlnPjK1CoJrWGLVCmUnXT9Llpv1YYUCGFtTHZECiO3rdJkWgmQaJ5l4cjJ9lDuvjyfIkxlQbKZQLxSJxc/zZOA==", + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/color/-/color-0.14.9.tgz", + "integrity": "sha512-LjMK72oP2lLaL0/wpx6KxzqVRH6vUnlNGtTntKVTnbfZcKv3/LjJAmGaXK7gpBPJIynmg1lUJau/4CJHfrOSPQ==", "requires": { "@types/d3-interpolate": "^1.3.1", "@types/d3-scale": "^2.1.1", @@ -5750,9 +5750,9 @@ } }, "@superset-ui/connection": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/@superset-ui/connection/-/connection-0.14.0.tgz", - "integrity": "sha512-9TBUF6tu9DIcm3PuOsfJ85MaHHRXjf+mQriqx070NdSLJl23Bp+gz5FlHGxdv3NQJY+VZiadPFe2arVKzREb5A==", + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/connection/-/connection-0.14.9.tgz", + "integrity": "sha512-47Qvs4hdXnDf8fEY4p+13qxgLldT8NCXoF5HudOune3l/AcNDbOUcx6EGz+FgYwzMgYW6Tv9u9cQlhZAXDYBtQ==", "requires": { "@babel/runtime": "^7.1.2", "fetch-retry": "^3.1.0", @@ -5760,23 +5760,23 @@ } }, "@superset-ui/core": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.14.0.tgz", - "integrity": "sha512-XqqyhFmiHzXTaS10uZY+iU+3ZJOBTX0nA+eWVKhgD+4yrKzWPvYW/daNq7+tIOmBx/VudtmxTgDShlQxtZkJAg==", + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/core/-/core-0.14.9.tgz", + "integrity": "sha512-/53U8m2mdQlzBr1ytuMg1DKE0yWzorY+B1r/5eVaOkNlWlYPO1rk78ATAowmAP8ydEad3zUmxK9XBKmzaHDQCw==", "requires": { "@types/lodash": "^4.14.149", "lodash": "^4.17.11" } }, "@superset-ui/dimension": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/@superset-ui/dimension/-/dimension-0.14.0.tgz", - "integrity": "sha512-O9XwgoaMrT+ETGW6fvThjSZ+QJjsCUx642bmzsPT66uak5rXY2IbiDG+Hs7pqWbG32bMRDuHOAwaRgGXpi6xJg==" + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/dimension/-/dimension-0.14.9.tgz", + "integrity": "sha512-sLqFGoBjvDMruVfer3Ykpy245IBXOGBYjCTJGsdxMDiO/tGlHfB5XymO3+pdRb9lhXJ6r9pZqXmStHdkzv93VQ==" }, "@superset-ui/legacy-plugin-chart-calendar": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-calendar/-/legacy-plugin-chart-calendar-0.14.1.tgz", - "integrity": "sha512-+wdAzk9z/VsTgy1V/I9pp0UHaCuJNcoiY5XMi40Ax4sZ43wMmxj+oGFBPsxfirV5JdtO8l98Hw6UVrCP1EOfSA==", + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-calendar/-/legacy-plugin-chart-calendar-0.14.9.tgz", + "integrity": "sha512-0N0hsAWiybLg/kfG+/H9StaVd+Us6nHt1ceC6NzVZgTZZ84zWS75hzTXmh54voz7jbRt1If9dKwDh9+XqWWPaA==", "requires": { "d3-array": "^2.0.3", "d3-selection": "^1.4.0", @@ -5792,22 +5792,21 @@ } }, "@superset-ui/legacy-plugin-chart-chord": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-chord/-/legacy-plugin-chart-chord-0.14.1.tgz", - "integrity": "sha512-kjLLL0ejTBvpvRF+Flk1x43vpeCRIWR3j5I/aBe4J2ZSKx7B44G1wvzXFiMtC0jq1qAPb/KhkL8ChjW06pQyaw==", + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-chord/-/legacy-plugin-chart-chord-0.14.9.tgz", + "integrity": "sha512-UTXccS0lMokmg3CPllZB2jCCx/mOCZTuHYoYV9tzDPMyoB4CParBXoopLi6Vr9COrkRrKO2nVoOTnPZUijZiQQ==", "requires": { - "@superset-ui/style": "0.14.0", + "@superset-ui/style": "0.14.9", "d3": "^3.5.17", "prop-types": "^15.6.2", "react": "^16.13.1" } }, "@superset-ui/legacy-plugin-chart-country-map": { - "version": "0.14.2", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-country-map/-/legacy-plugin-chart-country-map-0.14.2.tgz", - "integrity": "sha512-EiwfsO43tOxsG+juzO9rDThBAoGPh0wismR2FeBzf00TrMlD317DkV/+FcEYd/RAqFA0WnfBE2soe7Ts8ngkuA==", + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-country-map/-/legacy-plugin-chart-country-map-0.14.9.tgz", + "integrity": "sha512-Mdu/US/HkWdI7RO59p5GfvQx/DDNPSFwtF0szJp/0O2JP10rF6XSLNDNaxdp+hX+ihzQzixw6BYpDKhNknGfsA==", "requires": { - "@superset-ui/chart-controls": "0.14.2", "d3": "^3.5.17", "d3-array": "^2.0.3", "prop-types": "^15.6.2" @@ -5821,27 +5820,27 @@ } }, "@superset-ui/legacy-plugin-chart-event-flow": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-event-flow/-/legacy-plugin-chart-event-flow-0.14.1.tgz", - "integrity": "sha512-eKy6hOFVPz14I95xao8tSGoRxVvNcTdv/9VvwP4l1YYLurbOQjaIh1bG43fOuKdta38XCQu6cEubS5Nb9cIMVw==", + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-event-flow/-/legacy-plugin-chart-event-flow-0.14.9.tgz", + "integrity": "sha512-f5wkdH5OgAH25YMscD60JA0yf6k0Du9Q7qLhSHuOeEOm/NNQRJsvoAJHNAxRSLMf6Ll8hrEbpGF0F6ZVw3zuzA==", "requires": { "@data-ui/event-flow": "^0.0.84", "prop-types": "^15.6.2" } }, "@superset-ui/legacy-plugin-chart-force-directed": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-force-directed/-/legacy-plugin-chart-force-directed-0.14.1.tgz", - "integrity": "sha512-OuG9iaMagiBGoQ9aaRMa65tEAgumvpa38Mk8Fn28lG9liytkgKdZxsPBXWIs4mdJFdujlOQeYr3kI3S512OXpA==", + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-force-directed/-/legacy-plugin-chart-force-directed-0.14.9.tgz", + "integrity": "sha512-Af+pAIlJWwkyYBeyMqDEuG9bhhOMzNYL6lId1U7qCzAWC8zZ5xeiK8iXnKBim+nM9vM3RZPB1PkGU7hc6NEO+g==", "requires": { "d3": "^3.5.17", "prop-types": "^15.6.2" } }, "@superset-ui/legacy-plugin-chart-heatmap": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-heatmap/-/legacy-plugin-chart-heatmap-0.14.1.tgz", - "integrity": "sha512-WZ1glhNdFXeLUhtdWX+D6kszQYuxYcOXbxMT2rpqF5QYmRPa2ULQTdakFTlPXBm6y3k5a1Fv9ypElgIutjYzpw==", + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-heatmap/-/legacy-plugin-chart-heatmap-0.14.9.tgz", + "integrity": "sha512-xl+jh3P+isiiTPq+D3Fbuq7VshSXGPP6euWScTmkebjTfxoJxzEufXQb1pXImROBSSsBjWIUL54jFgBRToembg==", "requires": { "d3": "^3.5.17", "d3-svg-legend": "^1.x", @@ -5850,9 +5849,9 @@ } }, "@superset-ui/legacy-plugin-chart-histogram": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-histogram/-/legacy-plugin-chart-histogram-0.14.1.tgz", - "integrity": "sha512-EY0UyWhR5bIW+p7hzEz196QIiRNLdQidBT2RnDRwd0Wt1te+gC3V5nH/Q8hAVoQ1LEWWURwzlAm2wCkxN7jeUA==", + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-histogram/-/legacy-plugin-chart-histogram-0.14.9.tgz", + "integrity": "sha512-TmT0naQ2HX5HvWqBX2zRq3fXqmxRv+wX0zV45WlPgjZQyOi/Xlgb/hALZns8Vdia6gdXHZlYHoMUd0xx0SZGmA==", "requires": { "@data-ui/histogram": "^0.0.84", "@data-ui/theme": "^0.0.84", @@ -5923,9 +5922,9 @@ } }, "@superset-ui/legacy-plugin-chart-horizon": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-horizon/-/legacy-plugin-chart-horizon-0.14.1.tgz", - "integrity": "sha512-5LvpyI2bwO+fxb7Hg4YEBFDnBXpqlKZHXyJwzSl7Ek19Ift3TkIaRaN2P7kiaKUmsEH/IKj9CQU0tPH7jr95aA==", + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-horizon/-/legacy-plugin-chart-horizon-0.14.9.tgz", + "integrity": "sha512-dtq9aOO9M77h8gu4RklytDmXBxwXPtCXwwHGE6J0Z8Ek7uH7YBqCe8f+i6nqeGD+h4DU2NWSu77MA07OO8Qm/g==", "requires": { "d3-array": "^2.0.3", "d3-scale": "^3.0.1", @@ -5952,9 +5951,9 @@ } }, "@superset-ui/legacy-plugin-chart-iframe": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-iframe/-/legacy-plugin-chart-iframe-0.14.1.tgz", - "integrity": "sha512-tTB6nmzFkVQvzc5WE65muEyBOye36HPKQX2CQT8VLFgUoDCoY19aK/NQKf5x3kg+JDdm4HNEfvukJXW5VjT59g==", + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-iframe/-/legacy-plugin-chart-iframe-0.14.9.tgz", + "integrity": "sha512-/vpkBTtXnbSPzomhThnSXzpx/jZ+dwKVNhGD1Uy5lPCSod+W51Z7F5wq4T/ODUpuCcwRwM7RQuLA2ha5TeLiTw==", "requires": { "mustache": "^4.0.0", "prop-types": "^15.6.2" @@ -5968,9 +5967,9 @@ } }, "@superset-ui/legacy-plugin-chart-map-box": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-map-box/-/legacy-plugin-chart-map-box-0.14.1.tgz", - "integrity": "sha512-o1EfC9VLdRzHn2/ap5q9DSkadFTMUqusbhAnawQUuFcRDvD88SfQmpMmjCuHA0Nu1PtHLqMy8WJ1TvlELH34GA==", + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-map-box/-/legacy-plugin-chart-map-box-0.14.9.tgz", + "integrity": "sha512-fo0K78OFbmvxILsqJkR/C0B2Uwcl7q4EPWfyGHkUJlpmxqR+jiQUUfaiW+MBmfNvziDYstXbOfdV0/4/zXx1JA==", "requires": { "immutable": "^3.8.2", "mapbox-gl": "^0.53.0", @@ -5981,17 +5980,17 @@ } }, "@superset-ui/legacy-plugin-chart-markup": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-markup/-/legacy-plugin-chart-markup-0.14.1.tgz", - "integrity": "sha512-/Atp727N1Gn9M0jbn94/WVsO8sVDvfZ6SiK2Y/UNUbMyjmVmrg0NrxpHbywUiSHbG8Yytyd8G1xV47w1IKAQPg==", + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-markup/-/legacy-plugin-chart-markup-0.14.9.tgz", + "integrity": "sha512-S9JGPEUUlKURtJqJkwLY1vRXghItsxNzKFgsqPulYZYMmYL7IB9d5bpT6UlUgrYscVmV3hpSmAVndr73+9+Cog==", "requires": { "prop-types": "^15.6.2" } }, "@superset-ui/legacy-plugin-chart-paired-t-test": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-paired-t-test/-/legacy-plugin-chart-paired-t-test-0.14.1.tgz", - "integrity": "sha512-fojQzJKpkx/3RpJWhGPms+S4ghQ7SkLFjBTnn6KHOZfeuvV9/Yh9RTklkj49bWVhtAdVf50YtTflHsw8FKwNuw==", + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-paired-t-test/-/legacy-plugin-chart-paired-t-test-0.14.9.tgz", + "integrity": "sha512-x5Fx7M2k2+r0hTYTE/Uix51aGG/oQxKoOZBEJyGnDxfw1ClT8RbSj8s3sy5hSug+AyCR2EpSXclK9koGPvDAag==", "requires": { "distributions": "^1.0.0", "prop-types": "^15.6.2", @@ -6006,18 +6005,18 @@ } }, "@superset-ui/legacy-plugin-chart-parallel-coordinates": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-parallel-coordinates/-/legacy-plugin-chart-parallel-coordinates-0.14.1.tgz", - "integrity": "sha512-P98jnK4i2xPIMqgT3/eRvX4Lil5BwZm1BA5eNF2UVqtC2tbMKKLbKrZqqw2sgmBYA2UhQBN8HpMTYJWz9zoZuw==", + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-parallel-coordinates/-/legacy-plugin-chart-parallel-coordinates-0.14.9.tgz", + "integrity": "sha512-Mi8vlBv/Ki37Q0940KtyFrpqI8jespmoiQd6QIJxwMRIud8uxDCtW9sfzkc1+DKQU/7l0UThGnc3T/G1I0nWIA==", "requires": { "d3": "^3.5.17", "prop-types": "^15.6.2" } }, "@superset-ui/legacy-plugin-chart-partition": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-partition/-/legacy-plugin-chart-partition-0.14.1.tgz", - "integrity": "sha512-vVxbTW8QodowahzvHfbjji9QNCh7xei/ocF6y9IEmlpjzQfdzdV87halpo/t8ieybMqwockQvkIGx7D+9qBdnw==", + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-partition/-/legacy-plugin-chart-partition-0.14.9.tgz", + "integrity": "sha512-ef4Vori8Vh5pAS51Wj6MtTmLkDPvsIzobfn9liWKcxTohNjsxg/gX6gqIYbRmHXA3GNJgUsftW7/oCv1fiqSxg==", "requires": { "d3": "^3.5.17", "d3-hierarchy": "^1.1.8", @@ -6025,9 +6024,9 @@ } }, "@superset-ui/legacy-plugin-chart-pivot-table": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-pivot-table/-/legacy-plugin-chart-pivot-table-0.14.1.tgz", - "integrity": "sha512-kAtwRG2Z2wp6+G/KA/bJ/uxcskJoP+FFUpnXo/jWxo/OgiHqIuUIXCngpGjHk1MnhejE/4bb05xTLZOldfjt+A==", + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-pivot-table/-/legacy-plugin-chart-pivot-table-0.14.9.tgz", + "integrity": "sha512-czjbOIew4gDSeZ2yUkB3JHBf3FdwrNMj1Q96IpLLYcoJvWsIw8H6wSFXblCwNkoT8tiPVARZ2ltw4Qkjx0xUBg==", "requires": { "d3": "^3.5.17", "datatables.net-bs": "^1.10.15", @@ -6035,9 +6034,9 @@ } }, "@superset-ui/legacy-plugin-chart-rose": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-rose/-/legacy-plugin-chart-rose-0.14.1.tgz", - "integrity": "sha512-lNHmV4XAazT1aVR64cYR8o5PCuIry8vqihpHRqHHlfIRAClYFpbpNm3bLs2XxV322K2L4dfFazsmR5x3RsL9AA==", + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-rose/-/legacy-plugin-chart-rose-0.14.9.tgz", + "integrity": "sha512-sylNIX2PcICKEF3Xr0VzgivviFRJHLFq6akY0F/Mk3+GUctUGd8+xmSbKzMKLQlH+E9/9OLNqZ+tiODGI8bdQw==", "requires": { "d3": "^3.5.17", "nvd3": "1.8.6", @@ -6045,9 +6044,9 @@ } }, "@superset-ui/legacy-plugin-chart-sankey": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sankey/-/legacy-plugin-chart-sankey-0.14.1.tgz", - "integrity": "sha512-xuQMr+KNOHKRb7XAdxh4uDxOKcLOtaziKfEL5zt0V6svd0fHw98rd8zeCaf2u8RaG52XMODf0KR9JmHX2YMKMg==", + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sankey/-/legacy-plugin-chart-sankey-0.14.9.tgz", + "integrity": "sha512-phJzM71AUWgLeO5CJzwtGKT7yFDa0jgkGDV7YuggpUq8q0tB3oUJd4rETJABJ4431whjgXnAQQzAJiLmISmOgQ==", "requires": { "d3": "^3.5.17", "d3-sankey": "^0.4.2", @@ -6055,9 +6054,9 @@ } }, "@superset-ui/legacy-plugin-chart-sankey-loop": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sankey-loop/-/legacy-plugin-chart-sankey-loop-0.14.1.tgz", - "integrity": "sha512-1UjKpAOQkW7fs6D1onCy8k0V/jG4yPtENFhre93S7InOmYo4uVDJ8XvOwbN3BmmiD8rgVSaRDnBMavHEQ1Wx0g==", + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sankey-loop/-/legacy-plugin-chart-sankey-loop-0.14.9.tgz", + "integrity": "sha512-kEFpwE8B12Vk/bke7PtKl0w1Lo756dxrvbNq29T8udKubQsXGQHpbZJv7XjbRnEhkqRPiqVAQybTB+l0zqirzw==", "requires": { "d3-sankey-diagram": "^0.7.3", "d3-selection": "^1.4.0", @@ -6065,18 +6064,18 @@ } }, "@superset-ui/legacy-plugin-chart-sunburst": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sunburst/-/legacy-plugin-chart-sunburst-0.14.1.tgz", - "integrity": "sha512-ffslNziElgs9YFEEpkZhaWcjb7WxquwWouSzVx0AQM31uKnFpsT4jhj68d9eg3zPXcHf86X6C8K5ANov5hbiUg==", + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-sunburst/-/legacy-plugin-chart-sunburst-0.14.9.tgz", + "integrity": "sha512-/dXLC8n7AsRqicdiK5UfqEjKvx5mWd75nWNgFkOpzB7nJAa4B+X0ykH1ORBk4+PUIK69QDMkD/8hoalm50YxJw==", "requires": { "d3": "^3.5.17", "prop-types": "^15.6.2" } }, "@superset-ui/legacy-plugin-chart-treemap": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-treemap/-/legacy-plugin-chart-treemap-0.14.1.tgz", - "integrity": "sha512-qon3omfZyihi199CPWOw7jjwUjxDJ4r51VJ3vgXdok/gg9HnfT7qugk15Q2/1kLvPg84Zcs4DDyd686TN3dqhw==", + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-treemap/-/legacy-plugin-chart-treemap-0.14.9.tgz", + "integrity": "sha512-hHxySbtxK8BdDNR790UtdV676h9OpTO4F99qiW9nKCzCYiSEXPl6mBPrQtyPjX8i4lzwpm9GsB91hIj8zeZUSQ==", "requires": { "d3-hierarchy": "^1.1.8", "d3-selection": "^1.4.0", @@ -6084,9 +6083,9 @@ } }, "@superset-ui/legacy-plugin-chart-world-map": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-world-map/-/legacy-plugin-chart-world-map-0.14.1.tgz", - "integrity": "sha512-1qGO4GKtU+IGimNY7OcdF6oK3HiZZcno6a7oRuHP7D15Qj9abffyV+xOZjri6fChyWgVfxZXaftaMihXUQNH7A==", + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-world-map/-/legacy-plugin-chart-world-map-0.14.9.tgz", + "integrity": "sha512-8QR5tUvA7D5fQOgVON0viTlbYSHpV1sQhW3igvL6uWrF3u4xc+WVIeyn4ggw4601P4UhE4E5EXyLuHHFvWvDXg==", "requires": { "d3": "^3.5.17", "datamaps": "^0.5.8", @@ -6094,9 +6093,9 @@ } }, "@superset-ui/legacy-preset-chart-big-number": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-big-number/-/legacy-preset-chart-big-number-0.14.1.tgz", - "integrity": "sha512-EOqvJ3tJ7wWKBxQXZrsAV8RQ3SGnuuNMDVFgSOyhKc3jxEMagE2CV5rsSWoEDWA/fUO29Trl+/7Uya2QUIGilg==", + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-big-number/-/legacy-preset-chart-big-number-0.14.9.tgz", + "integrity": "sha512-hGwiSIiyEtZP54bjtZe3MaenSCrfgo0UJDO05fI6mRWybeZIj9QAZmGoZTx7Mdtw6TmAD+mAoAIgIey4EPChQg==", "requires": { "@data-ui/xy-chart": "^0.0.84", "@types/d3-color": "^1.2.2", @@ -6131,9 +6130,9 @@ } }, "@superset-ui/legacy-preset-chart-nvd3": { - "version": "0.14.4", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-nvd3/-/legacy-preset-chart-nvd3-0.14.4.tgz", - "integrity": "sha512-HJx6MTP3mun3+xnngraJY48gVd7iXluL9uR8pVOYtScIML1cBNw+DPHgeODe5NnGiM6xgJA5crZnSQn+n7cHrw==", + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-nvd3/-/legacy-preset-chart-nvd3-0.14.9.tgz", + "integrity": "sha512-VUSOxpRXoTU49OofNzPoXTNpr2MzRRMRfbaPlbQQOwtY5/+9dFa2SfbsD0fVDMtWiX2jPBQeIunAhlrtNUhrBg==", "requires": { "@data-ui/xy-chart": "^0.0.84", "d3": "^3.5.17", @@ -6149,9 +6148,9 @@ } }, "@superset-ui/number-format": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/@superset-ui/number-format/-/number-format-0.14.1.tgz", - "integrity": "sha512-SKMdalmaFx/OgbLhoqj5kDnw/80I3kFpEARXx1sNuY4/ofSwlQFlAMmL9prR74YPfFeR/xSznfnhPWaas1bf6A==", + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/number-format/-/number-format-0.14.9.tgz", + "integrity": "sha512-PVw0qT9o6N9r4mnRn282GgoI7SE55IkAN60JuDXcjEx0W40WI7vGeTYzMbmElVOlBS9a9KcqelL6SBhhEretJg==", "requires": { "@types/d3-format": "^1.3.0", "d3-format": "^1.3.2", @@ -6159,9 +6158,9 @@ } }, "@superset-ui/plugin-chart-table": { - "version": "0.14.8", - "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-table/-/plugin-chart-table-0.14.8.tgz", - "integrity": "sha512-xfu1y/6Vo4DXtvaaXBjUOPGrEEKkbtgVKHXDEWrk3MATmODMlut11vrNs/UcllTkzHGOhTCdg3eHEPfAM2+crw==", + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-table/-/plugin-chart-table-0.14.9.tgz", + "integrity": "sha512-A65LdejI4Vy99LLCVT20WrUGNIdp/FQBK2NsRIAMKNyhnZ1rp0R2F5xX0MG5AjxBUDQYlMQY4fptt1oB8V1fqA==", "requires": { "@emotion/core": "^10.0.28", "@types/d3-array": "^2.0.0", @@ -6186,9 +6185,9 @@ } }, "@superset-ui/plugin-chart-word-cloud": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-word-cloud/-/plugin-chart-word-cloud-0.14.1.tgz", - "integrity": "sha512-fv3qRe70CHkgLlyBWTnhhKFbs2E/lAjCggN1AznpM3LuKgCCmY4oqaS4A1tjlIImDx4zBESM+74Vld6w4EFcMA==", + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/plugin-chart-word-cloud/-/plugin-chart-word-cloud-0.14.9.tgz", + "integrity": "sha512-QT7YMvt2vJEuULSL5kGRQaq9TYEqRUoFInLsHjrKdhcFpjtfifWIBpn6jMMQ5n8XO+srXSjnMk7cjabIPK1jlQ==", "requires": { "@types/d3-cloud": "^1.2.1", "@types/d3-scale": "^2.0.2", @@ -6214,9 +6213,9 @@ } }, "@superset-ui/preset-chart-xy": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/@superset-ui/preset-chart-xy/-/preset-chart-xy-0.14.1.tgz", - "integrity": "sha512-5Pfai9R2ZMj98iSMP1yaSc9pYhsDu9jjDzvYITxiJz+HRrMqv+Ue5xU1lcRCI+TnHRQj5FghzWGYvS5gSH1GaQ==", + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/preset-chart-xy/-/preset-chart-xy-0.14.9.tgz", + "integrity": "sha512-x4tWBuD6V0LI7YzN+RO65j8H/YNuX6c3rAqoinrON+kzszdkbzirumSy2NNai+H2vO8RVT097Ndd1ZcHHZA0uA==", "requires": { "@data-ui/theme": "^0.0.84", "@data-ui/xy-chart": "^0.0.84", @@ -6338,14 +6337,14 @@ } }, "@superset-ui/query": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/@superset-ui/query/-/query-0.14.1.tgz", - "integrity": "sha512-YXVxrPS3JZFe6Kfwo02Lee+kLVoKzLV/WG4FpY76ZDSFpehF4OYE4EFqg0TpcPq1yBfDEDQPx/vJZUhSBxTI2w==" + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/query/-/query-0.14.9.tgz", + "integrity": "sha512-tldCA8YzqG02oCz/mSY5xA2g3AAqdF5f2p755tPimUHCqtn5axnE38AaRDz+0PyKNyStx0JkYkOVgqvX2ggpzA==" }, "@superset-ui/style": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/@superset-ui/style/-/style-0.14.0.tgz", - "integrity": "sha512-HIQUDzEYpsp0XWDy2kHSSwhgyuHrmL00bSeHfyot+BRptQqExIMGLm6otCrUS6VhGkXoQAUJ1a4g3KKoEmMgfQ==", + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/style/-/style-0.14.9.tgz", + "integrity": "sha512-gPaGU0Rb/klie07zNmnwFYo2S6fJQ7lMjLo58sVdVT66sor4/yraDKKf2/J7EZfPWnKbOqCu5lUxndswkO+l0w==", "requires": { "@emotion/core": "^10.0.28", "@emotion/styled": "^10.0.27", @@ -6353,29 +6352,29 @@ } }, "@superset-ui/superset-ui": { - "version": "0.14.2", - "resolved": "https://registry.npmjs.org/@superset-ui/superset-ui/-/superset-ui-0.14.2.tgz", - "integrity": "sha512-9MQs40nKMTr7ciAfuIkP48OPtwvS/wk/BQx67V3CqFSfuJQQRWi0r31Egd+lEqxwZTmf+k4b/GSsn1goQwPX2g==", + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/superset-ui/-/superset-ui-0.14.9.tgz", + "integrity": "sha512-OhvBVosk69FS/3lC/u+Gggzy1A+UYQqGTs7AyODF667YwFAABd+TVb6xmHYxs/4HNzyDbvqeD5yxwIRzzKbf7g==", "requires": { - "@superset-ui/chart": "0.14.1", - "@superset-ui/chart-composition": "0.14.1", - "@superset-ui/chart-controls": "0.14.2", - "@superset-ui/color": "0.14.2", - "@superset-ui/connection": "0.14.0", - "@superset-ui/core": "0.14.0", - "@superset-ui/dimension": "0.14.0", - "@superset-ui/number-format": "0.14.1", - "@superset-ui/query": "0.14.1", - "@superset-ui/style": "0.14.0", - "@superset-ui/time-format": "0.14.1", - "@superset-ui/translation": "0.14.0", - "@superset-ui/validator": "0.14.1" + "@superset-ui/chart": "0.14.9", + "@superset-ui/chart-composition": "0.14.9", + "@superset-ui/chart-controls": "0.14.9", + "@superset-ui/color": "0.14.9", + "@superset-ui/connection": "0.14.9", + "@superset-ui/core": "0.14.9", + "@superset-ui/dimension": "0.14.9", + "@superset-ui/number-format": "0.14.9", + "@superset-ui/query": "0.14.9", + "@superset-ui/style": "0.14.9", + "@superset-ui/time-format": "0.14.9", + "@superset-ui/translation": "0.14.9", + "@superset-ui/validator": "0.14.9" } }, "@superset-ui/time-format": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/@superset-ui/time-format/-/time-format-0.14.1.tgz", - "integrity": "sha512-HzKqyicCP2NJfkU2XojvK39BoRLkuyDspvXbcC/FLfZEENV43no7cnFLuZbTooDlPFBBlyjsZRPr3PwZ19zLFQ==", + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/time-format/-/time-format-0.14.9.tgz", + "integrity": "sha512-Pi8Hue0L215fZQATTQpAc8oPvv8Pi3gw00Zjz8YQPSDbHmJ6VwdADh1qqgw+KXOIpMklbUQx45PQoF4DqNWwRg==", "requires": { "@types/d3-time": "^1.0.9", "@types/d3-time-format": "^2.1.0", @@ -6394,17 +6393,17 @@ } }, "@superset-ui/translation": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/@superset-ui/translation/-/translation-0.14.0.tgz", - "integrity": "sha512-8S3N9c+Mmy8K7quI4sEPknNoli0AA91nZE6HgYZzbuV7d0hnF8b+1frxCcn0iMPGA45Z8oDWTjoZkYLiDEixCA==", + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/translation/-/translation-0.14.9.tgz", + "integrity": "sha512-zAw9yNNucE6ogSP6kN7AO4BFFet6t98DNfH/GJUM/cYzVEh6lRPFBIYfVW1BG/U9vWOuB5okaDgFZW2LTu0Jrw==", "requires": { "jed": "^1.1.1" } }, "@superset-ui/validator": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/@superset-ui/validator/-/validator-0.14.1.tgz", - "integrity": "sha512-k4IeD6EX+0/lklLxIn9x3b0SVU0v/imC61y3WcrW60PPyD1CQ9dsszQukGzSvHXnGykhQCqi3sLEPS0YWiquCA==" + "version": "0.14.9", + "resolved": "https://registry.npmjs.org/@superset-ui/validator/-/validator-0.14.9.tgz", + "integrity": "sha512-uwaarn7DgmVw67Votvd45rVdV5flwP6sxQT8Y6yPG9ttnEyaOThuubXzW1uYDCUiTkxCgZQ9YDkA7ww9WfSayQ==" }, "@svgr/babel-plugin-add-jsx-attribute": { "version": "5.4.0", @@ -7689,20 +7688,9 @@ "hoist-non-react-statics": "^3.3.0" }, "dependencies": { - "hoist-non-react-statics": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz", - "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==", - "dev": true, - "requires": { - "react-is": "^16.7.0" - } - }, "react-is": { - "version": "16.13.0", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.0.tgz", - "integrity": "sha512-GFMtL0vHkiBv9HluwNZTggSn/sCyEt9n02aM0dSAjGGyqyNlAyftYm4phPxdvCigG15JreC5biwxCgTAJZ7yAA==", - "dev": true + "version": "https://registry.npmjs.org/react-is/-/react-is-16.13.0.tgz", + "integrity": "sha512-GFMtL0vHkiBv9HluwNZTggSn/sCyEt9n02aM0dSAjGGyqyNlAyftYm4phPxdvCigG15JreC5biwxCgTAJZ7yAA==" } } }, @@ -7859,20 +7847,9 @@ "redux": "^4.0.0" }, "dependencies": { - "hoist-non-react-statics": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz", - "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==", - "dev": true, - "requires": { - "react-is": "^16.7.0" - } - }, "react-is": { - "version": "16.13.0", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.0.tgz", - "integrity": "sha512-GFMtL0vHkiBv9HluwNZTggSn/sCyEt9n02aM0dSAjGGyqyNlAyftYm4phPxdvCigG15JreC5biwxCgTAJZ7yAA==", - "dev": true + "version": "https://registry.npmjs.org/react-is/-/react-is-16.13.0.tgz", + "integrity": "sha512-GFMtL0vHkiBv9HluwNZTggSn/sCyEt9n02aM0dSAjGGyqyNlAyftYm4phPxdvCigG15JreC5biwxCgTAJZ7yAA==" }, "redux": { "version": "4.0.5", @@ -12916,25 +12893,12 @@ }, "dependencies": { "@babel/runtime": { - "version": "7.9.2", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz", - "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==", + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.4.tgz", + "integrity": "sha512-UpTN5yUJr9b4EX2CnGNWIvER7Ab83ibv0pcvvHc4UOdrBI5jb8bj+32cCwPX6xu0mt2daFNjYhoi+X7beH0RSw==", "requires": { "regenerator-runtime": "^0.13.4" } - }, - "hoist-non-react-statics": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz", - "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==", - "requires": { - "react-is": "^16.7.0" - } - }, - "react-is": { - "version": "16.13.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" } } }, @@ -14170,9 +14134,9 @@ } }, "fetch-retry": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/fetch-retry/-/fetch-retry-3.1.0.tgz", - "integrity": "sha512-pHCYCq7g854KkebphR3tKb4M7TJK91ZI0K2BU82cWv+vNkFQn0PZZFrQd/mL+Ra/mj2HLZNvzkTRjPEq2Dh/Bg==", + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/fetch-retry/-/fetch-retry-3.2.3.tgz", + "integrity": "sha512-baMBEv4uZ1X1cUZAvnM+C9XI7tl4CgHgJE0KBHo3JzuXO7atOeWD5HSkDA2oLYpbzLTZNslFckLkIn6T96hlew==", "requires": { "es6-promise": "^4.2.8" } @@ -15031,9 +14995,19 @@ } }, "hoist-non-react-statics": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz", - "integrity": "sha1-qkSM8JhtVcxAdzsXF0t90GbLfPs=" + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz", + "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==", + "requires": { + "react-is": "^16.7.0" + }, + "dependencies": { + "react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" + } + } }, "homedir-polyfill": { "version": "1.0.3", @@ -23959,17 +23933,8 @@ "source-map": "^0.7.3" }, "dependencies": { - "hoist-non-react-statics": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz", - "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==", - "requires": { - "react-is": "^16.7.0" - } - }, "react-is": { - "version": "16.13.0", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.0.tgz", + "version": "https://registry.npmjs.org/react-is/-/react-is-16.13.0.tgz", "integrity": "sha512-GFMtL0vHkiBv9HluwNZTggSn/sCyEt9n02aM0dSAjGGyqyNlAyftYm4phPxdvCigG15JreC5biwxCgTAJZ7yAA==" }, "source-map": { @@ -24204,16 +24169,6 @@ "prop-types": "^15.6.1", "react-is": "^16.6.0", "react-lifecycles-compat": "^3.0.0" - }, - "dependencies": { - "hoist-non-react-statics": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.2.1.tgz", - "integrity": "sha512-TFsu3TV3YLY+zFTZDrN8L2DTFanObwmBLpWvJs1qfUuEQ5bTAdFcwfx2T/bsCXfM9QHSLvjfP+nihEl0yvozxw==", - "requires": { - "react-is": "^16.3.2" - } - } } }, "react-router": { @@ -24233,21 +24188,6 @@ "tiny-warning": "^1.0.0" }, "dependencies": { - "hoist-non-react-statics": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz", - "integrity": "sha512-wbg3bpgA/ZqWrZuMOeJi8+SKMhr7X9TesL/rXMjTzh0p0JUBo3II8DHboYbuIXWRlttrUFxwcu/5kygrCw8fJw==", - "requires": { - "react-is": "^16.7.0" - }, - "dependencies": { - "react-is": { - "version": "16.12.0", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.12.0.tgz", - "integrity": "sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==" - } - } - }, "isarray": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", @@ -24525,6 +24465,13 @@ "global-cache": "^1.2.0", "hoist-non-react-statics": "^1.2.0", "prop-types": "^15.5.8" + }, + "dependencies": { + "hoist-non-react-statics": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz", + "integrity": "sha1-qkSM8JhtVcxAdzsXF0t90GbLfPs=" + } } }, "react-with-styles-interface-aphrodite": { @@ -24698,6 +24645,13 @@ "fbjs": "^0.8.1", "hoist-non-react-statics": "^1.0.0", "symbol-observable": "^1.0.4" + }, + "dependencies": { + "hoist-non-react-statics": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz", + "integrity": "sha1-qkSM8JhtVcxAdzsXF0t90GbLfPs=" + } } }, "redeyed": { @@ -26196,9 +26150,9 @@ }, "dependencies": { "escodegen": { - "version": "1.14.2", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.2.tgz", - "integrity": "sha512-InuOIiKk8wwuOFg6x9BQXbzjrQhtyXh46K9bqVTPzSo2FnyMBaYGBMC6PhQy7yxxil9vIedFBweQBMK74/7o8A==", + "version": "1.14.3", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz", + "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==", "requires": { "esprima": "^4.0.1", "estraverse": "^4.2.0", diff --git a/superset-frontend/package.json b/superset-frontend/package.json index 4684e5cb34..63d8083b8f 100644 --- a/superset-frontend/package.json +++ b/superset-frontend/package.json @@ -59,47 +59,47 @@ "@babel/runtime-corejs3": "^7.8.4", "@data-ui/sparkline": "^0.0.54", "@emotion/core": "^10.0.28", - "@superset-ui/chart": "^0.14.1", - "@superset-ui/chart-composition": "^0.14.1", - "@superset-ui/color": "^0.14.2", - "@superset-ui/connection": "^0.14.0", - "@superset-ui/chart-controls": "^0.14.2", - "@superset-ui/core": "^0.14.0", - "@superset-ui/dimension": "^0.14.0", - "@superset-ui/legacy-plugin-chart-calendar": "^0.14.1", - "@superset-ui/legacy-plugin-chart-chord": "^0.14.1", - "@superset-ui/legacy-plugin-chart-country-map": "^0.14.2", - "@superset-ui/legacy-plugin-chart-event-flow": "^0.14.1", - "@superset-ui/legacy-plugin-chart-force-directed": "^0.14.1", - "@superset-ui/legacy-plugin-chart-heatmap": "^0.14.1", - "@superset-ui/legacy-plugin-chart-histogram": "^0.14.1", - "@superset-ui/legacy-plugin-chart-horizon": "^0.14.1", - "@superset-ui/legacy-plugin-chart-iframe": "^0.14.1", - "@superset-ui/legacy-plugin-chart-map-box": "^0.14.1", - "@superset-ui/legacy-plugin-chart-markup": "^0.14.1", - "@superset-ui/legacy-plugin-chart-paired-t-test": "^0.14.1", - "@superset-ui/legacy-plugin-chart-parallel-coordinates": "^0.14.1", - "@superset-ui/legacy-plugin-chart-partition": "^0.14.1", - "@superset-ui/legacy-plugin-chart-pivot-table": "^0.14.1", - "@superset-ui/legacy-plugin-chart-rose": "^0.14.1", - "@superset-ui/legacy-plugin-chart-sankey": "^0.14.1", - "@superset-ui/legacy-plugin-chart-sankey-loop": "^0.14.1", - "@superset-ui/legacy-plugin-chart-sunburst": "^0.14.1", - "@superset-ui/plugin-chart-table": "^0.14.8", - "@superset-ui/legacy-plugin-chart-treemap": "^0.14.1", - "@superset-ui/legacy-plugin-chart-world-map": "^0.14.1", - "@superset-ui/legacy-preset-chart-big-number": "^0.14.1", + "@superset-ui/chart": "^0.14.9", + "@superset-ui/chart-composition": "^0.14.9", + "@superset-ui/chart-controls": "^0.14.9", + "@superset-ui/color": "^0.14.9", + "@superset-ui/connection": "^0.14.9", + "@superset-ui/core": "^0.14.9", + "@superset-ui/dimension": "^0.14.9", + "@superset-ui/legacy-plugin-chart-calendar": "^0.14.9", + "@superset-ui/legacy-plugin-chart-chord": "^0.14.9", + "@superset-ui/legacy-plugin-chart-country-map": "^0.14.9", + "@superset-ui/legacy-plugin-chart-event-flow": "^0.14.9", + "@superset-ui/legacy-plugin-chart-force-directed": "^0.14.9", + "@superset-ui/legacy-plugin-chart-heatmap": "^0.14.9", + "@superset-ui/legacy-plugin-chart-histogram": "^0.14.9", + "@superset-ui/legacy-plugin-chart-horizon": "^0.14.9", + "@superset-ui/legacy-plugin-chart-iframe": "^0.14.9", + "@superset-ui/legacy-plugin-chart-map-box": "^0.14.9", + "@superset-ui/legacy-plugin-chart-markup": "^0.14.9", + "@superset-ui/legacy-plugin-chart-paired-t-test": "^0.14.9", + "@superset-ui/legacy-plugin-chart-parallel-coordinates": "^0.14.9", + "@superset-ui/legacy-plugin-chart-partition": "^0.14.9", + "@superset-ui/legacy-plugin-chart-pivot-table": "^0.14.9", + "@superset-ui/legacy-plugin-chart-rose": "^0.14.9", + "@superset-ui/legacy-plugin-chart-sankey": "^0.14.9", + "@superset-ui/legacy-plugin-chart-sankey-loop": "^0.14.9", + "@superset-ui/legacy-plugin-chart-sunburst": "^0.14.9", + "@superset-ui/plugin-chart-table": "^0.14.9", + "@superset-ui/legacy-plugin-chart-treemap": "^0.14.9", + "@superset-ui/legacy-plugin-chart-world-map": "^0.14.9", + "@superset-ui/legacy-preset-chart-big-number": "^0.14.9", "@superset-ui/legacy-preset-chart-deckgl": "^0.2.4", - "@superset-ui/legacy-preset-chart-nvd3": "^0.14.4", - "@superset-ui/number-format": "^0.14.1", - "@superset-ui/plugin-chart-word-cloud": "^0.14.1", - "@superset-ui/preset-chart-xy": "^0.14.1", - "@superset-ui/query": "^0.14.1", - "@superset-ui/style": "^0.14.0", - "@superset-ui/superset-ui": "^0.14.2", - "@superset-ui/time-format": "^0.14.1", - "@superset-ui/translation": "^0.14.0", - "@superset-ui/validator": "^0.14.1", + "@superset-ui/legacy-preset-chart-nvd3": "^0.14.9", + "@superset-ui/number-format": "^0.14.9", + "@superset-ui/plugin-chart-word-cloud": "^0.14.9", + "@superset-ui/preset-chart-xy": "^0.14.9", + "@superset-ui/query": "^0.14.9", + "@superset-ui/style": "^0.14.9", + "@superset-ui/superset-ui": "^0.14.9", + "@superset-ui/time-format": "^0.14.9", + "@superset-ui/translation": "^0.14.9", + "@superset-ui/validator": "^0.14.9", "@types/classnames": "^2.2.9", "@types/enzyme": "^3.10.5", "@types/react-bootstrap": "^0.32.21", diff --git a/superset-frontend/spec/javascripts/views/chartList/ChartList_spec.jsx b/superset-frontend/spec/javascripts/views/chartList/ChartList_spec.jsx index 8584957226..a385fafede 100644 --- a/superset-frontend/spec/javascripts/views/chartList/ChartList_spec.jsx +++ b/superset-frontend/spec/javascripts/views/chartList/ChartList_spec.jsx @@ -105,7 +105,7 @@ describe('ChartList', () => { const callsD = fetchMock.calls(/chart\/\?q/); expect(callsD).toHaveLength(1); expect(callsD[0][0]).toMatchInlineSnapshot( - `"/http//localhost/api/v1/chart/?q=(order_column:changed_on,order_direction:desc,page:0,page_size:25)"`, + `"http://localhost/api/v1/chart/?q=(order_column:changed_on,order_direction:desc,page:0,page_size:25)"`, ); }); }); diff --git a/superset-frontend/spec/javascripts/views/dashboardList/DashboardList_spec.jsx b/superset-frontend/spec/javascripts/views/dashboardList/DashboardList_spec.jsx index 53a94ca1ee..ca35c5dd48 100644 --- a/superset-frontend/spec/javascripts/views/dashboardList/DashboardList_spec.jsx +++ b/superset-frontend/spec/javascripts/views/dashboardList/DashboardList_spec.jsx @@ -95,7 +95,7 @@ describe('DashboardList', () => { const callsD = fetchMock.calls(/dashboard\/\?q/); expect(callsD).toHaveLength(1); expect(callsD[0][0]).toMatchInlineSnapshot( - `"/http//localhost/api/v1/dashboard/?q=(order_column:changed_on,order_direction:desc,page:0,page_size:25)"`, + `"http://localhost/api/v1/dashboard/?q=(order_column:changed_on,order_direction:desc,page:0,page_size:25)"`, ); }); it('edits', () => { diff --git a/superset-frontend/spec/javascripts/views/datasetList/DatasetList_spec.jsx b/superset-frontend/spec/javascripts/views/datasetList/DatasetList_spec.jsx index 602974b7f8..665b2bf7f9 100644 --- a/superset-frontend/spec/javascripts/views/datasetList/DatasetList_spec.jsx +++ b/superset-frontend/spec/javascripts/views/datasetList/DatasetList_spec.jsx @@ -100,7 +100,7 @@ describe('DatasetList', () => { const callsD = fetchMock.calls(/dataset\/\?q/); expect(callsD).toHaveLength(1); expect(callsD[0][0]).toMatchInlineSnapshot( - `"/http//localhost/api/v1/dataset/?q=(order_column:changed_on,order_direction:desc,page:0,page_size:25)"`, + `"http://localhost/api/v1/dataset/?q=(order_column:changed_on,order_direction:desc,page:0,page_size:25)"`, ); }); }); diff --git a/superset-frontend/src/explore/components/PropertiesModal.tsx b/superset-frontend/src/explore/components/PropertiesModal.tsx index b24b0136ea..c2905c7053 100644 --- a/superset-frontend/src/explore/components/PropertiesModal.tsx +++ b/superset-frontend/src/explore/components/PropertiesModal.tsx @@ -32,7 +32,7 @@ import { OptionsType } from 'react-select/src/types'; import { AsyncSelect } from 'src/components/Select'; import rison from 'rison'; import { t } from '@superset-ui/translation'; -import { SupersetClient, Json } from '@superset-ui/connection'; +import { SupersetClient } from '@superset-ui/connection'; import Chart from 'src/types/Chart'; import getClientErrorObject from '../../utils/getClientErrorObject'; @@ -101,7 +101,7 @@ function PropertiesModal({ slice, onHide, onSave }: InternalProps) { const response = await SupersetClient.get({ endpoint: `/api/v1/chart/${slice.slice_id}`, }); - const chart = (response.json as Json).result; + const chart = response.json.result; setOwners( chart.owners.map((owner: any) => ({ value: owner.id, @@ -127,7 +127,7 @@ function PropertiesModal({ slice, onHide, onSave }: InternalProps) { endpoint: `/api/v1/chart/related/owners?q=${query}`, }).then( response => { - const { result } = response.json as Json; + const { result } = response.json; return result.map((item: any) => ({ value: item.value, label: item.text, @@ -160,7 +160,7 @@ function PropertiesModal({ slice, onHide, onSave }: InternalProps) { }); // update the redux state const updatedChart = { - ...(res.json as Json).result, + ...res.json.result, id: slice.slice_id, }; onSave(updatedChart);