Merge branch 'master' into villebro/echarts-pie

lerna.json

@@ -6,7 +6,7 @@
     "plugins/*"
   ],
   "useWorkspaces": true,
-  "version": "0.15.0",
+  "version": "0.15.1",
   "ignoreChanges": [
     "**/*.md",
     "**/*.spec.tsx?",

package.json

@@ -170,10 +170,14 @@
     "typescript": {
       "compilerOptions": {
         "rootDir": "./src",
+        "skipLibCheck": true,
         "declaration": true,
         "emitDeclarationOnly": true,
         "composite": true,
-        "resolveJsonModule": true
+        "resolveJsonModule": true,
+        "typeRoots": [
+          "./node_modules/@types"
+        ]
       }
     }
   },

packages/generator-superset/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/generator-superset",
-  "version": "0.15.0",
+  "version": "0.15.1",
   "description": "Scaffolder for Superset",
   "bugs": {
     "url": "https://github.com/apache-superset/superset-ui/issues"

packages/superset-ui-chart-controls/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/chart-controls",
-  "version": "0.15.0",
+  "version": "0.15.1",
   "description": "Superset UI control-utils",
   "sideEffects": false,
   "main": "lib/index.js",
@@ -25,17 +25,15 @@
   "publishConfig": {
     "access": "public"
   },
-  "peerDependencies": {
-    "react": "^16.13.1"
-  },
-  "devDependencies": {
-    "enzyme": "^3.11.0"
-  },
   "dependencies": {
-    "@superset-ui/core": "0.15.0",
-    "@types/react-bootstrap": "0.32.21",
+    "@superset-ui/core": "0.15.1",
     "lodash": "^4.17.15",
-    "prop-types": "^15.7.2",
+    "prop-types": "^15.7.2"
+  },
+  "peerDependencies": {
+    "@types/react": "*",
+    "@types/react-bootstrap": "*",
+    "react": "^16.13.1",
     "react-bootstrap": "^0.33.1"
   }
 }

packages/superset-ui-chart-controls/src/components/MetricOption.tsx

@@ -37,7 +37,7 @@ export interface MetricOptionProps {
   openInNewWindow?: boolean;
   showFormula?: boolean;
   showType?: boolean;
-  url: string;
+  url?: string;
 }
 
 export function MetricOption({

packages/superset-ui-chart-controls/src/utils/columnChoices.ts

@@ -21,7 +21,7 @@ import { DatasourceMeta } from '../types';
 /**
  * Convert Dataource columns to column choices
  */
-export default function columnChoices(datasource?: DatasourceMeta) {
+export default function columnChoices(datasource?: DatasourceMeta | null) {
   return (
     datasource?.columns
       .map(col => [col.column_name, col.verbose_name || col.column_name])

packages/superset-ui-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/core",
-  "version": "0.15.0",
+  "version": "0.15.1",
   "description": "Superset UI core",
   "sideEffects": false,
   "main": "lib/index.js",
@@ -40,9 +40,6 @@
     "@types/d3-time": "^1.0.9",
     "@types/d3-time-format": "^2.1.0",
     "@types/lodash": "^4.14.149",
-    "@types/react": "*",
-    "@types/react-bootstrap": "0.32.21",
-    "@types/react-loadable": "^5.5.3",
     "@vx/responsive": "^0.0.197",
     "csstype": "^2.6.4",
     "d3-format": "^1.3.2",
@@ -56,11 +53,15 @@
     "lodash": "^4.17.11",
     "pretty-ms": "^7.0.0",
     "react-error-boundary": "^1.2.5",
-    "react-loadable": "^5.5.0",
     "reselect": "^4.0.0",
     "whatwg-fetch": "^3.0.0"
   },
   "peerDependencies": {
-    "react": "^16.13.1"
+    "@types/react": "*",
+    "@types/react-bootstrap": "*",
+    "@types/react-loadable": "*",
+    "react": "^16.13.1",
+    "react-bootstrap": "^0.33.1",
+    "react-loadable": "^5.5.0"
   }
 }

packages/superset-ui-core/src/chart/types/QueryResponse.ts

@@ -9,6 +9,10 @@ export interface DataRecord {
   [key: string]: DataRecordValue;
 }
 
+export interface TimeseriesDataRecord extends DataRecord {
+  __timestamp: number | string | Date | null;
+}
+
 // data record value filters from FilterBox
 export interface DataRecordFilters {
   [key: string]: DataRecordValue[];

packages/superset-ui-demo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/demo",
-  "version": "0.15.0",
+  "version": "0.15.1",
   "description": "Storybook for Superset UI ✨",
   "private": true,
   "main": "index.js",
@@ -37,31 +37,33 @@
     "@storybook/addons": "^5.3.18",
     "@storybook/preset-typescript": "^3.0.0",
     "@storybook/react": "^5.3.18",
-    "@superset-ui/core": "0.15.0",
-    "@superset-ui/legacy-plugin-chart-calendar": "0.15.0",
-    "@superset-ui/legacy-plugin-chart-chord": "0.15.0",
-    "@superset-ui/legacy-plugin-chart-country-map": "0.15.0",
-    "@superset-ui/legacy-plugin-chart-event-flow": "0.15.0",
-    "@superset-ui/legacy-plugin-chart-force-directed": "0.15.0",
-    "@superset-ui/legacy-plugin-chart-heatmap": "0.15.0",
-    "@superset-ui/legacy-plugin-chart-histogram": "0.15.0",
-    "@superset-ui/legacy-plugin-chart-horizon": "0.15.0",
-    "@superset-ui/legacy-plugin-chart-map-box": "0.15.0",
-    "@superset-ui/legacy-plugin-chart-paired-t-test": "0.15.0",
-    "@superset-ui/legacy-plugin-chart-parallel-coordinates": "0.15.0",
-    "@superset-ui/legacy-plugin-chart-partition": "0.15.0",
-    "@superset-ui/legacy-plugin-chart-pivot-table": "0.15.0",
-    "@superset-ui/legacy-plugin-chart-rose": "0.15.0",
-    "@superset-ui/legacy-plugin-chart-sankey": "0.15.0",
-    "@superset-ui/legacy-plugin-chart-sankey-loop": "0.15.0",
-    "@superset-ui/legacy-plugin-chart-sunburst": "0.15.0",
-    "@superset-ui/legacy-plugin-chart-time-table": "0.15.0",
-    "@superset-ui/legacy-plugin-chart-treemap": "0.15.0",
+    "@superset-ui/core": "0.15.1",
+    "@superset-ui/legacy-plugin-chart-calendar": "0.15.1",
+    "@superset-ui/legacy-plugin-chart-chord": "0.15.1",
+    "@superset-ui/legacy-plugin-chart-country-map": "0.15.1",
+    "@superset-ui/legacy-plugin-chart-event-flow": "0.15.1",
+    "@superset-ui/legacy-plugin-chart-force-directed": "0.15.1",
+    "@superset-ui/legacy-plugin-chart-heatmap": "0.15.1",
+    "@superset-ui/legacy-plugin-chart-histogram": "0.15.1",
+    "@superset-ui/legacy-plugin-chart-horizon": "0.15.1",
+    "@superset-ui/legacy-plugin-chart-map-box": "0.15.1",
+    "@superset-ui/legacy-plugin-chart-paired-t-test": "0.15.1",
+    "@superset-ui/legacy-plugin-chart-parallel-coordinates": "0.15.1",
+    "@superset-ui/legacy-plugin-chart-partition": "0.15.1",
+    "@superset-ui/legacy-plugin-chart-pivot-table": "0.15.1",
+    "@superset-ui/legacy-plugin-chart-rose": "0.15.1",
+    "@superset-ui/legacy-plugin-chart-sankey": "0.15.1",
+    "@superset-ui/legacy-plugin-chart-sankey-loop": "0.15.1",
+    "@superset-ui/legacy-plugin-chart-sunburst": "0.15.1",
+    "@superset-ui/legacy-plugin-chart-time-table": "0.15.1",
+    "@superset-ui/legacy-plugin-chart-treemap": "0.15.1",
     "@superset-ui/legacy-plugin-chart-word-cloud": "^0.11.15",
-    "@superset-ui/legacy-plugin-chart-world-map": "0.15.0",
-    "@superset-ui/legacy-preset-chart-big-number": "0.15.0",
-    "@superset-ui/plugin-chart-table": "0.15.0",
-    "@superset-ui/plugin-chart-word-cloud": "0.15.0",
+    "@superset-ui/legacy-plugin-chart-world-map": "0.15.1",
+    "@superset-ui/legacy-preset-chart-big-number": "0.15.1",
+    "@superset-ui/plugin-chart-table": "0.15.1",
+    "@superset-ui/plugin-chart-word-cloud": "0.15.1",
+    "@types/react-bootstrap": "^0.32.22",
+    "@types/react-loadable": "^5.5.3",
     "@types/react-resizable": "^1.7.2",
     "@types/storybook__react": "5.2.1",
     "bootstrap": "^3.4.1",
@@ -71,6 +73,8 @@
     "jquery": "^3.4.1",
     "memoize-one": "^5.1.1",
     "react": "^16.13.1",
+    "react-bootstrap": "^0.33.1",
+    "react-loadable": "^5.5.0",
     "react-resizable": "^1.10.1",
     "storybook-addon-jsx": "^7.2.3"
   },

plugins/legacy-plugin-chart-calendar/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-calendar",
-  "version": "0.15.0",
+  "version": "0.15.1",
   "description": "Superset Legacy Chart - Calendar Heatmap",
   "sideEffects": [
     "*.css"

plugins/legacy-plugin-chart-calendar/tsconfig.json

@@ -16,10 +16,10 @@
   ],
   "references": [
     {
-      "path": "../../packages/superset-ui-core"
+      "path": "../../packages/superset-ui-chart-controls"
     },
     {
-      "path": "../../packages/superset-ui-chart-controls"
+      "path": "../../packages/superset-ui-core"
     }
   ]
 }

plugins/legacy-plugin-chart-chord/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-chord",
-  "version": "0.15.0",
+  "version": "0.15.1",
   "description": "Superset Legacy Chart - Chord Diagram",
   "sideEffects": [
     "*.css"
@@ -28,8 +28,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/chart-controls": "0.15.0",
-    "@superset-ui/core": "0.15.0",
+    "@superset-ui/chart-controls": "0.15.1",
+    "@superset-ui/core": "0.15.1",
     "d3": "^3.5.17",
     "prop-types": "^15.6.2",
     "react": "^16.13.1"

plugins/legacy-plugin-chart-chord/tsconfig.json

@@ -16,10 +16,10 @@
   ],
   "references": [
     {
-      "path": "../../packages/superset-ui-core"
+      "path": "../../packages/superset-ui-chart-controls"
     },
     {
-      "path": "../../packages/superset-ui-chart-controls"
+      "path": "../../packages/superset-ui-core"
     }
   ]
 }

plugins/legacy-plugin-chart-country-map/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-country-map",
-  "version": "0.15.0",
+  "version": "0.15.1",
   "description": "Superset Legacy Chart - Country Map",
   "sideEffects": [
     "*.css"
@@ -28,8 +28,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@superset-ui/chart-controls": "0.15.0",
-    "@superset-ui/core": "0.15.0",
+    "@superset-ui/chart-controls": "0.15.1",
+    "@superset-ui/core": "0.15.1",
     "d3": "^3.5.17",
     "d3-array": "^2.0.3",
     "prop-types": "^15.6.2"

plugins/legacy-plugin-chart-country-map/tsconfig.json

@@ -16,10 +16,10 @@
   ],
   "references": [
     {
-      "path": "../../packages/superset-ui-core"
+      "path": "../../packages/superset-ui-chart-controls"
     },
     {
-      "path": "../../packages/superset-ui-chart-controls"
+      "path": "../../packages/superset-ui-core"
     }
   ]
 }

plugins/legacy-plugin-chart-event-flow/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superset-ui/legacy-plugin-chart-event-flow",
-  "version": "0.15.0",
+  "version": "0.15.1",
   "description": "Superset Legacy Chart - Event Flow",
   "sideEffects": [
     "*.css"

plugins/legacy-plugin-chart-event-flow/src/EventFlow.jsx → plugins/legacy-plugin-chart-event-flow/src/EventFlow.tsx

@@ -16,30 +16,26 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-/* eslint-disable react/forbid-prop-types */
 import React from 'react';
-import PropTypes from 'prop-types';
-import { App } from '@data-ui/event-flow';
-import { t } from '@superset-ui/core';
+import { App as EventFlowApp } from '@data-ui/event-flow';
+import { t, TimeseriesDataRecord } from '@superset-ui/core';
 
-const propTypes = {
-  data: PropTypes.array,
-  height: PropTypes.number,
-  /* eslint-disable-next-line */
-  initialMinEventCount: PropTypes.number,
-  width: PropTypes.number,
-};
-const defaultProps = {
-  data: null,
-  height: 400,
-  width: 400,
-};
+export interface EventFlowProps {
+  data: TimeseriesDataRecord[];
+  height: number;
+  width: number;
+  initialMinEventCount: number;
+}
 
-function CustomEventFlow(props) {
-  const { data, height, initialMinEventCount, width } = props;
+export default function EventFlow({
+  data,
+  initialMinEventCount,
+  height = 400,
+  width = 400,
+}: EventFlowProps) {
   if (data) {
     return (
-      <App
+      <EventFlowApp
         width={width}
         height={height}
         data={data}
@@ -55,8 +51,3 @@ function CustomEventFlow(props) {
     </div>
   );
 }
-
-CustomEventFlow.propTypes = propTypes;
-CustomEventFlow.defaultProps = defaultProps;
-
-export default CustomEventFlow;