Skip to content

[pull] master from apache:master #418

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.

Sign up for GitHub

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

Merged
pull merged 3 commits into from
Jan 23, 2026
Merged

[pull] master from apache:master #418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c6821ca
chore(deps-dev): bump prettier from 3.8.0 to 3.8.1 in /superset-webso…
dependabot[bot] Jan 23, 2026
b1ad542
fix: add sans-serif font fallback to fontFamily (Fixes #37096) (#37172)
dheeraj12347 Jan 23, 2026
04c5517
fix(dataset-editor): add missing Data type label in calculated column…
massucattoj Jan 23, 2026
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
1 change: 1 addition & 0 deletions superset-frontend/src/components/Datasource/components/DatasourceEditor/DatasourceEditor.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,7 @@ function ColumnCollectionTable({
control={
<Select
ariaLabel={t('Data type')}
header={<FormLabel>{t('Data type')}</FormLabel>}
options={DATA_TYPES}
name="type"
allowNewOptions
Expand Down
21 changes: 21 additions & 0 deletions ...end/src/components/Datasource/components/DatasourceEditor/tests/DatasourceEditor.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,27 @@ test('can add new columns', async () => {
});
});

test('renders Data type label in calculated columns tab', async () => {
const testProps = createProps();
await asyncRender({
...testProps,
datasource: { ...testProps.datasource, table_name: 'Vehicle Sales +' },
});

const calcColsTab = screen.getByTestId('collection-tab-Calculated columns');
await userEvent.click(calcColsTab);

const calcColsPanel = within(
await screen.findByRole('tabpanel', { name: /calculated columns/i }),
);

const addBtn = calcColsPanel.getByRole('button', { name: /add item/i });
await userEvent.click(addBtn);

const dataTypeLabels = await calcColsPanel.findAllByText('Data type');
expect(dataTypeLabels.length).toBeGreaterThanOrEqual(2);
});

test('renders isSqla fields', async () => {
const testProps = createProps();
await asyncRender({
Expand Down
14 changes: 7 additions & 7 deletions superset-websocket/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion superset-websocket/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"eslint-plugin-lodash": "^8.0.0",
"globals": "^17.0.0",
"jest": "^29.7.0",
"prettier": "^3.8.0",
"prettier": "^3.8.1",
"ts-jest": "^29.4.6",
"ts-node": "^10.9.2",
"tscw-config": "^1.1.2",
Expand Down
2 changes: 1 addition & 1 deletion superset/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -921,7 +921,7 @@ class D3TimeFormat(TypedDict, total=False):
"colorInfo": "#66bcfe",
# Fonts
"fontUrls": [],
"fontFamily": "Inter, Helvetica, Arial",
"fontFamily": "Inter, Helvetica, Arial, sans-serif",
"fontFamilyCode": "'Fira Code', 'Courier New', monospace",
# Extra tokens
"transitionTiming": 0.3,
Expand Down
Loading