iop
/
superset
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Columns tab name field no longer editable, calculated columns rows now vertically aligned (#18164)

This commit is contained in:
Lyndsi Kay Williams 2022-01-25 14:34:56 -06:00 committed by GitHub
parent 9900e5a689
commit 2491b89f29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
superset-frontend/src/components/Datasource/DatasourceEditor.jsx
View File

@ -1271,7 +1271,6 @@ class DatasourceEditor extends React.PureComponent {
</ColumnButtonWrapper>
<ColumnCollectionTable
className="columns-table"
editableColumnName
columns={this.state.databaseColumns}
datasource={datasource}
onColumnsChange={databaseColumns =>
@ -1291,25 +1290,27 @@ class DatasourceEditor extends React.PureComponent {
}
key={3}
>
<ColumnCollectionTable
columns={this.state.calculatedColumns}
onColumnsChange={calculatedColumns =>
this.setColumns({ calculatedColumns })
}
onDatasourceChange={this.onDatasourceChange}
datasource={datasource}
editableColumnName
showExpression
allowAddItem
allowEditDataType
itemGenerator={() => ({
column_name: '<new column>',
filterable: true,
groupby: true,
expression: '<enter SQL expression here>',
__expanded: true,
})}
/>
<StyledColumnsTabWrapper>
<ColumnCollectionTable
columns={this.state.calculatedColumns}
onColumnsChange={calculatedColumns =>
this.setColumns({ calculatedColumns })
}
onDatasourceChange={this.onDatasourceChange}
datasource={datasource}
editableColumnName
showExpression
allowAddItem
allowEditDataType
itemGenerator={() => ({
column_name: '<new column>',
filterable: true,
groupby: true,
expression: '<enter SQL expression here>',
__expanded: true,
})}
/>
</StyledColumnsTabWrapper>
</Tabs.TabPane>
<Tabs.TabPane key={4} tab={t('Settings')}>
<Row gutter={16}>

2
superset-frontend/src/components/Datasource/DatasourceEditor.test.jsx
View File

@ -78,7 +78,7 @@ describe('DatasourceEditor', () => {
});
userEvent.click(getToggles[0]);
const getTextboxes = screen.getAllByRole('textbox');
expect(getTextboxes.length).toEqual(12);
expect(getTextboxes.length).toEqual(5);
const inputLabel = screen.getByPlaceholderText('Label');
const inputDescription = screen.getByPlaceholderText('Description');