diff --git a/superset-frontend/jest.config.js b/superset-frontend/jest.config.js index edbd83fe9e8c8..bc961ad3d16ce 100644 --- a/superset-frontend/jest.config.js +++ b/superset-frontend/jest.config.js @@ -30,7 +30,7 @@ module.exports = { '^src/(.*)$': '/src/$1', '^spec/(.*)$': '/spec/$1', // mapping to souce code instead of lib or esm module - '@superset-ui/(((?!(legacy-preset-chart-deckgl|core/src)).)*)$': + '@superset-ui/(((?!(core/src)).)*)$': '/node_modules/@superset-ui/$1/src', '@superset-ui/core/src/(.*)$': '/node_modules/@superset-ui/core/src/$1', diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json index a8b406839aa79..17dff2c557dc1 100644 --- a/superset-frontend/package-lock.json +++ b/superset-frontend/package-lock.json @@ -8108,12 +8108,12 @@ } }, "node_modules/@math.gl/web-mercator": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/@math.gl/web-mercator/-/web-mercator-3.5.3.tgz", - "integrity": "sha512-WZE9ALeTS4n3HDgkqTxcNLBU7DL0mjmPXSrcqSZIUeDY00+LCtNvMQWUAwqolpB7nD71vD6HLW8delzVuy4teA==", + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@math.gl/web-mercator/-/web-mercator-3.5.6.tgz", + "integrity": "sha512-siWHLJGp9o8fDEM1t0Rby+JXftl6il0z3927liWGzkHqFftXPHY858ShPy45ThDU8q5lyCftg8aVgrv4nfD+Zw==", "dependencies": { "@babel/runtime": "^7.12.0", - "gl-matrix": "^3.0.0" + "gl-matrix": "~3.3.0" } }, "node_modules/@mdx-js/loader": { @@ -21130,169 +21130,8 @@ "link": true }, "node_modules/@superset-ui/legacy-preset-chart-deckgl": { - "version": "0.4.13", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-deckgl/-/legacy-preset-chart-deckgl-0.4.13.tgz", - "integrity": "sha512-SRyAQ5NgcqCkhkOXsnzX7+GdapUzEgD5eFEvkC+4DHgUuxQv2M1nxWhDIQ31mq3MCfygqdaY8GwR74vsHHg5Zg==", - "dependencies": { - "@math.gl/web-mercator": "^3.2.2", - "@types/d3-array": "^2.0.0", - "bootstrap-slider": "^10.0.0", - "d3-array": "^1.2.4", - "d3-color": "^1.4.1", - "d3-scale": "^3.0.0", - "deck.gl": "8.5.2", - "jquery": "^3.4.1", - "lodash": "^4.17.15", - "mapbox-gl": "^2.4.0", - "moment": "^2.20.1", - "mousetrap": "^1.6.1", - "prop-types": "^15.6.0", - "react-bootstrap-slider": "2.1.5", - "react-map-gl": "^6.1.16", - "underscore": "^1.8.3", - "urijs": "^1.18.10", - "xss": "^1.0.6" - }, - "peerDependencies": { - "@superset-ui/chart-controls": "0.x.x", - "@superset-ui/core": "0.x.x", - "react": "^16.13.1" - } - }, - "node_modules/@superset-ui/legacy-preset-chart-deckgl/node_modules/@mapbox/geojson-rewind": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/@mapbox/geojson-rewind/-/geojson-rewind-0.5.1.tgz", - "integrity": "sha512-eL7fMmfTBKjrb+VFHXCGv9Ot0zc3C0U+CwXo1IrP+EPwDczLoXv34Tgq3y+2mPSFNVUXgU42ILWJTC7145KPTA==", - "dependencies": { - "get-stream": "^6.0.1", - "minimist": "^1.2.5" - }, - "bin": { - "geojson-rewind": "geojson-rewind" - } - }, - "node_modules/@superset-ui/legacy-preset-chart-deckgl/node_modules/@mapbox/mapbox-gl-supported": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-2.0.0.tgz", - "integrity": "sha512-zu4udqYiBrKMQKwpKJ4hhPON7tz0QR/JZ3iGpHnNWFmH3Sv/ysxlICATUtGCFpsyJf2v1WpFhlzaZ3GhhKmPMA==" - }, - "node_modules/@superset-ui/legacy-preset-chart-deckgl/node_modules/d3-scale": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.3.0.tgz", - "integrity": "sha512-1JGp44NQCt5d1g+Yy+GeOnZP7xHo0ii8zsQp6PGzd+C1/dl0KGsp9A7Mxwp+1D1o4unbTTxVdU/ZOIEBoeZPbQ==", - "dependencies": { - "d3-array": "^2.3.0", - "d3-format": "1 - 2", - "d3-interpolate": "1.2.0 - 2", - "d3-time": "^2.1.1", - "d3-time-format": "2 - 3" - } - }, - "node_modules/@superset-ui/legacy-preset-chart-deckgl/node_modules/d3-scale/node_modules/d3-array": { - "version": "2.12.1", - "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz", - "integrity": "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==", - "dependencies": { - "internmap": "^1.0.0" - } - }, - "node_modules/@superset-ui/legacy-preset-chart-deckgl/node_modules/d3-time": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-2.1.1.tgz", - "integrity": "sha512-/eIQe/eR4kCQwq7yxi7z4c6qEXf2IYGcjoWB5OOQy4Tq9Uv39/947qlDcN2TLkiTzQWzvnsuYPB9TrWaNfipKQ==", - "dependencies": { - "d3-array": "2" - } - }, - "node_modules/@superset-ui/legacy-preset-chart-deckgl/node_modules/d3-time/node_modules/d3-array": { - "version": "2.12.1", - "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz", - "integrity": "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==", - "dependencies": { - "internmap": "^1.0.0" - } - }, - "node_modules/@superset-ui/legacy-preset-chart-deckgl/node_modules/get-stream": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@superset-ui/legacy-preset-chart-deckgl/node_modules/mapbox-gl": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-2.4.0.tgz", - "integrity": "sha512-oH5fkh209U2Zqvgs1bBS+SQVhrj8rUT9OTgZmg+20GaNthDJFYDCXvGidVAkgacuCHSIALTZKzMV1DFgO+isFQ==", - "dependencies": { - "@mapbox/geojson-rewind": "^0.5.0", - "@mapbox/geojson-types": "^1.0.2", - "@mapbox/jsonlint-lines-primitives": "^2.0.2", - "@mapbox/mapbox-gl-supported": "^2.0.0", - "@mapbox/point-geometry": "^0.1.0", - "@mapbox/tiny-sdf": "^1.2.5", - "@mapbox/unitbezier": "^0.0.0", - "@mapbox/vector-tile": "^1.3.1", - "@mapbox/whoots-js": "^3.1.0", - "csscolorparser": "~1.0.3", - "earcut": "^2.2.2", - "geojson-vt": "^3.2.1", - "gl-matrix": "^3.3.0", - "grid-index": "^1.1.0", - "minimist": "^1.2.5", - "murmurhash-js": "^1.0.0", - "pbf": "^3.2.1", - "potpack": "^1.0.1", - "quickselect": "^2.0.0", - "rw": "^1.3.3", - "supercluster": "^7.1.3", - "tinyqueue": "^2.0.3", - "vt-pbf": "^3.1.1" - }, - "engines": { - "node": ">=14.15.4" - } - }, - "node_modules/@superset-ui/legacy-preset-chart-deckgl/node_modules/react-map-gl": { - "version": "6.1.16", - "resolved": "https://registry.npmjs.org/react-map-gl/-/react-map-gl-6.1.16.tgz", - "integrity": "sha512-d/4kFMMh2hDeZNeQOUm2wC1/as9q93EZiDmM5mGBx0LIch+9pTFgO6ZINIuUD9Zz4JqWGpthyjoKr3QKgrGiRA==", - "dependencies": { - "@babel/runtime": "^7.0.0", - "@types/geojson": "^7946.0.7", - "@types/mapbox-gl": "^2.0.3", - "mapbox-gl": "^2.3.0", - "mjolnir.js": "^2.5.0", - "prop-types": "^15.7.2", - "resize-observer-polyfill": "^1.5.1", - "viewport-mercator-project": "^7.0.3" - }, - "engines": { - "node": ">= 4", - "npm": ">= 3" - }, - "peerDependencies": { - "react": ">=16.3.0" - } - }, - "node_modules/@superset-ui/legacy-preset-chart-deckgl/node_modules/supercluster": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/supercluster/-/supercluster-7.1.3.tgz", - "integrity": "sha512-7+bR4FbF5SYsmkHfDp61QiwCKtwNDyPsddk9TzfsDA5DQr5Goii5CVD2SXjglweFCxjrzVZf945ahqYfUIk8UA==", - "dependencies": { - "kdbush": "^3.0.0" - } - }, - "node_modules/@superset-ui/legacy-preset-chart-deckgl/node_modules/viewport-mercator-project": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/viewport-mercator-project/-/viewport-mercator-project-7.0.3.tgz", - "integrity": "sha512-5nSgVK8jKTSKzOvsa8TSSd2IeQCpHfSNiBOOOMQLvzlxgWD0YoF4xRmyZio3GaLtKSE+50UB892X3R1SAMbaww==", - "dependencies": { - "@math.gl/web-mercator": "^3.4.3" - } + "resolved": "plugins/legacy-preset-chart-deckgl", + "link": true }, "node_modules/@superset-ui/legacy-preset-chart-nvd3": { "resolved": "plugins/legacy-preset-chart-nvd3", @@ -22241,9 +22080,9 @@ } }, "node_modules/@types/mapbox-gl": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/@types/mapbox-gl/-/mapbox-gl-2.4.0.tgz", - "integrity": "sha512-Na5vXw6Ez0L5To/+pL78dWPNoG6QlPdEDdnkSmIL5HWxemD+s0pTmTWDbMj7tcqJ2hnVyOyukVIveR9HPi7eeA==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@types/mapbox-gl/-/mapbox-gl-2.6.0.tgz", + "integrity": "sha512-lHdITzC0IVn9+Pq6WFkkK0N6rUKIqxsdrNeixiQdvROFn2Aeu3TDvhpuag1IdengL5WGGRuEhK6m6HB916ReLw==", "dependencies": { "@types/geojson": "*" } @@ -32134,9 +31973,9 @@ } }, "node_modules/earcut": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/earcut/-/earcut-2.2.2.tgz", - "integrity": "sha512-eZoZPPJcUHnfRZ0PjLvx2qBordSiO8ofC3vt+qACLM95u+4DovnbYNpQtJh0DNsWj8RnxrQytD4WA8gj5cRIaQ==" + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/earcut/-/earcut-2.2.3.tgz", + "integrity": "sha512-iRDI1QeCQIhMCZk48DRDMVgQSSBDmbzzNhnxIo+pwx3swkfjMh6vh0nWLq1NdvGHLKH6wIrAM3vQWeTj6qeoug==" }, "node_modules/ecc-jsbn": { "version": "0.1.2", @@ -56452,13 +56291,13 @@ "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==" }, "node_modules/vt-pbf": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/vt-pbf/-/vt-pbf-3.1.1.tgz", - "integrity": "sha512-pHjWdrIoxurpmTcbfBWXaPwSmtPAHS105253P1qyEfSTV2HJddqjM+kIHquaT/L6lVJIk9ltTGc0IxR/G47hYA==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/vt-pbf/-/vt-pbf-3.1.3.tgz", + "integrity": "sha512-2LzDFzt0mZKZ9IpVF2r69G9bXaP2Q2sArJCmcCgvfTdCCZzSyz4aCLoQyUilu37Ll56tCblIZrXFIjNUpGIlmA==", "dependencies": { "@mapbox/point-geometry": "0.1.0", "@mapbox/vector-tile": "^1.3.1", - "pbf": "^3.0.5" + "pbf": "^3.2.1" } }, "node_modules/w3c-hr-time": { @@ -60885,6 +60724,7 @@ "@superset-ui/legacy-plugin-chart-treemap": "0.18.25", "@superset-ui/legacy-plugin-chart-world-map": "0.18.25", "@superset-ui/legacy-preset-chart-big-number": "0.18.25", + "@superset-ui/legacy-preset-chart-deckgl": "^0.4.13", "@superset-ui/legacy-preset-chart-nvd3": "0.18.25", "@superset-ui/plugin-chart-echarts": "0.18.25", "@superset-ui/plugin-chart-table": "0.18.25", @@ -61673,6 +61513,173 @@ "react": "^15 || ^16" } }, + "plugins/legacy-preset-chart-deckgl": { + "version": "0.4.13", + "license": "Apache-2.0", + "dependencies": { + "@math.gl/web-mercator": "^3.2.2", + "@types/d3-array": "^2.0.0", + "bootstrap-slider": "^10.0.0", + "d3-array": "^1.2.4", + "d3-color": "^1.4.1", + "d3-scale": "^3.0.0", + "deck.gl": "8.5.2", + "jquery": "^3.4.1", + "lodash": "^4.17.15", + "mapbox-gl": "^2.4.0", + "moment": "^2.20.1", + "mousetrap": "^1.6.1", + "prop-types": "^15.6.0", + "react-bootstrap-slider": "2.1.5", + "react-map-gl": "^6.1.16", + "underscore": "^1.8.3", + "urijs": "^1.18.10", + "xss": "^1.0.6" + }, + "peerDependencies": { + "@superset-ui/chart-controls": "0.x.x", + "@superset-ui/core": "0.x.x", + "react": "^16.13.1", + "react-dom": "^16.13.1" + } + }, + "plugins/legacy-preset-chart-deckgl/node_modules/@mapbox/geojson-rewind": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/@mapbox/geojson-rewind/-/geojson-rewind-0.5.1.tgz", + "integrity": "sha512-eL7fMmfTBKjrb+VFHXCGv9Ot0zc3C0U+CwXo1IrP+EPwDczLoXv34Tgq3y+2mPSFNVUXgU42ILWJTC7145KPTA==", + "dependencies": { + "get-stream": "^6.0.1", + "minimist": "^1.2.5" + }, + "bin": { + "geojson-rewind": "geojson-rewind" + } + }, + "plugins/legacy-preset-chart-deckgl/node_modules/@mapbox/mapbox-gl-supported": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-2.0.1.tgz", + "integrity": "sha512-HP6XvfNIzfoMVfyGjBckjiAOQK9WfX0ywdLubuPMPv+Vqf5fj0uCbgBQYpiqcWZT6cbyyRnTSXDheT1ugvF6UQ==" + }, + "plugins/legacy-preset-chart-deckgl/node_modules/@mapbox/tiny-sdf": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@mapbox/tiny-sdf/-/tiny-sdf-2.0.4.tgz", + "integrity": "sha512-CBtL2rhZiYmdIryksp0zh4Mmx54iClYfNb0mpYeHrZnq4z84lVjre7LBWGPEjWspEn6AiF0lxC1HaZDye89m3g==" + }, + "plugins/legacy-preset-chart-deckgl/node_modules/d3-scale": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-3.3.0.tgz", + "integrity": "sha512-1JGp44NQCt5d1g+Yy+GeOnZP7xHo0ii8zsQp6PGzd+C1/dl0KGsp9A7Mxwp+1D1o4unbTTxVdU/ZOIEBoeZPbQ==", + "dependencies": { + "d3-array": "^2.3.0", + "d3-format": "1 - 2", + "d3-interpolate": "1.2.0 - 2", + "d3-time": "^2.1.1", + "d3-time-format": "2 - 3" + } + }, + "plugins/legacy-preset-chart-deckgl/node_modules/d3-scale/node_modules/d3-array": { + "version": "2.12.1", + "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz", + "integrity": "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==", + "dependencies": { + "internmap": "^1.0.0" + } + }, + "plugins/legacy-preset-chart-deckgl/node_modules/d3-time": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-2.1.1.tgz", + "integrity": "sha512-/eIQe/eR4kCQwq7yxi7z4c6qEXf2IYGcjoWB5OOQy4Tq9Uv39/947qlDcN2TLkiTzQWzvnsuYPB9TrWaNfipKQ==", + "dependencies": { + "d3-array": "2" + } + }, + "plugins/legacy-preset-chart-deckgl/node_modules/d3-time/node_modules/d3-array": { + "version": "2.12.1", + "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz", + "integrity": "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==", + "dependencies": { + "internmap": "^1.0.0" + } + }, + "plugins/legacy-preset-chart-deckgl/node_modules/get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "plugins/legacy-preset-chart-deckgl/node_modules/mapbox-gl": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-2.6.1.tgz", + "integrity": "sha512-faGbSZfcFuZ4GWwkWnJrRD3oICZAt/mVKnGuOmeBobCj9onfTRz270qSoOXeRBKd3po5VA2cCPI91YwA8DsAoQ==", + "dependencies": { + "@mapbox/geojson-rewind": "^0.5.1", + "@mapbox/geojson-types": "^1.0.2", + "@mapbox/jsonlint-lines-primitives": "^2.0.2", + "@mapbox/mapbox-gl-supported": "^2.0.0", + "@mapbox/point-geometry": "^0.1.0", + "@mapbox/tiny-sdf": "^2.0.2", + "@mapbox/unitbezier": "^0.0.0", + "@mapbox/vector-tile": "^1.3.1", + "@mapbox/whoots-js": "^3.1.0", + "csscolorparser": "~1.0.3", + "earcut": "^2.2.3", + "geojson-vt": "^3.2.1", + "gl-matrix": "^3.3.0", + "grid-index": "^1.1.0", + "minimist": "^1.2.5", + "murmurhash-js": "^1.0.0", + "pbf": "^3.2.1", + "potpack": "^1.0.1", + "quickselect": "^2.0.0", + "rw": "^1.3.3", + "supercluster": "^7.1.4", + "tinyqueue": "^2.0.3", + "vt-pbf": "^3.1.3" + } + }, + "plugins/legacy-preset-chart-deckgl/node_modules/react-map-gl": { + "version": "6.1.17", + "resolved": "https://registry.npmjs.org/react-map-gl/-/react-map-gl-6.1.17.tgz", + "integrity": "sha512-SKuMtvs7aQpHMJehf/GzUQnEhPWRIypTX7X2wVXGME2RBKdY0PnC1YTiy8W3aA4uwcolPvCCYB+ki3xal51ZXQ==", + "dependencies": { + "@babel/runtime": "^7.0.0", + "@types/geojson": "^7946.0.7", + "@types/mapbox-gl": "^2.0.3", + "mapbox-gl": "^2.3.0", + "mjolnir.js": "^2.5.0", + "prop-types": "^15.7.2", + "resize-observer-polyfill": "^1.5.1", + "viewport-mercator-project": "^7.0.4" + }, + "engines": { + "node": ">= 4", + "npm": ">= 3" + }, + "peerDependencies": { + "react": ">=16.3.0" + } + }, + "plugins/legacy-preset-chart-deckgl/node_modules/supercluster": { + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/supercluster/-/supercluster-7.1.4.tgz", + "integrity": "sha512-GhKkRM1jMR6WUwGPw05fs66pOFWhf59lXq+Q3J3SxPvhNcmgOtLRV6aVQPMRsmXdpaeFJGivt+t7QXUPL3ff4g==", + "dependencies": { + "kdbush": "^3.0.0" + } + }, + "plugins/legacy-preset-chart-deckgl/node_modules/viewport-mercator-project": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/viewport-mercator-project/-/viewport-mercator-project-7.0.4.tgz", + "integrity": "sha512-0jzpL6pIMocCKWg1C3mqi/N4UPgZC3FzwghEm1H+XsUo8hNZAyJc3QR7YqC816ibOR8aWT5pCsV+gCu8/BMJgg==", + "dependencies": { + "@math.gl/web-mercator": "^3.5.5" + } + }, "plugins/legacy-preset-chart-nvd3": { "name": "@superset-ui/legacy-preset-chart-nvd3", "version": "0.18.25", @@ -68127,12 +68134,12 @@ } }, "@math.gl/web-mercator": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/@math.gl/web-mercator/-/web-mercator-3.5.3.tgz", - "integrity": "sha512-WZE9ALeTS4n3HDgkqTxcNLBU7DL0mjmPXSrcqSZIUeDY00+LCtNvMQWUAwqolpB7nD71vD6HLW8delzVuy4teA==", + "version": "3.5.6", + "resolved": "https://registry.npmjs.org/@math.gl/web-mercator/-/web-mercator-3.5.6.tgz", + "integrity": "sha512-siWHLJGp9o8fDEM1t0Rby+JXftl6il0z3927liWGzkHqFftXPHY858ShPy45ThDU8q5lyCftg8aVgrv4nfD+Zw==", "requires": { "@babel/runtime": "^7.12.0", - "gl-matrix": "^3.0.0" + "gl-matrix": "~3.3.0" } }, "@mdx-js/loader": { @@ -77845,6 +77852,7 @@ "@superset-ui/legacy-plugin-chart-treemap": "0.18.25", "@superset-ui/legacy-plugin-chart-world-map": "0.18.25", "@superset-ui/legacy-preset-chart-big-number": "0.18.25", + "@superset-ui/legacy-preset-chart-deckgl": "^0.4.13", "@superset-ui/legacy-preset-chart-nvd3": "0.18.25", "@superset-ui/plugin-chart-echarts": "0.18.25", "@superset-ui/plugin-chart-table": "0.18.25", @@ -78483,9 +78491,7 @@ } }, "@superset-ui/legacy-preset-chart-deckgl": { - "version": "0.4.13", - "resolved": "https://registry.npmjs.org/@superset-ui/legacy-preset-chart-deckgl/-/legacy-preset-chart-deckgl-0.4.13.tgz", - "integrity": "sha512-SRyAQ5NgcqCkhkOXsnzX7+GdapUzEgD5eFEvkC+4DHgUuxQv2M1nxWhDIQ31mq3MCfygqdaY8GwR74vsHHg5Zg==", + "version": "file:plugins/legacy-preset-chart-deckgl", "requires": { "@math.gl/web-mercator": "^3.2.2", "@types/d3-array": "^2.0.0", @@ -78517,9 +78523,14 @@ } }, "@mapbox/mapbox-gl-supported": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-2.0.0.tgz", - "integrity": "sha512-zu4udqYiBrKMQKwpKJ4hhPON7tz0QR/JZ3iGpHnNWFmH3Sv/ysxlICATUtGCFpsyJf2v1WpFhlzaZ3GhhKmPMA==" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-2.0.1.tgz", + "integrity": "sha512-HP6XvfNIzfoMVfyGjBckjiAOQK9WfX0ywdLubuPMPv+Vqf5fj0uCbgBQYpiqcWZT6cbyyRnTSXDheT1ugvF6UQ==" + }, + "@mapbox/tiny-sdf": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@mapbox/tiny-sdf/-/tiny-sdf-2.0.4.tgz", + "integrity": "sha512-CBtL2rhZiYmdIryksp0zh4Mmx54iClYfNb0mpYeHrZnq4z84lVjre7LBWGPEjWspEn6AiF0lxC1HaZDye89m3g==" }, "d3-scale": { "version": "3.3.0", @@ -78567,21 +78578,21 @@ "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==" }, "mapbox-gl": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-2.4.0.tgz", - "integrity": "sha512-oH5fkh209U2Zqvgs1bBS+SQVhrj8rUT9OTgZmg+20GaNthDJFYDCXvGidVAkgacuCHSIALTZKzMV1DFgO+isFQ==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-2.6.1.tgz", + "integrity": "sha512-faGbSZfcFuZ4GWwkWnJrRD3oICZAt/mVKnGuOmeBobCj9onfTRz270qSoOXeRBKd3po5VA2cCPI91YwA8DsAoQ==", "requires": { - "@mapbox/geojson-rewind": "^0.5.0", + "@mapbox/geojson-rewind": "^0.5.1", "@mapbox/geojson-types": "^1.0.2", "@mapbox/jsonlint-lines-primitives": "^2.0.2", "@mapbox/mapbox-gl-supported": "^2.0.0", "@mapbox/point-geometry": "^0.1.0", - "@mapbox/tiny-sdf": "^1.2.5", + "@mapbox/tiny-sdf": "^2.0.2", "@mapbox/unitbezier": "^0.0.0", "@mapbox/vector-tile": "^1.3.1", "@mapbox/whoots-js": "^3.1.0", "csscolorparser": "~1.0.3", - "earcut": "^2.2.2", + "earcut": "^2.2.3", "geojson-vt": "^3.2.1", "gl-matrix": "^3.3.0", "grid-index": "^1.1.0", @@ -78591,15 +78602,15 @@ "potpack": "^1.0.1", "quickselect": "^2.0.0", "rw": "^1.3.3", - "supercluster": "^7.1.3", + "supercluster": "^7.1.4", "tinyqueue": "^2.0.3", - "vt-pbf": "^3.1.1" + "vt-pbf": "^3.1.3" } }, "react-map-gl": { - "version": "6.1.16", - "resolved": "https://registry.npmjs.org/react-map-gl/-/react-map-gl-6.1.16.tgz", - "integrity": "sha512-d/4kFMMh2hDeZNeQOUm2wC1/as9q93EZiDmM5mGBx0LIch+9pTFgO6ZINIuUD9Zz4JqWGpthyjoKr3QKgrGiRA==", + "version": "6.1.17", + "resolved": "https://registry.npmjs.org/react-map-gl/-/react-map-gl-6.1.17.tgz", + "integrity": "sha512-SKuMtvs7aQpHMJehf/GzUQnEhPWRIypTX7X2wVXGME2RBKdY0PnC1YTiy8W3aA4uwcolPvCCYB+ki3xal51ZXQ==", "requires": { "@babel/runtime": "^7.0.0", "@types/geojson": "^7946.0.7", @@ -78608,23 +78619,23 @@ "mjolnir.js": "^2.5.0", "prop-types": "^15.7.2", "resize-observer-polyfill": "^1.5.1", - "viewport-mercator-project": "^7.0.3" + "viewport-mercator-project": "^7.0.4" } }, "supercluster": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/supercluster/-/supercluster-7.1.3.tgz", - "integrity": "sha512-7+bR4FbF5SYsmkHfDp61QiwCKtwNDyPsddk9TzfsDA5DQr5Goii5CVD2SXjglweFCxjrzVZf945ahqYfUIk8UA==", + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/supercluster/-/supercluster-7.1.4.tgz", + "integrity": "sha512-GhKkRM1jMR6WUwGPw05fs66pOFWhf59lXq+Q3J3SxPvhNcmgOtLRV6aVQPMRsmXdpaeFJGivt+t7QXUPL3ff4g==", "requires": { "kdbush": "^3.0.0" } }, "viewport-mercator-project": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/viewport-mercator-project/-/viewport-mercator-project-7.0.3.tgz", - "integrity": "sha512-5nSgVK8jKTSKzOvsa8TSSd2IeQCpHfSNiBOOOMQLvzlxgWD0YoF4xRmyZio3GaLtKSE+50UB892X3R1SAMbaww==", + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/viewport-mercator-project/-/viewport-mercator-project-7.0.4.tgz", + "integrity": "sha512-0jzpL6pIMocCKWg1C3mqi/N4UPgZC3FzwghEm1H+XsUo8hNZAyJc3QR7YqC816ibOR8aWT5pCsV+gCu8/BMJgg==", "requires": { - "@math.gl/web-mercator": "^3.4.3" + "@math.gl/web-mercator": "^3.5.5" } } } @@ -79572,9 +79583,9 @@ } }, "@types/mapbox-gl": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/@types/mapbox-gl/-/mapbox-gl-2.4.0.tgz", - "integrity": "sha512-Na5vXw6Ez0L5To/+pL78dWPNoG6QlPdEDdnkSmIL5HWxemD+s0pTmTWDbMj7tcqJ2hnVyOyukVIveR9HPi7eeA==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@types/mapbox-gl/-/mapbox-gl-2.6.0.tgz", + "integrity": "sha512-lHdITzC0IVn9+Pq6WFkkK0N6rUKIqxsdrNeixiQdvROFn2Aeu3TDvhpuag1IdengL5WGGRuEhK6m6HB916ReLw==", "requires": { "@types/geojson": "*" } @@ -87371,9 +87382,9 @@ } }, "earcut": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/earcut/-/earcut-2.2.2.tgz", - "integrity": "sha512-eZoZPPJcUHnfRZ0PjLvx2qBordSiO8ofC3vt+qACLM95u+4DovnbYNpQtJh0DNsWj8RnxrQytD4WA8gj5cRIaQ==" + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/earcut/-/earcut-2.2.3.tgz", + "integrity": "sha512-iRDI1QeCQIhMCZk48DRDMVgQSSBDmbzzNhnxIo+pwx3swkfjMh6vh0nWLq1NdvGHLKH6wIrAM3vQWeTj6qeoug==" }, "ecc-jsbn": { "version": "0.1.2", @@ -106360,13 +106371,13 @@ "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==" }, "vt-pbf": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/vt-pbf/-/vt-pbf-3.1.1.tgz", - "integrity": "sha512-pHjWdrIoxurpmTcbfBWXaPwSmtPAHS105253P1qyEfSTV2HJddqjM+kIHquaT/L6lVJIk9ltTGc0IxR/G47hYA==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/vt-pbf/-/vt-pbf-3.1.3.tgz", + "integrity": "sha512-2LzDFzt0mZKZ9IpVF2r69G9bXaP2Q2sArJCmcCgvfTdCCZzSyz4aCLoQyUilu37Ll56tCblIZrXFIjNUpGIlmA==", "requires": { "@mapbox/point-geometry": "0.1.0", "@mapbox/vector-tile": "^1.3.1", - "pbf": "^3.0.5" + "pbf": "^3.2.1" } }, "w3c-hr-time": { diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/types.ts b/superset-frontend/packages/superset-ui-chart-controls/src/types.ts index 6188d39663ef9..581787b4651ca 100644 --- a/superset-frontend/packages/superset-ui-chart-controls/src/types.ts +++ b/superset-frontend/packages/superset-ui-chart-controls/src/types.ts @@ -229,7 +229,7 @@ export type SelectControlType = | 'FilterBoxItemControl'; // via react-select/src/filters -interface FilterOption { +export interface FilterOption { label: string; value: string; data: T; diff --git a/superset-frontend/packages/superset-ui-demo/package.json b/superset-frontend/packages/superset-ui-demo/package.json index e5b7b21e1e8f2..d218442670454 100644 --- a/superset-frontend/packages/superset-ui-demo/package.json +++ b/superset-frontend/packages/superset-ui-demo/package.json @@ -62,6 +62,7 @@ "@superset-ui/legacy-plugin-chart-treemap": "0.18.25", "@superset-ui/legacy-plugin-chart-world-map": "0.18.25", "@superset-ui/legacy-preset-chart-big-number": "0.18.25", + "@superset-ui/legacy-preset-chart-deckgl": "^0.4.13", "@superset-ui/legacy-preset-chart-nvd3": "0.18.25", "@superset-ui/plugin-chart-echarts": "0.18.25", "@superset-ui/plugin-chart-table": "0.18.25", diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Arc/Stories.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Arc/Stories.tsx new file mode 100644 index 0000000000000..aa97dc600b4df --- /dev/null +++ b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Arc/Stories.tsx @@ -0,0 +1,101 @@ +/* + * 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. + */ + +/* eslint-disable sort-keys */ +/* eslint-disable no-magic-numbers */ +import React from 'react'; +import { SuperChart } from '@superset-ui/core'; +import { ArcChartPlugin } from '@superset-ui/legacy-preset-chart-deckgl'; +import payload from './payload'; +import dummyDatasource from '../../../../shared/dummyDatasource'; + +new ArcChartPlugin().configure({ key: 'deck_arc' }).register(); + +export default { + title: 'Legacy Chart Plugins/legacy-preset-chart-deckgl/ArcChartPlugin', +}; + +export const ArcChartViz = () => ( + +); diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Arc/payload.js b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Arc/payload.js similarity index 89% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Arc/payload.js rename to superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Arc/payload.js index 835234a4b200b..b3a3f6c66aadd 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Arc/payload.js +++ b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Arc/payload.js @@ -1,3 +1,22 @@ +/* + * 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. + */ + /* eslint-disable sort-keys, no-magic-numbers */ export default { diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Grid/Stories.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Grid/Stories.tsx new file mode 100644 index 0000000000000..d0f0d2b26056e --- /dev/null +++ b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Grid/Stories.tsx @@ -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. + */ + +/* eslint-disable sort-keys */ +/* eslint-disable no-magic-numbers */ +import React from 'react'; +import { SuperChart } from '@superset-ui/core'; +import { GridChartPlugin } from '@superset-ui/legacy-preset-chart-deckgl'; +import payload from './payload'; +import dummyDatasource from '../../../../shared/dummyDatasource'; + +new GridChartPlugin().configure({ key: 'deck_grid' }).register(); + +export default { + title: 'Legacy Chart Plugins/legacy-preset-chart-deckgl/GridChartPlugin', +}; + +export const GridChartViz = () => ( + +); diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Hex/payload.js b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Grid/payload.js similarity index 83% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Hex/payload.js rename to superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Grid/payload.js index 4872c79adc7ea..7ce02ecf0c00a 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Hex/payload.js +++ b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Grid/payload.js @@ -1,3 +1,22 @@ +/* + * 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. + */ + /* eslint-disable sort-keys */ /* eslint-disable no-magic-numbers */ export default { diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Hex/Stories.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Hex/Stories.tsx new file mode 100644 index 0000000000000..8bc1219977f8b --- /dev/null +++ b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Hex/Stories.tsx @@ -0,0 +1,73 @@ +/* + * 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. + */ + +/* eslint-disable sort-keys */ +/* eslint-disable no-magic-numbers */ +import React from 'react'; +import { SuperChart } from '@superset-ui/core'; +import { HexChartPlugin } from '@superset-ui/legacy-preset-chart-deckgl'; +import payload from './payload'; +import dummyDatasource from '../../../../shared/dummyDatasource'; + +new HexChartPlugin().configure({ key: 'deck_hex' }).register(); + +export default { + title: 'Legacy Chart Plugins/legacy-preset-chart-deckgl/HexChartPlugin', +}; + +export const HexChartViz = () => ( + +); diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Grid/payload.js b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Hex/payload.js similarity index 83% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Grid/payload.js rename to superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Hex/payload.js index 4872c79adc7ea..7ce02ecf0c00a 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Grid/payload.js +++ b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Hex/payload.js @@ -1,3 +1,22 @@ +/* + * 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. + */ + /* eslint-disable sort-keys */ /* eslint-disable no-magic-numbers */ export default { diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Path/Stories.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Path/Stories.tsx new file mode 100644 index 0000000000000..d5b90dad9731c --- /dev/null +++ b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Path/Stories.tsx @@ -0,0 +1,81 @@ +/* + * 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. + */ + +/* eslint-disable sort-keys */ +/* eslint-disable no-magic-numbers */ +import React from 'react'; +import { SuperChart } from '@superset-ui/core'; +import { PathChartPlugin } from '@superset-ui/legacy-preset-chart-deckgl'; +import payload from './payload'; +import dummyDatasource from '../../../../shared/dummyDatasource'; + +new PathChartPlugin().configure({ key: 'deck_path' }).register(); + +export default { + title: 'Legacy Chart Plugins/legacy-preset-chart-deckgl/PathChartPlugin', +}; + +export const PathChartViz = () => ( + +); diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Path/payload.js b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Path/payload.js similarity index 88% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Path/payload.js rename to superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Path/payload.js index 4e4bbf12151cf..a30aad826984f 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Path/payload.js +++ b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Path/payload.js @@ -1,3 +1,22 @@ +/* + * 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. + */ + /* eslint-disable sort-keys */ /* eslint-disable no-magic-numbers */ export default { diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Polygon/Stories.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Polygon/Stories.tsx new file mode 100644 index 0000000000000..c2dd9a7cadc88 --- /dev/null +++ b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Polygon/Stories.tsx @@ -0,0 +1,141 @@ +/* + * 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. + */ + +/* eslint-disable sort-keys */ +/* eslint-disable no-magic-numbers */ +import React from 'react'; +import { SuperChart } from '@superset-ui/core'; +import { PolygonChartPlugin } from '@superset-ui/legacy-preset-chart-deckgl'; +import payload from './payload'; +import geojsonPayload from './geojsonPayload'; +import dummyDatasource from '../../../../shared/dummyDatasource'; + +new PolygonChartPlugin().configure({ key: 'deck_polygon' }).register(); + +export default { + title: 'Legacy Chart Plugins/legacy-preset-chart-deckgl/PolygonChartPlugin', +}; + +export const GeojsonPayload = () => ( + +); + +export const Payload = () => ( + +); diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Polygon/geojsonPayload.js b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Polygon/geojsonPayload.js similarity index 76% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Polygon/geojsonPayload.js rename to superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Polygon/geojsonPayload.js index d9006e8976ab8..e3d446a768901 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Polygon/geojsonPayload.js +++ b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Polygon/geojsonPayload.js @@ -1,3 +1,22 @@ +/* + * 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. + */ + export default { cache_key: '31946c4488d1899827d283b668d83281', cached_dttm: '2020-03-04T22:40:59', diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Polygon/payload.js b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Polygon/payload.js similarity index 93% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Polygon/payload.js rename to superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Polygon/payload.js index c5b951c80c5a1..24926529f95b5 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Polygon/payload.js +++ b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Polygon/payload.js @@ -1,3 +1,22 @@ +/* + * 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. + */ + /* eslint-disable sort-keys */ /* eslint-disable no-magic-numbers */ export default { diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Scatter/Stories.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Scatter/Stories.tsx new file mode 100644 index 0000000000000..a655a6bda2f9b --- /dev/null +++ b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Scatter/Stories.tsx @@ -0,0 +1,80 @@ +/* + * 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. + */ + +/* eslint-disable sort-keys */ +/* eslint-disable no-magic-numbers */ +import React from 'react'; +import { SuperChart } from '@superset-ui/core'; +import { ScatterChartPlugin } from '@superset-ui/legacy-preset-chart-deckgl'; +import payload from './payload'; +import dummyDatasource from '../../../../shared/dummyDatasource'; + +new ScatterChartPlugin().configure({ key: 'deck_scatter' }).register(); + +export default { + title: 'Legacy Chart Plugins/legacy-preset-chart-deckgl/ScatterChartPlugin', +}; + +export const ScatterChartViz = () => ( + +); diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Scatter/payload.js b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Scatter/payload.js similarity index 87% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Scatter/payload.js rename to superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Scatter/payload.js index 9ba08ebfd35ef..e5c5be625e803 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Scatter/payload.js +++ b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Scatter/payload.js @@ -1,3 +1,22 @@ +/* + * 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. + */ + /* eslint-disable sort-keys */ /* eslint-disable no-magic-numbers */ export default { diff --git a/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Screengrid/Stories.tsx b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Screengrid/Stories.tsx new file mode 100644 index 0000000000000..9ba915817ad60 --- /dev/null +++ b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Screengrid/Stories.tsx @@ -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. + */ + +/* eslint-disable sort-keys */ +/* eslint-disable no-magic-numbers */ +import React from 'react'; +import { SuperChart } from '@superset-ui/core'; +import { ScreengridChartPlugin } from '@superset-ui/legacy-preset-chart-deckgl'; +import payload from './payload'; +import dummyDatasource from '../../../../shared/dummyDatasource'; + +new ScreengridChartPlugin().configure({ key: 'deck_screengrid' }).register(); + +export default { + title: + 'Legacy Chart Plugins/legacy-preset-chart-deckgl/ScreengridChartPlugin', +}; + +export const ScreengridChartViz = () => ( + +); diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Screengrid/payload.js b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Screengrid/payload.js similarity index 88% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Screengrid/payload.js rename to superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Screengrid/payload.js index 7979042537184..6b01b369a2eca 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Screengrid/payload.js +++ b/superset-frontend/packages/superset-ui-demo/storybook/stories/plugins/legacy-preset-chart-deckgl/Screengrid/payload.js @@ -1,3 +1,22 @@ +/* + * 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. + */ + /* eslint-disable sort-keys */ /* eslint-disable no-magic-numbers */ export default { diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/README.md b/superset-frontend/plugins/legacy-preset-chart-deckgl/README.md similarity index 61% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/README.md rename to superset-frontend/plugins/legacy-preset-chart-deckgl/README.md index 8831ab6cc987f..7874da1771b13 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/README.md +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/README.md @@ -1,3 +1,22 @@ + + ## @superset-ui/legacy-preset-chart-deckgl [![Version](https://img.shields.io/npm/v/@superset-ui/legacy-preset-chart-deckgl.svg?style=flat-square)](https://img.shields.io/npm/v/@superset-ui/legacy-preset-chart-deckgl.svg?style=flat-square) @@ -20,9 +39,7 @@ or register charts one by one. Configure `key`, which can be any `string`, and r ```js import { ArcChartPlugin } from '@superset-ui/legacy-preset-chart-deckgl'; -new ArcChartPlugin() - .configure({ key: 'deck_arc' }) - .register(); +new ArcChartPlugin().configure({ key: 'deck_arc' }).register(); ``` Then use it via `SuperChart`. See [storybook](https://apache-superset.github.io/superset-ui-plugins-deckgl) for more details. diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/package.json b/superset-frontend/plugins/legacy-preset-chart-deckgl/package.json similarity index 96% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/package.json rename to superset-frontend/plugins/legacy-preset-chart-deckgl/package.json index c784a121cba4f..02198275e9036 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/package.json +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/package.json @@ -2,29 +2,26 @@ "name": "@superset-ui/legacy-preset-chart-deckgl", "version": "0.4.13", "description": "Superset Legacy Chart - deck.gl", - "sideEffects": true, - "main": "lib/index.js", - "module": "esm/index.js", - "files": [ - "esm", - "lib" - ], - "repository": { - "type": "git", - "url": "git+https://github.com/apache-superset/superset-ui-plugins-deckgl.git" - }, "keywords": [ "superset" ], - "author": "Superset", - "license": "Apache-2.0", + "homepage": "https://github.com/apache-superset/superset-ui-plugins-deckgl#readme", "bugs": { "url": "https://github.com/apache-superset/superset-ui-plugins-deckgl/issues" }, - "homepage": "https://github.com/apache-superset/superset-ui-plugins-deckgl#readme", - "publishConfig": { - "access": "public" + "repository": { + "type": "git", + "url": "git+https://github.com/apache-superset/superset-ui-plugins-deckgl.git" }, + "license": "Apache-2.0", + "author": "Superset", + "sideEffects": true, + "main": "lib/index.js", + "module": "esm/index.js", + "files": [ + "esm", + "lib" + ], "dependencies": { "@math.gl/web-mercator": "^3.2.2", "@types/d3-array": "^2.0.0", @@ -48,6 +45,10 @@ "peerDependencies": { "@superset-ui/chart-controls": "0.x.x", "@superset-ui/core": "0.x.x", - "react": "^16.13.1" + "react": "^16.13.1", + "react-dom": "^16.13.1" + }, + "publishConfig": { + "access": "public" } } diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/AnimatableDeckGLContainer.jsx b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/AnimatableDeckGLContainer.jsx similarity index 96% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/AnimatableDeckGLContainer.jsx rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/AnimatableDeckGLContainer.jsx index 9fb19c7a4d186..fc56fc6a3d261 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/AnimatableDeckGLContainer.jsx +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/AnimatableDeckGLContainer.jsx @@ -23,7 +23,7 @@ import React from 'react'; import PropTypes from 'prop-types'; -import DeckGLContainer from './DeckGLContainer'; +import { DeckGLContainerStyledWrapper } from './DeckGLContainer'; import PlaySlider from './components/PlaySlider'; const PLAYSLIDER_HEIGHT = 20; // px @@ -86,7 +86,7 @@ export default class AnimatableDeckGLContainer extends React.PureComponent { return (
- d.__timestamp >= values[0] && d.__timestamp <= values[1]); + features = features.filter( + d => d.__timestamp >= values[0] && d.__timestamp <= values[1], + ); } else { - features = features.filter(d => d.__timestamp >= values[0] && d.__timestamp < values[1]); + features = features.filter( + d => d.__timestamp >= values[0] && d.__timestamp < values[1], + ); } // Show only categories selected in the legend const cats = this.state.categories; if (fd.dimension) { - features = features.filter(d => cats[d.cat_color] && cats[d.cat_color].enabled); + features = features.filter( + d => cats[d.cat_color] && cats[d.cat_color].enabled, + ); } const filteredPayload = { @@ -180,7 +193,15 @@ export default class CategoricalDeckGLContainer extends React.PureComponent { data: { ...payload.data, features }, }; - return [getLayer(fd, filteredPayload, onAddFilter, this.setTooltip, this.props.datasource)]; + return [ + getLayer( + fd, + filteredPayload, + onAddFilter, + this.setTooltip, + this.props.datasource, + ), + ]; } // eslint-disable-next-line class-methods-use-this diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/DeckGLContainer.jsx b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/DeckGLContainer.jsx similarity index 96% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/DeckGLContainer.jsx rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/DeckGLContainer.jsx index 67d320894b031..e9b0dcd8801ba 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/DeckGLContainer.jsx +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/DeckGLContainer.jsx @@ -42,6 +42,7 @@ const propTypes = { bottomMargin: PropTypes.number, width: PropTypes.number.isRequired, height: PropTypes.number.isRequired, + onViewportChange: PropTypes.func, }; const defaultProps = { mapStyle: 'light', @@ -50,7 +51,7 @@ const defaultProps = { bottomMargin: 0, }; -class DeckGLContainer extends React.Component { +export class DeckGLContainer extends React.Component { constructor(props) { super(props); this.tick = this.tick.bind(this); @@ -133,7 +134,7 @@ class DeckGLContainer extends React.Component { DeckGLContainer.propTypes = propTypes; DeckGLContainer.defaultProps = defaultProps; -export default styled(DeckGLContainer)` +export const DeckGLContainerStyledWrapper = styled(DeckGLContainer)` .deckgl-tooltip > div { overflow: hidden; text-overflow: ellipsis; diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/Multi/Multi.jsx b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/Multi/Multi.jsx similarity index 94% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/Multi/Multi.jsx rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/Multi/Multi.jsx index 8ea3b939649ff..5af92b3a55017 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/Multi/Multi.jsx +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/Multi/Multi.jsx @@ -24,7 +24,7 @@ import _ from 'lodash'; import PropTypes from 'prop-types'; import { SupersetClient } from '@superset-ui/core'; -import DeckGLContainer from '../DeckGLContainer'; +import { DeckGLContainerStyledWrapper } from '../DeckGLContainer'; import { getExploreLongUrl } from '../utils/explore'; import layerGenerators from '../layers'; @@ -57,7 +57,10 @@ class DeckMulti extends React.PureComponent { UNSAFE_componentWillReceiveProps(nextProps) { const { formData, payload } = nextProps; - const hasChanges = !_.isEqual(this.props.formData.deck_slices, nextProps.formData.deck_slices); + const hasChanges = !_.isEqual( + this.props.formData.deck_slices, + nextProps.formData.deck_slices, + ); if (hasChanges) { this.loadLayers(formData, payload); } @@ -123,7 +126,7 @@ class DeckMulti extends React.PureComponent { const layers = Object.values(subSlicesLayers); return ( - { diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/Multi/images/thumbnail.png b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/Multi/images/thumbnail.png similarity index 100% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/Multi/images/thumbnail.png rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/Multi/images/thumbnail.png diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/Multi/images/thumbnailLarge.png b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/Multi/images/thumbnailLarge.png similarity index 100% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/Multi/images/thumbnailLarge.png rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/Multi/images/thumbnailLarge.png diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/Multi/index.js b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/Multi/index.js similarity index 100% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/Multi/index.js rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/Multi/index.js diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/TooltipRow.jsx b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/TooltipRow.jsx similarity index 100% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/TooltipRow.jsx rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/TooltipRow.jsx diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/components/BootstrapSliderWrapper.css b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/components/BootstrapSliderWrapper.css similarity index 100% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/components/BootstrapSliderWrapper.css rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/components/BootstrapSliderWrapper.css diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/components/BootstrapSliderWrapper.jsx b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/components/BootstrapSliderWrapper.jsx similarity index 100% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/components/BootstrapSliderWrapper.jsx rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/components/BootstrapSliderWrapper.jsx diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/components/Legend.css b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/components/Legend.css similarity index 100% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/components/Legend.css rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/components/Legend.css diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/components/Legend.jsx b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/components/Legend.jsx similarity index 93% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/components/Legend.jsx rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/components/Legend.jsx index 4368fb03183ef..bb18626b699f6 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/components/Legend.jsx +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/components/Legend.jsx @@ -64,14 +64,19 @@ export default class Legend extends React.PureComponent { if (k.includes(categoryDelimiter)) { const values = k.split(categoryDelimiter); - return this.format(values[0]) + categoryDelimiter + this.format(values[1]); + return ( + this.format(values[0]) + categoryDelimiter + this.format(values[1]) + ); } return this.format(k); } render() { - if (Object.keys(this.props.categories).length === 0 || this.props.position === null) { + if ( + Object.keys(this.props.categories).length === 0 || + this.props.position === null + ) { return null; } diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/components/PlaySlider.css b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/components/PlaySlider.css similarity index 100% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/components/PlaySlider.css rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/components/PlaySlider.css diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/components/PlaySlider.jsx b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/components/PlaySlider.jsx similarity index 90% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/components/PlaySlider.jsx rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/components/PlaySlider.jsx index 1fab8aff5c248..d0ec3199d4c81 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/components/PlaySlider.jsx +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/components/PlaySlider.jsx @@ -63,7 +63,8 @@ export default class PlaySlider extends React.PureComponent { const frames = Math.min(props.maxFrames, range / props.step); const width = range / frames; this.intervalMilliseconds = props.loopDuration / frames; - this.increment = width < props.step ? props.step : width - (width % props.step); + this.increment = + width < props.step ? props.step : width - (width % props.step); this.onChange = this.onChange.bind(this); this.play = this.play.bind(this); @@ -121,7 +122,9 @@ export default class PlaySlider extends React.PureComponent { return; } - const currentValues = Array.isArray(values) ? values : [values, values + step]; + const currentValues = Array.isArray(values) + ? values + : [values, values + step]; const nextValues = currentValues.map(value => value + this.increment); const carriageReturn = nextValues[1] > end ? nextValues[0] - start : 0; @@ -135,7 +138,9 @@ export default class PlaySlider extends React.PureComponent { return; } - const currentValues = Array.isArray(values) ? values : [values, values + step]; + const currentValues = Array.isArray(values) + ? values + : [values, values + step]; const nextValues = currentValues.map(value => value - this.increment); const carriageReturn = nextValues[0] < start ? end - nextValues[1] : 0; @@ -158,14 +163,21 @@ export default class PlaySlider extends React.PureComponent { } render() { - const { start, end, step, orientation, reversed, disabled, range, values } = this.props; + const { start, end, step, orientation, reversed, disabled, range, values } = + this.props; return (
- + - +
void; + payload: JsonObject; + setControlValue: () => void; + viewport: Viewport; + width: number; }; -const defaultProps = { - onAddFilter() {}, +interface getLayerType { + ( + formData: QueryFormData, + payload: JsonObject, + onAddFilter: () => void, + setTooltip: (tooltip: string) => void, + ): T; +} +interface getPointsType { + (point: number[]): T; +} +type deckGLComponentState = { + viewport: Viewport; + layer: unknown; }; -export function createDeckGLComponent(getLayer, getPoints) { +export function createDeckGLComponent( + getLayer: getLayerType, + getPoints: getPointsType, +): React.ComponentClass { // Higher order component - class Component extends React.PureComponent { - containerRef = React.createRef(); + class Component extends React.PureComponent< + deckGLComponentProps, + deckGLComponentState + > { + containerRef: React.RefObject = React.createRef(); - constructor(props) { + constructor(props: deckGLComponentProps) { super(props); const { width, height, formData } = props; @@ -58,7 +75,7 @@ export function createDeckGLComponent(getLayer, getPoints) { width, height, points: getPoints(props.payload.data.features), - }); + }) as Viewport; } this.state = { @@ -68,29 +85,32 @@ export function createDeckGLComponent(getLayer, getPoints) { this.onViewportChange = this.onViewportChange.bind(this); } - UNSAFE_componentWillReceiveProps(nextProps) { + UNSAFE_componentWillReceiveProps(nextProps: deckGLComponentProps) { // Only recompute the layer if anything BUT the viewport has changed const nextFdNoVP = { ...nextProps.formData, viewport: null }; const currFdNoVP = { ...this.props.formData, viewport: null }; - if (!isEqual(nextFdNoVP, currFdNoVP) || nextProps.payload !== this.props.payload) { + if ( + !isEqual(nextFdNoVP, currFdNoVP) || + nextProps.payload !== this.props.payload + ) { this.setState({ layer: this.computeLayer(nextProps) }); } } - onViewportChange(viewport) { + onViewportChange(viewport: Viewport) { this.setState({ viewport }); } - computeLayer(props) { + computeLayer(props: deckGLComponentProps) { const { formData, payload, onAddFilter } = props; return getLayer(formData, payload, onAddFilter, this.setTooltip); } - setTooltip = tooltip => { + setTooltip = (tooltip: string) => { const { current } = this.containerRef; if (current) { - current.setTooltip(tooltip); + current?.setTooltip(tooltip); } }; @@ -99,7 +119,7 @@ export function createDeckGLComponent(getLayer, getPoints) { const { layer, viewport } = this.state; return ( - , + getPoints: getPointsType, +) { + return function Component(props: deckGLComponentProps) { + const { + datasource, + formData, + height, + payload, + setControlValue, + viewport, + width, + } = props; return ( ); - } - - Component.propTypes = propTypes; - Component.defaultProps = defaultProps; - - return Component; + }; } diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/index.js b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/index.js new file mode 100644 index 0000000000000..819964173ed85 --- /dev/null +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/index.js @@ -0,0 +1,28 @@ +/** + * 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. + */ +export { default as DeckGLChartPreset } from './preset'; +export { default as ArcChartPlugin } from './layers/Arc'; +export { default as GeoJsonChartPlugin } from './layers/Geojson'; +export { default as GridChartPlugin } from './layers/Grid'; +export { default as HexChartPlugin } from './layers/Hex'; +export { default as MultiChartPlugin } from './Multi'; +export { default as PathChartPlugin } from './layers/Path'; +export { default as PolygonChartPlugin } from './layers/Polygon'; +export { default as ScatterChartPlugin } from './layers/Scatter'; +export { default as ScreengridChartPlugin } from './layers/Screengrid'; diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Arc/Arc.jsx b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/Arc.jsx similarity index 87% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Arc/Arc.jsx rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/Arc.jsx index 6ff9f0c1cb86e..a2c8e61436100 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Arc/Arc.jsx +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/Arc.jsx @@ -45,7 +45,10 @@ function setTooltipContent(formData) { value={`${o.object.targetPosition[0]}, ${o.object.targetPosition[1]}`} /> {formData.dimension && ( - + )}
); @@ -58,8 +61,10 @@ export function getLayer(fd, payload, onAddFilter, setTooltip) { return new ArcLayer({ data, - getSourceColor: d => d.sourceColor || d.color || [sc.r, sc.g, sc.b, 255 * sc.a], - getTargetColor: d => d.targetColor || d.color || [tc.r, tc.g, tc.b, 255 * tc.a], + getSourceColor: d => + d.sourceColor || d.color || [sc.r, sc.g, sc.b, 255 * sc.a], + getTargetColor: d => + d.targetColor || d.color || [tc.r, tc.g, tc.b, 255 * tc.a], id: `path-layer-${fd.slice_id}`, strokeWidth: fd.stroke_width ? fd.stroke_width : 3, ...commonLayerProps(fd, setTooltip, setTooltipContent(fd)), diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Arc/controlPanel.js b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/controlPanel.ts similarity index 86% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Arc/controlPanel.js rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/controlPanel.ts index 53e139aca9cf6..3794ef38daef4 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Arc/controlPanel.js +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/controlPanel.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { sections } from '@superset-ui/chart-controls'; +import { ControlPanelConfig, sections } from '@superset-ui/chart-controls'; import { t, validateNonEmpty, legacyValidateInteger } from '@superset-ui/core'; import timeGrainSqlaAnimationOverrides, { columnChoices, @@ -37,7 +37,7 @@ import { mapboxStyle, } from '../../utilities/Shared_DeckGL'; -export default { +const config: ControlPanelConfig = { controlPanelSections: [ sections.legacyRegularTime, { @@ -99,17 +99,21 @@ export default { ], [ { - ...dimension, - label: t('Categorical Color'), - description: t('Pick a dimension from which categorical colors are defined'), + name: dimension.name, + config: { + ...dimension.config, + label: t('Categorical Color'), + description: t( + 'Pick a dimension from which categorical colors are defined', + ), + }, }, 'color_scheme', - 'label_colors', ], [ { name: 'stroke_width', - color: { + config: { type: 'SelectControl', freeForm: true, label: t('Stroke Width'), @@ -126,7 +130,12 @@ export default { }, { label: t('Advanced'), - controlSetRows: [[jsColumns], [jsDataMutator], [jsTooltip], [jsOnclickHref]], + controlSetRows: [ + [jsColumns], + [jsDataMutator], + [jsTooltip], + [jsOnclickHref], + ], }, ], controlOverrides: { @@ -136,3 +145,5 @@ export default { time_grain_sqla: timeGrainSqlaAnimationOverrides, }, }; + +export default config; diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Arc/images/thumbnail.png b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/images/thumbnail.png similarity index 100% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Arc/images/thumbnail.png rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/images/thumbnail.png diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Arc/images/thumbnailLarge.png b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/images/thumbnailLarge.png similarity index 100% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Arc/images/thumbnailLarge.png rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/images/thumbnailLarge.png diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Arc/index.js b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/index.js similarity index 93% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Arc/index.js rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/index.js index 5d2be50dd7a3b..fa7e4155a2f6e 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Arc/index.js +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Arc/index.js @@ -24,7 +24,9 @@ import controlPanel from './controlPanel'; const metadata = new ChartMetadata({ category: t('Map'), credits: ['https://uber.github.io/deck.gl'], - description: t('Plot the distance (like flight paths) between origin and destination.'), + description: t( + 'Plot the distance (like flight paths) between origin and destination.', + ), name: t('deck.gl Arc'), thumbnail, useLegacyApi: true, diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Geojson/Geojson.jsx b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/Geojson.jsx similarity index 97% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Geojson/Geojson.jsx rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/Geojson.jsx index c4b722ec0e8b4..a1416f6b56ef2 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Geojson/Geojson.jsx +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Geojson/Geojson.jsx @@ -22,7 +22,7 @@ import PropTypes from 'prop-types'; import { GeoJsonLayer } from 'deck.gl'; // TODO import geojsonExtent from 'geojson-extent'; -import DeckGLContainer from '../../DeckGLContainer'; +import { DeckGLContainerStyledWrapper } from '../../DeckGLContainer'; import { hexToRGB } from '../../utils/colors'; import sandboxedEval from '../../utils/sandbox'; import { commonLayerProps } from '../common'; @@ -151,7 +151,8 @@ class DeckGLGeoJson extends React.Component { }; render() { - const { formData, payload, setControlValue, onAddFilter, viewport } = this.props; + const { formData, payload, setControlValue, onAddFilter, viewport } = + this.props; // TODO get this to work // if (formData.autozoom) { @@ -161,7 +162,7 @@ class DeckGLGeoJson extends React.Component { const layer = getLayer(formData, payload, onAddFilter, this.setTooltip); return ( - - +
); } diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Grid/controlPanel.js b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/controlPanel.ts similarity index 79% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Grid/controlPanel.js rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/controlPanel.ts index f012bfbf9b1c2..a96fe21dd68a7 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Grid/controlPanel.js +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/controlPanel.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { sections } from '@superset-ui/chart-controls'; +import { ControlPanelConfig, sections } from '@superset-ui/chart-controls'; import { t, validateNonEmpty } from '@superset-ui/core'; import { filterNulls, @@ -32,13 +32,19 @@ import { mapboxStyle, } from '../../utilities/Shared_DeckGL'; -export default { +const config: ControlPanelConfig = { controlPanelSections: [ sections.legacyRegularTime, { label: t('Query'), expanded: true, - controlSetRows: [[spatial], ['size'], ['row_limit'], [filterNulls], ['adhoc_filters']], + controlSetRows: [ + [spatial], + ['size'], + ['row_limit'], + [filterNulls], + ['adhoc_filters'], + ], }, { label: t('Map'), @@ -50,7 +56,12 @@ export default { }, { label: t('Advanced'), - controlSetRows: [[jsColumns], [jsDataMutator], [jsTooltip], [jsOnclickHref]], + controlSetRows: [ + [jsColumns], + [jsDataMutator], + [jsTooltip], + [jsOnclickHref], + ], }, ], controlOverrides: { @@ -61,3 +72,5 @@ export default { }, }, }; + +export default config; diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Grid/images/thumbnail.png b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/images/thumbnail.png similarity index 100% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Grid/images/thumbnail.png rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/images/thumbnail.png diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Grid/images/thumbnailLarge.png b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/images/thumbnailLarge.png similarity index 100% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Grid/images/thumbnailLarge.png rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/images/thumbnailLarge.png diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Grid/index.js b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/index.js similarity index 100% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Grid/index.js rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Grid/index.js diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Hex/Hex.jsx b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/Hex.jsx similarity index 95% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Hex/Hex.jsx rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/Hex.jsx index 55263158cd0d1..46b3c59974daa 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Hex/Hex.jsx +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/Hex.jsx @@ -32,7 +32,10 @@ function setTooltipContent(o) { label={`${t('Centroid (Longitude and Latitude)')}: `} value={`(${o.coordinate[0]}, ${o.coordinate[1]})`} /> - +
); } diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Hex/controlPanel.js b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/controlPanel.ts similarity index 80% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Hex/controlPanel.js rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/controlPanel.ts index f300821675af4..4db5e39b964a1 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Hex/controlPanel.js +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/controlPanel.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { sections } from '@superset-ui/chart-controls'; +import { ControlPanelConfig, sections } from '@superset-ui/chart-controls'; import { t } from '@superset-ui/core'; import { formatSelectOptions } from '../../utilities/utils'; import { @@ -33,13 +33,19 @@ import { viewport, } from '../../utilities/Shared_DeckGL'; -export default { +const config: ControlPanelConfig = { controlPanelSections: [ sections.legacyRegularTime, { label: t('Query'), expanded: true, - controlSetRows: [[spatial], ['size'], ['row_limit'], [filterNulls], ['adhoc_filters']], + controlSetRows: [ + [spatial], + ['size'], + ['row_limit'], + [filterNulls], + ['adhoc_filters'], + ], }, { label: t('Map'), @@ -55,7 +61,9 @@ export default { config: { type: 'SelectControl', label: t('Dynamic Aggregation Function'), - description: t('The function to use when aggregating points into groups'), + description: t( + 'The function to use when aggregating points into groups', + ), default: 'sum', clearable: false, renderTrigger: true, @@ -80,7 +88,14 @@ export default { }, { label: t('Advanced'), - controlSetRows: [[jsColumns], [jsDataMutator], [jsTooltip], [jsOnclickHref]], + controlSetRows: [ + [jsColumns], + [jsDataMutator], + [jsTooltip], + [jsOnclickHref], + ], }, ], }; + +export default config; diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Hex/images/thumbnail.png b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/images/thumbnail.png similarity index 100% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Hex/images/thumbnail.png rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/images/thumbnail.png diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Hex/images/thumbnailLarge.png b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/images/thumbnailLarge.png similarity index 100% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Hex/images/thumbnailLarge.png rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/images/thumbnailLarge.png diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Hex/index.js b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/index.js similarity index 100% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Hex/index.js rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Hex/index.js diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Path/Path.jsx b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/Path.jsx similarity index 100% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Path/Path.jsx rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/Path.jsx diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Path/controlPanel.js b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/controlPanel.ts similarity index 82% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Path/controlPanel.js rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/controlPanel.ts index 9a0b3f4e00a90..99866115ab029 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Path/controlPanel.js +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/controlPanel.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { sections } from '@superset-ui/chart-controls'; +import { ControlPanelConfig, sections } from '@superset-ui/chart-controls'; import { FeatureFlag, isFeatureEnabled, t } from '@superset-ui/core'; import { filterNulls, @@ -34,14 +34,18 @@ import { } from '../../utilities/Shared_DeckGL'; import { dndLineColumn } from '../../utilities/sharedDndControls'; -export default { +const config: ControlPanelConfig = { controlPanelSections: [ sections.legacyRegularTime, { label: t('Query'), expanded: true, controlSetRows: [ - [isFeatureEnabled(FeatureFlag.ENABLE_EXPLORE_DRAG_AND_DROP) ? dndLineColumn : lineColumn], + [ + isFeatureEnabled(FeatureFlag.ENABLE_EXPLORE_DRAG_AND_DROP) + ? dndLineColumn + : lineColumn, + ], [ { ...lineType, @@ -70,7 +74,14 @@ export default { }, { label: t('Advanced'), - controlSetRows: [[jsColumns], [jsDataMutator], [jsTooltip], [jsOnclickHref]], + controlSetRows: [ + [jsColumns], + [jsDataMutator], + [jsTooltip], + [jsOnclickHref], + ], }, ], }; + +export default config; diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Path/images/thumbnail.png b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/images/thumbnail.png similarity index 100% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Path/images/thumbnail.png rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/images/thumbnail.png diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Path/images/thumbnailLarge.png b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/images/thumbnailLarge.png similarity index 100% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Path/images/thumbnailLarge.png rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/images/thumbnailLarge.png diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Path/index.js b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/index.js similarity index 100% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Path/index.js rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Path/index.js diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Polygon/Polygon.jsx b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/Polygon.jsx similarity index 90% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Polygon/Polygon.jsx rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/Polygon.jsx index 2801c7e4ff410..bdd4f66bc1161 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Polygon/Polygon.jsx +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/Polygon.jsx @@ -56,7 +56,9 @@ function setTooltipContent(formData) { return (
- {o.object.name && } + {o.object.name && ( + + )} {o.object[formData.line_column] && ( )} {formData.metric && ( - + )}
); }; } -export function getLayer(formData, payload, onAddFilter, setTooltip, selected, onSelect, filters) { +export function getLayer( + formData, + payload, + onAddFilter, + setTooltip, + selected, + onSelect, + filters, +) { const fd = formData; const fc = fd.fill_color_picker; const sc = fd.stroke_color_picker; @@ -108,7 +121,9 @@ export function getLayer(formData, payload, onAddFilter, setTooltip, selected, o }; const tooltipContentGenerator = - fd.line_column && fd.metric && ['json', 'geohash', 'zipcode'].includes(fd.line_type) + fd.line_column && + fd.metric && + ['json', 'geohash', 'zipcode'].includes(fd.line_type) ? setTooltipContent(fd) : undefined; @@ -172,9 +187,15 @@ class DeckGLPolygon extends React.Component { // the granularity has to be read from the payload form_data, not the // props formData which comes from the instantaneous controls state - const granularity = payload.form_data.time_grain_sqla || payload.form_data.granularity || 'P1D'; - - const { start, end, getStep, values, disabled } = getPlaySliderParams(timestamps, granularity); + const granularity = + payload.form_data.time_grain_sqla || + payload.form_data.granularity || + 'P1D'; + + const { start, end, getStep, values, disabled } = getPlaySliderParams( + timestamps, + granularity, + ); let { viewport } = props; if (formData.autozoom) { @@ -227,7 +248,9 @@ class DeckGLPolygon extends React.Component { onValuesChange(values) { this.setState({ - values: Array.isArray(values) ? values : [values, values + this.state.getStep(values)], + values: Array.isArray(values) + ? values + : [values, values + this.state.getStep(values)], }); } @@ -240,9 +263,13 @@ class DeckGLPolygon extends React.Component { // time filter if (values[0] === values[1] || values[1] === this.end) { - filters.push(d => d.__timestamp >= values[0] && d.__timestamp <= values[1]); + filters.push( + d => d.__timestamp >= values[0] && d.__timestamp <= values[1], + ); } else { - filters.push(d => d.__timestamp >= values[0] && d.__timestamp < values[1]); + filters.push( + d => d.__timestamp >= values[0] && d.__timestamp < values[1], + ); } const layer = getLayer( diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Polygon/controlPanel.js b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/controlPanel.ts similarity index 90% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Polygon/controlPanel.js rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/controlPanel.ts index deaa471fca4b4..faea2336bb48e 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Polygon/controlPanel.js +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/controlPanel.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { sections } from '@superset-ui/chart-controls'; +import { ControlPanelConfig, sections } from '@superset-ui/chart-controls'; import { FeatureFlag, isFeatureEnabled, t } from '@superset-ui/core'; import timeGrainSqlaAnimationOverrides from '../../utilities/controls'; import { formatSelectOptions } from '../../utilities/utils'; @@ -49,7 +49,7 @@ const lines = isFeatureEnabled(FeatureFlag.ENABLE_EXPLORE_DRAG_AND_DROP) ? dndLineColumn : lineColumn; -export default { +const config: ControlPanelConfig = { controlPanelSections: [ sections.legacyRegularTime, { @@ -144,7 +144,9 @@ export default { freeForm: true, label: t('Bucket break points'), choices: formatSelectOptions([]), - description: t('List of n+1 values for bucketing metric into n buckets.'), + description: t( + 'List of n+1 values for bucketing metric into n buckets.', + ), renderTrigger: true, }, }, @@ -167,7 +169,9 @@ export default { label: t('Multiple filtering'), renderTrigger: true, default: true, - description: t('Allow sending multiple polygons as a filter event'), + description: t( + 'Allow sending multiple polygons as a filter event', + ), }, }, ], @@ -176,7 +180,12 @@ export default { }, { label: t('Advanced'), - controlSetRows: [[jsColumns], [jsDataMutator], [jsTooltip], [jsOnclickHref]], + controlSetRows: [ + [jsColumns], + [jsDataMutator], + [jsTooltip], + [jsOnclickHref], + ], }, ], controlOverrides: { @@ -186,3 +195,5 @@ export default { time_grain_sqla: timeGrainSqlaAnimationOverrides, }, }; + +export default config; diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Polygon/images/thumbnail.png b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/images/thumbnail.png similarity index 100% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Polygon/images/thumbnail.png rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/images/thumbnail.png diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Polygon/images/thumbnailLarge.png b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/images/thumbnailLarge.png similarity index 100% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Polygon/images/thumbnailLarge.png rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/images/thumbnailLarge.png diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Polygon/index.js b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/index.js similarity index 93% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Polygon/index.js rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/index.js index 6b4cab727b16f..325eeac401415 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Polygon/index.js +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Polygon/index.js @@ -30,7 +30,13 @@ const metadata = new ChartMetadata({ name: t('deck.gl Polygon'), thumbnail, useLegacyApi: true, - tags: [t('deckGL'), t('3D'), t('Multi-Dimensions'), t('Geo'), t('Experimental')], + tags: [ + t('deckGL'), + t('3D'), + t('Multi-Dimensions'), + t('Geo'), + t('Experimental'), + ], }); export default class PolygonChartPlugin extends ChartPlugin { diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Scatter/Scatter.jsx b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/Scatter.jsx similarity index 84% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Scatter/Scatter.jsx rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/Scatter.jsx index 8fc980d970049..ca0162fa3a1cf 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Scatter/Scatter.jsx +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/Scatter.jsx @@ -40,15 +40,26 @@ function setTooltipContent(formData, verboseMap) { value={`${o.object.position[0]}, ${o.object.position[1]}`} /> {o.object.cat_color && ( - + + )} + {o.object.metric && ( + )} - {o.object.metric && } ); }; } -export function getLayer(formData, payload, onAddFilter, setTooltip, datasource) { +export function getLayer( + formData, + payload, + onAddFilter, + setTooltip, + datasource, +) { const fd = formData; const dataWithRadius = payload.data.features.map(d => { let radius = unitToRadius(fd.point_unit, d.radius) || 10; @@ -73,7 +84,11 @@ export function getLayer(formData, payload, onAddFilter, setTooltip, datasource) radiusMinPixels: fd.min_radius || null, radiusMaxPixels: fd.max_radius || null, stroked: false, - ...commonLayerProps(fd, setTooltip, setTooltipContent(fd, datasource?.verboseMap)), + ...commonLayerProps( + fd, + setTooltip, + setTooltipContent(fd, datasource?.verboseMap), + ), }); } diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Scatter/controlPanel.js b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/controlPanel.ts similarity index 83% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Scatter/controlPanel.js rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/controlPanel.ts index 4fad98b127f2d..4932019bb7ad3 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Scatter/controlPanel.js +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/controlPanel.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { sections } from '@superset-ui/chart-controls'; +import { ControlPanelConfig, sections } from '@superset-ui/chart-controls'; import { t, validateNonEmpty } from '@superset-ui/core'; import timeGrainSqlaAnimationOverrides from '../../utilities/controls'; import { @@ -36,7 +36,7 @@ import { mapboxStyle, } from '../../utilities/Shared_DeckGL'; -export default { +const config: ControlPanelConfig = { onInit: controlState => ({ ...controlState, time_grain_sqla: { @@ -53,7 +53,11 @@ export default { { label: t('Query'), expanded: true, - controlSetRows: [[spatial, null], ['row_limit', filterNulls], ['adhoc_filters']], + controlSetRows: [ + [spatial, null], + ['row_limit', filterNulls], + ['adhoc_filters'], + ], }, { label: t('Map'), @@ -83,7 +87,9 @@ export default { ['radius_km', 'Radius in kilometers'], ['radius_miles', 'Radius in miles'], ], - description: t('The unit of measure for the specified point radius'), + description: t( + 'The unit of measure for the specified point radius', + ), }, }, ], @@ -130,9 +136,14 @@ export default { [legendFormat], [ { - ...dimension, - label: t('Categorical Color'), - description: t('Pick a dimension from which categorical colors are defined'), + name: dimension.name, + config: { + ...dimension.config, + label: t('Categorical Color'), + description: t( + 'Pick a dimension from which categorical colors are defined', + ), + }, }, ], ['color_scheme'], @@ -140,7 +151,12 @@ export default { }, { label: t('Advanced'), - controlSetRows: [[jsColumns], [jsDataMutator], [jsTooltip], [jsOnclickHref]], + controlSetRows: [ + [jsColumns], + [jsDataMutator], + [jsTooltip], + [jsOnclickHref], + ], }, ], controlOverrides: { @@ -150,3 +166,5 @@ export default { time_grain_sqla: timeGrainSqlaAnimationOverrides, }, }; + +export default config; diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Scatter/images/thumbnail.png b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/images/thumbnail.png similarity index 100% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Scatter/images/thumbnail.png rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/images/thumbnail.png diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Scatter/images/thumbnailLarge.png b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/images/thumbnailLarge.png similarity index 100% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Scatter/images/thumbnailLarge.png rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/images/thumbnailLarge.png diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Scatter/index.js b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/index.js similarity index 100% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Scatter/index.js rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Scatter/index.js diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Screengrid/Screengrid.jsx b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/Screengrid.jsx similarity index 90% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Screengrid/Screengrid.jsx rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/Screengrid.jsx index 8e285a6865e1f..061ccc46de4d1 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Screengrid/Screengrid.jsx +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/Screengrid.jsx @@ -48,7 +48,15 @@ function setTooltipContent(o) { ); } -export function getLayer(formData, payload, onAddFilter, setTooltip, selected, onSelect, filters) { +export function getLayer( + formData, + payload, + onAddFilter, + setTooltip, + selected, + onSelect, + filters, +) { const fd = formData; const c = fd.color_picker; let data = payload.data.features.map(d => ({ @@ -122,9 +130,14 @@ class DeckGLScreenGrid extends React.PureComponent { // the granularity has to be read from the payload form_data, not the // props formData which comes from the instantaneous controls state const granularity = - props.payload.form_data.time_grain_sqla || props.payload.form_data.granularity || 'P1D'; + props.payload.form_data.time_grain_sqla || + props.payload.form_data.granularity || + 'P1D'; - const { start, end, getStep, values, disabled } = getPlaySliderParams(timestamps, granularity); + const { start, end, getStep, values, disabled } = getPlaySliderParams( + timestamps, + granularity, + ); const { width, height, formData } = props; let { viewport } = props; @@ -151,8 +164,10 @@ class DeckGLScreenGrid extends React.PureComponent { onValuesChange(values) { this.setState({ - // eslint-disable-next-line react/no-access-state-in-setstate - values: Array.isArray(values) ? values : [values, values + this.state.getStep(values)], + values: Array.isArray(values) + ? values + : // eslint-disable-next-line react/no-access-state-in-setstate + [values, values + this.state.getStep(values)], }); } @@ -161,9 +176,13 @@ class DeckGLScreenGrid extends React.PureComponent { // time filter if (values[0] === values[1] || values[1] === this.end) { - filters.push(d => d.__timestamp >= values[0] && d.__timestamp <= values[1]); + filters.push( + d => d.__timestamp >= values[0] && d.__timestamp <= values[1], + ); } else { - filters.push(d => d.__timestamp >= values[0] && d.__timestamp < values[1]); + filters.push( + d => d.__timestamp >= values[0] && d.__timestamp < values[1], + ); } const layer = getLayer( diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Screengrid/controlPanel.js b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/controlPanel.ts similarity index 81% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Screengrid/controlPanel.js rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/controlPanel.ts index 6435761b63057..733d12ca21b86 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Screengrid/controlPanel.js +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/controlPanel.ts @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -import { sections } from '@superset-ui/chart-controls'; +import { ControlPanelConfig, sections } from '@superset-ui/chart-controls'; import { t, validateNonEmpty } from '@superset-ui/core'; import timeGrainSqlaAnimationOverrides from '../../utilities/controls'; import { @@ -32,13 +32,19 @@ import { mapboxStyle, } from '../../utilities/Shared_DeckGL'; -export default { +const config: ControlPanelConfig = { controlPanelSections: [ sections.legacyRegularTime, { label: t('Query'), expanded: true, - controlSetRows: [[spatial], ['size'], ['row_limit'], [filterNulls], ['adhoc_filters']], + controlSetRows: [ + [spatial], + ['size'], + ['row_limit'], + [filterNulls], + ['adhoc_filters'], + ], }, { label: t('Map'), @@ -54,7 +60,12 @@ export default { }, { label: t('Advanced'), - controlSetRows: [[jsColumns], [jsDataMutator], [jsTooltip], [jsOnclickHref]], + controlSetRows: [ + [jsColumns], + [jsDataMutator], + [jsTooltip], + [jsOnclickHref], + ], }, ], controlOverrides: { @@ -66,3 +77,5 @@ export default { time_grain_sqla: timeGrainSqlaAnimationOverrides, }, }; + +export default config; diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Screengrid/images/thumbnail.png b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/images/thumbnail.png similarity index 100% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Screengrid/images/thumbnail.png rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/images/thumbnail.png diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Screengrid/images/thumbnailLarge.png b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/images/thumbnailLarge.png similarity index 100% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Screengrid/images/thumbnailLarge.png rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/images/thumbnailLarge.png diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Screengrid/index.js b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/index.js similarity index 93% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Screengrid/index.js rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/index.js index b7b0c1dc3a729..fc285ba104e93 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/Screengrid/index.js +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/Screengrid/index.js @@ -30,7 +30,13 @@ const metadata = new ChartMetadata({ name: t('deck.gl Screen Grid'), thumbnail, useLegacyApi: true, - tags: [t('deckGL'), t('Comparison'), t('Intensity'), t('Experimental'), t('Density')], + tags: [ + t('deckGL'), + t('Comparison'), + t('Intensity'), + t('Experimental'), + t('Density'), + ], }); export default class ScreengridChartPlugin extends ChartPlugin { diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/common.jsx b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/common.jsx similarity index 91% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/common.jsx rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/common.jsx index bac9b9fcb2b3e..e847ef3eec40b 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/common.jsx +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/common.jsx @@ -19,7 +19,12 @@ import * as d3array from 'd3-array'; import sandboxedEval from '../utils/sandbox'; -export function commonLayerProps(formData, setTooltip, setTooltipContent, onSelect) { +export function commonLayerProps( + formData, + setTooltip, + setTooltipContent, + onSelect, +) { const fd = formData; let onHover; let tooltipContentGenerator = setTooltipContent; @@ -73,7 +78,9 @@ export function getAggFunc(type = 'sum', accessor = null) { d3func = (arr, acc) => { let sortedArr; if (accessor) { - sortedArr = arr.sort((o1, o2) => d3array.ascending(accessor(o1), accessor(o2))); + sortedArr = arr.sort((o1, o2) => + d3array.ascending(accessor(o1), accessor(o2)), + ); } else { sortedArr = arr.sort(d3array.ascending); } diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/index.js b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/index.js similarity index 100% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/layers/index.js rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/layers/index.js diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/preset.js b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/preset.js similarity index 100% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/preset.js rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/preset.js diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/transformProps.js b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/transformProps.js similarity index 98% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/transformProps.js rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/transformProps.js index a05128c023df5..ab62dbead77ef 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/transformProps.js +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/transformProps.js @@ -19,7 +19,8 @@ const NOOP = () => {}; export default function transformProps(chartProps) { - const { datasource, height, hooks, queriesData, rawFormData, width } = chartProps; + const { datasource, height, hooks, queriesData, rawFormData, width } = + chartProps; const { onAddFilter = NOOP, setControlValue = NOOP } = hooks; return { diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/types.ts b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/types.ts new file mode 100644 index 0000000000000..9177da614d6fd --- /dev/null +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/types.ts @@ -0,0 +1,23 @@ +/** + * 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. + */ +// range and point actually have different value ranges +// and also are different concept-wise + +export type Range = [number, number]; +export type Point = [number, number]; diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx similarity index 94% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx index 4c29d7d53a303..d3e3751479a36 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utilities/Shared_DeckGL.jsx @@ -40,11 +40,18 @@ const jsFunctionInfo = ( {t( 'For more information about objects are in context in the scope of this function, refer to the', )} - {t(" source code of Superset's sandboxed parser")}.. + {t(" source code of Superset's sandboxed parser")}. + . ); -function jsFunctionControl(label, description, extraDescr = null, height = 100, defaultText = '') { +function jsFunctionControl( + label, + description, + extraDescr = null, + height = 100, + defaultText = '', +) { return { type: 'TextAreaControl', language: 'javascript', @@ -62,7 +69,9 @@ function jsFunctionControl(label, description, extraDescr = null, height = 100, mapStateToProps: state => ({ // eslint-disable-next-line no-negated-condition warning: !state.common.conf.ENABLE_JAVASCRIPT_CONTROLS - ? t('This functionality is disabled in your environment for security reasons.') + ? t( + 'This functionality is disabled in your environment for security reasons.', + ) : null, readOnly: !state.common.conf.ENABLE_JAVASCRIPT_CONTROLS, }), @@ -86,7 +95,9 @@ export const autozoom = { label: t('Auto Zoom'), default: true, renderTrigger: true, - description: t('When checked, the map will zoom to your data after each query'), + description: t( + 'When checked, the map will zoom to your data after each query', + ), }, }; @@ -107,7 +118,9 @@ export const jsColumns = { ...sharedControls.groupby, label: t('Extra data for JS'), default: [], - description: t('List of extra columns made available in Javascript functions'), + description: t( + 'List of extra columns made available in Javascript functions', + ), }, }; @@ -127,7 +140,9 @@ export const jsTooltip = { name: 'js_tooltip', config: jsFunctionControl( t('Javascript tooltip generator'), - t('Define a function that receives the input and outputs the content for a tooltip'), + t( + 'Define a function that receives the input and outputs the content for a tooltip', + ), ), }; diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/controls.jsx b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utilities/controls.jsx similarity index 89% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/controls.jsx rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/utilities/controls.jsx index 9cab4af549691..5281fa772fea9 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/controls.jsx +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utilities/controls.jsx @@ -20,7 +20,9 @@ export function columnChoices(datasource) { if (datasource && datasource.columns) { return datasource.columns .map(col => [col.column_name, col.verbose_name || col.column_name]) - .sort((opt1, opt2) => (opt1[1].toLowerCase() > opt2[1].toLowerCase() ? 1 : -1)); + .sort((opt1, opt2) => + opt1[1].toLowerCase() > opt2[1].toLowerCase() ? 1 : -1, + ); } return []; } @@ -47,6 +49,8 @@ export const PRIMARY_COLOR = { r: 0, g: 122, b: 135, a: 1 }; export default { default: null, mapStateToProps: state => ({ - choices: state.datasource ? state.datasource.time_grain_sqla.filter(o => o[0] !== null) : null, + choices: state.datasource + ? state.datasource.time_grain_sqla.filter(o => o[0] !== null) + : null, }), }; diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/sharedDndControls.jsx b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utilities/sharedDndControls.jsx similarity index 100% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/sharedDndControls.jsx rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/utilities/sharedDndControls.jsx diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/utils.js b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utilities/utils.js similarity index 97% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/utils.js rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/utilities/utils.js index 1fa8a3288c442..d9b783f0e078b 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utilities/utils.js +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utilities/utils.js @@ -68,7 +68,9 @@ export function getParam(name) { const regex = new RegExp(`[\\?&]${formattedName}=([^&#]*)`); // eslint-disable-next-line no-restricted-globals const results = regex.exec(location.search); - return results === null ? '' : decodeURIComponent(results[1].replace(/\+/g, ' ')); + return results === null + ? '' + : decodeURIComponent(results[1].replace(/\+/g, ' ')); } export function mainMetric(savedMetrics) { diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utils.js b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils.js similarity index 87% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utils.js rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils.js index 69734335042ba..5b3bc9dfdf123 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utils.js +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils.js @@ -19,7 +19,10 @@ */ import { extent } from 'd3-array'; import { scaleThreshold } from 'd3-scale'; -import { getSequentialSchemeRegistry, SequentialScheme } from '@superset-ui/core'; +import { + getSequentialSchemeRegistry, + SequentialScheme, +} from '@superset-ui/core'; import { hexToRGB } from './utils/colors'; const DEFAULT_NUM_BUCKETS = 10; @@ -34,13 +37,16 @@ export function getBreakPoints( } if (formDataBreakPoints === undefined || formDataBreakPoints.length === 0) { // compute evenly distributed break points based on number of buckets - const numBuckets = formDataNumBuckets ? parseInt(formDataNumBuckets, 10) : DEFAULT_NUM_BUCKETS; + const numBuckets = formDataNumBuckets + ? parseInt(formDataNumBuckets, 10) + : DEFAULT_NUM_BUCKETS; const [minValue, maxValue] = extent(features, accessor); if (minValue === undefined) { return []; } const delta = (maxValue - minValue) / numBuckets; - const precision = delta === 0 ? 0 : Math.max(0, Math.ceil(Math.log10(1 / delta))); + const precision = + delta === 0 ? 0 : Math.max(0, Math.ceil(Math.log10(1 / delta))); const extraBucket = maxValue > maxValue.toFixed(precision) ? 1 : 0; return new Array(numBuckets + 1 + extraBucket) @@ -85,7 +91,9 @@ export function getBreakPointColorScaler( // bucket colors into discrete colors const n = breakPoints.length - 1; const bucketedColors = - n > 1 ? colorScheme.getColors(n) : [colorScheme.colors[colorScheme.colors.length - 1]]; + n > 1 + ? colorScheme.getColors(n) + : [colorScheme.colors[colorScheme.colors.length - 1]]; // repeat ends const first = bucketedColors[0]; @@ -94,9 +102,7 @@ export function getBreakPointColorScaler( bucketedColors.push(last); const points = breakPoints.map(p => parseFloat(p)); - scaler = scaleThreshold() - .domain(points) - .range(bucketedColors); + scaler = scaleThreshold().domain(points).range(bucketedColors); maskPoint = value => value > breakPoints[n] || value < breakPoints[0]; } else { // interpolate colors linearly @@ -123,7 +129,8 @@ export function getBuckets(fd, features, accessor) { const buckets = {}; breakPoints.slice(1).forEach((value, i) => { const range = `${breakPoints[i]} - ${breakPoints[i + 1]}`; - const mid = 0.5 * (parseFloat(breakPoints[i]) + parseFloat(breakPoints[i + 1])); + const mid = + 0.5 * (parseFloat(breakPoints[i]) + parseFloat(breakPoints[i + 1])); // fix polygon doesn't show const metricLabel = fd.metric ? fd.metric.label || fd.metric : null; buckets[range] = { diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utils/colors.js b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/colors.js similarity index 100% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utils/colors.js rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/colors.js diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/computeBoundsFromPoints.ts b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/computeBoundsFromPoints.ts new file mode 100644 index 0000000000000..729f75adbddfc --- /dev/null +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/computeBoundsFromPoints.ts @@ -0,0 +1,56 @@ +/** + * 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. + */ +import { extent as d3Extent } from 'd3-array'; +import { Point, Range } from '../types'; + +const LAT_LIMIT: Range = [-90, 90]; +const LNG_LIMIT: Range = [-180, 180]; + +/** + * Expand a coordinate range by `padding` and within limits, if needed + */ +function expandIfNeeded( + [curMin, curMax]: Range, + [minBound, maxBound]: Range, + padding = 0.25, +) { + return curMin < curMax + ? [curMin, curMax] + : [ + Math.max(minBound, curMin - padding), + Math.min(maxBound, curMax + padding), + ]; +} + +export default function computeBoundsFromPoints( + points: Point[], +): [Point, Point] { + const latBounds = expandIfNeeded( + d3Extent(points, (x: Point) => x[1]) as Range, + LAT_LIMIT, + ); + const lngBounds = expandIfNeeded( + d3Extent(points, (x: Point) => x[0]) as Range, + LNG_LIMIT, + ); + return [ + [lngBounds[0], latBounds[0]], + [lngBounds[1], latBounds[1]], + ]; +} diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utils/explore.js b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/explore.js similarity index 52% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utils/explore.js rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/explore.js index 44aff588e400b..5714eb5da1052 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utils/explore.js +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/explore.js @@ -1,3 +1,21 @@ +/** + * 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. + */ import URI from 'urijs'; import { safeStringify } from './safeStringify'; @@ -13,7 +31,12 @@ export function getURIDirectory(formData, endpointType = 'base') { return directory; } -export function getExploreLongUrl(formData, endpointType, allowOverflow = true, extraSearch = {}) { +export function getExploreLongUrl( + formData, + endpointType, + allowOverflow = true, + extraSearch = {}, +) { if (!formData.datasource) { return null; } @@ -28,10 +51,7 @@ export function getExploreLongUrl(formData, endpointType, allowOverflow = true, if (endpointType === 'standalone') { search.standalone = 'true'; } - const url = uri - .directory(directory) - .search(search) - .toString(); + const url = uri.directory(directory).search(search).toString(); if (!allowOverflow && url.length > MAX_URL_LENGTH) { const minimalFormData = { datasource: formData.datasource, diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/fitViewport.ts b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/fitViewport.ts new file mode 100644 index 0000000000000..5b5bbb6b478fb --- /dev/null +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/fitViewport.ts @@ -0,0 +1,76 @@ +/** + * 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. + */ +import { fitBounds } from '@math.gl/web-mercator'; +import computeBoundsFromPoints from './computeBoundsFromPoints'; +import { Point } from '../types'; + +export type Viewport = { + longtitude: number; + latitude: number; + zoom: number; + bearing?: number; + pitch?: number; +}; + +export type FitViewportOptions = { + points: Point[]; + width: number; + height: number; + minExtent?: number; + maxZoom?: number; + offset?: [number, number]; + padding?: number; +}; + +export default function fitViewport( + originalViewPort: Viewport, + { + points, + width, + height, + minExtent, + maxZoom, + offset, + padding = 20, + }: FitViewportOptions, +) { + const { bearing, pitch } = originalViewPort; + const bounds = computeBoundsFromPoints(points); + + try { + return { + ...fitBounds({ + bounds, + width, + height, + minExtent, + maxZoom, + offset, + padding, + }), + bearing, + pitch, + }; + } catch (error) { + // eslint-disable-next-line no-console + console.error('Could not fit viewport', error); + } + + return originalViewPort; +} diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utils/geo.js b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/geo.js similarity index 94% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utils/geo.js rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/geo.js index b75ad8d4df53d..b09cc089dcfba 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utils/geo.js +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/geo.js @@ -58,7 +58,8 @@ export function kmToPixels(kilometers, latitude, zoomLevel) { // Algorithm from: https://wiki.openstreetmap.org/wiki/Zoom_levels const latitudeRad = latitude * (Math.PI / 180); // Seems like the zoomLevel is off by one - const kmPerPixel = (EARTH_CIRCUMFERENCE_KM * Math.cos(latitudeRad)) / 2 ** (zoomLevel + 9); + const kmPerPixel = + (EARTH_CIRCUMFERENCE_KM * Math.cos(latitudeRad)) / 2 ** (zoomLevel + 9); return roundDecimal(kilometers / kmPerPixel, 2); } diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/getPointsFromPolygon.ts b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/getPointsFromPolygon.ts new file mode 100644 index 0000000000000..19d431a733125 --- /dev/null +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/getPointsFromPolygon.ts @@ -0,0 +1,46 @@ +/** + * 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. + */ +import { Point } from '../types'; + +/** Format originally used by the Polygon plugin */ +type CustomPolygonFeature = { + polygon: Point[]; +}; + +/** + * Format that is geojson standard + * https://geojson.org/geojson-spec.html + */ +type GeojsonPolygonFeature = { + polygon: { + type: 'Feature'; + geometry: { + type: 'Polygon'; + coordinates: Point[][]; + }; + }; +}; + +export default function getPointsFromPolygon( + feature: CustomPolygonFeature | GeojsonPolygonFeature, +) { + return 'geometry' in feature.polygon + ? feature.polygon.geometry.coordinates[0] + : feature.polygon; +} diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utils/safeStringify.js b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/safeStringify.js similarity index 100% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utils/safeStringify.js rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/safeStringify.js diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utils/sandbox.js b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/sandbox.js similarity index 100% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utils/sandbox.js rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/sandbox.js diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utils/time.js b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/time.js similarity index 91% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utils/time.js rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/time.js index 44c023e6fa882..83cb78b494c14 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utils/time.js +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/time.js @@ -66,19 +66,18 @@ function getStepSeconds(step, start) { * seconds, which is why we need to know the start time. */ const startMillliseconds = parseInt(moment(start).format('x'), 10); - const endMilliseconds = parseInt( - moment(start) - .add(step) - .format('x'), - 10, - ); + const endMilliseconds = parseInt(moment(start).add(step).format('x'), 10); return endMilliseconds - startMillliseconds; } export function getPlaySliderParams(timestamps, timeGrain) { - const minTimestamp = moment(Number(timestamps.reduce((a, b) => (a < b ? a : b)))); - const maxTimestamp = moment(Number(timestamps.reduce((a, b) => (a > b ? a : b)))); + const minTimestamp = moment( + Number(timestamps.reduce((a, b) => (a < b ? a : b))), + ); + const maxTimestamp = moment( + Number(timestamps.reduce((a, b) => (a > b ? a : b))), + ); let step; let reference; @@ -122,7 +121,8 @@ export function getPlaySliderParams(timestamps, timeGrain) { end.add(step); } - const values = timeGrain != null ? [start, start.clone().add(step)] : [start, end]; + const values = + timeGrain != null ? [start, start.clone().add(step)] : [start, end]; const disabled = timestamps.every(timestamp => timestamp === null); return { diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utils/utils.js b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/utils.js similarity index 88% rename from superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utils/utils.js rename to superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/utils.js index d582f26b6cf84..13bc88157f0e5 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utils/utils.js +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/src/utils/utils.js @@ -22,8 +22,9 @@ export function roundDecimal(number, precision) { let roundedNumber; if (precision) { - // eslint-disable-next-line no-param-reassign - roundedNumber = Math.round(number * (precision = 10 ** precision)) / precision; + roundedNumber = + // eslint-disable-next-line no-param-reassign + Math.round(number * (precision = 10 ** precision)) / precision; } else { roundedNumber = Math.round(number); } diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/test/utils/colors.test.js b/superset-frontend/plugins/legacy-preset-chart-deckgl/test/utils/colors.test.js new file mode 100644 index 0000000000000..e624454e483e2 --- /dev/null +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/test/utils/colors.test.js @@ -0,0 +1,25 @@ +/** + * 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. + */ +import { hexToRGB } from '../../src/utils/colors'; + +describe('colors', () => { + it('hexToRGB()', () => { + expect(hexToRGB('#ffffff')).toEqual([255, 255, 255, 255]); + }); +}); diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/test/utils/getPointsFromPolygon.test.ts b/superset-frontend/plugins/legacy-preset-chart-deckgl/test/utils/getPointsFromPolygon.test.ts new file mode 100644 index 0000000000000..d8366b1b0aead --- /dev/null +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/test/utils/getPointsFromPolygon.test.ts @@ -0,0 +1,56 @@ +/** + * 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. + */ +import getPointsFromPolygon from '../../src/utils/getPointsFromPolygon'; + +describe('getPointsFromPolygon', () => { + it('handle original input', () => { + expect( + getPointsFromPolygon({ + polygon: [ + [1, 2], + [3, 4], + ], + }), + ).toEqual([ + [1, 2], + [3, 4], + ]); + }); + it('handle geojson features', () => { + expect( + getPointsFromPolygon({ + polygon: { + type: 'Feature', + geometry: { + type: 'Polygon', + coordinates: [ + [ + [1, 2], + [3, 4], + ], + ], + }, + }, + }), + ).toEqual([ + [1, 2], + [3, 4], + ]); + }); +}); diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/tsconfig.json b/superset-frontend/plugins/legacy-preset-chart-deckgl/tsconfig.json new file mode 100644 index 0000000000000..3e1b196c648c6 --- /dev/null +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/tsconfig.json @@ -0,0 +1,26 @@ +{ + "compilerOptions": { + "declarationDir": "lib", + "outDir": "lib", + "rootDir": "src" + }, + "exclude": [ + "lib", + "test" + ], + "extends": "../../tsconfig.json", + "include": [ + "src/**/*", + "types/**/*", + "test/**/*", + "../../types/**/*" + ], + "references": [ + { + "path": "../../packages/superset-ui-chart-controls" + }, + { + "path": "../../packages/superset-ui-core" + } + ] +} diff --git a/superset-frontend/plugins/legacy-preset-chart-deckgl/types/external.d.ts b/superset-frontend/plugins/legacy-preset-chart-deckgl/types/external.d.ts new file mode 100644 index 0000000000000..5b600d05f8e56 --- /dev/null +++ b/superset-frontend/plugins/legacy-preset-chart-deckgl/types/external.d.ts @@ -0,0 +1,19 @@ +/** + * 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. + */ +declare module '@math.gl/web-mercator'; diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/index.js b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/index.js deleted file mode 100644 index c98f3d1d65ad6..0000000000000 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/index.js +++ /dev/null @@ -1,10 +0,0 @@ -export { default as DeckGLChartPreset } from './preset'; -export { default as ArcChartPlugin } from './layers/Arc'; -export { default as GeoJsonChartPlugin } from './layers/Geojson'; -export { default as GridChartPlugin } from './layers/Grid'; -export { default as HexChartPlugin } from './layers/Hex'; -export { default as MultiChartPlugin } from './Multi'; -export { default as PathChartPlugin } from './layers/Path'; -export { default as PolygonChartPlugin } from './layers/Polygon'; -export { default as ScatterChartPlugin } from './layers/Scatter'; -export { default as ScreengridChartPlugin } from './layers/Screengrid'; diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utils/computeBoundsFromPoints.ts b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utils/computeBoundsFromPoints.ts deleted file mode 100644 index f37234251081c..0000000000000 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utils/computeBoundsFromPoints.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { extent as d3Extent } from 'd3-array'; -import { Point, Range } from './types'; - -const LAT_LIMIT: Range = [-90, 90]; -const LNG_LIMIT: Range = [-180, 180]; - -/** - * Expand a coordinate range by `padding` and within limits, if needed - */ -function expandIfNeeded([curMin, curMax]: Range, [minBound, maxBound]: Range, padding = 0.25) { - return curMin < curMax - ? [curMin, curMax] - : [Math.max(minBound, curMin - padding), Math.min(maxBound, curMax + padding)]; -} - -export default function computeBoundsFromPoints(points: Point[]) { - const latBounds = expandIfNeeded(d3Extent(points, (x: Point) => x[1]) as Range, LAT_LIMIT); - const lngBounds = expandIfNeeded(d3Extent(points, (x: Point) => x[0]) as Range, LNG_LIMIT); - return [ - [lngBounds[0], latBounds[0]], - [lngBounds[1], latBounds[1]], - ]; -} diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utils/fitViewport.ts b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utils/fitViewport.ts deleted file mode 100644 index fa876ee8030a0..0000000000000 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utils/fitViewport.ts +++ /dev/null @@ -1,50 +0,0 @@ -import { fitBounds } from '@math.gl/web-mercator'; -import computeBoundsFromPoints from './computeBoundsFromPoints'; -import { Point } from './types'; - -type Viewport = { - longtitude: number; - latitude: number; - zoom: number; - bearing?: number; - pitch?: number; -}; - -type FitViewportOptions = { - points: Point[]; - width: number; - height: number; - minExtent?: number; - maxZoom?: number; - offset?: [number, number]; - padding?: number; -}; - -export default function fitViewport( - originalViewPort: Viewport, - { points, width, height, minExtent, maxZoom, offset, padding = 20 }: FitViewportOptions, -) { - const { bearing, pitch } = originalViewPort; - const bounds = computeBoundsFromPoints(points); - - try { - return { - ...fitBounds({ - bounds, - width, - height, - minExtent, - maxZoom, - offset, - padding, - }), - bearing, - pitch, - }; - } catch (error) { - // eslint-disable-next-line no-console - console.error('Could not fit viewport', error); - } - - return originalViewPort; -} diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utils/getPointsFromPolygon.ts b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utils/getPointsFromPolygon.ts deleted file mode 100644 index a8023951c1e4a..0000000000000 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utils/getPointsFromPolygon.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { Point } from './types'; - -/** Format originally used by the Polygon plugin */ -type CustomPolygonFeature = { - polygon: Point[]; -}; - -/** - * Format that is geojson standard - * https://geojson.org/geojson-spec.html - */ -type GeojsonPolygonFeature = { - polygon: { - type: 'Feature'; - geometry: { - type: 'Polygon'; - coordinates: Point[][]; - }; - }; -}; - -export default function getPointsFromPolygon( - feature: CustomPolygonFeature | GeojsonPolygonFeature, -) { - return 'geometry' in feature.polygon ? feature.polygon.geometry.coordinates[0] : feature.polygon; -} diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utils/types.ts b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utils/types.ts deleted file mode 100644 index 5f53f0ce0dd0b..0000000000000 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/src/utils/types.ts +++ /dev/null @@ -1,5 +0,0 @@ -// range and point actually have different value ranges -// and also are different concept-wise - -export type Range = [number, number]; -export type Point = [number, number]; diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/test/utils/colors.test.js b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/test/utils/colors.test.js deleted file mode 100644 index 9fc24d2c756f9..0000000000000 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/test/utils/colors.test.js +++ /dev/null @@ -1,7 +0,0 @@ -import { hexToRGB } from '../../src/utils/colors'; - -describe('colors', () => { - it('hexToRGB()', () => { - expect(hexToRGB('#ffffff')).toEqual([255, 255, 255, 255]); - }); -}); diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/test/utils/getPointsFromPolygon.test.ts b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/test/utils/getPointsFromPolygon.test.ts deleted file mode 100644 index e7e8340b493da..0000000000000 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/test/utils/getPointsFromPolygon.test.ts +++ /dev/null @@ -1,38 +0,0 @@ -import getPointsFromPolygon from '../../src/utils/getPointsFromPolygon'; - -describe('getPointsFromPolygon', () => { - it('handle original input', () => { - expect( - getPointsFromPolygon({ - polygon: [ - [1, 2], - [3, 4], - ], - }), - ).toEqual([ - [1, 2], - [3, 4], - ]); - }); - it('handle geojson features', () => { - expect( - getPointsFromPolygon({ - polygon: { - type: 'Feature', - geometry: { - type: 'Polygon', - coordinates: [ - [ - [1, 2], - [3, 4], - ], - ], - }, - }, - }), - ).toEqual([ - [1, 2], - [3, 4], - ]); - }); -}); diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/types/external.d.ts b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/types/external.d.ts deleted file mode 100644 index 7d762cf947e85..0000000000000 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/types/external.d.ts +++ /dev/null @@ -1 +0,0 @@ -declare module '@math.gl/web-mercator'; diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/yarn.lock b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/yarn.lock deleted file mode 100644 index 6e591c75d1607..0000000000000 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-legacy-preset-chart-deckgl/yarn.lock +++ /dev/null @@ -1,1062 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@babel/runtime@^7.0.0", "@babel/runtime@^7.12.0", "@babel/runtime@^7.3.1": - "integrity" "sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg==" - "resolved" "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.8.tgz" - "version" "7.14.8" - dependencies: - "regenerator-runtime" "^0.13.4" - -"@deck.gl/aggregation-layers@8.5.2": - "integrity" "sha512-oiqXPmyn2v0lX9tWCvgmWs29stHSLS3tje71Ff2FVXDNmvP5FoZItFa8y7O7KSTkej2/rSwZeSte/a9pri6Njg==" - "resolved" "https://registry.npmjs.org/@deck.gl/aggregation-layers/-/aggregation-layers-8.5.2.tgz" - "version" "8.5.2" - dependencies: - "@luma.gl/shadertools" "^8.5.4" - "@math.gl/web-mercator" "^3.5.3" - "d3-hexbin" "^0.2.1" - -"@deck.gl/carto@8.5.2": - "integrity" "sha512-Kw/3NUM+2NcHjxH6b7IOUYXEwmJ4SNQujFzAVFW5amG4Lut8074NGSF5XHi+4M/zgk7vXDFsGRxLqspsA/dg8w==" - "resolved" "https://registry.npmjs.org/@deck.gl/carto/-/carto-8.5.2.tgz" - "version" "8.5.2" - dependencies: - "@loaders.gl/loader-utils" "^3.0.6" - "@loaders.gl/mvt" "^3.0.6" - "@loaders.gl/tiles" "^3.0.6" - "@math.gl/web-mercator" "^3.5.3" - "cartocolor" "^4.0.2" - "d3-scale" "^3.2.3" - -"@deck.gl/core@8.5.2": - "integrity" "sha512-SAFv7fKx6k1Rj8R4qTMQO2wEhEfixROzbcoSS6RivxrfES00KYYj6jJ7iNEnq3dFn6qc37LPpxqtYYHO4BcvYA==" - "resolved" "https://registry.npmjs.org/@deck.gl/core/-/core-8.5.2.tgz" - "version" "8.5.2" - dependencies: - "@loaders.gl/core" "^3.0.6" - "@loaders.gl/images" "^3.0.6" - "@luma.gl/core" "^8.5.4" - "@math.gl/web-mercator" "^3.5.3" - "gl-matrix" "^3.0.0" - "math.gl" "^3.5.3" - "mjolnir.js" "^2.5.0" - "probe.gl" "^3.4.0" - -"@deck.gl/extensions@8.5.2": - "integrity" "sha512-VhbQsMNPM7RCR/ERwb1u1x0rEWAxgXfcCWttW+gYvbiagW/LrAJ22jhOghlRW/wilEmupHYbXQlWkW2V/mYfsg==" - "resolved" "https://registry.npmjs.org/@deck.gl/extensions/-/extensions-8.5.2.tgz" - "version" "8.5.2" - dependencies: - "@luma.gl/shadertools" "^8.5.4" - -"@deck.gl/geo-layers@8.5.2": - "integrity" "sha512-t6+TgAdbKWDw8g9UX1y6D+5twcdJuKaXw4qSib/0yVurWi/Mil5Plihybt1l9uBZuwkr+UcpxPR73zzo+qd9MA==" - "resolved" "https://registry.npmjs.org/@deck.gl/geo-layers/-/geo-layers-8.5.2.tgz" - "version" "8.5.2" - dependencies: - "@loaders.gl/3d-tiles" "^3.0.6" - "@loaders.gl/gis" "^3.0.6" - "@loaders.gl/loader-utils" "^3.0.6" - "@loaders.gl/mvt" "^3.0.6" - "@loaders.gl/terrain" "^3.0.6" - "@loaders.gl/tiles" "^3.0.6" - "@luma.gl/experimental" "^8.5.4" - "@math.gl/culling" "^3.5.3" - "@math.gl/web-mercator" "^3.5.3" - "h3-js" "^3.6.0" - "long" "^3.2.0" - "math.gl" "^3.5.3" - -"@deck.gl/google-maps@8.5.2": - "integrity" "sha512-Dk3ozenBWgt9nFSYOT4N82urNW/JhiMszfFq6zLt3jUp0N7EJ9d2XO81hclM59BhjIdGWb6drTe96NvtbabVLQ==" - "resolved" "https://registry.npmjs.org/@deck.gl/google-maps/-/google-maps-8.5.2.tgz" - "version" "8.5.2" - -"@deck.gl/json@8.5.2": - "integrity" "sha512-lVS16bvPfLUSidgBURZvGbWEjgK8GjLWlp1iGuLvua2W6TnWIyiKa6a3XoebgeXd8kqwSbQxhNnuSVPX+Di6Rg==" - "resolved" "https://registry.npmjs.org/@deck.gl/json/-/json-8.5.2.tgz" - "version" "8.5.2" - dependencies: - "d3-dsv" "^1.0.8" - "expression-eval" "^2.0.0" - -"@deck.gl/layers@8.5.2": - "integrity" "sha512-HmpE3qf9CI7sU/xa2DMCNg31pzpzK5XuUHyC70dsLq8AV7Sm3vZQz17KMU/CWSZpVr7yQ8uxTeSQARiv/zeOFQ==" - "resolved" "https://registry.npmjs.org/@deck.gl/layers/-/layers-8.5.2.tgz" - "version" "8.5.2" - dependencies: - "@loaders.gl/images" "^3.0.6" - "@mapbox/tiny-sdf" "^1.1.0" - "@math.gl/polygon" "^3.5.3" - "earcut" "^2.0.6" - -"@deck.gl/mapbox@8.5.2": - "integrity" "sha512-nMpzfdPFBVthT+EMgIcKo4YO6bZCqADQtqnxIFtfofZIiKS6R5OSuJ3sXPSNZ9ReCJGzdmndEz7/Qtm9Sia/bA==" - "resolved" "https://registry.npmjs.org/@deck.gl/mapbox/-/mapbox-8.5.2.tgz" - "version" "8.5.2" - -"@deck.gl/mesh-layers@8.5.2": - "integrity" "sha512-dUfQyGjm5CYQg9AQdRsGtEEXGSGHxifPlws0zWWoj1r757wjqM0aZ663TUJEsJQDTLNOvbBLGTiuFeCBUoKO4Q==" - "resolved" "https://registry.npmjs.org/@deck.gl/mesh-layers/-/mesh-layers-8.5.2.tgz" - "version" "8.5.2" - dependencies: - "@loaders.gl/gltf" "^3.0.6" - "@luma.gl/experimental" "^8.5.4" - "@luma.gl/shadertools" "^8.5.4" - -"@deck.gl/react@8.5.2": - "integrity" "sha512-h7AJ9nPY1PTjrAVP7T1fvWDChWZrVOsEfYIoEP4W6ILSjvDqEQfVL0+9RhjUwQV2nKrg0QmpqCmbfOrgKQQbYw==" - "resolved" "https://registry.npmjs.org/@deck.gl/react/-/react-8.5.2.tgz" - "version" "8.5.2" - dependencies: - "prop-types" "^15.6.0" - -"@loaders.gl/3d-tiles@^3.0.6": - "integrity" "sha512-jZeOyDPGD2wEkTLW4Do9A4UUQ+OGjhhNXztB0AsttZ69OpkmsxJXb76xxwevf+eThrsTgSTjZ06eC5DHX0kyXA==" - "resolved" "https://registry.npmjs.org/@loaders.gl/3d-tiles/-/3d-tiles-3.0.8.tgz" - "version" "3.0.8" - dependencies: - "@loaders.gl/core" "3.0.8" - "@loaders.gl/draco" "3.0.8" - "@loaders.gl/gltf" "3.0.8" - "@loaders.gl/loader-utils" "3.0.8" - "@loaders.gl/math" "3.0.8" - "@loaders.gl/tiles" "3.0.8" - "@math.gl/core" "^3.5.1" - "@math.gl/geospatial" "^3.5.1" - -"@loaders.gl/core@^3.0.6", "@loaders.gl/core@3.0.8": - "integrity" "sha512-FIfbhMkoRX2JonEHXHgClC7jwOSsEwvvmjlaTMRAY+gFKvJPGmegkp4VgUZquLFf6GedJt/1TuMMvAX6gdq1pg==" - "resolved" "https://registry.npmjs.org/@loaders.gl/core/-/core-3.0.8.tgz" - "version" "3.0.8" - dependencies: - "@babel/runtime" "^7.3.1" - "@loaders.gl/loader-utils" "3.0.8" - "@loaders.gl/worker-utils" "3.0.8" - "probe.gl" "^3.4.0" - -"@loaders.gl/draco@3.0.8": - "integrity" "sha512-ZCXzXNHWQ7H0qk/kC+rWzjMWjLzZGzQcDbdpIuy8xJdp4rTpmMkLUseFPby8vhkmIaqxWPwPB6mx/vM7L6JENg==" - "resolved" "https://registry.npmjs.org/@loaders.gl/draco/-/draco-3.0.8.tgz" - "version" "3.0.8" - dependencies: - "@babel/runtime" "^7.3.1" - "@loaders.gl/loader-utils" "3.0.8" - "@loaders.gl/schema" "3.0.8" - "@loaders.gl/worker-utils" "3.0.8" - "draco3d" "1.4.1" - -"@loaders.gl/gis@^3.0.6", "@loaders.gl/gis@3.0.8": - "integrity" "sha512-7NL+lIb7NezlMupYskVil6M3RZunXJl+TyaVAW82GLbzPSOq+m/G7h3+z0GBa8iv/U/I+cB5BhSN+GZmvFwqEA==" - "resolved" "https://registry.npmjs.org/@loaders.gl/gis/-/gis-3.0.8.tgz" - "version" "3.0.8" - dependencies: - "@loaders.gl/loader-utils" "3.0.8" - "@loaders.gl/schema" "3.0.8" - "@mapbox/vector-tile" "^1.3.1" - "pbf" "^3.2.1" - -"@loaders.gl/gltf@^3.0.6", "@loaders.gl/gltf@3.0.8": - "integrity" "sha512-4PXWTlqyvlbZE2Vp4iQ+Y87ZO1WuRvSlbImDhygd0hoINfmJ9ObxrFS3yJcpJTu007nWxXorNVEOKyuoo+4Iyw==" - "resolved" "https://registry.npmjs.org/@loaders.gl/gltf/-/gltf-3.0.8.tgz" - "version" "3.0.8" - dependencies: - "@loaders.gl/core" "3.0.8" - "@loaders.gl/draco" "3.0.8" - "@loaders.gl/images" "3.0.8" - "@loaders.gl/loader-utils" "3.0.8" - -"@loaders.gl/images@^3.0.6", "@loaders.gl/images@3.0.8": - "integrity" "sha512-rO2cIYJYlMs/uO9YSoF4/BEA4p/9xQ3gHZ1sIJkPYVnDqzpbu8nvUjWTQqIdL/MkQBTW8tz3twCdM+B6G9Fa2w==" - "resolved" "https://registry.npmjs.org/@loaders.gl/images/-/images-3.0.8.tgz" - "version" "3.0.8" - dependencies: - "@loaders.gl/loader-utils" "3.0.8" - -"@loaders.gl/loader-utils@^3.0.6", "@loaders.gl/loader-utils@3.0.8": - "integrity" "sha512-PW1WyyQ+LXkqoGHBZHsmfNQkKiLAYf1gok+kHnHvY9fCzhJeA1iTNEUKPXGXKgS00m/k5cBTkOWAaOG9KRvBCQ==" - "resolved" "https://registry.npmjs.org/@loaders.gl/loader-utils/-/loader-utils-3.0.8.tgz" - "version" "3.0.8" - dependencies: - "@babel/runtime" "^7.3.1" - "@loaders.gl/worker-utils" "3.0.8" - "@probe.gl/stats" "^3.4.0" - -"@loaders.gl/math@3.0.8": - "integrity" "sha512-jfFpxxr4Bq5JfOPqLVJc4JJGoGGvVTOCWiJhnTtSAKhaNSwldmNWaZ0w8E2nlgPKPMAHiTRKOQnd9sSY5m66Cw==" - "resolved" "https://registry.npmjs.org/@loaders.gl/math/-/math-3.0.8.tgz" - "version" "3.0.8" - dependencies: - "@loaders.gl/images" "3.0.8" - "@loaders.gl/loader-utils" "3.0.8" - "@math.gl/core" "^3.5.1" - -"@loaders.gl/mvt@^3.0.6": - "integrity" "sha512-Jk1QTHgpxMsUT01w5IJJ2en9qq0yOZcL2wGXVc7CFp2h6inB22rC3drUwq1mUNGe6iy3EWIo7EeJVd9B+5JyTQ==" - "resolved" "https://registry.npmjs.org/@loaders.gl/mvt/-/mvt-3.0.8.tgz" - "version" "3.0.8" - dependencies: - "@loaders.gl/gis" "3.0.8" - "@loaders.gl/loader-utils" "3.0.8" - "@math.gl/polygon" "^3.5.1" - "pbf" "^3.2.1" - -"@loaders.gl/schema@3.0.8": - "integrity" "sha512-yne5WE7fZZWFl2zF8fzDlYhPVJua6h6mTCSmlQ5pryaMXTZS9mfzXXIFWRL3kswqnQTu/QNFdyFj1mP0haF24w==" - "resolved" "https://registry.npmjs.org/@loaders.gl/schema/-/schema-3.0.8.tgz" - "version" "3.0.8" - dependencies: - "@types/geojson" "^7946.0.7" - "apache-arrow" "^4.0.0" - "d3-dsv" "^1.2.0" - -"@loaders.gl/terrain@^3.0.6": - "integrity" "sha512-MtOAYEB/xJB4CN4B0YNPkO4v1ZY332joxiOHQI1x37x4sWVAqOrKLr9jB42sZCB8aINi2WMWGiErtf9wh9L5Pg==" - "resolved" "https://registry.npmjs.org/@loaders.gl/terrain/-/terrain-3.0.8.tgz" - "version" "3.0.8" - dependencies: - "@babel/runtime" "^7.3.1" - "@loaders.gl/loader-utils" "3.0.8" - "@loaders.gl/schema" "3.0.8" - "@mapbox/martini" "^0.2.0" - -"@loaders.gl/tiles@^3.0.6", "@loaders.gl/tiles@3.0.8": - "integrity" "sha512-Rc+yHFdQg2sYmcYkwvszukFWdm9EW354F9HUR7y/oauos6tsdo4YTj31zgytaYR63/EqWQ7kwI29/eePEcutzg==" - "resolved" "https://registry.npmjs.org/@loaders.gl/tiles/-/tiles-3.0.8.tgz" - "version" "3.0.8" - dependencies: - "@loaders.gl/core" "3.0.8" - "@loaders.gl/loader-utils" "3.0.8" - "@loaders.gl/math" "3.0.8" - "@math.gl/core" "^3.5.1" - "@math.gl/culling" "^3.5.1" - "@math.gl/geospatial" "^3.5.1" - "@math.gl/web-mercator" "^3.5.1" - "@probe.gl/stats" "^3.4.0" - -"@loaders.gl/worker-utils@3.0.8": - "integrity" "sha512-Pg72HuXPcL725TrOlOr83xloVUHj6OMWmno1dI8ccuqfOBsgoRjxNZrcSvwBzfK8tFCzuN2X30I+mHl3BkuYLw==" - "resolved" "https://registry.npmjs.org/@loaders.gl/worker-utils/-/worker-utils-3.0.8.tgz" - "version" "3.0.8" - dependencies: - "@babel/runtime" "^7.3.1" - -"@luma.gl/constants@8.5.4": - "integrity" "sha512-lrA4ja92om/gDHYOvM9itL5S7FVzjKulyknDz6S+Y7gmgHgXk2ln1Xar5zUCsLnhAYx4glHITXGH5Y5rdWgT1Q==" - "resolved" "https://registry.npmjs.org/@luma.gl/constants/-/constants-8.5.4.tgz" - "version" "8.5.4" - -"@luma.gl/core@^8.5.4": - "integrity" "sha512-+saDz1D3mcPd53vgbG60ryg1w5CF9Z2wdakKHzR810VoJLw97t4aNdg/eNgyWOvbOHxaKJBPm8K0sGjej67+jw==" - "resolved" "https://registry.npmjs.org/@luma.gl/core/-/core-8.5.4.tgz" - "version" "8.5.4" - dependencies: - "@babel/runtime" "^7.0.0" - "@luma.gl/constants" "8.5.4" - "@luma.gl/engine" "8.5.4" - "@luma.gl/gltools" "8.5.4" - "@luma.gl/shadertools" "8.5.4" - "@luma.gl/webgl" "8.5.4" - -"@luma.gl/engine@8.5.4": - "integrity" "sha512-Sfv972IzvR9s9kKWugs67XQUh9jC0e/PpBrzvyGVnPU4XvFq42RZVF73pzEklVU6AlpR8Zg5CPtxGdhyOHtT7w==" - "resolved" "https://registry.npmjs.org/@luma.gl/engine/-/engine-8.5.4.tgz" - "version" "8.5.4" - dependencies: - "@babel/runtime" "^7.0.0" - "@luma.gl/constants" "8.5.4" - "@luma.gl/gltools" "8.5.4" - "@luma.gl/shadertools" "8.5.4" - "@luma.gl/webgl" "8.5.4" - "@math.gl/core" "^3.5.0" - "probe.gl" "^3.4.0" - -"@luma.gl/experimental@^8.5.4": - "integrity" "sha512-09waqRhgIrw+Sq0/in4tw4jPag5YsFfV1nEHJaLAg5RFv92S53IEubSJgkuG02HoOBkPxQ7KYvs9VNmriisnYg==" - "resolved" "https://registry.npmjs.org/@luma.gl/experimental/-/experimental-8.5.4.tgz" - "version" "8.5.4" - dependencies: - "@luma.gl/constants" "8.5.4" - "@math.gl/core" "^3.5.0" - "earcut" "^2.0.6" - -"@luma.gl/gltools@8.5.4": - "integrity" "sha512-JotiPuymQz2Xc41AYlS2moJC/EHxU+OX/OMKi0+/MeOlEFLsdochgTA0I64j8yofLTXdeiGCneGtD1Ao8fk+bw==" - "resolved" "https://registry.npmjs.org/@luma.gl/gltools/-/gltools-8.5.4.tgz" - "version" "8.5.4" - dependencies: - "@babel/runtime" "^7.0.0" - "@luma.gl/constants" "8.5.4" - "probe.gl" "^3.4.0" - -"@luma.gl/shadertools@^8.5.4", "@luma.gl/shadertools@8.5.4": - "integrity" "sha512-rwLBLrACi75aWnuJm8rVKCQnJR2sMTCxHuexfjHJ7Uecl0vVcVJZT7c9EnCFaz5LUTNbdupvuhq0SKNckKiKmw==" - "resolved" "https://registry.npmjs.org/@luma.gl/shadertools/-/shadertools-8.5.4.tgz" - "version" "8.5.4" - dependencies: - "@babel/runtime" "^7.0.0" - "@math.gl/core" "^3.5.0" - -"@luma.gl/webgl@8.5.4": - "integrity" "sha512-dWy4dhTbtvDO9zQBdx1Yb+DxNx/1JWV9rhhJxJUtTKbGZSX0RjkASTT6GBWMl5jrH1JYJefS1wswHmmPVXjK0Q==" - "resolved" "https://registry.npmjs.org/@luma.gl/webgl/-/webgl-8.5.4.tgz" - "version" "8.5.4" - dependencies: - "@babel/runtime" "^7.0.0" - "@luma.gl/constants" "8.5.4" - "@luma.gl/gltools" "8.5.4" - "probe.gl" "^3.4.0" - -"@mapbox/geojson-rewind@^0.5.0": - "integrity" "sha512-eL7fMmfTBKjrb+VFHXCGv9Ot0zc3C0U+CwXo1IrP+EPwDczLoXv34Tgq3y+2mPSFNVUXgU42ILWJTC7145KPTA==" - "resolved" "https://registry.npmjs.org/@mapbox/geojson-rewind/-/geojson-rewind-0.5.1.tgz" - "version" "0.5.1" - dependencies: - "get-stream" "^6.0.1" - "minimist" "^1.2.5" - -"@mapbox/geojson-types@^1.0.2": - "integrity" "sha512-e9EBqHHv3EORHrSfbR9DqecPNn+AmuAoQxV6aL8Xu30bJMJR1o8PZLZzpk1Wq7/NfCbuhmakHTPYRhoqLsXRnw==" - "resolved" "https://registry.npmjs.org/@mapbox/geojson-types/-/geojson-types-1.0.2.tgz" - "version" "1.0.2" - -"@mapbox/jsonlint-lines-primitives@^2.0.2": - "integrity" "sha1-zlblOfg1UrWNENZy6k1vya3HsjQ=" - "resolved" "https://registry.npmjs.org/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz" - "version" "2.0.2" - -"@mapbox/mapbox-gl-supported@^2.0.0": - "integrity" "sha512-zu4udqYiBrKMQKwpKJ4hhPON7tz0QR/JZ3iGpHnNWFmH3Sv/ysxlICATUtGCFpsyJf2v1WpFhlzaZ3GhhKmPMA==" - "resolved" "https://registry.npmjs.org/@mapbox/mapbox-gl-supported/-/mapbox-gl-supported-2.0.0.tgz" - "version" "2.0.0" - -"@mapbox/martini@^0.2.0": - "integrity" "sha512-7hFhtkb0KTLEls+TRw/rWayq5EeHtTaErgm/NskVoXmtgAQu/9D299aeyj6mzAR/6XUnYRp2lU+4IcrYRFjVsQ==" - "resolved" "https://registry.npmjs.org/@mapbox/martini/-/martini-0.2.0.tgz" - "version" "0.2.0" - -"@mapbox/point-geometry@^0.1.0", "@mapbox/point-geometry@~0.1.0", "@mapbox/point-geometry@0.1.0": - "integrity" "sha1-ioP5M1x4YO/6Lu7KJUMyqgru2PI=" - "resolved" "https://registry.npmjs.org/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz" - "version" "0.1.0" - -"@mapbox/tiny-sdf@^1.1.0", "@mapbox/tiny-sdf@^1.2.5": - "integrity" "sha512-cD8A/zJlm6fdJOk6DqPUV8mcpyJkRz2x2R+/fYcWDYG3oWbG7/L7Yl/WqQ1VZCjnL9OTIMAn6c+BC5Eru4sQEw==" - "resolved" "https://registry.npmjs.org/@mapbox/tiny-sdf/-/tiny-sdf-1.2.5.tgz" - "version" "1.2.5" - -"@mapbox/unitbezier@^0.0.0": - "integrity" "sha1-FWUb1VOme4WB+zmIEMmK2Go0Uk4=" - "resolved" "https://registry.npmjs.org/@mapbox/unitbezier/-/unitbezier-0.0.0.tgz" - "version" "0.0.0" - -"@mapbox/vector-tile@^1.3.1": - "integrity" "sha512-MCEddb8u44/xfQ3oD+Srl/tNcQoqTw3goGk2oLsrFxOTc3dUp+kAnby3PvAeeBYSMSjSPD1nd1AJA6W49WnoUw==" - "resolved" "https://registry.npmjs.org/@mapbox/vector-tile/-/vector-tile-1.3.1.tgz" - "version" "1.3.1" - dependencies: - "@mapbox/point-geometry" "~0.1.0" - -"@mapbox/whoots-js@^3.1.0": - "integrity" "sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q==" - "resolved" "https://registry.npmjs.org/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz" - "version" "3.1.0" - -"@math.gl/core@^3.5.0", "@math.gl/core@^3.5.1", "@math.gl/core@3.5.3": - "integrity" "sha512-TaSnvG0qFh1VxeNW5L58jSx0nJUMWMpUl6zo6Z3ScQzFySG5cicGOBzk/D40RkIZWPazCKCZ+ZThg5npSK9y3g==" - "resolved" "https://registry.npmjs.org/@math.gl/core/-/core-3.5.3.tgz" - "version" "3.5.3" - dependencies: - "@babel/runtime" "^7.12.0" - "gl-matrix" "^3.0.0" - -"@math.gl/culling@^3.5.1", "@math.gl/culling@^3.5.3": - "integrity" "sha512-ABpAcrvoIOLSm1EUkwgDem4RfO28HWPBs/+taZ/ZSpJG6KiVPklpKU1NCK+05HuJStkpFZ+XlWtehWU6FAMCyA==" - "resolved" "https://registry.npmjs.org/@math.gl/culling/-/culling-3.5.3.tgz" - "version" "3.5.3" - dependencies: - "@babel/runtime" "^7.12.0" - "@math.gl/core" "3.5.3" - "gl-matrix" "^3.0.0" - -"@math.gl/geospatial@^3.5.1": - "integrity" "sha512-cnc8VMQrt30JmlG200VDJmmvSjaGW57gY9KEZ+raapxyyFyfDNuAuIrIxe+zbK66FbvFWTbJlDaNmKqVG+ohyw==" - "resolved" "https://registry.npmjs.org/@math.gl/geospatial/-/geospatial-3.5.3.tgz" - "version" "3.5.3" - dependencies: - "@babel/runtime" "^7.12.0" - "@math.gl/core" "3.5.3" - "gl-matrix" "^3.0.0" - -"@math.gl/polygon@^3.5.1", "@math.gl/polygon@^3.5.3": - "integrity" "sha512-VktscmyQg/Rd56nJk0Nj/UyvnPDbsnZNMWCdl3G5AYenYzLWy6h4FEWhLx8pD+Xw7VuFot8LR4WAK2TPzXzrWw==" - "resolved" "https://registry.npmjs.org/@math.gl/polygon/-/polygon-3.5.3.tgz" - "version" "3.5.3" - dependencies: - "@math.gl/core" "3.5.3" - -"@math.gl/web-mercator@^3.2.2", "@math.gl/web-mercator@^3.4.3", "@math.gl/web-mercator@^3.5.1", "@math.gl/web-mercator@^3.5.3": - "integrity" "sha512-WZE9ALeTS4n3HDgkqTxcNLBU7DL0mjmPXSrcqSZIUeDY00+LCtNvMQWUAwqolpB7nD71vD6HLW8delzVuy4teA==" - "resolved" "https://registry.npmjs.org/@math.gl/web-mercator/-/web-mercator-3.5.3.tgz" - "version" "3.5.3" - dependencies: - "@babel/runtime" "^7.12.0" - "gl-matrix" "^3.0.0" - -"@probe.gl/stats@^3.4.0", "@probe.gl/stats@3.4.0": - "integrity" "sha512-Gl37r9qGuiKadIvTZdSZvzCNOttJYw6RcY1oT0oDuB8r2uhuZAdSMQRQTy9FTinp6MY6O9wngGnV6EpQ8wSBAw==" - "resolved" "https://registry.npmjs.org/@probe.gl/stats/-/stats-3.4.0.tgz" - "version" "3.4.0" - dependencies: - "@babel/runtime" "^7.0.0" - -"@types/d3-array@^2.0.0": - "integrity" "sha512-hN879HLPTVqZV3FQEXy7ptt083UXwguNbnxdTGzVW4y4KjX5uyNKljrQixZcSJfLyFirbpUokxpXtvR+N5+KIg==" - "resolved" "https://registry.npmjs.org/@types/d3-array/-/d3-array-2.12.3.tgz" - "version" "2.12.3" - -"@types/flatbuffers@^1.10.0": - "integrity" "sha512-7btbphLrKvo5yl/5CC2OCxUSMx1wV1wvGT1qDXkSt7yi00/YW7E8k6qzXqJHsp+WU0eoG7r6MTQQXI9lIvd0qA==" - "resolved" "https://registry.npmjs.org/@types/flatbuffers/-/flatbuffers-1.10.0.tgz" - "version" "1.10.0" - -"@types/geojson@*", "@types/geojson@^7946.0.7": - "integrity" "sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA==" - "resolved" "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.8.tgz" - "version" "7946.0.8" - -"@types/mapbox-gl@^2.0.3": - "integrity" "sha512-Na5vXw6Ez0L5To/+pL78dWPNoG6QlPdEDdnkSmIL5HWxemD+s0pTmTWDbMj7tcqJ2hnVyOyukVIveR9HPi7eeA==" - "resolved" "https://registry.npmjs.org/@types/mapbox-gl/-/mapbox-gl-2.4.0.tgz" - "version" "2.4.0" - dependencies: - "@types/geojson" "*" - -"@types/node@^14.14.37": - "integrity" "sha512-CMjgRNsks27IDwI785YMY0KLt3co/c0cQ5foxHYv/shC2w8oOnVwz5Ubq1QG5KzrcW+AXk6gzdnxIkDnTvzu3g==" - "resolved" "https://registry.npmjs.org/@types/node/-/node-14.17.9.tgz" - "version" "14.17.9" - -"@types/text-encoding-utf-8@^1.0.1": - "integrity" "sha512-AQ6zewa0ucLJvtUi5HsErbOFKAcQfRLt9zFLlUOvcXBy2G36a+ZDpCHSGdzJVUD8aNURtIjh9aSjCStNMRCcRQ==" - "resolved" "https://registry.npmjs.org/@types/text-encoding-utf-8/-/text-encoding-utf-8-1.0.2.tgz" - "version" "1.0.2" - -"ansi-styles@^3.2.1": - "integrity" "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==" - "resolved" "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz" - "version" "3.2.1" - dependencies: - "color-convert" "^1.9.0" - -"apache-arrow@^4.0.0": - "integrity" "sha512-DyF7GXCbSjsw4P5C8b+qW7OnJKa6w9mJI0mhV0+EfZbVZCmhfiF6ffqcnrI/kzBrRqn9hH/Ft9n5+m4DTbBJpg==" - "resolved" "https://registry.npmjs.org/apache-arrow/-/apache-arrow-4.0.1.tgz" - "version" "4.0.1" - dependencies: - "@types/flatbuffers" "^1.10.0" - "@types/node" "^14.14.37" - "@types/text-encoding-utf-8" "^1.0.1" - "command-line-args" "5.1.1" - "command-line-usage" "6.1.1" - "flatbuffers" "1.12.0" - "json-bignum" "^0.0.3" - "pad-left" "^2.1.0" - "text-encoding-utf-8" "^1.0.2" - "tslib" "^2.2.0" - -"array-back@^3.0.1": - "integrity" "sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==" - "resolved" "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz" - "version" "3.1.0" - -"array-back@^4.0.1": - "integrity" "sha512-NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg==" - "resolved" "https://registry.npmjs.org/array-back/-/array-back-4.0.2.tgz" - "version" "4.0.2" - -"bootstrap-slider@^10.0.0": - "integrity" "sha512-8JTPZB9QVOdrGzYF3YgC3YW6ssfPeBvBwZnXffiZ7YH/zz1D0EKlZvmQsm/w3N0XjVNYQEoQ0ax+jHrErV4K1Q==" - "resolved" "https://registry.npmjs.org/bootstrap-slider/-/bootstrap-slider-10.6.2.tgz" - "version" "10.6.2" - -"bootstrap-slider@9.9.0": - "integrity" "sha1-ThTsxkAZAdod33aBqiTjOwDa3Og=" - "resolved" "https://registry.npmjs.org/bootstrap-slider/-/bootstrap-slider-9.9.0.tgz" - "version" "9.9.0" - -"cartocolor@^4.0.2": - "integrity" "sha512-+Gh9mb6lFxsDOLQlBLPxAHCnWXlg2W8q3AcVwqRcy95TdBbcOU89Wrb6h2Hd/6Ww1Kc1pzXmUdpnWD+xeCG0dg==" - "resolved" "https://registry.npmjs.org/cartocolor/-/cartocolor-4.0.2.tgz" - "version" "4.0.2" - dependencies: - "colorbrewer" "1.0.0" - -"chalk@^2.4.2": - "integrity" "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==" - "resolved" "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz" - "version" "2.4.2" - dependencies: - "ansi-styles" "^3.2.1" - "escape-string-regexp" "^1.0.5" - "supports-color" "^5.3.0" - -"color-convert@^1.9.0": - "integrity" "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==" - "resolved" "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz" - "version" "1.9.3" - dependencies: - "color-name" "1.1.3" - -"color-name@1.1.3": - "integrity" "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" - "resolved" "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz" - "version" "1.1.3" - -"colorbrewer@1.0.0": - "integrity" "sha1-T5czO5abp2Ejgr5LwzlLNB+0yKI=" - "resolved" "https://registry.npmjs.org/colorbrewer/-/colorbrewer-1.0.0.tgz" - "version" "1.0.0" - -"command-line-args@5.1.1": - "integrity" "sha512-hL/eG8lrll1Qy1ezvkant+trihbGnaKaeEjj6Scyr3DN+RC7iQ5Rz84IeLERfAWDGo0HBSNAakczwgCilDXnWg==" - "resolved" "https://registry.npmjs.org/command-line-args/-/command-line-args-5.1.1.tgz" - "version" "5.1.1" - dependencies: - "array-back" "^3.0.1" - "find-replace" "^3.0.0" - "lodash.camelcase" "^4.3.0" - "typical" "^4.0.0" - -"command-line-usage@6.1.1": - "integrity" "sha512-F59pEuAR9o1SF/bD0dQBDluhpT4jJQNWUHEuVBqpDmCUo6gPjCi+m9fCWnWZVR/oG6cMTUms4h+3NPl74wGXvA==" - "resolved" "https://registry.npmjs.org/command-line-usage/-/command-line-usage-6.1.1.tgz" - "version" "6.1.1" - dependencies: - "array-back" "^4.0.1" - "chalk" "^2.4.2" - "table-layout" "^1.0.1" - "typical" "^5.2.0" - -"commander@^2.20.3", "commander@2": - "integrity" "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==" - "resolved" "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz" - "version" "2.20.3" - -"csscolorparser@~1.0.3": - "integrity" "sha1-s085HupNqPPpgjHizNjfnAQfFxs=" - "resolved" "https://registry.npmjs.org/csscolorparser/-/csscolorparser-1.0.3.tgz" - "version" "1.0.3" - -"cssfilter@0.0.10": - "integrity" "sha1-xtJnJjKi5cg+AT5oZKQs6N79IK4=" - "resolved" "https://registry.npmjs.org/cssfilter/-/cssfilter-0.0.10.tgz" - "version" "0.0.10" - -"d3-array@^1.2.4": - "integrity" "sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw==" - "resolved" "https://registry.npmjs.org/d3-array/-/d3-array-1.2.4.tgz" - "version" "1.2.4" - -"d3-array@^2.3.0": - "integrity" "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==" - "resolved" "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz" - "version" "2.12.1" - dependencies: - "internmap" "^1.0.0" - -"d3-array@2": - "integrity" "sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ==" - "resolved" "https://registry.npmjs.org/d3-array/-/d3-array-2.12.1.tgz" - "version" "2.12.1" - dependencies: - "internmap" "^1.0.0" - -"d3-color@^1.4.1", "d3-color@1 - 2": - "integrity" "sha512-p2sTHSLCJI2QKunbGb7ocOh7DgTAn8IrLx21QRc/BSnodXM4sv6aLQlnfpvehFMLZEfBc6g9pH9SWQccFYfJ9Q==" - "resolved" "https://registry.npmjs.org/d3-color/-/d3-color-1.4.1.tgz" - "version" "1.4.1" - -"d3-dsv@^1.0.8", "d3-dsv@^1.2.0": - "integrity" "sha512-9yVlqvZcSOMhCYzniHE7EVUws7Fa1zgw+/EAV2BxJoG3ME19V6BQFBwI855XQDsxyOuG7NibqRMTtiF/Qup46g==" - "resolved" "https://registry.npmjs.org/d3-dsv/-/d3-dsv-1.2.0.tgz" - "version" "1.2.0" - dependencies: - "commander" "2" - "iconv-lite" "0.4" - "rw" "1" - -"d3-format@1 - 2": - "integrity" "sha512-Ab3S6XuE/Q+flY96HXT0jOXcM4EAClYFnRGY5zsjRGNy6qCYrQsMffs7cV5Q9xejb35zxW5hf/guKw34kvIKsA==" - "resolved" "https://registry.npmjs.org/d3-format/-/d3-format-2.0.0.tgz" - "version" "2.0.0" - -"d3-hexbin@^0.2.1": - "integrity" "sha1-nFg32s/UcasFM3qeke8Qv8T5iDE=" - "resolved" "https://registry.npmjs.org/d3-hexbin/-/d3-hexbin-0.2.2.tgz" - "version" "0.2.2" - -"d3-interpolate@1.2.0 - 2": - "integrity" "sha512-c5UhwwTs/yybcmTpAVqwSFl6vrQ8JZJoT5F7xNFK9pymv5C0Ymcc9/LIJHtYIggg/yS9YHw8i8O8tgb9pupjeQ==" - "resolved" "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-2.0.1.tgz" - "version" "2.0.1" - dependencies: - "d3-color" "1 - 2" - -"d3-scale@^3.0.0", "d3-scale@^3.2.3": - "integrity" "sha512-1JGp44NQCt5d1g+Yy+GeOnZP7xHo0ii8zsQp6PGzd+C1/dl0KGsp9A7Mxwp+1D1o4unbTTxVdU/ZOIEBoeZPbQ==" - "resolved" "https://registry.npmjs.org/d3-scale/-/d3-scale-3.3.0.tgz" - "version" "3.3.0" - dependencies: - "d3-array" "^2.3.0" - "d3-format" "1 - 2" - "d3-interpolate" "1.2.0 - 2" - "d3-time" "^2.1.1" - "d3-time-format" "2 - 3" - -"d3-time-format@2 - 3": - "integrity" "sha512-UXJh6EKsHBTjopVqZBhFysQcoXSv/5yLONZvkQ5Kk3qbwiUYkdX17Xa1PT6U1ZWXGGfB1ey5L8dKMlFq2DO0Ag==" - "resolved" "https://registry.npmjs.org/d3-time-format/-/d3-time-format-3.0.0.tgz" - "version" "3.0.0" - dependencies: - "d3-time" "1 - 2" - -"d3-time@^2.1.1", "d3-time@1 - 2": - "integrity" "sha512-/eIQe/eR4kCQwq7yxi7z4c6qEXf2IYGcjoWB5OOQy4Tq9Uv39/947qlDcN2TLkiTzQWzvnsuYPB9TrWaNfipKQ==" - "resolved" "https://registry.npmjs.org/d3-time/-/d3-time-2.1.1.tgz" - "version" "2.1.1" - dependencies: - "d3-array" "2" - -"deck.gl@8.5.2": - "integrity" "sha512-tsEyv62Zzc+GT3By0Y1R2gqEJ8K3tGBDaLprAoeAsg7fvIa5ikFBdWEBFHa1UDbgE2UEmYbcBK/yK4GAL8Ia4A==" - "resolved" "https://registry.npmjs.org/deck.gl/-/deck.gl-8.5.2.tgz" - "version" "8.5.2" - dependencies: - "@deck.gl/aggregation-layers" "8.5.2" - "@deck.gl/carto" "8.5.2" - "@deck.gl/core" "8.5.2" - "@deck.gl/extensions" "8.5.2" - "@deck.gl/geo-layers" "8.5.2" - "@deck.gl/google-maps" "8.5.2" - "@deck.gl/json" "8.5.2" - "@deck.gl/layers" "8.5.2" - "@deck.gl/mapbox" "8.5.2" - "@deck.gl/mesh-layers" "8.5.2" - "@deck.gl/react" "8.5.2" - -"deep-extend@~0.6.0": - "integrity" "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==" - "resolved" "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz" - "version" "0.6.0" - -"draco3d@1.4.1": - "integrity" "sha512-9Rxonc70xiovBC+Bq1h57SNZIHzWTibU1VfIGp5z3Xx8dPtv4yT5uGhiH7P5uvJRR2jkrvHafRxR7bTANkvfpg==" - "resolved" "https://registry.npmjs.org/draco3d/-/draco3d-1.4.1.tgz" - "version" "1.4.1" - -"earcut@^2.0.6", "earcut@^2.2.2": - "integrity" "sha512-iRDI1QeCQIhMCZk48DRDMVgQSSBDmbzzNhnxIo+pwx3swkfjMh6vh0nWLq1NdvGHLKH6wIrAM3vQWeTj6qeoug==" - "resolved" "https://registry.npmjs.org/earcut/-/earcut-2.2.3.tgz" - "version" "2.2.3" - -"es6bindall@^0.0.9": - "integrity" "sha1-ceAK+mn43VmsWsiYoNMcl434F9U=" - "resolved" "https://registry.npmjs.org/es6bindall/-/es6bindall-0.0.9.tgz" - "version" "0.0.9" - -"escape-string-regexp@^1.0.5": - "integrity" "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" - "resolved" "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz" - "version" "1.0.5" - -"expression-eval@^2.0.0": - "integrity" "sha512-FUJO/Akvl/JOWkvlqZaqbkhsEWlCJWDeZG4tzX96UH68D9FeRgYgtb55C2qtqbORC0Q6x5419EDjWu4IT9kQfg==" - "resolved" "https://registry.npmjs.org/expression-eval/-/expression-eval-2.1.0.tgz" - "version" "2.1.0" - dependencies: - "jsep" "^0.3.0" - -"find-replace@^3.0.0": - "integrity" "sha512-6Tb2myMioCAgv5kfvP5/PkZZ/ntTpVK39fHY7WkWBgvbeE+VHd/tZuZ4mrC+bxh4cfOZeYKVPaJIZtZXV7GNCQ==" - "resolved" "https://registry.npmjs.org/find-replace/-/find-replace-3.0.0.tgz" - "version" "3.0.0" - dependencies: - "array-back" "^3.0.1" - -"flatbuffers@1.12.0": - "integrity" "sha512-c7CZADjRcl6j0PlvFy0ZqXQ67qSEZfrVPynmnL+2zPc+NtMvrF8Y0QceMo7QqnSPc7+uWjUIAbvCQ5WIKlMVdQ==" - "resolved" "https://registry.npmjs.org/flatbuffers/-/flatbuffers-1.12.0.tgz" - "version" "1.12.0" - -"geojson-vt@^3.2.1": - "integrity" "sha512-EvGQQi/zPrDA6zr6BnJD/YhwAkBP8nnJ9emh3EnHQKVMfg/MRVtPbMYdgVy/IaEmn4UfagD2a6fafPDL5hbtwg==" - "resolved" "https://registry.npmjs.org/geojson-vt/-/geojson-vt-3.2.1.tgz" - "version" "3.2.1" - -"get-stream@^6.0.1": - "integrity" "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==" - "resolved" "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz" - "version" "6.0.1" - -"gl-matrix@^3.0.0", "gl-matrix@^3.3.0": - "integrity" "sha512-COb7LDz+SXaHtl/h4LeaFcNdJdAQSDeVqjiIihSXNrkWObZLhDI4hIkZC11Aeqp7bcE72clzB0BnDXr2SmslRA==" - "resolved" "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.3.0.tgz" - "version" "3.3.0" - -"grid-index@^1.1.0": - "integrity" "sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==" - "resolved" "https://registry.npmjs.org/grid-index/-/grid-index-1.1.0.tgz" - "version" "1.1.0" - -"h3-js@^3.6.0": - "integrity" "sha512-LPjlHSwB9zQZrMqKloCZmmmt3yZzIK7nqPcXqwU93zT3TtYG6jP4tZBzAPouxut7lLjdFbMQ75wRBiKfpsnY7w==" - "resolved" "https://registry.npmjs.org/h3-js/-/h3-js-3.7.2.tgz" - "version" "3.7.2" - -"hammerjs@^2.0.8": - "integrity" "sha1-BO93hiz/K7edMPdpIJWTAiK/YPE=" - "resolved" "https://registry.npmjs.org/hammerjs/-/hammerjs-2.0.8.tgz" - "version" "2.0.8" - -"has-flag@^3.0.0": - "integrity" "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" - "resolved" "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz" - "version" "3.0.0" - -"iconv-lite@0.4": - "integrity" "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==" - "resolved" "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz" - "version" "0.4.24" - dependencies: - "safer-buffer" ">= 2.1.2 < 3" - -"ieee754@^1.1.12": - "integrity" "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==" - "resolved" "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz" - "version" "1.2.1" - -"internmap@^1.0.0": - "integrity" "sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw==" - "resolved" "https://registry.npmjs.org/internmap/-/internmap-1.0.1.tgz" - "version" "1.0.1" - -"jquery@^3.4.1": - "integrity" "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" - "resolved" "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz" - "version" "3.6.0" - -"js-tokens@^3.0.0 || ^4.0.0": - "integrity" "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" - "resolved" "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz" - "version" "4.0.0" - -"jsep@^0.3.0": - "integrity" "sha512-AoRLBDc6JNnKjNcmonituEABS5bcfqDhQAWWXNTFrqu6nVXBpBAGfcoTGZMFlIrh9FjmE1CQyX9CTNwZrXMMDA==" - "resolved" "https://registry.npmjs.org/jsep/-/jsep-0.3.5.tgz" - "version" "0.3.5" - -"json-bignum@^0.0.3": - "integrity" "sha1-QRY7UENsdz2CQk28IO1w23YEuNc=" - "resolved" "https://registry.npmjs.org/json-bignum/-/json-bignum-0.0.3.tgz" - "version" "0.0.3" - -"kdbush@^3.0.0": - "integrity" "sha512-hRkd6/XW4HTsA9vjVpY9tuXJYLSlelnkTmVFu4M9/7MIYQtFcHpbugAU7UbOfjOiVSVYl2fqgBuJ32JUmRo5Ew==" - "resolved" "https://registry.npmjs.org/kdbush/-/kdbush-3.0.0.tgz" - "version" "3.0.0" - -"lodash.camelcase@^4.3.0": - "integrity" "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=" - "resolved" "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz" - "version" "4.3.0" - -"lodash@^4.17.15": - "integrity" "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" - "resolved" "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz" - "version" "4.17.21" - -"long@^3.2.0": - "integrity" "sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=" - "resolved" "https://registry.npmjs.org/long/-/long-3.2.0.tgz" - "version" "3.2.0" - -"loose-envify@^1.4.0": - "integrity" "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==" - "resolved" "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz" - "version" "1.4.0" - dependencies: - "js-tokens" "^3.0.0 || ^4.0.0" - -"mapbox-gl@^2.3.0", "mapbox-gl@^2.4.0": - "integrity" "sha512-oH5fkh209U2Zqvgs1bBS+SQVhrj8rUT9OTgZmg+20GaNthDJFYDCXvGidVAkgacuCHSIALTZKzMV1DFgO+isFQ==" - "resolved" "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-2.4.0.tgz" - "version" "2.4.0" - dependencies: - "@mapbox/geojson-rewind" "^0.5.0" - "@mapbox/geojson-types" "^1.0.2" - "@mapbox/jsonlint-lines-primitives" "^2.0.2" - "@mapbox/mapbox-gl-supported" "^2.0.0" - "@mapbox/point-geometry" "^0.1.0" - "@mapbox/tiny-sdf" "^1.2.5" - "@mapbox/unitbezier" "^0.0.0" - "@mapbox/vector-tile" "^1.3.1" - "@mapbox/whoots-js" "^3.1.0" - "csscolorparser" "~1.0.3" - "earcut" "^2.2.2" - "geojson-vt" "^3.2.1" - "gl-matrix" "^3.3.0" - "grid-index" "^1.1.0" - "minimist" "^1.2.5" - "murmurhash-js" "^1.0.0" - "pbf" "^3.2.1" - "potpack" "^1.0.1" - "quickselect" "^2.0.0" - "rw" "^1.3.3" - "supercluster" "^7.1.3" - "tinyqueue" "^2.0.3" - "vt-pbf" "^3.1.1" - -"math.gl@^3.5.3": - "integrity" "sha512-cRQRZlc+XvNHd3bIfu3kdPPPAW0vwDelZJmkjn2TDvCyPcmyDtAiZ2Poo1aFoINP7HzN6oHYxapc/0wV3q6Opg==" - "resolved" "https://registry.npmjs.org/math.gl/-/math.gl-3.5.3.tgz" - "version" "3.5.3" - dependencies: - "@math.gl/core" "3.5.3" - -"minimist@^1.2.5": - "integrity" "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" - "resolved" "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz" - "version" "1.2.5" - -"mjolnir.js@^2.5.0": - "integrity" "sha512-rGA7+BJKvXI0ypxQD/+rQE/sW26kmc8UIZWhmQrjhwCf/zvhbcBlsu2vPB6w0Kv/rVnVFEONTSQqC0vFEpQvIA==" - "resolved" "https://registry.npmjs.org/mjolnir.js/-/mjolnir.js-2.6.0.tgz" - "version" "2.6.0" - dependencies: - "@babel/runtime" "^7.0.0" - "hammerjs" "^2.0.8" - -"moment@^2.20.1": - "integrity" "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==" - "resolved" "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz" - "version" "2.29.1" - -"mousetrap@^1.6.1": - "integrity" "sha512-QNo4kEepaIBwiT8CDhP98umTetp+JNfQYBWvC1pc6/OAibuXtRcxZ58Qz8skvEHYvURne/7R8T5VoOI7rDsEUA==" - "resolved" "https://registry.npmjs.org/mousetrap/-/mousetrap-1.6.5.tgz" - "version" "1.6.5" - -"murmurhash-js@^1.0.0": - "integrity" "sha1-sGJ44h/Gw3+lMTcysEEry2rhX1E=" - "resolved" "https://registry.npmjs.org/murmurhash-js/-/murmurhash-js-1.0.0.tgz" - "version" "1.0.0" - -"object-assign@^4.1.1": - "integrity" "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" - "resolved" "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz" - "version" "4.1.1" - -"pad-left@^2.1.0": - "integrity" "sha1-FuajstRKjhOMsIOMx8tAOk/J6ZQ=" - "resolved" "https://registry.npmjs.org/pad-left/-/pad-left-2.1.0.tgz" - "version" "2.1.0" - dependencies: - "repeat-string" "^1.5.4" - -"pbf@^3.2.1": - "integrity" "sha512-ClrV7pNOn7rtmoQVF4TS1vyU0WhYRnP92fzbfF75jAIwpnzdJXf8iTd4CMEqO4yUenH6NDqLiwjqlh6QgZzgLQ==" - "resolved" "https://registry.npmjs.org/pbf/-/pbf-3.2.1.tgz" - "version" "3.2.1" - dependencies: - "ieee754" "^1.1.12" - "resolve-protobuf-schema" "^2.1.0" - -"potpack@^1.0.1": - "integrity" "sha512-15vItUAbViaYrmaB/Pbw7z6qX2xENbFSTA7Ii4tgbPtasxm5v6ryKhKtL91tpWovDJzTiZqdwzhcFBCwiMVdVw==" - "resolved" "https://registry.npmjs.org/potpack/-/potpack-1.0.1.tgz" - "version" "1.0.1" - -"probe.gl@^3.4.0": - "integrity" "sha512-9CLByZATuhuG/Viq3ckfWU+dAhb7dMmjzsyCy4s7ds9ueTejcVRENxL197/XacOK/AN61YrEERB0QnouB0Qc0Q==" - "resolved" "https://registry.npmjs.org/probe.gl/-/probe.gl-3.4.0.tgz" - "version" "3.4.0" - dependencies: - "@babel/runtime" "^7.0.0" - "@probe.gl/stats" "3.4.0" - -"prop-types@^15.6.0", "prop-types@^15.7.2": - "integrity" "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==" - "resolved" "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz" - "version" "15.7.2" - dependencies: - "loose-envify" "^1.4.0" - "object-assign" "^4.1.1" - "react-is" "^16.8.1" - -"protocol-buffers-schema@^3.3.1": - "integrity" "sha512-YVCvdhxWNDP8/nJDyXLuM+UFsuPk4+1PB7WGPVDzm3HTHbzFLxQYeW2iZpS4mmnXrQJGBzt230t/BbEb7PrQaw==" - "resolved" "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.5.1.tgz" - "version" "3.5.1" - -"quickselect@^2.0.0": - "integrity" "sha512-RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw==" - "resolved" "https://registry.npmjs.org/quickselect/-/quickselect-2.0.0.tgz" - "version" "2.0.0" - -"react-bootstrap-slider@2.1.5": - "integrity" "sha512-7rO3JlCVIpr+XtwiSfg8r+MPqyl9KdLI61pNuSMBYYQZ42IWBC+kk/UDyYevp76aGAMtd9SCW8erxOvq+VpekQ==" - "resolved" "https://registry.npmjs.org/react-bootstrap-slider/-/react-bootstrap-slider-2.1.5.tgz" - "version" "2.1.5" - dependencies: - "bootstrap-slider" "9.9.0" - "es6bindall" "^0.0.9" - -"react-is@^16.8.1": - "integrity" "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" - "resolved" "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz" - "version" "16.13.1" - -"react-map-gl@^6.1.16": - "integrity" "sha512-d/4kFMMh2hDeZNeQOUm2wC1/as9q93EZiDmM5mGBx0LIch+9pTFgO6ZINIuUD9Zz4JqWGpthyjoKr3QKgrGiRA==" - "resolved" "https://registry.npmjs.org/react-map-gl/-/react-map-gl-6.1.16.tgz" - "version" "6.1.16" - dependencies: - "@babel/runtime" "^7.0.0" - "@types/geojson" "^7946.0.7" - "@types/mapbox-gl" "^2.0.3" - "mapbox-gl" "^2.3.0" - "mjolnir.js" "^2.5.0" - "prop-types" "^15.7.2" - "resize-observer-polyfill" "^1.5.1" - "viewport-mercator-project" "^7.0.3" - -"reduce-flatten@^2.0.0": - "integrity" "sha512-EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w==" - "resolved" "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-2.0.0.tgz" - "version" "2.0.0" - -"regenerator-runtime@^0.13.4": - "integrity" "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==" - "resolved" "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz" - "version" "0.13.9" - -"repeat-string@^1.5.4": - "integrity" "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" - "resolved" "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz" - "version" "1.6.1" - -"resize-observer-polyfill@^1.5.1": - "integrity" "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==" - "resolved" "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz" - "version" "1.5.1" - -"resolve-protobuf-schema@^2.1.0": - "integrity" "sha512-kI5ffTiZWmJaS/huM8wZfEMer1eRd7oJQhDuxeCLe3t7N7mX3z94CN0xPxBQxFYQTSNz9T0i+v6inKqSdK8xrQ==" - "resolved" "https://registry.npmjs.org/resolve-protobuf-schema/-/resolve-protobuf-schema-2.1.0.tgz" - "version" "2.1.0" - dependencies: - "protocol-buffers-schema" "^3.3.1" - -"rw@^1.3.3", "rw@1": - "integrity" "sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q=" - "resolved" "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz" - "version" "1.3.3" - -"safer-buffer@>= 2.1.2 < 3": - "integrity" "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" - "resolved" "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz" - "version" "2.1.2" - -"supercluster@^7.1.3": - "integrity" "sha512-7+bR4FbF5SYsmkHfDp61QiwCKtwNDyPsddk9TzfsDA5DQr5Goii5CVD2SXjglweFCxjrzVZf945ahqYfUIk8UA==" - "resolved" "https://registry.npmjs.org/supercluster/-/supercluster-7.1.3.tgz" - "version" "7.1.3" - dependencies: - "kdbush" "^3.0.0" - -"supports-color@^5.3.0": - "integrity" "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==" - "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz" - "version" "5.5.0" - dependencies: - "has-flag" "^3.0.0" - -"table-layout@^1.0.1": - "integrity" "sha512-qd/R7n5rQTRFi+Zf2sk5XVVd9UQl6ZkduPFC3S7WEGJAmetDTjY3qPN50eSKzwuzEyQKy5TN2TiZdkIjos2L6A==" - "resolved" "https://registry.npmjs.org/table-layout/-/table-layout-1.0.2.tgz" - "version" "1.0.2" - dependencies: - "array-back" "^4.0.1" - "deep-extend" "~0.6.0" - "typical" "^5.2.0" - "wordwrapjs" "^4.0.0" - -"text-encoding-utf-8@^1.0.2": - "integrity" "sha512-8bw4MY9WjdsD2aMtO0OzOCY3pXGYNx2d2FfHRVUKkiCPDWjKuOlhLVASS+pD7VkLTVjW268LYJHwsnPFlBpbAg==" - "resolved" "https://registry.npmjs.org/text-encoding-utf-8/-/text-encoding-utf-8-1.0.2.tgz" - "version" "1.0.2" - -"tinyqueue@^2.0.3": - "integrity" "sha512-ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA==" - "resolved" "https://registry.npmjs.org/tinyqueue/-/tinyqueue-2.0.3.tgz" - "version" "2.0.3" - -"tslib@^2.2.0": - "integrity" "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==" - "resolved" "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz" - "version" "2.3.0" - -"typical@^4.0.0": - "integrity" "sha512-VAH4IvQ7BDFYglMd7BPRDfLgxZZX4O4TFcRDA6EN5X7erNJJq+McIEp8np9aVtxrCJ6qx4GTYVfOWNjcqwZgRw==" - "resolved" "https://registry.npmjs.org/typical/-/typical-4.0.0.tgz" - "version" "4.0.0" - -"typical@^5.2.0": - "integrity" "sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg==" - "resolved" "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz" - "version" "5.2.0" - -"underscore@^1.8.3": - "integrity" "sha512-hzSoAVtJF+3ZtiFX0VgfFPHEDRm7Y/QPjGyNo4TVdnDTdft3tr8hEkD25a1jC+TjTuE7tkHGKkhwCgs9dgBB2g==" - "resolved" "https://registry.npmjs.org/underscore/-/underscore-1.13.1.tgz" - "version" "1.13.1" - -"urijs@^1.18.10": - "integrity" "sha512-Id+IKjdU0Hx+7Zx717jwLPsPeUqz7rAtuVBRLLs+qn+J2nf9NGITWVCxcijgYxBqe83C7sqsQPs6H1pyz3x9gA==" - "resolved" "https://registry.npmjs.org/urijs/-/urijs-1.19.7.tgz" - "version" "1.19.7" - -"viewport-mercator-project@^7.0.3": - "integrity" "sha512-5nSgVK8jKTSKzOvsa8TSSd2IeQCpHfSNiBOOOMQLvzlxgWD0YoF4xRmyZio3GaLtKSE+50UB892X3R1SAMbaww==" - "resolved" "https://registry.npmjs.org/viewport-mercator-project/-/viewport-mercator-project-7.0.3.tgz" - "version" "7.0.3" - dependencies: - "@math.gl/web-mercator" "^3.4.3" - -"vt-pbf@^3.1.1": - "integrity" "sha512-2LzDFzt0mZKZ9IpVF2r69G9bXaP2Q2sArJCmcCgvfTdCCZzSyz4aCLoQyUilu37Ll56tCblIZrXFIjNUpGIlmA==" - "resolved" "https://registry.npmjs.org/vt-pbf/-/vt-pbf-3.1.3.tgz" - "version" "3.1.3" - dependencies: - "@mapbox/point-geometry" "0.1.0" - "@mapbox/vector-tile" "^1.3.1" - "pbf" "^3.2.1" - -"wordwrapjs@^4.0.0": - "integrity" "sha512-kKlNACbvHrkpIw6oPeYDSmdCTu2hdMHoyXLTcUKala++lx5Y+wjJ/e474Jqv5abnVmwxw08DiTuHmw69lJGksA==" - "resolved" "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-4.0.1.tgz" - "version" "4.0.1" - dependencies: - "reduce-flatten" "^2.0.0" - "typical" "^5.2.0" - -"xss@^1.0.6": - "integrity" "sha512-2t7FahYnGJys6DpHLhajusId7R0Pm2yTmuL0GV9+mV0ZlaLSnb2toBmppATfg5sWIhZQGlsTLoecSzya+l4EAQ==" - "resolved" "https://registry.npmjs.org/xss/-/xss-1.0.9.tgz" - "version" "1.0.9" - dependencies: - "commander" "^2.20.3" - "cssfilter" "0.0.10" diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Arc/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Arc/Stories.tsx deleted file mode 100644 index a6dddd49e4b66..0000000000000 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Arc/Stories.tsx +++ /dev/null @@ -1,81 +0,0 @@ -/* eslint-disable sort-keys */ -/* eslint-disable no-magic-numbers */ -import React from 'react'; -import { SuperChart } from '@superset-ui/core'; -import payload from './payload'; -import dummyDatasource from '../../../shared/dummyDatasource'; - -export default [ - { - renderStory: () => ( - - ), - storyName: 'Basic', - storyPath: 'legacy-preset-chart-deckgl|ArcChartPlugin', - }, -]; diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Arc/index.js b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Arc/index.js deleted file mode 100644 index d6d484a0ef00b..0000000000000 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Arc/index.js +++ /dev/null @@ -1,8 +0,0 @@ -import { ArcChartPlugin } from '../../../../../superset-ui-legacy-preset-chart-deckgl'; -import Stories from './Stories'; - -new ArcChartPlugin().configure({ key: 'deck_arc' }).register(); - -export default { - examples: [...Stories], -}; diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Grid/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Grid/Stories.tsx deleted file mode 100644 index 2b7c817bc5d14..0000000000000 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Grid/Stories.tsx +++ /dev/null @@ -1,52 +0,0 @@ -/* eslint-disable sort-keys */ -/* eslint-disable no-magic-numbers */ -import React from 'react'; -import { SuperChart } from '@superset-ui/core'; -import payload from './payload'; -import dummyDatasource from '../../../shared/dummyDatasource'; - -export default [ - { - renderStory: () => ( - - ), - storyName: 'Basic', - storyPath: 'legacy-preset-chart-deckgl|GridChartPlugin', - }, -]; diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Grid/index.js b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Grid/index.js deleted file mode 100644 index b5c5a03b10a31..0000000000000 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Grid/index.js +++ /dev/null @@ -1,8 +0,0 @@ -import { GridChartPlugin } from '../../../../../superset-ui-legacy-preset-chart-deckgl'; -import Stories from './Stories'; - -new GridChartPlugin().configure({ key: 'deck_grid' }).register(); - -export default { - examples: [...Stories], -}; diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Hex/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Hex/Stories.tsx deleted file mode 100644 index bf6fd91df18b5..0000000000000 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Hex/Stories.tsx +++ /dev/null @@ -1,53 +0,0 @@ -/* eslint-disable sort-keys */ -/* eslint-disable no-magic-numbers */ -import React from 'react'; -import { SuperChart } from '@superset-ui/core'; -import payload from './payload'; -import dummyDatasource from '../../../shared/dummyDatasource'; - -export default [ - { - renderStory: () => ( - - ), - storyName: 'Basic', - storyPath: 'legacy-preset-chart-deckgl|HexChartPlugin', - }, -]; diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Hex/index.js b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Hex/index.js deleted file mode 100644 index 2cec534211812..0000000000000 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Hex/index.js +++ /dev/null @@ -1,8 +0,0 @@ -import { HexChartPlugin } from '../../../../../superset-ui-legacy-preset-chart-deckgl'; -import Stories from './Stories'; - -new HexChartPlugin().configure({ key: 'deck_hex' }).register(); - -export default { - examples: [...Stories], -}; diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Path/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Path/Stories.tsx deleted file mode 100644 index d2a85d9b6b1a1..0000000000000 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Path/Stories.tsx +++ /dev/null @@ -1,61 +0,0 @@ -/* eslint-disable sort-keys */ -/* eslint-disable no-magic-numbers */ -import React from 'react'; -import { SuperChart } from '@superset-ui/core'; -import payload from './payload'; -import dummyDatasource from '../../../shared/dummyDatasource'; - -export default [ - { - renderStory: () => ( - - ), - storyName: 'Basic', - storyPath: 'legacy-preset-chart-deckgl|PathChartPlugin', - }, -]; diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Path/index.js b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Path/index.js deleted file mode 100644 index a5a6d6ea7d799..0000000000000 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Path/index.js +++ /dev/null @@ -1,8 +0,0 @@ -import { PathChartPlugin } from '../../../../../superset-ui-legacy-preset-chart-deckgl'; -import Stories from './Stories'; - -new PathChartPlugin().configure({ key: 'deck_path' }).register(); - -export default { - examples: [...Stories], -}; diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Polygon/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Polygon/Stories.tsx deleted file mode 100644 index 39753f54dd2e3..0000000000000 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Polygon/Stories.tsx +++ /dev/null @@ -1,124 +0,0 @@ -/* eslint-disable sort-keys */ -/* eslint-disable no-magic-numbers */ -import React from 'react'; -import { SuperChart } from '@superset-ui/core'; -import payload from './payload'; -import geojsonPayload from './geojsonPayload'; -import dummyDatasource from '../../../shared/dummyDatasource'; - -export default [ - { - renderStory: () => ( - - ), - storyName: 'Basic', - storyPath: 'legacy-preset-chart-deckgl|PolygonChartPlugin', - }, - { - renderStory: () => ( - - ), - storyName: 'Single Polygon in geojson format', - storyPath: 'legacy-preset-chart-deckgl|PolygonChartPlugin', - }, -]; diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Polygon/index.js b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Polygon/index.js deleted file mode 100644 index fcfc99b9422b6..0000000000000 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Polygon/index.js +++ /dev/null @@ -1,8 +0,0 @@ -import { PolygonChartPlugin } from '../../../../../superset-ui-legacy-preset-chart-deckgl'; -import Stories from './Stories'; - -new PolygonChartPlugin().configure({ key: 'deck_polygon' }).register(); - -export default { - examples: [...Stories], -}; diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Scatter/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Scatter/Stories.tsx deleted file mode 100644 index a1763fc8c7faf..0000000000000 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Scatter/Stories.tsx +++ /dev/null @@ -1,60 +0,0 @@ -/* eslint-disable sort-keys */ -/* eslint-disable no-magic-numbers */ -import React from 'react'; -import { SuperChart } from '@superset-ui/core'; -import payload from './payload'; -import dummyDatasource from '../../../shared/dummyDatasource'; - -export default [ - { - renderStory: () => ( - - ), - storyName: 'Basic', - storyPath: 'legacy-preset-chart-deckgl|ScatterChartPlugin', - }, -]; diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Scatter/index.js b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Scatter/index.js deleted file mode 100644 index 2df5dc5291900..0000000000000 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Scatter/index.js +++ /dev/null @@ -1,8 +0,0 @@ -import { ScatterChartPlugin } from '../../../../../superset-ui-legacy-preset-chart-deckgl'; -import Stories from './Stories'; - -new ScatterChartPlugin().configure({ key: 'deck_scatter' }).register(); - -export default { - examples: [...Stories], -}; diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Screengrid/Stories.tsx b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Screengrid/Stories.tsx deleted file mode 100644 index 12a05a6aad7d4..0000000000000 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Screengrid/Stories.tsx +++ /dev/null @@ -1,51 +0,0 @@ -/* eslint-disable sort-keys */ -/* eslint-disable no-magic-numbers */ -import React from 'react'; -import { SuperChart } from '@superset-ui/core'; -import payload from './payload'; -import dummyDatasource from '../../../shared/dummyDatasource'; - -export default [ - { - renderStory: () => ( - - ), - storyName: 'Basic', - storyPath: 'legacy-preset-chart-deckgl|ScreengridChartPlugin', - }, -]; diff --git a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Screengrid/index.js b/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Screengrid/index.js deleted file mode 100644 index e274e0690042a..0000000000000 --- a/superset-frontend/temporary_superset_ui/superset-ui-plugins-deckgl/packages/superset-ui-plugins-demo/storybook/stories/legacy-preset-chart-deckgl/Screengrid/index.js +++ /dev/null @@ -1,8 +0,0 @@ -import { ScreengridChartPlugin } from '../../../../../superset-ui-legacy-preset-chart-deckgl'; -import Stories from './Stories'; - -new ScreengridChartPlugin().configure({ key: 'deck_screengrid' }).register(); - -export default { - examples: [...Stories], -};