Skip to content

fix(settingsMenu): Version #35096

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
eschutho merged 3 commits into from
Sep 10, 2025
Merged

fix(settingsMenu): Version #35096

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
f07f008
wip fix to version number menu item
rebenitez1802 Sep 10, 2025
44aed58
styles cleaned
rebenitez1802 Sep 10, 2025
e072358
fix tests for Menu
rebenitez1802 Sep 10, 2025
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
25 changes: 19 additions & 6 deletions superset-frontend/src/features/home/Menu.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,13 +492,26 @@ test('should render the About section and version_string, sha or build_number wh
});
userEvent.hover(screen.getByText('Settings'));
const about = await screen.findByText('About');
const version = await screen.findAllByText(`Version: ${version_string}`);
const sha = await screen.findAllByText(`SHA: ${version_sha}`);
const build = await screen.findAllByText(`Build: ${build_number}`);

// The version information is rendered as combined text in a single element
// Use getAllByText to get all matching elements and check the first one
const versionTexts = await screen.findAllByText(
(_, element) =>
element?.textContent?.includes(`Version: ${version_string}`) ?? false,
);
const shaTexts = await screen.findAllByText(
(_, element) =>
element?.textContent?.includes(`SHA: ${version_sha}`) ?? false,
);
const buildTexts = await screen.findAllByText(
(_, element) =>
element?.textContent?.includes(`Build: ${build_number}`) ?? false,
);

expect(about).toBeInTheDocument();
expect(version[0]).toBeInTheDocument();
expect(sha[0]).toBeInTheDocument();
expect(build[0]).toBeInTheDocument();
expect(versionTexts[0]).toBeInTheDocument();
expect(shaTexts[0]).toBeInTheDocument();
expect(buildTexts[0]).toBeInTheDocument();
});

test('should render the Documentation link when available', async () => {
Expand Down
58 changes: 25 additions & 33 deletions superset-frontend/src/features/home/RightMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import {
Typography,
TelemetryPixel,
} from '@superset-ui/core/components';
import type { MenuItem } from '@superset-ui/core/components/Menu';
import type { ItemType, MenuItem } from '@superset-ui/core/components/Menu';
import { ensureAppRoot } from 'src/utils/pathUtils';
import { findPermission } from 'src/utils/findPermission';
import { isUserAdmin } from 'src/dashboard/util/permissionUtils';
Expand All @@ -63,14 +63,6 @@ import {

const extensionsRegistry = getExtensionsRegistry();

const versionInfoStyles = (theme: SupersetTheme) => css`
padding: ${theme.sizeUnit * 1.5}px ${theme.sizeUnit * 4}px
${theme.sizeUnit * 4}px ${theme.sizeUnit * 7}px;
color: ${theme.colorText};
font-size: ${theme.fontSizeSM}px;
white-space: nowrap;
`;

const StyledDiv = styled.div<{ align: string }>`
display: flex;
height: 100%;
Expand Down Expand Up @@ -520,42 +512,42 @@ const RightMenu = ({
if (navbarRight.version_string || navbarRight.version_sha) {
items.push({ type: 'divider', key: 'version-info-divider' });

items.push({
const aboutItem: ItemType = {
type: 'group',
label: t('About'),
key: 'about-section',
children: [
{
key: 'about-info',
style: { height: 'auto', minHeight: 'auto' },
label: (
<div className="about-section">
{navbarRight.show_watermark && (
<div css={versionInfoStyles}>
{t('Powered by Apache Superset')}
</div>
)}
{navbarRight.version_string && (
<div css={versionInfoStyles}>
{t('Version')}: {navbarRight.version_string}
</div>
)}
{navbarRight.version_sha && (
<div css={versionInfoStyles}>
{t('SHA')}: {navbarRight.version_sha}
</div>
)}
{navbarRight.build_number && (
<div css={versionInfoStyles}>
{t('Build')}: {navbarRight.build_number}
</div>
)}
<div
css={(theme: SupersetTheme) => css`
font-size: ${theme.fontSizeSM}px;
color: ${theme.colorTextSecondary || theme.colorText};

This comment was marked as resolved.

Sign in to view

white-space: pre-wrap;
padding: ${theme.sizeUnit}px ${theme.sizeUnit * 2}px;
`}
>
{[
navbarRight.show_watermark &&
t('Powered by Apache Superset'),
navbarRight.version_string &&
`${t('Version')}: ${navbarRight.version_string}`,
navbarRight.version_sha &&
`${t('SHA')}: ${navbarRight.version_sha}`,
navbarRight.build_number &&
`${t('Build')}: ${navbarRight.build_number}`,
]
.filter(Boolean)
.join('\n')}
</div>
),
},
],
});
};
items.push(aboutItem);
}

return items;
};

Expand Down
Loading