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

refactor: migrate ExploreCtasResultsButton component to typescript #18142

Merged
merged 14 commits into from
Feb 17, 2022
Original file line number Diff line number Diff line change
Expand Up @@ -17,33 +17,37 @@
* under the License.
*/
import React from 'react';
import PropTypes from 'prop-types';
import { bindActionCreators } from 'redux';
import { connect } from 'react-redux';
import { useSelector } from 'react-redux';
import { t } from '@superset-ui/core';
import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls';
import Button from 'src/components/Button';
import { exploreChart } from 'src/explore/exploreUtils';
import * as actions from 'src/SqlLab/actions/sqlLab';
import { RootState } from 'src/SqlLab/types';

const propTypes = {
actions: PropTypes.object.isRequired,
table: PropTypes.string.isRequired,
schema: PropTypes.string,
dbId: PropTypes.number.isRequired,
errorMessage: PropTypes.string,
templateParams: PropTypes.string,
};
interface ExploreCtasResultsButtonProps {
actions: {
createCtasDatasource: Function;
addInfoToast: Function;
addDangerToast: Function;
};
table: string;
schema?: string | null;
dbId: number;
templateParams?: string;
}

function ExploreCtasResultsButton({
const ExploreCtasResultsButton = ({
actions,
table,
schema,
dbId,
templateParams,
errorMessage,
actions,
}) {
}: ExploreCtasResultsButtonProps) => {
const { createCtasDatasource, addInfoToast, addDangerToast } = actions;
const errorMessage = useSelector(
(state: RootState) => state.sqlLab.errorMessage,
);

const buildVizOptions = {
datasourceName: table,
schema,
Expand All @@ -53,7 +57,7 @@ function ExploreCtasResultsButton({

const visualize = () => {
createCtasDatasource(buildVizOptions)
.then(data => {
.then((data: { table_id: number }) => {
const formData = {
datasource: `${data.table_id}__table`,
metrics: ['count'],
Expand Down Expand Up @@ -86,19 +90,6 @@ function ExploreCtasResultsButton({
{t('Explore')}
</Button>
);
}
ExploreCtasResultsButton.propTypes = propTypes;

const mapStateToProps = ({ sqlLab, common }) => ({
errorMessage: sqlLab.errorMessage,
timeout: common.conf?.SUPERSET_WEBSERVER_TIMEOUT,
});

const mapDispatchToProps = dispatch => ({
actions: bindActionCreators(actions, dispatch),
});
};

export default connect(
mapStateToProps,
mapDispatchToProps,
)(ExploreCtasResultsButton);
export default ExploreCtasResultsButton;
Original file line number Diff line number Diff line change
Expand Up @@ -726,10 +726,10 @@ export default class ResultSet extends React.PureComponent<
</Button>
<ExploreCtasResultsButton
// @ts-ignore Redux types are difficult to work with, ignoring for now
actions={this.props.actions}
table={tempTable}
schema={tempSchema}
dbId={exploreDBId}
actions={this.props.actions}
/>
</ButtonGroup>
</>
Expand Down
1 change: 1 addition & 0 deletions superset-frontend/src/SqlLab/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ export type RootState = {
tables: Record<string, any>[];
queriesLastUpdate: number;
user: UserWithPermissionsAndRoles;
errorMessage: string | null;
};
localStorageUsageInKilobytes: number;
messageToasts: toastState[];
Expand Down