fix: all storybook thingy

apache-superset · Apr 27, 2020 · 03cbbaf · 03cbbaf
1 parent e811c84
commit 03cbbaf
Show file tree

Hide file tree

Showing 24 changed files with 29 additions and 48 deletions.
diff --git a/...tories/preset-chart-xy/BoxPlot/Stories.ts → ...ugins/preset-chart-xy/BoxPlot/Stories.tsx b/...tories/preset-chart-xy/BoxPlot/Stories.ts → ...ugins/preset-chart-xy/BoxPlot/Stories.tsx
@@ -1,7 +1,4 @@
-import {
-  BoxPlotChartPlugin,
-  LegacyBoxPlotChartPlugin,
-} from '@superset-ui/preset-chart-xy';
+import { BoxPlotChartPlugin, LegacyBoxPlotChartPlugin } from '@superset-ui/preset-chart-xy';
 import { BOX_PLOT_PLUGIN_LEGACY_TYPE, BOX_PLOT_PLUGIN_TYPE } from './constants';
 new LegacyBoxPlotChartPlugin().configure({ key: BOX_PLOT_PLUGIN_LEGACY_TYPE }).register();
 new BoxPlotChartPlugin().configure({ key: BOX_PLOT_PLUGIN_TYPE }).register();

diff --git a/...ries/preset-chart-xy/BoxPlot/constants.ts → ...gins/preset-chart-xy/BoxPlot/constants.ts b/...ries/preset-chart-xy/BoxPlot/constants.ts → ...gins/preset-chart-xy/BoxPlot/constants.ts
diff --git a/...k/stories/preset-chart-xy/BoxPlot/data.ts → ...s/plugins/preset-chart-xy/BoxPlot/data.ts b/...k/stories/preset-chart-xy/BoxPlot/data.ts → ...s/plugins/preset-chart-xy/BoxPlot/data.ts
diff --git a/...preset-chart-xy/BoxPlot/stories/Basic.tsx → ...preset-chart-xy/BoxPlot/stories/Basic.tsx b/...preset-chart-xy/BoxPlot/stories/Basic.tsx → ...preset-chart-xy/BoxPlot/stories/Basic.tsx
diff --git a/...reset-chart-xy/BoxPlot/stories/Legacy.tsx → ...reset-chart-xy/BoxPlot/stories/Legacy.tsx b/...reset-chart-xy/BoxPlot/stories/Legacy.tsx → ...reset-chart-xy/BoxPlot/stories/Legacy.tsx
diff --git a/...k/stories/preset-chart-xy/Line/Stories.ts → .../plugins/preset-chart-xy/Line/Stories.tsx b/...k/stories/preset-chart-xy/Line/Stories.ts → .../plugins/preset-chart-xy/Line/Stories.tsx
@@ -13,4 +13,3 @@ export { default as withLabelFlush } from './stories/flush';
 export { default as withMissingData } from './stories/missing';
 export { default as legacyShim } from './stories/legacy';
 export { default as withTimeShift } from './stories/timeShift';
-
diff --git a/...stories/preset-chart-xy/Line/constants.ts → ...plugins/preset-chart-xy/Line/constants.ts b/...stories/preset-chart-xy/Line/constants.ts → ...plugins/preset-chart-xy/Line/constants.ts
diff --git a/...stories/preset-chart-xy/Line/data/data.js → ...plugins/preset-chart-xy/Line/data/data.js b/...stories/preset-chart-xy/Line/data/data.js → ...plugins/preset-chart-xy/Line/data/data.js
diff --git a/...tories/preset-chart-xy/Line/data/data2.js → ...lugins/preset-chart-xy/Line/data/data2.js b/...tories/preset-chart-xy/Line/data/data2.js → ...lugins/preset-chart-xy/Line/data/data2.js
diff --git a/...s/preset-chart-xy/Line/data/legacyData.js → ...s/preset-chart-xy/Line/data/legacyData.js b/...s/preset-chart-xy/Line/data/legacyData.js → ...s/preset-chart-xy/Line/data/legacyData.js
diff --git a/...es/preset-chart-xy/Line/stories/basic.tsx → ...ns/preset-chart-xy/Line/stories/basic.tsx b/...es/preset-chart-xy/Line/stories/basic.tsx → ...ns/preset-chart-xy/Line/stories/basic.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import React from 'react';
 import { SuperChart } from '@superset-ui/chart';
 import { radios } from '@storybook/addon-knobs';
 import data from '../data/data';
@@ -21,11 +21,7 @@ export default () => (
           },
           axis: {
             orient: radios('x.axis.orient', { top: 'top', bottom: 'bottom' }, 'bottom'),
-            title: radios(
-              'x.axis.title',
-              { enable: 'Time', disable: '', '': undefined },
-              'Time',
-            ),
+            title: radios('x.axis.title', { enable: 'Time', disable: '', '': undefined }, 'Time'),
           },
         },
         y: {
@@ -40,11 +36,7 @@ export default () => (
               { left: 'left', right: 'right', '': undefined },
               'left',
             ),
-            title: radios(
-              'y.axis.title',
-              { enable: 'Score', disable: '', '': undefined },
-              'Score',
-            ),
+            title: radios('y.axis.title', { enable: 'Score', disable: '', '': undefined }, 'Score'),
           },
         },
         stroke: {

diff --git a/...es/preset-chart-xy/Line/stories/flush.tsx → ...ns/preset-chart-xy/Line/stories/flush.tsx b/...es/preset-chart-xy/Line/stories/flush.tsx → ...ns/preset-chart-xy/Line/stories/flush.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import React from 'react';
 import { SuperChart } from '@superset-ui/chart';
 import { radios } from '@storybook/addon-knobs';
 import rawData from '../data/data';
@@ -30,11 +30,7 @@ export default () => (
             axis: {
               tickCount: 6,
               orient: radios('x.axis.orient', { top: 'top', bottom: 'bottom' }, 'bottom'),
-              title: radios(
-                'x.axis.title',
-                { enable: 'Time', disable: '', '': undefined },
-                'Time',
-              ),
+              title: radios('x.axis.title', { enable: 'Time', disable: '', '': undefined }, 'Time'),
             },
           },
           y: {
@@ -64,7 +60,8 @@ export default () => (
           },
         },
       }}
-    />,
+    />
+    ,
     <SuperChart
       key="line2"
       chartType={LINE_PLUGIN_TYPE}
@@ -85,11 +82,7 @@ export default () => (
               labelFlush: 5,
               tickCount: 6,
               orient: radios('x.axis.orient', { top: 'top', bottom: 'bottom' }, 'bottom'),
-              title: radios(
-                'x.axis.title',
-                { enable: 'Time', disable: '', '': undefined },
-                'Time',
-              ),
+              title: radios('x.axis.title', { enable: 'Time', disable: '', '': undefined }, 'Time'),
             },
           },
           y: {

diff --git a/...s/preset-chart-xy/Line/stories/legacy.tsx → ...s/preset-chart-xy/Line/stories/legacy.tsx b/...s/preset-chart-xy/Line/stories/legacy.tsx → ...s/preset-chart-xy/Line/stories/legacy.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import React from 'react';
 import { SuperChart } from '@superset-ui/chart';
 import data from '../data/legacyData';
 import { LINE_PLUGIN_LEGACY_TYPE } from '../constants';
@@ -33,7 +33,8 @@ export default () => (
         yAxisShowminmax: false,
         yLogScale: false,
       }}
-    />,
+    />
+    ,
     <SuperChart
       key="line2"
       chartType={LINE_PLUGIN_LEGACY_TYPE}

diff --git a/.../preset-chart-xy/Line/stories/missing.tsx → .../preset-chart-xy/Line/stories/missing.tsx b/.../preset-chart-xy/Line/stories/missing.tsx → .../preset-chart-xy/Line/stories/missing.tsx
@@ -50,7 +50,7 @@ const missing = () => (
         },
       },
     }}
-  />,
+  />
 );
 
-export default missing;
+export default missing;
diff --git a/...es/preset-chart-xy/Line/stories/query.tsx → ...ns/preset-chart-xy/Line/stories/query.tsx b/...es/preset-chart-xy/Line/stories/query.tsx → ...ns/preset-chart-xy/Line/stories/query.tsx
@@ -64,4 +64,4 @@
 //     },
 //     storyName: 'Queries',
 //     storyPath: 'preset-chart-xy|LineChartPlugin',
-//   })
+//   })
diff --git a/...reset-chart-xy/Line/stories/timeShift.tsx → ...reset-chart-xy/Line/stories/timeShift.tsx b/...reset-chart-xy/Line/stories/timeShift.tsx → ...reset-chart-xy/Line/stories/timeShift.tsx
@@ -1,4 +1,4 @@
-import * as React from 'react';
+import React from 'react';
 import { SuperChart } from '@superset-ui/chart';
 import data from '../data/data2';
 import { LINE_PLUGIN_TYPE } from '../constants';
@@ -74,5 +74,5 @@ export default () => (
         },
       },
     }}
-  />,
+  />
 );
diff --git a/...es/preset-chart-xy/ScatterPlot/Stories.ts → ...s/preset-chart-xy/ScatterPlot/Stories.tsx b/...es/preset-chart-xy/ScatterPlot/Stories.ts → ...s/preset-chart-xy/ScatterPlot/Stories.tsx
@@ -1,7 +1,4 @@
-import {
-  ScatterPlotChartPlugin,
-  LegacyScatterPlotChartPlugin,
-} from '@superset-ui/preset-chart-xy';
+import { ScatterPlotChartPlugin, LegacyScatterPlotChartPlugin } from '@superset-ui/preset-chart-xy';
 import { SCATTER_PLOT_PLUGIN_TYPE, SCATTER_PLOT_PLUGIN_LEGACY_TYPE } from './constants';
 
 new LegacyScatterPlotChartPlugin().configure({ key: SCATTER_PLOT_PLUGIN_LEGACY_TYPE }).register();

diff --git a/.../preset-chart-xy/ScatterPlot/constants.ts → .../preset-chart-xy/ScatterPlot/constants.ts b/.../preset-chart-xy/ScatterPlot/constants.ts → .../preset-chart-xy/ScatterPlot/constants.ts
diff --git a/.../preset-chart-xy/ScatterPlot/data/data.ts → .../preset-chart-xy/ScatterPlot/data/data.ts b/.../preset-chart-xy/ScatterPlot/data/data.ts → .../preset-chart-xy/ScatterPlot/data/data.ts
diff --git a/...t-chart-xy/ScatterPlot/data/legacyData.ts → ...t-chart-xy/ScatterPlot/data/legacyData.ts b/...t-chart-xy/ScatterPlot/data/legacyData.ts → ...t-chart-xy/ScatterPlot/data/legacyData.ts
diff --git a/...et-chart-xy/ScatterPlot/stories/basic.tsx → ...et-chart-xy/ScatterPlot/stories/basic.tsx b/...et-chart-xy/ScatterPlot/stories/basic.tsx → ...et-chart-xy/ScatterPlot/stories/basic.tsx
@@ -23,7 +23,7 @@ export default () => (
             type: 'linear',
           },
           axis: {
-            orient: radios('x.axis.orient', ['top', 'bottom'], 'bottom'),
+            orient: radios('x.axis.orient', { top: 'top', bottom: 'bottom' }, 'bottom'),
           },
         },
         y: {
@@ -33,7 +33,7 @@ export default () => (
             type: 'linear',
           },
           axis: {
-            orient: radios('y.axis.orient', ['left', 'right'], 'left'),
+            orient: radios('y.axis.orient', { left: 'left', right: 'right' }, 'left'),
           },
         },
         fill: {
@@ -44,5 +44,5 @@ export default () => (
         group: [{ field: 'country_name', title: 'Country' }],
       },
     }}
-  />,
+  />
 );
diff --git a/...t-chart-xy/ScatterPlot/stories/bubble.tsx → ...t-chart-xy/ScatterPlot/stories/bubble.tsx b/...t-chart-xy/ScatterPlot/stories/bubble.tsx → ...t-chart-xy/ScatterPlot/stories/bubble.tsx
@@ -23,7 +23,7 @@ export default () => (
             type: 'linear',
           },
           axis: {
-            orient: radios('x.axis.orient', ['top', 'bottom'], 'bottom'),
+            orient: radios('x.axis.orient', { top: 'top', bottom: 'bottom' }, 'bottom'),
           },
         },
         y: {
@@ -33,7 +33,7 @@ export default () => (
             type: 'linear',
           },
           axis: {
-            orient: radios('y.axis.orient', ['left', 'right'], 'left'),
+            orient: radios('y.axis.orient', { left: 'left', right: 'right' }, 'left'),
           },
         },
         size: {

diff --git a/...t-chart-xy/ScatterPlot/stories/legacy.tsx → ...t-chart-xy/ScatterPlot/stories/legacy.tsx b/...t-chart-xy/ScatterPlot/stories/legacy.tsx → ...t-chart-xy/ScatterPlot/stories/legacy.tsx
diff --git a/plugins/plugin-chart-word-cloud/src/chart/WordCloud.tsx b/plugins/plugin-chart-word-cloud/src/chart/WordCloud.tsx
@@ -39,7 +39,9 @@ export default class WordCloud extends React.PureComponent<
   WordCloudProps & typeof defaultProps,
   State
 > {
-  isMounted: boolean = false;
+  // Cannot name it isMounted because of conflict
+  // with React's component function name
+  isComponentMounted: boolean = false;
 
   state: State = {
     words: [],
@@ -50,7 +52,7 @@ export default class WordCloud extends React.PureComponent<
   static defaultProps = defaultProps;
 
   componentDidMount() {
-    this.isMounted = true;
+    this.isComponentMounted = true;
     this.update();
   }
 
@@ -69,11 +71,11 @@ export default class WordCloud extends React.PureComponent<
   }
 
   componentWillUnmount() {
-    this.isMounted = false;
+    this.isComponentMounted = false;
   }
 
   setWords = (words: Word[]) => {
-    if (this.isMounted) {
+    if (this.isComponentMounted) {
       this.setState({ words });
     }
   };
Original file line number	Diff line number	Diff line change
Expand Up		@@ -13,4 +13,3 @@ export { default as withLabelFlush } from './stories/flush';
		export { default as withMissingData } from './stories/missing';
		export { default as legacyShim } from './stories/legacy';
		export { default as withTimeShift } from './stories/timeShift';
-Original file line number
+Diff line change
@@ Expand Up / @@ -50,7 +50,7 @@ const missing = () => ( @@
             },
           },
         }}
-      />,
+      />
     );
-    export default missing;
+    export default missing;