QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-05-12 19:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(explore): Adhoc columns don't display correctly (#20802)

Browse Source 
* fix(explore): Adhoc columns have empty labels

* Add unit test

* Address comments
This commit is contained in:
Kamil Gabryjelski
2022-07-21 21:11:49 +02:00
committed by GitHub
parent 922b4b8d1d
commit af1bddffad
4 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx
View File

@@ -121,7 +121,7 @@ const ColumnSelectPopover = ({
const onSqlExpressionChange = useCallback(
sqlExpression => {
setAdhocColumn({ label, sqlExpression } as AdhocColumn);
setAdhocColumn({ label, sqlExpression, expressionType: 'SQL' });
setSelectedSimpleColumn(undefined);
setSelectedCalculatedColumn(undefined);
},

20
superset-frontend/src/explore/components/controls/DndColumnSelectControl/DndColumnSelect.test.tsx
View File

@@ -27,7 +27,9 @@ const defaultProps: DndColumnSelectProps = {
type: 'DndColumnSelect',
name: 'Filter',
onChange: jest.fn(),
options: { string: { column_name: 'Column A' } },
options: {
string: { column_name: 'Column A' },
},
actions: { setControlValue: jest.fn() },
};
@@ -42,3 +44,19 @@ test('renders with value', () => {
});
expect(screen.getByText('Column A')).toBeInTheDocument();
});
test('renders adhoc column', () => {
render(
<DndColumnSelect
{...defaultProps}
value={{
sqlExpression: 'Count *',
label: 'adhoc column',
expressionType: 'SQL',
}}
/>,
{ useDnd: true },
);
expect(screen.getByText('adhoc column')).toBeVisible();
expect(screen.getByLabelText('calculator')).toBeVisible();
});