Merge pull request #4 from apache-superset/master

merge
stephenLYZ · Apr 22, 2021 · f011d71 · f011d71
2 parents 0c87b2f + ec94457
commit f011d71
Show file tree

Hide file tree

Showing 36 changed files with 112 additions and 146 deletions.
diff --git a/docs/debugging.md b/docs/debugging.md
@@ -4,11 +4,11 @@
 
 1. First, make sure you have run `yarn` and `yarn build` in `superset-ui` or your own plugin repo.
 2. Go to
-   [superset-frontend](https://github.com/apache/incubator-superset/tree/master/superset-frontend),
+   [superset-frontend](https://github.com/apache/superset/tree/master/superset-frontend),
    use `npm link` to create a symlink of the plugin source code in `node_modules`:
 
    ```sh
-   cd incubator-superset/superset-frontend
+   cd superset/superset-frontend
    # npm link ~/path/to/your/plugin
    npm link ../../superset-ui/plugins/plugin-chart-word-cloud
    ```
@@ -24,4 +24,4 @@
 
 ## Deactivate plugins
 
-To deactivate a plugin, simply run `npm install` in `incubator-superset/superset-frontend` again.
+To deactivate a plugin, simply run `npm install` in `superset/superset-frontend` again.
diff --git a/lerna.json b/lerna.json
@@ -6,7 +6,7 @@
     "plugins/*"
   ],
   "useWorkspaces": true,
-  "version": "0.17.35",
+  "version": "0.17.36",
   "ignoreChanges": [
     "**/*.md",
     "**/*.spec.tsx?",

diff --git a/packages/superset-ui-chart-controls/package.json b/packages/superset-ui-chart-controls/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/chart-controls",
-  "version": "0.17.34",
+  "version": "0.17.36",
   "description": "Superset UI control-utils",
   "sideEffects": false,
   "main": "lib/index.js",

diff --git a/packages/superset-ui-chart-controls/src/components/MetricOption.tsx b/packages/superset-ui-chart-controls/src/components/MetricOption.tsx
@@ -21,6 +21,7 @@ import { styled, Metric, SafeMarkdown } from '@superset-ui/core';
 import InfoTooltipWithTrigger from './InfoTooltipWithTrigger';
 import { ColumnTypeLabel } from './ColumnTypeLabel';
 import CertifiedIconWithTooltip from './CertifiedIconWithTooltip';
+import Tooltip from './Tooltip';
 
 const FlexRowContainer = styled.div`
   align-items: center;
@@ -67,7 +68,9 @@ export function MetricOption({
           details={metric.certification_details}
         />
       )}
-      <span className="option-label">{link}</span>
+      <Tooltip id="metric-name-tooltip" title={verbose} trigger={['hover']} placement="top">
+        <span className="option-label">{link}</span>
+      </Tooltip>
       {metric.description && (
         <InfoTooltipWithTrigger
           className="text-muted"

diff --git a/packages/superset-ui-chart-controls/test/components/MetricOption.test.tsx b/packages/superset-ui-chart-controls/test/components/MetricOption.test.tsx
@@ -83,4 +83,7 @@ describe('MetricOption', () => {
     wrapper = shallow(factory(props));
     expect(wrapper.find('ColumnTypeLabel')).toHaveLength(1);
   });
+  it('shows a Tooltip for the verbose metric name', () => {
+    expect(wrapper.find('Tooltip')).toHaveLength(1);
+  });
 });
diff --git a/packages/superset-ui-demo/package.json b/packages/superset-ui-demo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/demo",
-  "version": "0.17.35",
+  "version": "0.17.36",
   "description": "Storybook for Superset UI ✨",
   "private": true,
   "main": "index.js",
@@ -39,31 +39,31 @@
     "@storybook/preset-typescript": "^3.0.0",
     "@storybook/react": "^5.3.18",
     "@superset-ui/core": "file:../superset-ui-core/src",
-    "@superset-ui/legacy-plugin-chart-calendar": "0.17.34",
-    "@superset-ui/legacy-plugin-chart-chord": "0.17.34",
-    "@superset-ui/legacy-plugin-chart-country-map": "0.17.34",
-    "@superset-ui/legacy-plugin-chart-event-flow": "0.17.34",
-    "@superset-ui/legacy-plugin-chart-force-directed": "0.17.34",
-    "@superset-ui/legacy-plugin-chart-heatmap": "0.17.34",
-    "@superset-ui/legacy-plugin-chart-histogram": "0.17.34",
-    "@superset-ui/legacy-plugin-chart-horizon": "0.17.34",
-    "@superset-ui/legacy-plugin-chart-map-box": "0.17.34",
-    "@superset-ui/legacy-plugin-chart-paired-t-test": "0.17.34",
-    "@superset-ui/legacy-plugin-chart-parallel-coordinates": "0.17.34",
-    "@superset-ui/legacy-plugin-chart-partition": "0.17.34",
-    "@superset-ui/legacy-plugin-chart-pivot-table": "0.17.34",
-    "@superset-ui/legacy-plugin-chart-rose": "0.17.34",
-    "@superset-ui/legacy-plugin-chart-sankey": "0.17.34",
-    "@superset-ui/legacy-plugin-chart-sankey-loop": "0.17.34",
-    "@superset-ui/legacy-plugin-chart-sunburst": "0.17.34",
-    "@superset-ui/legacy-plugin-chart-time-table": "0.17.34",
-    "@superset-ui/legacy-plugin-chart-treemap": "0.17.34",
+    "@superset-ui/legacy-plugin-chart-calendar": "0.17.36",
+    "@superset-ui/legacy-plugin-chart-chord": "0.17.36",
+    "@superset-ui/legacy-plugin-chart-country-map": "0.17.36",
+    "@superset-ui/legacy-plugin-chart-event-flow": "0.17.36",
+    "@superset-ui/legacy-plugin-chart-force-directed": "0.17.36",
+    "@superset-ui/legacy-plugin-chart-heatmap": "0.17.36",
+    "@superset-ui/legacy-plugin-chart-histogram": "0.17.36",
+    "@superset-ui/legacy-plugin-chart-horizon": "0.17.36",
+    "@superset-ui/legacy-plugin-chart-map-box": "0.17.36",
+    "@superset-ui/legacy-plugin-chart-paired-t-test": "0.17.36",
+    "@superset-ui/legacy-plugin-chart-parallel-coordinates": "0.17.36",
+    "@superset-ui/legacy-plugin-chart-partition": "0.17.36",
+    "@superset-ui/legacy-plugin-chart-pivot-table": "0.17.36",
+    "@superset-ui/legacy-plugin-chart-rose": "0.17.36",
+    "@superset-ui/legacy-plugin-chart-sankey": "0.17.36",
+    "@superset-ui/legacy-plugin-chart-sankey-loop": "0.17.36",
+    "@superset-ui/legacy-plugin-chart-sunburst": "0.17.36",
+    "@superset-ui/legacy-plugin-chart-time-table": "0.17.36",
+    "@superset-ui/legacy-plugin-chart-treemap": "0.17.36",
     "@superset-ui/legacy-plugin-chart-word-cloud": "^0.11.15",
-    "@superset-ui/legacy-plugin-chart-world-map": "0.17.34",
-    "@superset-ui/legacy-preset-chart-big-number": "0.17.34",
-    "@superset-ui/plugin-chart-echarts": "0.17.35",
-    "@superset-ui/plugin-chart-table": "0.17.35",
-    "@superset-ui/plugin-chart-word-cloud": "0.17.34",
+    "@superset-ui/legacy-plugin-chart-world-map": "0.17.36",
+    "@superset-ui/legacy-preset-chart-big-number": "0.17.36",
+    "@superset-ui/plugin-chart-echarts": "0.17.36",
+    "@superset-ui/plugin-chart-table": "0.17.36",
+    "@superset-ui/plugin-chart-word-cloud": "0.17.36",
     "@types/react-bootstrap": "^0.32.22",
     "@types/react-loadable": "^5.5.3",
     "@types/react-resizable": "^1.7.2",

diff --git a/plugins/legacy-plugin-chart-calendar/package.json b/plugins/legacy-plugin-chart-calendar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-calendar",
-  "version": "0.17.34",
+  "version": "0.17.36",
   "description": "Superset Legacy Chart - Calendar Heatmap",
   "sideEffects": [
     "*.css"
@@ -28,7 +28,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/chart-controls": "0.17.34",
+    "@superset-ui/chart-controls": "0.17.36",
     "@superset-ui/core": "0.17.32",
     "d3-array": "^2.0.3",
     "d3-selection": "^1.4.0",

diff --git a/plugins/legacy-plugin-chart-chord/package.json b/plugins/legacy-plugin-chart-chord/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-chord",
-  "version": "0.17.34",
+  "version": "0.17.36",
   "description": "Superset Legacy Chart - Chord Diagram",
   "sideEffects": [
     "*.css"
@@ -28,7 +28,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/chart-controls": "0.17.34",
+    "@superset-ui/chart-controls": "0.17.36",
     "@superset-ui/core": "0.17.32",
     "d3": "^3.5.17",
     "prop-types": "^15.6.2",

diff --git a/plugins/legacy-plugin-chart-country-map/package.json b/plugins/legacy-plugin-chart-country-map/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-country-map",
-  "version": "0.17.34",
+  "version": "0.17.36",
   "description": "Superset Legacy Chart - Country Map",
   "sideEffects": [
     "*.css"
@@ -28,7 +28,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/chart-controls": "0.17.34",
+    "@superset-ui/chart-controls": "0.17.36",
     "@superset-ui/core": "0.17.32",
     "d3": "^3.5.17",
     "d3-array": "^2.0.3",

diff --git a/plugins/legacy-plugin-chart-event-flow/package.json b/plugins/legacy-plugin-chart-event-flow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-event-flow",
-  "version": "0.17.34",
+  "version": "0.17.36",
   "description": "Superset Legacy Chart - Event Flow",
   "sideEffects": [
     "*.css"
@@ -29,7 +29,7 @@
   },
   "dependencies": {
     "@data-ui/event-flow": "^0.0.84",
-    "@superset-ui/chart-controls": "0.17.34",
+    "@superset-ui/chart-controls": "0.17.36",
     "@superset-ui/core": "0.17.32",
     "prop-types": "^15.6.2"
   },

diff --git a/plugins/legacy-plugin-chart-force-directed/package.json b/plugins/legacy-plugin-chart-force-directed/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-force-directed",
-  "version": "0.17.34",
+  "version": "0.17.36",
   "description": "Superset Legacy Chart - Force-directed Graph",
   "sideEffects": [
     "*.css"
@@ -28,7 +28,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/chart-controls": "0.17.34",
+    "@superset-ui/chart-controls": "0.17.36",
     "@superset-ui/core": "0.17.32",
     "d3": "^3.5.17",
     "prop-types": "^15.7.2"

diff --git a/plugins/legacy-plugin-chart-heatmap/package.json b/plugins/legacy-plugin-chart-heatmap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-heatmap",
-  "version": "0.17.34",
+  "version": "0.17.36",
   "description": "Superset Legacy Chart - Heatmap",
   "sideEffects": [
     "*.css"
@@ -28,7 +28,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/chart-controls": "0.17.34",
+    "@superset-ui/chart-controls": "0.17.36",
     "@superset-ui/core": "0.17.32",
     "d3": "^3.5.17",
     "d3-svg-legend": "^1.x",

diff --git a/plugins/legacy-plugin-chart-histogram/package.json b/plugins/legacy-plugin-chart-histogram/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-histogram",
-  "version": "0.17.34",
+  "version": "0.17.36",
   "description": "Superset Legacy Chart - Histogram",
   "sideEffects": [
     "*.css"
@@ -30,7 +30,7 @@
   "dependencies": {
     "@data-ui/histogram": "^0.0.84",
     "@data-ui/theme": "^0.0.84",
-    "@superset-ui/chart-controls": "0.17.34",
+    "@superset-ui/chart-controls": "0.17.36",
     "@superset-ui/core": "0.17.32",
     "@vx/legend": "^0.0.198",
     "@vx/responsive": "^0.0.199",

diff --git a/plugins/legacy-plugin-chart-horizon/package.json b/plugins/legacy-plugin-chart-horizon/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-horizon",
-  "version": "0.17.34",
+  "version": "0.17.36",
   "description": "Superset Legacy Chart - Horizon",
   "sideEffects": [
     "*.css"
@@ -28,7 +28,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/chart-controls": "0.17.34",
+    "@superset-ui/chart-controls": "0.17.36",
     "@superset-ui/core": "0.17.32",
     "d3-array": "^2.0.3",
     "d3-scale": "^3.0.1",

diff --git a/plugins/legacy-plugin-chart-map-box/package.json b/plugins/legacy-plugin-chart-map-box/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-map-box",
-  "version": "0.17.34",
+  "version": "0.17.36",
   "description": "Superset Legacy Chart - MapBox",
   "sideEffects": [
     "*.css"
@@ -28,7 +28,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/chart-controls": "0.17.34",
+    "@superset-ui/chart-controls": "0.17.36",
     "@superset-ui/core": "0.17.32",
     "immutable": "^3.8.2",
     "mapbox-gl": "^0.53.0",

diff --git a/plugins/legacy-plugin-chart-paired-t-test/package.json b/plugins/legacy-plugin-chart-paired-t-test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-paired-t-test",
-  "version": "0.17.34",
+  "version": "0.17.36",
   "description": "Superset Legacy Chart - Paired T Test",
   "sideEffects": [
     "*.css"
@@ -28,7 +28,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/chart-controls": "0.17.34",
+    "@superset-ui/chart-controls": "0.17.36",
     "@superset-ui/core": "0.17.32",
     "distributions": "^1.0.0",
     "prop-types": "^15.6.2",

diff --git a/plugins/legacy-plugin-chart-parallel-coordinates/package.json b/plugins/legacy-plugin-chart-parallel-coordinates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-parallel-coordinates",
-  "version": "0.17.34",
+  "version": "0.17.36",
   "description": "Superset Legacy Chart - Parallel Coordinates",
   "sideEffects": [
     "*.css"
@@ -28,7 +28,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/chart-controls": "0.17.34",
+    "@superset-ui/chart-controls": "0.17.36",
     "@superset-ui/core": "0.17.32",
     "d3": "^3.5.17",
     "prop-types": "^15.7.2"

diff --git a/plugins/legacy-plugin-chart-partition/package.json b/plugins/legacy-plugin-chart-partition/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-partition",
-  "version": "0.17.34",
+  "version": "0.17.36",
   "description": "Superset Legacy Chart - Partition",
   "sideEffects": [
     "*.css"
@@ -28,7 +28,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/chart-controls": "0.17.34",
+    "@superset-ui/chart-controls": "0.17.36",
     "@superset-ui/core": "0.17.32",
     "d3": "^3.5.17",
     "d3-hierarchy": "^1.1.8",

diff --git a/plugins/legacy-plugin-chart-pivot-table/package.json b/plugins/legacy-plugin-chart-pivot-table/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-pivot-table",
-  "version": "0.17.34",
+  "version": "0.17.36",
   "description": "Superset Legacy Chart - Pivot Table",
   "sideEffects": [
     "*.css"
@@ -28,7 +28,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/chart-controls": "0.17.34",
+    "@superset-ui/chart-controls": "0.17.36",
     "@superset-ui/core": "0.17.32",
     "d3": "^3.5.17",
     "datatables.net-bs": "^1.10.15",

diff --git a/plugins/legacy-plugin-chart-rose/package.json b/plugins/legacy-plugin-chart-rose/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-rose",
-  "version": "0.17.34",
+  "version": "0.17.36",
   "description": "Superset Legacy Chart - Nightingale Rose Diagram",
   "sideEffects": [
     "*.css"
@@ -28,7 +28,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/chart-controls": "0.17.34",
+    "@superset-ui/chart-controls": "0.17.36",
     "@superset-ui/core": "0.17.32",
     "d3": "^3.5.17",
     "nvd3": "1.8.6",

diff --git a/plugins/legacy-plugin-chart-sankey-loop/package.json b/plugins/legacy-plugin-chart-sankey-loop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-sankey-loop",
-  "version": "0.17.34",
+  "version": "0.17.36",
   "description": "Superset Legacy Chart - Sankey Diagram with Loops",
   "sideEffects": [
     "*.css"
@@ -28,7 +28,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/chart-controls": "0.17.34",
+    "@superset-ui/chart-controls": "0.17.36",
     "@superset-ui/core": "0.17.32",
     "d3-sankey-diagram": "^0.7.3",
     "d3-selection": "^1.4.0",

diff --git a/plugins/legacy-plugin-chart-sankey/package.json b/plugins/legacy-plugin-chart-sankey/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-sankey",
-  "version": "0.17.34",
+  "version": "0.17.36",
   "description": "Superset Legacy Chart - Sankey Diagram",
   "sideEffects": [
     "*.css"
@@ -28,7 +28,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/chart-controls": "0.17.34",
+    "@superset-ui/chart-controls": "0.17.36",
     "@superset-ui/core": "0.17.32",
     "d3": "^3.5.17",
     "d3-sankey": "^0.4.2",