diff --git a/lerna.json b/lerna.json index 96dc0b847a..b75db16cab 100644 --- a/lerna.json +++ b/lerna.json @@ -6,7 +6,7 @@ "plugins/*" ], "useWorkspaces": true, - "version": "0.15.0", + "version": "0.15.1", "ignoreChanges": [ "**/*.md", "**/*.spec.tsx?", diff --git a/package.json b/package.json index d4360c18d6..4960711cda 100644 --- a/package.json +++ b/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" + ] } } }, diff --git a/packages/generator-superset/generators/plugin-chart/templates/src/images/thumbnail.png b/packages/generator-superset/generators/plugin-chart/templates/src/images/thumbnail.png index cc2c8fbebe..7afef30bd4 100644 Binary files a/packages/generator-superset/generators/plugin-chart/templates/src/images/thumbnail.png and b/packages/generator-superset/generators/plugin-chart/templates/src/images/thumbnail.png differ diff --git a/packages/generator-superset/package.json b/packages/generator-superset/package.json index 4058514915..5c0afdddd3 100644 --- a/packages/generator-superset/package.json +++ b/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" diff --git a/packages/superset-ui-chart-controls/package.json b/packages/superset-ui-chart-controls/package.json index 0a2540a597..c45702a99a 100644 --- 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.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" } } diff --git a/packages/superset-ui-chart-controls/src/components/MetricOption.tsx b/packages/superset-ui-chart-controls/src/components/MetricOption.tsx index c59ceb6597..3ae35bada3 100644 --- a/packages/superset-ui-chart-controls/src/components/MetricOption.tsx +++ b/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({ diff --git a/packages/superset-ui-chart-controls/src/utils/columnChoices.ts b/packages/superset-ui-chart-controls/src/utils/columnChoices.ts index 72e424fcbe..3c39cfdf1c 100644 --- a/packages/superset-ui-chart-controls/src/utils/columnChoices.ts +++ b/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]) diff --git a/packages/superset-ui-core/package.json b/packages/superset-ui-core/package.json index 795c375887..964c62ba0c 100644 --- a/packages/superset-ui-core/package.json +++ b/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" } } diff --git a/packages/superset-ui-core/src/chart/types/QueryResponse.ts b/packages/superset-ui-core/src/chart/types/QueryResponse.ts index e6b865664c..629d0b90e3 100644 --- a/packages/superset-ui-core/src/chart/types/QueryResponse.ts +++ b/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[]; diff --git a/packages/superset-ui-demo/package.json b/packages/superset-ui-demo/package.json index b44af03a1f..660197dc69 100644 --- a/packages/superset-ui-demo/package.json +++ b/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" }, diff --git a/plugins/legacy-plugin-chart-calendar/package.json b/plugins/legacy-plugin-chart-calendar/package.json index 68142ee24a..611c8e5d9c 100644 --- 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.15.0", + "version": "0.15.1", "description": "Superset Legacy Chart - Calendar Heatmap", "sideEffects": [ "*.css" diff --git a/plugins/legacy-plugin-chart-calendar/src/images/thumbnail.png b/plugins/legacy-plugin-chart-calendar/src/images/thumbnail.png index c83db08ee8..bac8c2857f 100644 Binary files a/plugins/legacy-plugin-chart-calendar/src/images/thumbnail.png and b/plugins/legacy-plugin-chart-calendar/src/images/thumbnail.png differ diff --git a/plugins/legacy-plugin-chart-calendar/src/images/thumbnailLarge.png b/plugins/legacy-plugin-chart-calendar/src/images/thumbnailLarge.png index bf79a9e237..8e0624b9b5 100644 Binary files a/plugins/legacy-plugin-chart-calendar/src/images/thumbnailLarge.png and b/plugins/legacy-plugin-chart-calendar/src/images/thumbnailLarge.png differ diff --git a/plugins/legacy-plugin-chart-calendar/tsconfig.json b/plugins/legacy-plugin-chart-calendar/tsconfig.json index 6513450e51..40f75135aa 100644 --- a/plugins/legacy-plugin-chart-calendar/tsconfig.json +++ b/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" } ] } \ No newline at end of file diff --git a/plugins/legacy-plugin-chart-chord/package.json b/plugins/legacy-plugin-chart-chord/package.json index 77d20f6998..ff8f7d4f09 100644 --- 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.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" diff --git a/plugins/legacy-plugin-chart-chord/src/images/thumbnail.png b/plugins/legacy-plugin-chart-chord/src/images/thumbnail.png index 18df6a72a7..b148b19e95 100644 Binary files a/plugins/legacy-plugin-chart-chord/src/images/thumbnail.png and b/plugins/legacy-plugin-chart-chord/src/images/thumbnail.png differ diff --git a/plugins/legacy-plugin-chart-chord/src/images/thumbnailLarge.png b/plugins/legacy-plugin-chart-chord/src/images/thumbnailLarge.png index a4a30b6aeb..b70c681d87 100644 Binary files a/plugins/legacy-plugin-chart-chord/src/images/thumbnailLarge.png and b/plugins/legacy-plugin-chart-chord/src/images/thumbnailLarge.png differ diff --git a/plugins/legacy-plugin-chart-chord/tsconfig.json b/plugins/legacy-plugin-chart-chord/tsconfig.json index 6513450e51..40f75135aa 100644 --- a/plugins/legacy-plugin-chart-chord/tsconfig.json +++ b/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" } ] } \ No newline at end of file diff --git a/plugins/legacy-plugin-chart-country-map/package.json b/plugins/legacy-plugin-chart-country-map/package.json index 5ffaddfc28..05ab79e0d3 100644 --- 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.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" diff --git a/plugins/legacy-plugin-chart-country-map/src/images/thumbnail.png b/plugins/legacy-plugin-chart-country-map/src/images/thumbnail.png index 52acbfab52..e3742f1ee8 100644 Binary files a/plugins/legacy-plugin-chart-country-map/src/images/thumbnail.png and b/plugins/legacy-plugin-chart-country-map/src/images/thumbnail.png differ diff --git a/plugins/legacy-plugin-chart-country-map/src/images/thumbnailLarge.png b/plugins/legacy-plugin-chart-country-map/src/images/thumbnailLarge.png index 896fd6b09a..cfa72f4641 100644 Binary files a/plugins/legacy-plugin-chart-country-map/src/images/thumbnailLarge.png and b/plugins/legacy-plugin-chart-country-map/src/images/thumbnailLarge.png differ diff --git a/plugins/legacy-plugin-chart-country-map/tsconfig.json b/plugins/legacy-plugin-chart-country-map/tsconfig.json index 6513450e51..40f75135aa 100644 --- a/plugins/legacy-plugin-chart-country-map/tsconfig.json +++ b/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" } ] } \ No newline at end of file diff --git a/plugins/legacy-plugin-chart-event-flow/package.json b/plugins/legacy-plugin-chart-event-flow/package.json index c21a9329f3..99f7f0ee43 100644 --- 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.15.0", + "version": "0.15.1", "description": "Superset Legacy Chart - Event Flow", "sideEffects": [ "*.css" diff --git a/plugins/legacy-plugin-chart-event-flow/src/EventFlow.jsx b/plugins/legacy-plugin-chart-event-flow/src/EventFlow.tsx similarity index 64% rename from plugins/legacy-plugin-chart-event-flow/src/EventFlow.jsx rename to plugins/legacy-plugin-chart-event-flow/src/EventFlow.tsx index 5164604553..c663e0a918 100644 --- a/plugins/legacy-plugin-chart-event-flow/src/EventFlow.jsx +++ b/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 ( - ); } - -CustomEventFlow.propTypes = propTypes; -CustomEventFlow.defaultProps = defaultProps; - -export default CustomEventFlow; diff --git a/plugins/legacy-plugin-chart-event-flow/src/controlPanel.jsx b/plugins/legacy-plugin-chart-event-flow/src/controlPanel.tsx similarity index 82% rename from plugins/legacy-plugin-chart-event-flow/src/controlPanel.jsx rename to plugins/legacy-plugin-chart-event-flow/src/controlPanel.tsx index 4c5506e5d2..0b3b315329 100644 --- a/plugins/legacy-plugin-chart-event-flow/src/controlPanel.jsx +++ b/plugins/legacy-plugin-chart-event-flow/src/controlPanel.tsx @@ -17,10 +17,17 @@ * under the License. */ import React from 'react'; -import { t, validateNonEmpty, ColumnOption, columnChoices } from '@superset-ui/core'; -import { formatSelectOptionsForRange } from '@superset-ui/chart-controls'; +import { t, validateNonEmpty } from '@superset-ui/core'; +import { + formatSelectOptionsForRange, + ColumnOption, + columnChoices, + ControlPanelConfig, + SelectControlConfig, + ColumnMeta, +} from '@superset-ui/chart-controls'; -export default { +const config: ControlPanelConfig = { controlPanelSections: [ { label: t('Event definition'), @@ -32,14 +39,15 @@ export default { config: { type: 'SelectControl', label: t('Column containing event names'), - default: control => + description: t('Columns to display'), + mapStateToProps: state => ({ + choices: columnChoices(state?.datasource), + }), + // choices is from `mapStateToProps` + default: (control: { choices?: string[] }) => control.choices && control.choices.length > 0 ? control.choices[0][0] : null, + validators: [validateNonEmpty], }, - description: t('Columns to display'), - mapStateToProps: state => ({ - choices: columnChoices(state.datasource), - }), - validators: [validateNonEmpty], }, ], ['row_limit'], @@ -86,6 +94,7 @@ export default { [ { name: 'all_columns', + // eslint-disable-next-line @typescript-eslint/consistent-type-assertions config: { type: 'SelectControl', multi: true, @@ -101,7 +110,7 @@ export default { }), commaChoosesOption: false, freeForm: true, - }, + } as SelectControlConfig, }, ], ], @@ -118,3 +127,5 @@ export default { }, }, }; + +export default config; diff --git a/plugins/legacy-plugin-chart-event-flow/src/images/thumbnail.png b/plugins/legacy-plugin-chart-event-flow/src/images/thumbnail.png index a24c1c5f6f..de10a4d19b 100644 Binary files a/plugins/legacy-plugin-chart-event-flow/src/images/thumbnail.png and b/plugins/legacy-plugin-chart-event-flow/src/images/thumbnail.png differ diff --git a/plugins/legacy-plugin-chart-event-flow/src/images/thumbnailLarge.png b/plugins/legacy-plugin-chart-event-flow/src/images/thumbnailLarge.png index 45765295be..0edb53563d 100644 Binary files a/plugins/legacy-plugin-chart-event-flow/src/images/thumbnailLarge.png and b/plugins/legacy-plugin-chart-event-flow/src/images/thumbnailLarge.png differ diff --git a/plugins/legacy-plugin-chart-event-flow/src/index.js b/plugins/legacy-plugin-chart-event-flow/src/index.ts similarity index 95% rename from plugins/legacy-plugin-chart-event-flow/src/index.js rename to plugins/legacy-plugin-chart-event-flow/src/index.ts index 494ad1e130..16268861f8 100644 --- a/plugins/legacy-plugin-chart-event-flow/src/index.js +++ b/plugins/legacy-plugin-chart-event-flow/src/index.ts @@ -32,7 +32,7 @@ export default class EventFlowChartPlugin extends ChartPlugin { constructor() { super({ loadChart: () => import('./EventFlow'), - loadTransformProps: () => import('./transformProps.js'), + loadTransformProps: () => import('./transformProps'), metadata, controlPanel, }); diff --git a/plugins/legacy-plugin-chart-event-flow/src/transformProps.js b/plugins/legacy-plugin-chart-event-flow/src/transformProps.ts similarity index 63% rename from plugins/legacy-plugin-chart-event-flow/src/transformProps.js rename to plugins/legacy-plugin-chart-event-flow/src/transformProps.ts index d0fe071358..dad2229e79 100644 --- a/plugins/legacy-plugin-chart-event-flow/src/transformProps.js +++ b/plugins/legacy-plugin-chart-event-flow/src/transformProps.ts @@ -16,10 +16,24 @@ * specific language governing permissions and limitations * under the License. */ +import { ChartProps, TimeseriesDataRecord } from '@superset-ui/core'; import { cleanEvents, TS, EVENT_NAME, ENTITY_ID } from '@data-ui/event-flow'; -export default function transformProps(chartProps) { - const { formData, queryData, width, height } = chartProps; +export interface EventFlowFormData { + allColumnsX: string; + entity: string; + minLeafNodeEventCount: number; +} + +export interface EventFlowChartProps extends ChartProps { + formData: EventFlowFormData; + queryData: { + data: TimeseriesDataRecord[]; + }; +} + +export default function transformProps(chartProps: ChartProps) { + const { formData, queryData, width, height } = chartProps as EventFlowChartProps; const { allColumnsX, entity, minLeafNodeEventCount } = formData; const { data } = queryData; @@ -30,10 +44,11 @@ export default function transformProps(chartProps) { // map from the Superset form fields to 's expected data keys const accessorFunctions = { - [ENTITY_ID]: datum => String(datum[userKey]), - [EVENT_NAME]: datum => datum[eventNameKey], - // eslint-disable-next-line no-underscore-dangle - [TS]: datum => new Date(datum.__timestamp), + [ENTITY_ID]: (datum: TimeseriesDataRecord) => String(datum[userKey]), + [EVENT_NAME]: (datum: TimeseriesDataRecord) => datum[eventNameKey] as string, + [TS]: (datum: TimeseriesDataRecord): Date | null => + // eslint-disable-next-line no-underscore-dangle + datum.__timestamp || datum.__timestamp === 0 ? new Date(datum.__timestamp) : null, }; const cleanData = cleanEvents(data, accessorFunctions); diff --git a/plugins/legacy-plugin-chart-event-flow/src/types/external.d.ts b/plugins/legacy-plugin-chart-event-flow/src/types/external.d.ts new file mode 100644 index 0000000000..69bcffd0f8 --- /dev/null +++ b/plugins/legacy-plugin-chart-event-flow/src/types/external.d.ts @@ -0,0 +1,2 @@ +declare module '*.png'; +declare module '@data-ui/event-flow'; diff --git a/plugins/legacy-plugin-chart-event-flow/tsconfig.json b/plugins/legacy-plugin-chart-event-flow/tsconfig.json index 6513450e51..40f75135aa 100644 --- a/plugins/legacy-plugin-chart-event-flow/tsconfig.json +++ b/plugins/legacy-plugin-chart-event-flow/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" } ] } \ No newline at end of file diff --git a/plugins/legacy-plugin-chart-force-directed/package.json b/plugins/legacy-plugin-chart-force-directed/package.json index 7512b003df..74a2dbe51d 100644 --- 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.15.0", + "version": "0.15.1", "description": "Superset Legacy Chart - Force-directed Graph", "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.7.2" }, diff --git a/plugins/legacy-plugin-chart-force-directed/src/images/thumbnail.png b/plugins/legacy-plugin-chart-force-directed/src/images/thumbnail.png index 15e0edb2f0..e7fad14aa5 100644 Binary files a/plugins/legacy-plugin-chart-force-directed/src/images/thumbnail.png and b/plugins/legacy-plugin-chart-force-directed/src/images/thumbnail.png differ diff --git a/plugins/legacy-plugin-chart-force-directed/src/images/thumbnailLarge.png b/plugins/legacy-plugin-chart-force-directed/src/images/thumbnailLarge.png index 1cc7ce9579..d3d30319fd 100644 Binary files a/plugins/legacy-plugin-chart-force-directed/src/images/thumbnailLarge.png and b/plugins/legacy-plugin-chart-force-directed/src/images/thumbnailLarge.png differ diff --git a/plugins/legacy-plugin-chart-force-directed/tsconfig.json b/plugins/legacy-plugin-chart-force-directed/tsconfig.json index 6513450e51..40f75135aa 100644 --- a/plugins/legacy-plugin-chart-force-directed/tsconfig.json +++ b/plugins/legacy-plugin-chart-force-directed/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" } ] } \ No newline at end of file diff --git a/plugins/legacy-plugin-chart-heatmap/package.json b/plugins/legacy-plugin-chart-heatmap/package.json index 1d9613f348..2ac6db3c42 100644 --- 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.15.0", + "version": "0.15.1", "description": "Superset Legacy Chart - Heatmap", "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-svg-legend": "^1.x", "d3-tip": "^0.9.1", diff --git a/plugins/legacy-plugin-chart-heatmap/src/images/thumbnail.png b/plugins/legacy-plugin-chart-heatmap/src/images/thumbnail.png index 8d5f8dacca..f1703fc9d9 100644 Binary files a/plugins/legacy-plugin-chart-heatmap/src/images/thumbnail.png and b/plugins/legacy-plugin-chart-heatmap/src/images/thumbnail.png differ diff --git a/plugins/legacy-plugin-chart-heatmap/src/images/thumbnailLarge.png b/plugins/legacy-plugin-chart-heatmap/src/images/thumbnailLarge.png index ac81a45881..1dfeabbdbb 100644 Binary files a/plugins/legacy-plugin-chart-heatmap/src/images/thumbnailLarge.png and b/plugins/legacy-plugin-chart-heatmap/src/images/thumbnailLarge.png differ diff --git a/plugins/legacy-plugin-chart-heatmap/tsconfig.json b/plugins/legacy-plugin-chart-heatmap/tsconfig.json index 6513450e51..40f75135aa 100644 --- a/plugins/legacy-plugin-chart-heatmap/tsconfig.json +++ b/plugins/legacy-plugin-chart-heatmap/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" } ] } \ No newline at end of file diff --git a/plugins/legacy-plugin-chart-histogram/package.json b/plugins/legacy-plugin-chart-histogram/package.json index 07cffffc35..09d4232c54 100644 --- 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.15.0", + "version": "0.15.1", "description": "Superset Legacy Chart - Histogram", "sideEffects": [ "*.css" @@ -30,8 +30,8 @@ "dependencies": { "@data-ui/histogram": "^0.0.84", "@data-ui/theme": "^0.0.84", - "@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", "@vx/legend": "^0.0.198", "@vx/responsive": "^0.0.197", "@vx/scale": "^0.0.197", diff --git a/plugins/legacy-plugin-chart-histogram/src/images/thumbnail.png b/plugins/legacy-plugin-chart-histogram/src/images/thumbnail.png index c6f8fdcfd6..22e5ea4243 100644 Binary files a/plugins/legacy-plugin-chart-histogram/src/images/thumbnail.png and b/plugins/legacy-plugin-chart-histogram/src/images/thumbnail.png differ diff --git a/plugins/legacy-plugin-chart-histogram/src/images/thumbnailLarge.png b/plugins/legacy-plugin-chart-histogram/src/images/thumbnailLarge.png index f7bbe62407..3c63c0eb52 100644 Binary files a/plugins/legacy-plugin-chart-histogram/src/images/thumbnailLarge.png and b/plugins/legacy-plugin-chart-histogram/src/images/thumbnailLarge.png differ diff --git a/plugins/legacy-plugin-chart-histogram/tsconfig.json b/plugins/legacy-plugin-chart-histogram/tsconfig.json index 6513450e51..40f75135aa 100644 --- a/plugins/legacy-plugin-chart-histogram/tsconfig.json +++ b/plugins/legacy-plugin-chart-histogram/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" } ] } \ No newline at end of file diff --git a/plugins/legacy-plugin-chart-horizon/package.json b/plugins/legacy-plugin-chart-horizon/package.json index ad82f9617a..9551a7ae1f 100644 --- 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.15.0", + "version": "0.15.1", "description": "Superset Legacy Chart - Horizon", "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-array": "^2.0.3", "d3-scale": "^3.0.1", "prop-types": "^15.6.2" diff --git a/plugins/legacy-plugin-chart-horizon/src/images/thumbnail.png b/plugins/legacy-plugin-chart-horizon/src/images/thumbnail.png index f927b7659a..6e2c5c0e90 100644 Binary files a/plugins/legacy-plugin-chart-horizon/src/images/thumbnail.png and b/plugins/legacy-plugin-chart-horizon/src/images/thumbnail.png differ diff --git a/plugins/legacy-plugin-chart-horizon/src/images/thumbnailLarge.png b/plugins/legacy-plugin-chart-horizon/src/images/thumbnailLarge.png index a5d4bf3ec4..f091dd8f09 100644 Binary files a/plugins/legacy-plugin-chart-horizon/src/images/thumbnailLarge.png and b/plugins/legacy-plugin-chart-horizon/src/images/thumbnailLarge.png differ diff --git a/plugins/legacy-plugin-chart-horizon/tsconfig.json b/plugins/legacy-plugin-chart-horizon/tsconfig.json index 6513450e51..40f75135aa 100644 --- a/plugins/legacy-plugin-chart-horizon/tsconfig.json +++ b/plugins/legacy-plugin-chart-horizon/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" } ] } \ No newline at end of file diff --git a/plugins/legacy-plugin-chart-map-box/package.json b/plugins/legacy-plugin-chart-map-box/package.json index c93ba0a654..5d2b9b0906 100644 --- 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.15.0", + "version": "0.15.1", "description": "Superset Legacy Chart - MapBox", "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", "immutable": "^3.8.2", "mapbox-gl": "^0.53.0", "prop-types": "^15.6.2", diff --git a/plugins/legacy-plugin-chart-map-box/src/images/thumbnail.png b/plugins/legacy-plugin-chart-map-box/src/images/thumbnail.png index 2132df5517..c05e3bcf52 100644 Binary files a/plugins/legacy-plugin-chart-map-box/src/images/thumbnail.png and b/plugins/legacy-plugin-chart-map-box/src/images/thumbnail.png differ diff --git a/plugins/legacy-plugin-chart-map-box/src/images/thumbnailLarge.png b/plugins/legacy-plugin-chart-map-box/src/images/thumbnailLarge.png index 662c163d63..d19b1b5797 100644 Binary files a/plugins/legacy-plugin-chart-map-box/src/images/thumbnailLarge.png and b/plugins/legacy-plugin-chart-map-box/src/images/thumbnailLarge.png differ diff --git a/plugins/legacy-plugin-chart-map-box/tsconfig.json b/plugins/legacy-plugin-chart-map-box/tsconfig.json index 6513450e51..40f75135aa 100644 --- a/plugins/legacy-plugin-chart-map-box/tsconfig.json +++ b/plugins/legacy-plugin-chart-map-box/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" } ] } \ No newline at end of file diff --git a/plugins/legacy-plugin-chart-paired-t-test/package.json b/plugins/legacy-plugin-chart-paired-t-test/package.json index 33b8237a6b..3f238b5096 100644 --- 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.15.0", + "version": "0.15.1", "description": "Superset Legacy Chart - Paired T Test", "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", "distributions": "^1.0.0", "prop-types": "^15.6.2", "reactable-arc": "0.15.0" diff --git a/plugins/legacy-plugin-chart-paired-t-test/src/images/thumbnail.png b/plugins/legacy-plugin-chart-paired-t-test/src/images/thumbnail.png index 4a3b225458..62ab0bcb06 100644 Binary files a/plugins/legacy-plugin-chart-paired-t-test/src/images/thumbnail.png and b/plugins/legacy-plugin-chart-paired-t-test/src/images/thumbnail.png differ diff --git a/plugins/legacy-plugin-chart-paired-t-test/src/images/thumbnailLarge.png b/plugins/legacy-plugin-chart-paired-t-test/src/images/thumbnailLarge.png index 4f8ad71b12..2c6e69237e 100644 Binary files a/plugins/legacy-plugin-chart-paired-t-test/src/images/thumbnailLarge.png and b/plugins/legacy-plugin-chart-paired-t-test/src/images/thumbnailLarge.png differ diff --git a/plugins/legacy-plugin-chart-paired-t-test/tsconfig.json b/plugins/legacy-plugin-chart-paired-t-test/tsconfig.json index 6513450e51..40f75135aa 100644 --- a/plugins/legacy-plugin-chart-paired-t-test/tsconfig.json +++ b/plugins/legacy-plugin-chart-paired-t-test/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" } ] } \ No newline at end of file diff --git a/plugins/legacy-plugin-chart-parallel-coordinates/package.json b/plugins/legacy-plugin-chart-parallel-coordinates/package.json index 1e3d16b487..631f551541 100644 --- 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.15.0", + "version": "0.15.1", "description": "Superset Legacy Chart - Parallel Coordinates", "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.7.2" }, diff --git a/plugins/legacy-plugin-chart-parallel-coordinates/src/images/thumbnail.png b/plugins/legacy-plugin-chart-parallel-coordinates/src/images/thumbnail.png index 5401034d3e..b6a8bb9527 100644 Binary files a/plugins/legacy-plugin-chart-parallel-coordinates/src/images/thumbnail.png and b/plugins/legacy-plugin-chart-parallel-coordinates/src/images/thumbnail.png differ diff --git a/plugins/legacy-plugin-chart-parallel-coordinates/src/images/thumbnailLarge.png b/plugins/legacy-plugin-chart-parallel-coordinates/src/images/thumbnailLarge.png index fc1a157345..7e877b0737 100644 Binary files a/plugins/legacy-plugin-chart-parallel-coordinates/src/images/thumbnailLarge.png and b/plugins/legacy-plugin-chart-parallel-coordinates/src/images/thumbnailLarge.png differ diff --git a/plugins/legacy-plugin-chart-parallel-coordinates/tsconfig.json b/plugins/legacy-plugin-chart-parallel-coordinates/tsconfig.json index 6513450e51..40f75135aa 100644 --- a/plugins/legacy-plugin-chart-parallel-coordinates/tsconfig.json +++ b/plugins/legacy-plugin-chart-parallel-coordinates/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" } ] } \ No newline at end of file diff --git a/plugins/legacy-plugin-chart-partition/package.json b/plugins/legacy-plugin-chart-partition/package.json index 48c1d3a69d..6d98ec6f4c 100644 --- 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.15.0", + "version": "0.15.1", "description": "Superset Legacy Chart - Partition", "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-hierarchy": "^1.1.8", "prop-types": "^15.6.2" diff --git a/plugins/legacy-plugin-chart-partition/src/images/thumbnail.png b/plugins/legacy-plugin-chart-partition/src/images/thumbnail.png index f49ee88cf8..2b35d0d809 100644 Binary files a/plugins/legacy-plugin-chart-partition/src/images/thumbnail.png and b/plugins/legacy-plugin-chart-partition/src/images/thumbnail.png differ diff --git a/plugins/legacy-plugin-chart-partition/src/images/thumbnailLarge.png b/plugins/legacy-plugin-chart-partition/src/images/thumbnailLarge.png index 7cf6e1358a..cc3ef62787 100644 Binary files a/plugins/legacy-plugin-chart-partition/src/images/thumbnailLarge.png and b/plugins/legacy-plugin-chart-partition/src/images/thumbnailLarge.png differ diff --git a/plugins/legacy-plugin-chart-partition/tsconfig.json b/plugins/legacy-plugin-chart-partition/tsconfig.json index 6513450e51..40f75135aa 100644 --- a/plugins/legacy-plugin-chart-partition/tsconfig.json +++ b/plugins/legacy-plugin-chart-partition/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" } ] } \ No newline at end of file diff --git a/plugins/legacy-plugin-chart-pivot-table/package.json b/plugins/legacy-plugin-chart-pivot-table/package.json index 488157de7b..77b3ccba3e 100644 --- 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.15.0", + "version": "0.15.1", "description": "Superset Legacy Chart - Pivot Table", "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", "datatables.net-bs": "^1.10.15", "prop-types": "^15.6.2" diff --git a/plugins/legacy-plugin-chart-pivot-table/src/images/thumbnail.png b/plugins/legacy-plugin-chart-pivot-table/src/images/thumbnail.png index a22794bb9e..7f003266eb 100644 Binary files a/plugins/legacy-plugin-chart-pivot-table/src/images/thumbnail.png and b/plugins/legacy-plugin-chart-pivot-table/src/images/thumbnail.png differ diff --git a/plugins/legacy-plugin-chart-pivot-table/src/images/thumbnailLarge.png b/plugins/legacy-plugin-chart-pivot-table/src/images/thumbnailLarge.png index 37f86af079..3e4745e77a 100644 Binary files a/plugins/legacy-plugin-chart-pivot-table/src/images/thumbnailLarge.png and b/plugins/legacy-plugin-chart-pivot-table/src/images/thumbnailLarge.png differ diff --git a/plugins/legacy-plugin-chart-pivot-table/tsconfig.json b/plugins/legacy-plugin-chart-pivot-table/tsconfig.json index 6513450e51..40f75135aa 100644 --- a/plugins/legacy-plugin-chart-pivot-table/tsconfig.json +++ b/plugins/legacy-plugin-chart-pivot-table/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" } ] } \ No newline at end of file diff --git a/plugins/legacy-plugin-chart-rose/package.json b/plugins/legacy-plugin-chart-rose/package.json index c07902465e..7828623130 100644 --- 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.15.0", + "version": "0.15.1", "description": "Superset Legacy Chart - Nightingale Rose Diagram", "sideEffects": [ "*.css" diff --git a/plugins/legacy-plugin-chart-rose/src/images/thumbnail.png b/plugins/legacy-plugin-chart-rose/src/images/thumbnail.png index 2006746195..9e01036997 100644 Binary files a/plugins/legacy-plugin-chart-rose/src/images/thumbnail.png and b/plugins/legacy-plugin-chart-rose/src/images/thumbnail.png differ diff --git a/plugins/legacy-plugin-chart-rose/src/images/thumbnailLarge.png b/plugins/legacy-plugin-chart-rose/src/images/thumbnailLarge.png index 763fa2b120..03935f9ee4 100644 Binary files a/plugins/legacy-plugin-chart-rose/src/images/thumbnailLarge.png and b/plugins/legacy-plugin-chart-rose/src/images/thumbnailLarge.png differ diff --git a/plugins/legacy-plugin-chart-rose/tsconfig.json b/plugins/legacy-plugin-chart-rose/tsconfig.json index 6513450e51..40f75135aa 100644 --- a/plugins/legacy-plugin-chart-rose/tsconfig.json +++ b/plugins/legacy-plugin-chart-rose/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" } ] } \ No newline at end of file diff --git a/plugins/legacy-plugin-chart-sankey-loop/package.json b/plugins/legacy-plugin-chart-sankey-loop/package.json index 2f2bf8fba6..0ae393fa41 100644 --- 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.15.0", + "version": "0.15.1", "description": "Superset Legacy Chart - Sankey Diagram with Loops", "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-sankey-diagram": "^0.7.3", "d3-selection": "^1.4.0", "prop-types": "^15.6.2" diff --git a/plugins/legacy-plugin-chart-sankey-loop/src/images/thumbnail.png b/plugins/legacy-plugin-chart-sankey-loop/src/images/thumbnail.png index ef9d2b17d5..5d814582a5 100644 Binary files a/plugins/legacy-plugin-chart-sankey-loop/src/images/thumbnail.png and b/plugins/legacy-plugin-chart-sankey-loop/src/images/thumbnail.png differ diff --git a/plugins/legacy-plugin-chart-sankey-loop/src/images/thumbnailLarge.png b/plugins/legacy-plugin-chart-sankey-loop/src/images/thumbnailLarge.png index ef9d2b17d5..5d814582a5 100644 Binary files a/plugins/legacy-plugin-chart-sankey-loop/src/images/thumbnailLarge.png and b/plugins/legacy-plugin-chart-sankey-loop/src/images/thumbnailLarge.png differ diff --git a/plugins/legacy-plugin-chart-sankey-loop/tsconfig.json b/plugins/legacy-plugin-chart-sankey-loop/tsconfig.json index 6513450e51..40f75135aa 100644 --- a/plugins/legacy-plugin-chart-sankey-loop/tsconfig.json +++ b/plugins/legacy-plugin-chart-sankey-loop/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" } ] } \ No newline at end of file diff --git a/plugins/legacy-plugin-chart-sankey/package.json b/plugins/legacy-plugin-chart-sankey/package.json index 807a30dd37..f3804ee2f2 100644 --- 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.15.0", + "version": "0.15.1", "description": "Superset Legacy Chart - Sankey 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", "d3-sankey": "^0.4.2", "prop-types": "^15.6.2" diff --git a/plugins/legacy-plugin-chart-sankey/src/images/thumbnail.png b/plugins/legacy-plugin-chart-sankey/src/images/thumbnail.png index 93d73f6a65..6bf13f8fd6 100644 Binary files a/plugins/legacy-plugin-chart-sankey/src/images/thumbnail.png and b/plugins/legacy-plugin-chart-sankey/src/images/thumbnail.png differ diff --git a/plugins/legacy-plugin-chart-sankey/src/images/thumbnailLarge.png b/plugins/legacy-plugin-chart-sankey/src/images/thumbnailLarge.png index 981cdba870..231316b88a 100644 Binary files a/plugins/legacy-plugin-chart-sankey/src/images/thumbnailLarge.png and b/plugins/legacy-plugin-chart-sankey/src/images/thumbnailLarge.png differ diff --git a/plugins/legacy-plugin-chart-sankey/tsconfig.json b/plugins/legacy-plugin-chart-sankey/tsconfig.json index 6513450e51..40f75135aa 100644 --- a/plugins/legacy-plugin-chart-sankey/tsconfig.json +++ b/plugins/legacy-plugin-chart-sankey/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" } ] } \ No newline at end of file diff --git a/plugins/legacy-plugin-chart-sunburst/package.json b/plugins/legacy-plugin-chart-sunburst/package.json index 4ec63b47e0..3a4d5b878c 100644 --- a/plugins/legacy-plugin-chart-sunburst/package.json +++ b/plugins/legacy-plugin-chart-sunburst/package.json @@ -1,6 +1,6 @@ { "name": "@superset-ui/legacy-plugin-chart-sunburst", - "version": "0.15.0", + "version": "0.15.1", "description": "Superset Legacy Chart - Sunburst", "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" } diff --git a/plugins/legacy-plugin-chart-sunburst/src/images/thumbnail.png b/plugins/legacy-plugin-chart-sunburst/src/images/thumbnail.png index ec6b607be2..46f8262b87 100644 Binary files a/plugins/legacy-plugin-chart-sunburst/src/images/thumbnail.png and b/plugins/legacy-plugin-chart-sunburst/src/images/thumbnail.png differ diff --git a/plugins/legacy-plugin-chart-sunburst/src/images/thumbnailLarge.png b/plugins/legacy-plugin-chart-sunburst/src/images/thumbnailLarge.png index f155363aad..6c4706bf76 100644 Binary files a/plugins/legacy-plugin-chart-sunburst/src/images/thumbnailLarge.png and b/plugins/legacy-plugin-chart-sunburst/src/images/thumbnailLarge.png differ diff --git a/plugins/legacy-plugin-chart-sunburst/tsconfig.json b/plugins/legacy-plugin-chart-sunburst/tsconfig.json index 6513450e51..40f75135aa 100644 --- a/plugins/legacy-plugin-chart-sunburst/tsconfig.json +++ b/plugins/legacy-plugin-chart-sunburst/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" } ] } \ No newline at end of file diff --git a/plugins/legacy-plugin-chart-time-table/package.json b/plugins/legacy-plugin-chart-time-table/package.json index cd6f3c59a6..ec26dc92b9 100644 --- a/plugins/legacy-plugin-chart-time-table/package.json +++ b/plugins/legacy-plugin-chart-time-table/package.json @@ -1,6 +1,6 @@ { "name": "@superset-ui/legacy-plugin-chart-time-table", - "version": "0.15.0", + "version": "0.15.1", "description": "Superset Chart Plugin - Time Table", "sideEffects": [ "*.css" @@ -29,10 +29,9 @@ }, "dependencies": { "@data-ui/sparkline": "^0.0.84", - "@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", "@types/d3-scale": "^2.0.2", - "@types/react": "*", "d3-scale": "^3.2.1", "emotion-theming": "^10.0.27", "moment": "^2.26.0", @@ -41,6 +40,7 @@ "reactable-arc": "^0.15.0" }, "peerDependencies": { + "@types/react": "*", "react": "^16.3.1" } } diff --git a/plugins/legacy-plugin-chart-time-table/src/images/thumbnail.png b/plugins/legacy-plugin-chart-time-table/src/images/thumbnail.png index fe11d8eda9..22c2ee2904 100644 Binary files a/plugins/legacy-plugin-chart-time-table/src/images/thumbnail.png and b/plugins/legacy-plugin-chart-time-table/src/images/thumbnail.png differ diff --git a/plugins/legacy-plugin-chart-time-table/src/images/thumbnailLarge.png b/plugins/legacy-plugin-chart-time-table/src/images/thumbnailLarge.png index 5eba0c2f0b..4dd4b925c7 100644 Binary files a/plugins/legacy-plugin-chart-time-table/src/images/thumbnailLarge.png and b/plugins/legacy-plugin-chart-time-table/src/images/thumbnailLarge.png differ diff --git a/plugins/legacy-plugin-chart-time-table/tsconfig.json b/plugins/legacy-plugin-chart-time-table/tsconfig.json index 6513450e51..40f75135aa 100644 --- a/plugins/legacy-plugin-chart-time-table/tsconfig.json +++ b/plugins/legacy-plugin-chart-time-table/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" } ] } \ No newline at end of file diff --git a/plugins/legacy-plugin-chart-treemap/package.json b/plugins/legacy-plugin-chart-treemap/package.json index 5772f831b9..7d3718ca31 100644 --- a/plugins/legacy-plugin-chart-treemap/package.json +++ b/plugins/legacy-plugin-chart-treemap/package.json @@ -1,6 +1,6 @@ { "name": "@superset-ui/legacy-plugin-chart-treemap", - "version": "0.15.0", + "version": "0.15.1", "description": "Superset Legacy Chart - Treemap", "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-hierarchy": "^1.1.8", "d3-selection": "^1.4.0", "prop-types": "^15.6.2" diff --git a/plugins/legacy-plugin-chart-treemap/src/images/thumbnail.png b/plugins/legacy-plugin-chart-treemap/src/images/thumbnail.png index 27c6c5c0fd..cba7798780 100644 Binary files a/plugins/legacy-plugin-chart-treemap/src/images/thumbnail.png and b/plugins/legacy-plugin-chart-treemap/src/images/thumbnail.png differ diff --git a/plugins/legacy-plugin-chart-treemap/src/images/thumbnailLarge.png b/plugins/legacy-plugin-chart-treemap/src/images/thumbnailLarge.png index 0aec60c819..4e00e29b13 100644 Binary files a/plugins/legacy-plugin-chart-treemap/src/images/thumbnailLarge.png and b/plugins/legacy-plugin-chart-treemap/src/images/thumbnailLarge.png differ diff --git a/plugins/legacy-plugin-chart-treemap/tsconfig.json b/plugins/legacy-plugin-chart-treemap/tsconfig.json index 6513450e51..40f75135aa 100644 --- a/plugins/legacy-plugin-chart-treemap/tsconfig.json +++ b/plugins/legacy-plugin-chart-treemap/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" } ] } \ No newline at end of file diff --git a/plugins/legacy-plugin-chart-world-map/package.json b/plugins/legacy-plugin-chart-world-map/package.json index 0563461e3a..cb0eab882b 100644 --- a/plugins/legacy-plugin-chart-world-map/package.json +++ b/plugins/legacy-plugin-chart-world-map/package.json @@ -1,6 +1,6 @@ { "name": "@superset-ui/legacy-plugin-chart-world-map", - "version": "0.15.0", + "version": "0.15.1", "description": "Superset Legacy Chart - World 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.4.0", "d3-color": "^1.4.1", diff --git a/plugins/legacy-plugin-chart-world-map/src/images/thumbnail.png b/plugins/legacy-plugin-chart-world-map/src/images/thumbnail.png index 4b3fe0bbbc..688bb5e31e 100644 Binary files a/plugins/legacy-plugin-chart-world-map/src/images/thumbnail.png and b/plugins/legacy-plugin-chart-world-map/src/images/thumbnail.png differ diff --git a/plugins/legacy-plugin-chart-world-map/src/images/thumbnailLarge.png b/plugins/legacy-plugin-chart-world-map/src/images/thumbnailLarge.png index 82e8ad2d10..677dba4948 100644 Binary files a/plugins/legacy-plugin-chart-world-map/src/images/thumbnailLarge.png and b/plugins/legacy-plugin-chart-world-map/src/images/thumbnailLarge.png differ diff --git a/plugins/legacy-plugin-chart-world-map/tsconfig.json b/plugins/legacy-plugin-chart-world-map/tsconfig.json index 6513450e51..40f75135aa 100644 --- a/plugins/legacy-plugin-chart-world-map/tsconfig.json +++ b/plugins/legacy-plugin-chart-world-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" } ] } \ No newline at end of file diff --git a/plugins/legacy-preset-chart-big-number/package.json b/plugins/legacy-preset-chart-big-number/package.json index f206a514d9..ad90f9bde7 100644 --- a/plugins/legacy-preset-chart-big-number/package.json +++ b/plugins/legacy-preset-chart-big-number/package.json @@ -1,6 +1,6 @@ { "name": "@superset-ui/legacy-preset-chart-big-number", - "version": "0.15.0", + "version": "0.15.1", "description": "Superset Legacy Chart - Big Number", "sideEffects": [ "*.css" @@ -29,8 +29,8 @@ }, "dependencies": { "@data-ui/xy-chart": "^0.0.84", - "@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", "@types/d3-color": "^1.2.2", "@types/shortid": "^0.0.29", "d3-color": "^1.2.3", diff --git a/plugins/legacy-preset-chart-big-number/src/BigNumber/images/thumbnail.png b/plugins/legacy-preset-chart-big-number/src/BigNumber/images/thumbnail.png index 90ac5a5b12..15aa9ba4c7 100644 Binary files a/plugins/legacy-preset-chart-big-number/src/BigNumber/images/thumbnail.png and b/plugins/legacy-preset-chart-big-number/src/BigNumber/images/thumbnail.png differ diff --git a/plugins/legacy-preset-chart-big-number/src/BigNumber/images/thumbnailLarge.png b/plugins/legacy-preset-chart-big-number/src/BigNumber/images/thumbnailLarge.png index 2420f25e9f..b7e3ea24f6 100644 Binary files a/plugins/legacy-preset-chart-big-number/src/BigNumber/images/thumbnailLarge.png and b/plugins/legacy-preset-chart-big-number/src/BigNumber/images/thumbnailLarge.png differ diff --git a/plugins/legacy-preset-chart-big-number/src/BigNumberTotal/images/thumbnail.png b/plugins/legacy-preset-chart-big-number/src/BigNumberTotal/images/thumbnail.png index 350d5a1ab1..bab5074454 100644 Binary files a/plugins/legacy-preset-chart-big-number/src/BigNumberTotal/images/thumbnail.png and b/plugins/legacy-preset-chart-big-number/src/BigNumberTotal/images/thumbnail.png differ diff --git a/plugins/legacy-preset-chart-big-number/src/BigNumberTotal/images/thumbnailLarge.png b/plugins/legacy-preset-chart-big-number/src/BigNumberTotal/images/thumbnailLarge.png index eb4b345731..ef66511a1a 100644 Binary files a/plugins/legacy-preset-chart-big-number/src/BigNumberTotal/images/thumbnailLarge.png and b/plugins/legacy-preset-chart-big-number/src/BigNumberTotal/images/thumbnailLarge.png differ diff --git a/plugins/legacy-preset-chart-big-number/tsconfig.json b/plugins/legacy-preset-chart-big-number/tsconfig.json index 6513450e51..40f75135aa 100644 --- a/plugins/legacy-preset-chart-big-number/tsconfig.json +++ b/plugins/legacy-preset-chart-big-number/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" } ] } \ No newline at end of file diff --git a/plugins/legacy-preset-chart-nvd3/package.json b/plugins/legacy-preset-chart-nvd3/package.json index 54fd2ca70b..6465922375 100644 --- a/plugins/legacy-preset-chart-nvd3/package.json +++ b/plugins/legacy-preset-chart-nvd3/package.json @@ -1,6 +1,6 @@ { "name": "@superset-ui/legacy-preset-chart-nvd3", - "version": "0.15.0", + "version": "0.15.1", "description": "Superset Legacy Chart - NVD3", "sideEffects": [ "*.css" @@ -29,8 +29,8 @@ }, "dependencies": { "@data-ui/xy-chart": "^0.0.84", - "@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-tip": "^0.9.1", "dompurify": "^2.0.6", diff --git a/plugins/legacy-preset-chart-nvd3/src/Area/images/thumbnail.png b/plugins/legacy-preset-chart-nvd3/src/Area/images/thumbnail.png index 6b2fb75d42..270ed2339d 100644 Binary files a/plugins/legacy-preset-chart-nvd3/src/Area/images/thumbnail.png and b/plugins/legacy-preset-chart-nvd3/src/Area/images/thumbnail.png differ diff --git a/plugins/legacy-preset-chart-nvd3/src/Area/images/thumbnailLarge.png b/plugins/legacy-preset-chart-nvd3/src/Area/images/thumbnailLarge.png index 86f1080cda..d8b23bea15 100644 Binary files a/plugins/legacy-preset-chart-nvd3/src/Area/images/thumbnailLarge.png and b/plugins/legacy-preset-chart-nvd3/src/Area/images/thumbnailLarge.png differ diff --git a/plugins/legacy-preset-chart-nvd3/src/Bar/images/thumbnail.png b/plugins/legacy-preset-chart-nvd3/src/Bar/images/thumbnail.png index 1ef2633122..e3ef120993 100644 Binary files a/plugins/legacy-preset-chart-nvd3/src/Bar/images/thumbnail.png and b/plugins/legacy-preset-chart-nvd3/src/Bar/images/thumbnail.png differ diff --git a/plugins/legacy-preset-chart-nvd3/src/Bar/images/thumbnailLarge.png b/plugins/legacy-preset-chart-nvd3/src/Bar/images/thumbnailLarge.png index ab0e8d9915..35c176e6d1 100644 Binary files a/plugins/legacy-preset-chart-nvd3/src/Bar/images/thumbnailLarge.png and b/plugins/legacy-preset-chart-nvd3/src/Bar/images/thumbnailLarge.png differ diff --git a/plugins/legacy-preset-chart-nvd3/src/BoxPlot/images/thumbnail.png b/plugins/legacy-preset-chart-nvd3/src/BoxPlot/images/thumbnail.png index 8925e50680..ece94d0807 100644 Binary files a/plugins/legacy-preset-chart-nvd3/src/BoxPlot/images/thumbnail.png and b/plugins/legacy-preset-chart-nvd3/src/BoxPlot/images/thumbnail.png differ diff --git a/plugins/legacy-preset-chart-nvd3/src/BoxPlot/images/thumbnailLarge.png b/plugins/legacy-preset-chart-nvd3/src/BoxPlot/images/thumbnailLarge.png index de8f061a68..35eff285e3 100644 Binary files a/plugins/legacy-preset-chart-nvd3/src/BoxPlot/images/thumbnailLarge.png and b/plugins/legacy-preset-chart-nvd3/src/BoxPlot/images/thumbnailLarge.png differ diff --git a/plugins/legacy-preset-chart-nvd3/src/Bubble/images/thumbnail.png b/plugins/legacy-preset-chart-nvd3/src/Bubble/images/thumbnail.png index 453388104e..c27ba47197 100644 Binary files a/plugins/legacy-preset-chart-nvd3/src/Bubble/images/thumbnail.png and b/plugins/legacy-preset-chart-nvd3/src/Bubble/images/thumbnail.png differ diff --git a/plugins/legacy-preset-chart-nvd3/src/Bubble/images/thumbnailLarge.png b/plugins/legacy-preset-chart-nvd3/src/Bubble/images/thumbnailLarge.png index 08de51f4ff..c1127688ef 100644 Binary files a/plugins/legacy-preset-chart-nvd3/src/Bubble/images/thumbnailLarge.png and b/plugins/legacy-preset-chart-nvd3/src/Bubble/images/thumbnailLarge.png differ diff --git a/plugins/legacy-preset-chart-nvd3/src/Bullet/images/thumbnail.png b/plugins/legacy-preset-chart-nvd3/src/Bullet/images/thumbnail.png index f98c70f29b..38e9a733cf 100644 Binary files a/plugins/legacy-preset-chart-nvd3/src/Bullet/images/thumbnail.png and b/plugins/legacy-preset-chart-nvd3/src/Bullet/images/thumbnail.png differ diff --git a/plugins/legacy-preset-chart-nvd3/src/Bullet/images/thumbnailLarge.png b/plugins/legacy-preset-chart-nvd3/src/Bullet/images/thumbnailLarge.png index 7a66a41c7a..5829117182 100644 Binary files a/plugins/legacy-preset-chart-nvd3/src/Bullet/images/thumbnailLarge.png and b/plugins/legacy-preset-chart-nvd3/src/Bullet/images/thumbnailLarge.png differ diff --git a/plugins/legacy-preset-chart-nvd3/src/Compare/images/thumbnail.png b/plugins/legacy-preset-chart-nvd3/src/Compare/images/thumbnail.png index c17af52389..df29a818d3 100644 Binary files a/plugins/legacy-preset-chart-nvd3/src/Compare/images/thumbnail.png and b/plugins/legacy-preset-chart-nvd3/src/Compare/images/thumbnail.png differ diff --git a/plugins/legacy-preset-chart-nvd3/src/Compare/images/thumbnailLarge.png b/plugins/legacy-preset-chart-nvd3/src/Compare/images/thumbnailLarge.png index 00b0a7c515..86b38069a9 100644 Binary files a/plugins/legacy-preset-chart-nvd3/src/Compare/images/thumbnailLarge.png and b/plugins/legacy-preset-chart-nvd3/src/Compare/images/thumbnailLarge.png differ diff --git a/plugins/legacy-preset-chart-nvd3/src/DistBar/images/thumbnail.png b/plugins/legacy-preset-chart-nvd3/src/DistBar/images/thumbnail.png index cdd5120d0a..8e9e6b600a 100644 Binary files a/plugins/legacy-preset-chart-nvd3/src/DistBar/images/thumbnail.png and b/plugins/legacy-preset-chart-nvd3/src/DistBar/images/thumbnail.png differ diff --git a/plugins/legacy-preset-chart-nvd3/src/DistBar/images/thumbnailLarge.png b/plugins/legacy-preset-chart-nvd3/src/DistBar/images/thumbnailLarge.png index b41014788a..bfaeeb2dfb 100644 Binary files a/plugins/legacy-preset-chart-nvd3/src/DistBar/images/thumbnailLarge.png and b/plugins/legacy-preset-chart-nvd3/src/DistBar/images/thumbnailLarge.png differ diff --git a/plugins/legacy-preset-chart-nvd3/src/DualLine/images/thumbnail.png b/plugins/legacy-preset-chart-nvd3/src/DualLine/images/thumbnail.png old mode 100755 new mode 100644 index a5f723cb23..a62ecfbac4 Binary files a/plugins/legacy-preset-chart-nvd3/src/DualLine/images/thumbnail.png and b/plugins/legacy-preset-chart-nvd3/src/DualLine/images/thumbnail.png differ diff --git a/plugins/legacy-preset-chart-nvd3/src/DualLine/images/thumbnailLarge.png b/plugins/legacy-preset-chart-nvd3/src/DualLine/images/thumbnailLarge.png old mode 100755 new mode 100644 index 23a77500b7..3c11fe43a9 Binary files a/plugins/legacy-preset-chart-nvd3/src/DualLine/images/thumbnailLarge.png and b/plugins/legacy-preset-chart-nvd3/src/DualLine/images/thumbnailLarge.png differ diff --git a/plugins/legacy-preset-chart-nvd3/src/Line/images/thumbnail.png b/plugins/legacy-preset-chart-nvd3/src/Line/images/thumbnail.png index 7df5084c47..61a0d866aa 100644 Binary files a/plugins/legacy-preset-chart-nvd3/src/Line/images/thumbnail.png and b/plugins/legacy-preset-chart-nvd3/src/Line/images/thumbnail.png differ diff --git a/plugins/legacy-preset-chart-nvd3/src/Line/images/thumbnailLarge.png b/plugins/legacy-preset-chart-nvd3/src/Line/images/thumbnailLarge.png index 67f8fe887f..8cae308c3e 100644 Binary files a/plugins/legacy-preset-chart-nvd3/src/Line/images/thumbnailLarge.png and b/plugins/legacy-preset-chart-nvd3/src/Line/images/thumbnailLarge.png differ diff --git a/plugins/legacy-preset-chart-nvd3/src/LineMulti/images/thumbnail.png b/plugins/legacy-preset-chart-nvd3/src/LineMulti/images/thumbnail.png index f776bb847b..dd5b396529 100644 Binary files a/plugins/legacy-preset-chart-nvd3/src/LineMulti/images/thumbnail.png and b/plugins/legacy-preset-chart-nvd3/src/LineMulti/images/thumbnail.png differ diff --git a/plugins/legacy-preset-chart-nvd3/src/LineMulti/images/thumbnailLarge.png b/plugins/legacy-preset-chart-nvd3/src/LineMulti/images/thumbnailLarge.png index 473be99b21..2f1bc855e3 100644 Binary files a/plugins/legacy-preset-chart-nvd3/src/LineMulti/images/thumbnailLarge.png and b/plugins/legacy-preset-chart-nvd3/src/LineMulti/images/thumbnailLarge.png differ diff --git a/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js b/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js index 351d74bf45..7f2a334a3f 100644 --- a/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js +++ b/plugins/legacy-preset-chart-nvd3/src/NVD3Vis.js @@ -24,14 +24,17 @@ import mathjs from 'mathjs'; import moment from 'moment'; import PropTypes from 'prop-types'; import { - isDefined, t, + isDefined, getTimeFormatter, smartDateVerboseFormatter, getNumberFormatter, NumberFormats, CategoricalColorNamespace, } from '@superset-ui/core'; + +import 'nvd3-fork/build/nv.d3.css'; + /* eslint-disable-next-line */ import ANNOTATION_TYPES, { applyNativeColumns } from './vendor/superset/AnnotationTypes'; import isTruthy from './utils/isTruthy'; diff --git a/plugins/legacy-preset-chart-nvd3/src/Pie/images/thumbnail.png b/plugins/legacy-preset-chart-nvd3/src/Pie/images/thumbnail.png index 1c93bf593a..8dcb780d09 100644 Binary files a/plugins/legacy-preset-chart-nvd3/src/Pie/images/thumbnail.png and b/plugins/legacy-preset-chart-nvd3/src/Pie/images/thumbnail.png differ diff --git a/plugins/legacy-preset-chart-nvd3/src/Pie/images/thumbnailLarge.png b/plugins/legacy-preset-chart-nvd3/src/Pie/images/thumbnailLarge.png index ab76749f74..8115f25f17 100644 Binary files a/plugins/legacy-preset-chart-nvd3/src/Pie/images/thumbnailLarge.png and b/plugins/legacy-preset-chart-nvd3/src/Pie/images/thumbnailLarge.png differ diff --git a/plugins/legacy-preset-chart-nvd3/src/TimePivot/images/thumbnail.png b/plugins/legacy-preset-chart-nvd3/src/TimePivot/images/thumbnail.png index 83201c2bc0..dde48ae024 100644 Binary files a/plugins/legacy-preset-chart-nvd3/src/TimePivot/images/thumbnail.png and b/plugins/legacy-preset-chart-nvd3/src/TimePivot/images/thumbnail.png differ diff --git a/plugins/legacy-preset-chart-nvd3/src/TimePivot/images/thumbnailLarge.png b/plugins/legacy-preset-chart-nvd3/src/TimePivot/images/thumbnailLarge.png index 149f3dae5d..489eccd294 100644 Binary files a/plugins/legacy-preset-chart-nvd3/src/TimePivot/images/thumbnailLarge.png and b/plugins/legacy-preset-chart-nvd3/src/TimePivot/images/thumbnailLarge.png differ diff --git a/plugins/legacy-preset-chart-nvd3/tsconfig.json b/plugins/legacy-preset-chart-nvd3/tsconfig.json index 6513450e51..40f75135aa 100644 --- a/plugins/legacy-preset-chart-nvd3/tsconfig.json +++ b/plugins/legacy-preset-chart-nvd3/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" } ] } \ No newline at end of file diff --git a/plugins/plugin-chart-choropleth-map/package.json b/plugins/plugin-chart-choropleth-map/package.json index 04d0efd802..dc2219c560 100644 --- a/plugins/plugin-chart-choropleth-map/package.json +++ b/plugins/plugin-chart-choropleth-map/package.json @@ -1,6 +1,6 @@ { "name": "@superset-ui/plugin-chart-choropleth-map", - "version": "0.15.0", + "version": "0.15.1", "description": "Superset Chart - Choropleth Map", "sideEffects": false, "private": true, @@ -27,11 +27,10 @@ "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", "@types/d3-geo": "^1.11.1", "@types/geojson": "^7946.0.3", - "@types/react": "*", "@types/topojson-client": "^3.0.0", "@types/topojson-specification": "^1.0.0", "@vx/clip-path": "^0.0.197", @@ -46,6 +45,7 @@ "topojson-client": "^3.1.0" }, "peerDependencies": { + "@types/react": "*", "react": "^16.13.1" } } diff --git a/plugins/plugin-chart-choropleth-map/src/images/thumbnail.png b/plugins/plugin-chart-choropleth-map/src/images/thumbnail.png index 665bb0e817..fd31d5b8ff 100644 Binary files a/plugins/plugin-chart-choropleth-map/src/images/thumbnail.png and b/plugins/plugin-chart-choropleth-map/src/images/thumbnail.png differ diff --git a/plugins/plugin-chart-choropleth-map/tsconfig.json b/plugins/plugin-chart-choropleth-map/tsconfig.json index 6513450e51..40f75135aa 100644 --- a/plugins/plugin-chart-choropleth-map/tsconfig.json +++ b/plugins/plugin-chart-choropleth-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" } ] } \ No newline at end of file diff --git a/plugins/plugin-chart-echarts/package.json b/plugins/plugin-chart-echarts/package.json index f4d072c6ac..7b4284472e 100644 --- a/plugins/plugin-chart-echarts/package.json +++ b/plugins/plugin-chart-echarts/package.json @@ -1,6 +1,6 @@ { "name": "@superset-ui/plugin-chart-echarts", - "version": "0.15.0", + "version": "0.15.1", "description": "Superset Chart - Echarts", "sideEffects": false, "main": "lib/index.js", @@ -33,8 +33,8 @@ "jest": "^26.0.1" }, "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", "@types/echarts": "^4.6.3", "echarts": "^4.9.0" } diff --git a/plugins/plugin-chart-echarts/src/Timeseries/images/thumbnail.png b/plugins/plugin-chart-echarts/src/Timeseries/images/thumbnail.png index 1c42c78117..32b060e9dc 100644 Binary files a/plugins/plugin-chart-echarts/src/Timeseries/images/thumbnail.png and b/plugins/plugin-chart-echarts/src/Timeseries/images/thumbnail.png differ diff --git a/plugins/plugin-chart-echarts/src/Timeseries/types.ts b/plugins/plugin-chart-echarts/src/Timeseries/types.ts index 1279576e52..9b31fa2569 100644 --- a/plugins/plugin-chart-echarts/src/Timeseries/types.ts +++ b/plugins/plugin-chart-echarts/src/Timeseries/types.ts @@ -16,15 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -import { DataRecord, DataRecordValue } from '@superset-ui/core'; +import { DataRecordValue } from '@superset-ui/core'; import { EchartsProps } from '../types'; export type TimestampType = string | number | Date; -export interface TimeseriesDataRecord extends DataRecord { - __timestamp: TimestampType; -} - export type EchartsBaseTimeseriesSeries = { name: string; data: [Date, DataRecordValue][]; diff --git a/plugins/plugin-chart-echarts/src/utils/prophet.ts b/plugins/plugin-chart-echarts/src/utils/prophet.ts index cf3259274f..891dab55c8 100644 --- a/plugins/plugin-chart-echarts/src/utils/prophet.ts +++ b/plugins/plugin-chart-echarts/src/utils/prophet.ts @@ -16,9 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -import { DataRecord, NumberFormatter } from '@superset-ui/core'; +import { TimeseriesDataRecord, NumberFormatter } from '@superset-ui/core'; import { ForecastSeriesContext, ForecastSeriesEnum, ProphetValue } from '../types'; -import { TimeseriesDataRecord } from '../Timeseries/types'; const seriesTypeRegex = new RegExp( `(.+)(${ForecastSeriesEnum.ForecastLower}|${ForecastSeriesEnum.ForecastTrend}|${ForecastSeriesEnum.ForecastUpper})$`, @@ -87,26 +86,27 @@ export const formatProphetTooltipSeries = ({ return `${row.trim()}`; }; -export const rebaseTimeseriesDatum = (data: DataRecord[]): TimeseriesDataRecord[] => { +export function rebaseTimeseriesDatum(data: TimeseriesDataRecord[]) { const keys = data.length > 0 ? Object.keys(data[0]) : []; + // eslint-disable-next-line @typescript-eslint/no-unsafe-return return data.map(row => { const newRow: TimeseriesDataRecord = { __timestamp: '' }; keys.forEach(key => { const forecastContext = extractForecastSeriesContext(key); const lowerKey = `${forecastContext.name}${ForecastSeriesEnum.ForecastLower}`; - let value = row[key]; + let value = row[key] as number; if ( forecastContext.type === ForecastSeriesEnum.ForecastUpper && keys.includes(lowerKey) && value !== null && row[lowerKey] !== null ) { - // @ts-ignore - value -= row[lowerKey]; + value -= row[lowerKey] as number; } newRow[key] = value; }); + // eslint-disable-next-line @typescript-eslint/no-unsafe-return return newRow; }); -}; +} diff --git a/plugins/plugin-chart-echarts/src/utils/series.ts b/plugins/plugin-chart-echarts/src/utils/series.ts index eb23927b9d..a4b983f964 100644 --- a/plugins/plugin-chart-echarts/src/utils/series.ts +++ b/plugins/plugin-chart-echarts/src/utils/series.ts @@ -17,17 +17,16 @@ * specific language governing permissions and limitations * under the License. */ -import { DataRecord } from '@superset-ui/core'; -import { TimeseriesDataRecord } from '../Timeseries/types'; +import { DataRecord, TimeseriesDataRecord } from '@superset-ui/core'; -// eslint-disable-next-line import/prefer-default-export export function extractTimeseriesSeries( data: TimeseriesDataRecord[], ): echarts.EChartOption.Series[] { if (data.length === 0) return []; + // eslint-disable-next-line @typescript-eslint/no-unsafe-return const rows = data.map(datum => ({ ...datum, - __timestamp: new Date(datum.__timestamp), + __timestamp: datum.__timestamp || datum.__timestamp === 0 ? new Date(datum.__timestamp) : null, })); return Object.keys(rows[0]) @@ -35,6 +34,7 @@ export function extractTimeseriesSeries( .map(key => ({ name: key, // @ts-ignore + // eslint-disable-next-line @typescript-eslint/no-unsafe-return data: rows.map(datum => [datum.__timestamp, datum[key]]), })); } diff --git a/plugins/plugin-chart-echarts/test/utils/formatters.test.ts b/plugins/plugin-chart-echarts/test/utils/formatters.test.ts index 557e278f03..edde483dcd 100644 --- a/plugins/plugin-chart-echarts/test/utils/formatters.test.ts +++ b/plugins/plugin-chart-echarts/test/utils/formatters.test.ts @@ -16,8 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -import { formatPieLabel } from '../../src/utils/formatters'; import { getNumberFormatter } from '@superset-ui/core'; +import { formatPieLabel } from '../../src/utils/formatters'; describe('formatPieLabel', () => { it('should generate a valid pie chart label', () => { diff --git a/plugins/plugin-chart-echarts/tsconfig.json b/plugins/plugin-chart-echarts/tsconfig.json index 6513450e51..40f75135aa 100644 --- a/plugins/plugin-chart-echarts/tsconfig.json +++ b/plugins/plugin-chart-echarts/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" } ] } \ No newline at end of file diff --git a/plugins/plugin-chart-table/package.json b/plugins/plugin-chart-table/package.json index 1c4820c310..b51828b2b4 100644 --- a/plugins/plugin-chart-table/package.json +++ b/plugins/plugin-chart-table/package.json @@ -1,6 +1,6 @@ { "name": "@superset-ui/plugin-chart-table", - "version": "0.15.0", + "version": "0.15.1", "description": "Superset Chart - Table", "main": "lib/index.js", "module": "esm/index.js", @@ -27,11 +27,10 @@ }, "dependencies": { "@emotion/core": "^10.0.28", - "@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", "@types/d3-array": "^2.0.0", "@types/match-sorter": "^4.0.0", - "@types/react": "*", "@types/react-table": "^7.0.19", "d3-array": "^2.4.0", "match-sorter": "^4.1.0", @@ -42,6 +41,7 @@ "xss": "^1.0.6" }, "peerDependencies": { + "@types/react": "*", "react": "^16.13.1", "react-dom": "^16.13.1" } diff --git a/plugins/plugin-chart-table/src/images/thumbnail.png b/plugins/plugin-chart-table/src/images/thumbnail.png index 0561210b9f..296702c954 100644 Binary files a/plugins/plugin-chart-table/src/images/thumbnail.png and b/plugins/plugin-chart-table/src/images/thumbnail.png differ diff --git a/plugins/plugin-chart-table/src/images/thumbnailLarge.png b/plugins/plugin-chart-table/src/images/thumbnailLarge.png index a3dd1bee98..133d2804f8 100644 Binary files a/plugins/plugin-chart-table/src/images/thumbnailLarge.png and b/plugins/plugin-chart-table/src/images/thumbnailLarge.png differ diff --git a/plugins/plugin-chart-table/tsconfig.json b/plugins/plugin-chart-table/tsconfig.json index 6513450e51..40f75135aa 100644 --- a/plugins/plugin-chart-table/tsconfig.json +++ b/plugins/plugin-chart-table/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" } ] } \ No newline at end of file diff --git a/plugins/plugin-chart-word-cloud/package.json b/plugins/plugin-chart-word-cloud/package.json index 39bea13f97..ebb26e69cd 100644 --- a/plugins/plugin-chart-word-cloud/package.json +++ b/plugins/plugin-chart-word-cloud/package.json @@ -1,6 +1,6 @@ { "name": "@superset-ui/plugin-chart-word-cloud", - "version": "0.15.0", + "version": "0.15.1", "description": "Superset Chart Plugin - Word Cloud", "sideEffects": [ "*.css" @@ -28,17 +28,17 @@ "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", "@types/d3-cloud": "^1.2.1", "@types/d3-scale": "^2.0.2", - "@types/react": "*", "d3-cloud": "^1.2.5", "d3-scale": "^3.0.1", "emotion-theming": "^10.0.27", "encodable": "^0.7.6" }, "peerDependencies": { + "@types/react": "*", "react": "^16.13.1" } } diff --git a/plugins/plugin-chart-word-cloud/src/images/thumbnail.png b/plugins/plugin-chart-word-cloud/src/images/thumbnail.png index 1829a2f560..92e0984998 100644 Binary files a/plugins/plugin-chart-word-cloud/src/images/thumbnail.png and b/plugins/plugin-chart-word-cloud/src/images/thumbnail.png differ diff --git a/plugins/plugin-chart-word-cloud/src/images/thumbnailLarge.png b/plugins/plugin-chart-word-cloud/src/images/thumbnailLarge.png index 03936e1253..d477f5cecf 100644 Binary files a/plugins/plugin-chart-word-cloud/src/images/thumbnailLarge.png and b/plugins/plugin-chart-word-cloud/src/images/thumbnailLarge.png differ diff --git a/plugins/plugin-chart-word-cloud/tsconfig.json b/plugins/plugin-chart-word-cloud/tsconfig.json index 6513450e51..40f75135aa 100644 --- a/plugins/plugin-chart-word-cloud/tsconfig.json +++ b/plugins/plugin-chart-word-cloud/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" } ] } \ No newline at end of file diff --git a/plugins/preset-chart-xy/package.json b/plugins/preset-chart-xy/package.json index c12658b8d3..b7c69dcb5b 100644 --- a/plugins/preset-chart-xy/package.json +++ b/plugins/preset-chart-xy/package.json @@ -1,6 +1,6 @@ { "name": "@superset-ui/preset-chart-xy", - "version": "0.15.0", + "version": "0.15.1", "description": "Superset Chart - XY", "sideEffects": [ "*.css" @@ -31,8 +31,8 @@ "dependencies": { "@data-ui/theme": "^0.0.84", "@data-ui/xy-chart": "^0.0.84", - "@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", "@vx/axis": "^0.0.198", "@vx/legend": "^0.0.198", "@vx/scale": "^0.0.197", diff --git a/plugins/preset-chart-xy/src/BoxPlot/images/thumbnail.png b/plugins/preset-chart-xy/src/BoxPlot/images/thumbnail.png index 20b4ec0b2e..d5eab92b08 100644 Binary files a/plugins/preset-chart-xy/src/BoxPlot/images/thumbnail.png and b/plugins/preset-chart-xy/src/BoxPlot/images/thumbnail.png differ diff --git a/plugins/preset-chart-xy/src/Line/images/thumbnail.png b/plugins/preset-chart-xy/src/Line/images/thumbnail.png index ecb8dd566e..67debacc65 100644 Binary files a/plugins/preset-chart-xy/src/Line/images/thumbnail.png and b/plugins/preset-chart-xy/src/Line/images/thumbnail.png differ diff --git a/plugins/preset-chart-xy/src/Line/images/thumbnailLarge.png b/plugins/preset-chart-xy/src/Line/images/thumbnailLarge.png index ecb8dd566e..67debacc65 100644 Binary files a/plugins/preset-chart-xy/src/Line/images/thumbnailLarge.png and b/plugins/preset-chart-xy/src/Line/images/thumbnailLarge.png differ diff --git a/plugins/preset-chart-xy/src/ScatterPlot/images/thumbnail.png b/plugins/preset-chart-xy/src/ScatterPlot/images/thumbnail.png index 2864805375..cd81fbd389 100644 Binary files a/plugins/preset-chart-xy/src/ScatterPlot/images/thumbnail.png and b/plugins/preset-chart-xy/src/ScatterPlot/images/thumbnail.png differ diff --git a/plugins/preset-chart-xy/tsconfig.json b/plugins/preset-chart-xy/tsconfig.json index 6513450e51..40f75135aa 100644 --- a/plugins/preset-chart-xy/tsconfig.json +++ b/plugins/preset-chart-xy/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" } ] } \ No newline at end of file diff --git a/scripts/build.js b/scripts/build.js index 554b8aa411..b0741abddd 100755 --- a/scripts/build.js +++ b/scripts/build.js @@ -22,7 +22,7 @@ const { argv } = require('yargs') .option('clean', { describe: 'Whether to clean cache', type: 'boolean', - default: true, + default: false, }) .option('type', { describe: 'Whether to run tsc', diff --git a/tsconfig.options.json b/tsconfig.options.json index a247b60834..519b36d7ce 100644 --- a/tsconfig.options.json +++ b/tsconfig.options.json @@ -23,7 +23,11 @@ "composite": true, "declarationMap": true, "rootDir": "./src", + "skipLibCheck": true, "emitDeclarationOnly": true, - "resolveJsonModule": true + "resolveJsonModule": true, + "typeRoots": [ + "./node_modules/@types" + ] } } \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 13976a80af..d3e1eac8e3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4134,9 +4134,9 @@ "@types/istanbul-lib-report" "*" "@types/jest@^26.0.0", "@types/jest@^26.0.4": - version "26.0.4" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.4.tgz#d2e513e85aca16992816f192582b5e67b0b15efb" - integrity sha512-4fQNItvelbNA9+sFgU+fhJo8ZFF+AS4Egk3GWwCW2jFtViukXbnztccafAdLhzE/0EiCogljtQQXP8aQ9J7sFg== + version "26.0.13" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.13.tgz#5a7b9d5312f5dd521a38329c38ee9d3802a0b85e" + integrity sha512-sCzjKow4z9LILc6DhBvn5AkIfmQzDZkgtVVKmGwVrs5tuid38ws281D4l+7x1kP487+FlKDh5kfMZ8WSPAdmdA== dependencies: jest-diff "^25.2.1" pretty-format "^25.2.1" @@ -4237,10 +4237,10 @@ "@types/history" "*" "@types/react" "*" -"@types/react-bootstrap@0.32.21": - version "0.32.21" - resolved "https://registry.yarnpkg.com/@types/react-bootstrap/-/react-bootstrap-0.32.21.tgz#ac614f8c2f42bff9d7e1e01c2c3dddb22ff86e43" - integrity sha512-AV/6cMUBbKArEQcjXEzpoHexHi6hJL0cH3Vcw9qI4Ob2g/XFRvyTAFdMlGlp8HZmOHXL35PdF0K75Z31Po87qg== +"@types/react-bootstrap@^0.32.22": + version "0.32.22" + resolved "https://registry.yarnpkg.com/@types/react-bootstrap/-/react-bootstrap-0.32.22.tgz#26a1a5a95ce46759672c56168b46de9e759d89c6" + integrity sha512-pjUVcJzogMxns3lbvMqnnU+I8EOYxl3aI13tS2vvRm0RdAe1rs7Ds/VZA29GI6p8p3Un6NqKUpW3+dgwAjyzxg== dependencies: "@types/react" "*" @@ -12096,17 +12096,7 @@ jest-config@^26.1.0: micromatch "^4.0.2" pretty-format "^26.1.0" -jest-diff@^25.2.1: - version "25.2.6" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.2.6.tgz#a6d70a9ab74507715ea1092ac513d1ab81c1b5e7" - integrity sha512-KuadXImtRghTFga+/adnNrv9s61HudRMR7gVSbP35UKZdn4IK2/0N0PpGZIqtmllK9aUyye54I3nu28OYSnqOg== - dependencies: - chalk "^3.0.0" - diff-sequences "^25.2.6" - jest-get-type "^25.2.6" - pretty-format "^25.2.6" - -jest-diff@^25.5.0: +jest-diff@^25.2.1, jest-diff@^25.5.0: version "25.5.0" resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.5.0.tgz#1dd26ed64f96667c068cef026b677dfa01afcfa9" integrity sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A== @@ -15433,7 +15423,7 @@ pretty-error@^2.1.1: renderkid "^2.0.1" utila "~0.4" -pretty-format@^25.2.1, pretty-format@^25.2.6, pretty-format@^25.5.0: +pretty-format@^25.2.1, pretty-format@^25.5.0: version "25.5.0" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz#7873c1d774f682c34b8d48b6743a2bf2ac55791a" integrity sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==