Skip to content
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

Jump to bottom

feat: update version info pop-up with python/groovy version #2291

Merged
merged 3 commits into from
Nov 12, 2024
Merged

feat: update version info pop-up with python/groovy version #2291

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
147b0fc
feat: change version info from tooltip to contextual help component
dsmmcken Nov 12, 2024
688cf37
add python, groovy and clarifiy OS is UA reported
dsmmcken Nov 12, 2024
89c56c5
look at us having tests and stuff
dsmmcken Nov 12, 2024
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 packages/code-studio/src/settings/SettingsMenu.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,4 +204,5 @@ $settings-menu-z-index: $zindex-modal;
grid-template-columns: auto auto;
gap: $spacer-1 $spacer-3;
text-align: left;
margin-bottom: $spacer-2;
}
50 changes: 27 additions & 23 deletions packages/code-studio/src/settings/SettingsMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import {
vsClose,
vsWatch,
vsRecordKeys,
vsInfo,
vsLayers,
vsPaintcan,
dhUserIncognito,
Expand All @@ -19,10 +18,12 @@ import {
} from '@deephaven/icons';
import {
Button,
ContextualHelp,
Heading,
Content,
CopyButton,
GLOBAL_SHORTCUTS,
Logo,
Tooltip,
} from '@deephaven/components';
import { type ServerConfigValues, type User, store } from '@deephaven/redux';
import {
Expand Down Expand Up @@ -383,27 +384,30 @@ export class SettingsMenu extends Component<
<div className="app-settings-footer-item">
<div className="font-weight-bold">Version</div>
<span className="d-inline-block text-muted">
{deephavenVersion} <FontAwesomeIcon icon={vsInfo} />
<Tooltip interactive>
<div className="detailed-server-config">
{Object.entries(versionInfo).map(([key, value]) =>
getRow(key, value)
)}
</div>
<CopyButton
kind="inline"
tooltip="Copy version numbers"
copy={Object.entries({
...versionInfo,
...pluginInfo,
})
.map(([key, value]) => `${key}: ${value}`)
.join('\n')}
>
Copy Versions
<small className="text-muted">({copyShortcut})</small>
</CopyButton>
</Tooltip>
{deephavenVersion}
<ContextualHelp variant="info">
<Heading>Version Info</Heading>
<Content>
<div className="detailed-server-config">
{Object.entries(versionInfo).map(([key, value]) =>
getRow(key, value)
)}
</div>
<CopyButton
kind="inline"
tooltip="Copy version numbers"
copy={Object.entries({
...versionInfo,
...pluginInfo,
})
.map(([key, value]) => `${key}: ${value}`)
.join('\n')}
>
Copy Versions
<small className="text-muted">({copyShortcut})</small>
</CopyButton>
</Content>
</ContextualHelp>
</span>
</div>
<div className="app-settings-footer-item">
Expand Down
9 changes: 7 additions & 2 deletions packages/code-studio/src/settings/SettingsUtils.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ describe('getFormattedVersionInfo', () => {
it('should return the formatted version information', () => {
const serverConfigValues = new Map<string, string>();
serverConfigValues.set('deephaven.version', '1.0.0');
serverConfigValues.set('python.version', '3.9.7');
serverConfigValues.set('groovy.version', '11.0.1');
serverConfigValues.set('java.version', '11.0.1');
serverConfigValues.set('barrage.version', '2.3.4');

Expand All @@ -20,10 +22,12 @@ describe('getFormattedVersionInfo', () => {
expect(result).toEqual({
'Engine Version': '1.0.0',
'Web UI Version': '0.0.1',
'Python Version': '3.9.7',
'Java Version': '11.0.1',
'Groovy Version': '11.0.1',
'Barrage Version': '2.3.4',
'Browser Name': 'Chrome 96',
'OS Name': 'Windows NT 10.0',
'User Agent OS': 'Windows NT 10.0',
});
});

Expand All @@ -43,9 +47,10 @@ describe('getFormattedVersionInfo', () => {
'Engine Version': 'Unknown',
'Web UI Version': '0.0.1',
'Java Version': 'Unknown',
'Groovy Version': 'Unknown',
'Barrage Version': 'Unknown',
'Browser Name': 'Unknown',
'OS Name': 'Unknown',
'User Agent OS': 'Unknown',
});
});
});
6 changes: 5 additions & 1 deletion packages/code-studio/src/settings/SettingsUtils.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,17 @@ export function getFormattedVersionInfo(
Number(parseFloat(ua.browser.version ?? '')) || ''
}`;
const os = `${ua.os.name ?? ''} ${ua.os.version ?? ''}`;
const pythonVersion = serverConfigValues.get('python.version') ?? '';
return {
'Engine Version': serverConfigValues.get('deephaven.version') ?? 'Unknown',
'Web UI Version': import.meta.env.npm_package_version ?? 'Unknown',
// Python version is only available in python sessions
...(pythonVersion !== '' ? { 'Python Version': pythonVersion } : {}),
'Java Version': serverConfigValues.get('java.version') ?? 'Unknown',
'Groovy Version': serverConfigValues.get('groovy.version') ?? 'Unknown',
'Barrage Version': serverConfigValues.get('barrage.version') ?? 'Unknown',
'Browser Name': browser.trim() || 'Unknown',
'OS Name': os.trim() || 'Unknown',
'User Agent OS': os.trim() || 'Unknown',
};
}

Expand Down
Loading