Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: migrating storybook jsx to typescript #18100 #18133

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -17,41 +17,37 @@
* under the License.
*/

/* eslint-disable jsx-a11y/label-has-associated-control */
import React from 'react';
import { formatNumber } from '@superset-ui/core';

const propTypes = {};
const defaultProps = {};

class NumberFormatValidator extends React.PureComponent {
state: { formatString: string; testValues: any[] } = {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
state: { formatString: string; testValues: any[] } = {
state: { formatString: string; testValues: (number | null | undefined)[] } = {

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

formatString: '.3~s',
testValues: [
987654321,
12345.6789,
3000,
400.14,
70.00002,
1,
0,
-1,
-70.00002,
-400.14,
-3000,
-12345.6789,
-987654321,
Number.POSITIVE_INFINITY,
Number.NEGATIVE_INFINITY,
NaN,
null,
undefined,
],
};

constructor(props) {
super(props);

this.state = {
formatString: '.3~s',
testValues: [
987654321,
12345.6789,
3000,
400.14,
70.00002,
1,
0,
-1,
-70.00002,
-400.14,
-3000,
-12345.6789,
-987654321,
Number.POSITIVE_INFINITY,
Number.NEGATIVE_INFINITY,
NaN,
null,
undefined,
],
};

this.handleFormatChange = this.handleFormatChange.bind(this);
}

Expand Down Expand Up @@ -90,14 +86,17 @@ class NumberFormatValidator extends React.PureComponent {
<div className="col-sm-8">
<div className="form">
<div className="form-group">
<label>Enter D3 format string:&nbsp;&nbsp;</label>
<input
id="formatString"
className="form-control form-control-lg"
type="text"
value={formatString}
onChange={this.handleFormatChange}
/>
{/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}
<label>
Enter D3 format string:
<input
id="formatString"
className="form-control form-control-lg"
type="text"
value={formatString}
onChange={this.handleFormatChange}
/>
</label>
</div>
</div>
</div>
Expand All @@ -113,8 +112,8 @@ class NumberFormatValidator extends React.PureComponent {
</tr>
</thead>
<tbody>
{testValues.map(v => (
<tr key={v}>
{testValues.map((v, index) => (
<tr key={index}>
<td>
<code>{`${v}`}</code>
</td>
Expand All @@ -132,9 +131,6 @@ class NumberFormatValidator extends React.PureComponent {
}
}

NumberFormatValidator.propTypes = propTypes;
NumberFormatValidator.defaultProps = defaultProps;

export default {
title: 'Core Packages/@superset-ui-number-format',
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,30 +17,25 @@
* under the License.
*/

/* eslint-disable jsx-a11y/label-has-associated-control */
import React from 'react';
import { formatTime } from '@superset-ui/core';

const propTypes = {};
const defaultProps = {};

class TimeFormatValidator extends React.PureComponent {
state: { formatString: string; testValues: any[] } = {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as above.

Suggested change
state: { formatString: string; testValues: any[] } = {
state: { formatString: string; testValues: (Date | number | null | undefined)[] } = {

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This typing do suggest another change in the file
superset-frontend/packages/superset-ui-core/src/time-format/TimeFormatterRegistrySingleton.ts::formatTime() method

value: Date | number | null | undefined, --> value: Date | null | undefined, Hope it is okay to change this. Functionally it seem to work. So making that change also.

formatString: '%Y-%m-%d %H:%M:%S',
testValues: [
new Date(Date.UTC(1986, 5, 14, 8, 30, 53)),
new Date(Date.UTC(2001, 9, 27, 13, 45, 2, 678)),
new Date(Date.UTC(2009, 1, 1, 0, 0, 0)),
new Date(Date.UTC(2018, 1, 1, 10, 20, 33)),
0,
null,
undefined,
],
};

constructor(props) {
super(props);

this.state = {
formatString: '%Y-%m-%d %H:%M:%S',
testValues: [
new Date(Date.UTC(1986, 5, 14, 8, 30, 53)),
new Date(Date.UTC(2001, 9, 27, 13, 45, 2, 678)),
new Date(Date.UTC(2009, 1, 1, 0, 0, 0)),
new Date(Date.UTC(2018, 1, 1, 10, 20, 33)),
0,
null,
undefined,
],
};

this.handleFormatChange = this.handleFormatChange.bind(this);
}

Expand Down Expand Up @@ -78,14 +73,17 @@ class TimeFormatValidator extends React.PureComponent {
<div className="col-sm-8">
<div className="form">
<div className="form-group">
<label>Enter D3 time format string:&nbsp;&nbsp;</label>
<input
id="formatString"
className="form-control form-control-lg"
type="text"
value={formatString}
onChange={this.handleFormatChange}
/>
{/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}
<label>
Enter D3 time format string:
<input
id="formatString"
className="form-control form-control-lg"
type="text"
value={formatString}
onChange={this.handleFormatChange}
/>
</label>
</div>
</div>
</div>
Expand All @@ -101,8 +99,8 @@ class TimeFormatValidator extends React.PureComponent {
</tr>
</thead>
<tbody>
{testValues.map(v => (
<tr key={v}>
{testValues.map((v, index) => (
<tr key={index}>
<td>
<code>
{v instanceof Date ? v.toUTCString() : `${v}`}
Expand All @@ -122,9 +120,6 @@ class TimeFormatValidator extends React.PureComponent {
}
}

TimeFormatValidator.propTypes = propTypes;
TimeFormatValidator.defaultProps = defaultProps;

export default {
title: 'Core Packages/@superset-ui-time-format',
};
Expand Down