ktmud commented on a change in pull request #11755:
URL:
https://github.com/apache/incubator-superset/pull/11755#discussion_r538087627
##########
File path: superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx
##########
@@ -108,31 +97,27 @@ export const SaveDatasetModal:
FunctionComponent<SaveDatasetModalProps> = ({
<>
{!shouldOverwriteDataset && (
<Button
- buttonSize="sm"
+ disabled={disableSaveAndExploreBtn}
+ buttonSize="medium"
buttonStyle="primary"
- className="m-r-5"
onClick={onOk}
>
Save & Explore
</Button>
)}
{shouldOverwriteDataset && (
<>
- <Button
- buttonSize="sm"
- buttonStyle="danger"
- className="m-r-5"
- onClick={handleOverwriteCancel}
- >
- Cancel
+ <Button buttonSize="medium" onClick={handleOverwriteCancel}>
+ Back
</Button>
<Button
- buttonSize="sm"
+ className="md"
+ buttonSize="medium"
buttonStyle="primary"
- className="m-r-5"
onClick={handleOverwriteDataset}
+ disabled={disableSaveAndExploreBtn}
>
- Ok
+ Save & Explore
Review comment:
i18n needed
##########
File path: superset-frontend/src/SqlLab/components/ResultSet.tsx
##########
@@ -124,6 +205,145 @@ export default class ResultSet extends
React.PureComponent<
}
}
+ handleOnChangeAutoComplete = () => {
+ this.setState({ datasetToOverwrite: {} });
+ };
+
+ handleOverwriteDataset = async () => {
+ const { sql, results, dbId } = this.props.query;
+ const { datasetToOverwrite } = this.state;
+
+ updateDatset(
+ datasetToOverwrite.datasetId,
+ dbId,
+ sql,
+ results.selected_columns.map(d => ({ column_name: d.name })),
+ true,
+ )
+ .then(() => {
+ exploreChart({
+ ...EXPLORE_CHART_DEFAULT,
+ datasource: `${datasetToOverwrite.datasetId}__table`,
+ all_columns: results.selected_columns.map(d => d.name),
+ });
+ })
+ .catch(() => {
+ this.props.actions.addDangerToast(
+ t('An error occurred overwriting dataset'),
+ );
+ });
+
+ this.setState({
+ showSaveDatasetModal: false,
+ shouldOverwriteDataSet: false,
+ datasetToOverwrite: {},
+ newSaveDatasetName: `${this.props.query.tab} ${moment().format(
+ 'MM/DD/YYYY HH:mm:ss',
Review comment:
This is US English only. No need to resolve in this PR, but we should
really start thinking about an i18n strategy for things like date formatting.
cc @villebro @rusackas
##########
File path: superset-frontend/src/SqlLab/components/ResultSet.tsx
##########
@@ -87,6 +122,16 @@ export default class ResultSet extends React.PureComponent<
searchText: '',
showExploreResultsButton: false,
data: [],
+ showSaveDatasetModal: false,
+ newSaveDatasetName: `${props.query.tab} ${moment().format(
+ 'MM/DD/YYYY HH:mm:ss',
+ )}`,
+ userDatasetsOwned: [],
+ saveDatasetRadioBtnState: DatasetRadioState.SAVE_NEW,
Review comment:
This is getting too specific. I would just call it
"shouldSaveAsNewDataset" or something aline. Imagine what if a future design
changes the radio button to a dropdown select?
##########
File path: superset-frontend/src/SqlLab/components/ResultSet.tsx
##########
@@ -87,6 +122,16 @@ export default class ResultSet extends React.PureComponent<
searchText: '',
showExploreResultsButton: false,
data: [],
+ showSaveDatasetModal: false,
+ newSaveDatasetName: `${props.query.tab} ${moment().format(
+ 'MM/DD/YYYY HH:mm:ss',
+ )}`,
+ userDatasetsOwned: [],
+ saveDatasetRadioBtnState: DatasetRadioState.SAVE_NEW,
+ shouldOverwriteDataSet: false,
+ datasetToOverwrite: {},
+ saveModalAutocompleteValue: '',
+ userDatasetOptions: [],
Review comment:
I feel you many be passing too many states between components
unnecessarily. Can these be combined into one construct as the modal's local
states and only be passed up to the parent component when users hit "Save"?
##########
File path: superset-frontend/src/SqlLab/components/ResultSet.tsx
##########
@@ -124,6 +205,145 @@ export default class ResultSet extends
React.PureComponent<
}
}
+ handleOnChangeAutoComplete = () => {
+ this.setState({ datasetToOverwrite: {} });
+ };
+
+ handleOverwriteDataset = async () => {
+ const { sql, results, dbId } = this.props.query;
+ const { datasetToOverwrite } = this.state;
+
+ updateDatset(
+ datasetToOverwrite.datasetId,
+ dbId,
+ sql,
+ results.selected_columns.map(d => ({ column_name: d.name })),
+ true,
+ )
+ .then(() => {
+ exploreChart({
+ ...EXPLORE_CHART_DEFAULT,
+ datasource: `${datasetToOverwrite.datasetId}__table`,
+ all_columns: results.selected_columns.map(d => d.name),
+ });
+ })
+ .catch(() => {
+ this.props.actions.addDangerToast(
+ t('An error occurred overwriting dataset'),
+ );
+ });
+
+ this.setState({
+ showSaveDatasetModal: false,
+ shouldOverwriteDataSet: false,
+ datasetToOverwrite: {},
+ newSaveDatasetName: `${this.props.query.tab} ${moment().format(
+ 'MM/DD/YYYY HH:mm:ss',
+ )}`,
+ });
+ };
+
+ handleSaveInDataset = () => {
+ // if user wants to overwrite a dataset we need to prompt them
+ if (
+ this.state.saveDatasetRadioBtnState ===
+ DatasetRadioState.OVERWRITE_DATASET
+ ) {
+ this.setState({ shouldOverwriteDataSet: true });
+ return;
+ }
+
+ const { schema, sql, dbId, templateParams } = this.props.query;
+ const selectedColumns = this.props.query?.results?.selected_columns || [];
+
+ this.props.actions
+ .createDatasource({
+ schema,
+ sql,
+ dbId,
+ templateParams,
+ datasourceName: this.state.newSaveDatasetName,
+ columns: selectedColumns,
+ })
+ .then((data: { table_id: number }) => {
+ exploreChart({
+ datasource: `${data.table_id}__table`,
+ metrics: [],
+ groupby: [],
+ time_range: 'No filter',
+ viz_type: 'table',
+ all_columns: selectedColumns.map(c => c.name),
+ row_limit: 1000,
+ });
+ })
+ .catch(() => {
+ this.props.actions.addDangerToast(
+ t('An error occurred saving dataset'),
+ );
+ });
+
+ this.setState({
+ showSaveDatasetModal: false,
+ newSaveDatasetName: `${this.props.query.tab} ${moment().format(
+ 'MM/DD/YYYY HH:mm:ss',
+ )}`,
+ });
Review comment:
There's seem to be some repetitive code between Override and Save as
New. Is there a chance for abstraction?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
