Skip to content

Commit 8cecb23

Browse files
authored
Move version to menu and remove preview badge (#429)
* Move version to menu and remove preview badge * Update test
1 parent ff57266 commit 8cecb23

File tree

2 files changed

+22
-27
lines changed

2 files changed

+22
-27
lines changed

e2e/components.spec.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ test.describe('components', () => {
1616

1717
test('in header are visible', async ({ page }) => {
1818
await expect(page.getByText('Data source')).toBeVisible();
19-
await expect(page.getByText('Preview')).toBeVisible();
2019
await expect(page.getByRole('button', { name: 'Need help' })).toBeVisible();
2120
await expect(page.getByTestId('data-testid TimePicker Open Button')).toBeVisible();
2221
await expect(page.getByTestId('data-testid RefreshPicker run button')).toBeVisible();

src/pages/Explore/TraceExploration.tsx

Lines changed: 22 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import {
2020
SceneVariableSet,
2121
} from '@grafana/scenes';
2222
import { config } from '@grafana/runtime';
23-
import { Badge, Button, Drawer, Dropdown, Icon, IconButton, Menu, Stack, Tooltip, useStyles2 } from '@grafana/ui';
23+
import { Button, Drawer, Dropdown, Icon, IconButton, Menu, Stack, useStyles2 } from '@grafana/ui';
2424

2525
import { TracesByServiceScene } from '../../components/Explore/TracesByService/TracesByServiceScene';
2626
import {
@@ -73,7 +73,7 @@ export interface TraceExplorationState extends SceneObjectState {
7373
const version = process.env.VERSION;
7474
const buildTime = process.env.BUILD_TIME;
7575
const commitSha = process.env.COMMIT_SHA;
76-
const compositeVersion = `v${version} - ${buildTime?.split('T')[0]} (${commitSha})`;
76+
const compositeVersion = `${buildTime?.split('T')[0]} (${commitSha})`;
7777

7878
export class TraceExploration extends SceneObjectBase<TraceExplorationState> {
7979
protected _urlSync = new SceneObjectUrlSyncConfig(this, { keys: ['primarySignal', 'traceId', 'spanId', 'metric'] });
@@ -252,8 +252,19 @@ export class TraceExplorationScene extends SceneObjectBase {
252252
const filtersVariable = getFiltersVariable(traceExploration);
253253
const primarySignalVariable = getPrimarySignalVariable(traceExploration);
254254

255+
function VersionHeader() {
256+
const styles = useStyles2(getStyles);
257+
258+
return (
259+
<div className={styles.menuHeader}>
260+
<h5>Grafana Traces Drilldown v{version}</h5>
261+
<div className={styles.menuHeaderSubtitle}>Last update: {compositeVersion}</div>
262+
</div>
263+
);
264+
}
265+
255266
const menu = (
256-
<Menu>
267+
<Menu header={<VersionHeader />}>
257268
<div className={styles.menu}>
258269
{config.feedbackLinksEnabled && (
259270
<Menu.Item
@@ -310,11 +321,6 @@ export class TraceExplorationScene extends SceneObjectBase {
310321
</Stack>
311322

312323
<div className={styles.controls}>
313-
<Tooltip content={<PreviewTooltip text={compositeVersion} />} interactive>
314-
<span className={styles.preview}>
315-
<Badge text="&nbsp;Preview" color="blue" icon="rocket" />
316-
</span>
317-
</Tooltip>
318324
<Dropdown overlay={menu} onVisibleChange={() => setMenuVisible(!menuVisible)}>
319325
<Button variant="secondary" icon="info-circle">
320326
Need help
@@ -371,16 +377,6 @@ export class TraceExplorationScene extends SceneObjectBase {
371377
};
372378
}
373379

374-
const PreviewTooltip = ({ text }: { text: string }) => {
375-
const styles = useStyles2(getStyles);
376-
377-
return (
378-
<Stack direction={'column'} gap={2}>
379-
<div className={styles.tooltip}>{text}</div>
380-
</Stack>
381-
);
382-
};
383-
384380
function getTopScene() {
385381
return new TracesByServiceScene({});
386382
}
@@ -515,14 +511,14 @@ function getStyles(theme: GrafanaTheme2) {
515511
color: theme.colors.text.link,
516512
},
517513
}),
518-
preview: css({
519-
label: 'preview',
520-
cursor: 'help',
521-
522-
'> div:first-child': {
523-
padding: '5.5px',
524-
},
525-
}),
514+
menuHeader: css`
515+
padding: ${theme.spacing(0.5, 1)};
516+
white-space: nowrap;
517+
`,
518+
menuHeaderSubtitle: css`
519+
color: ${theme.colors.text.secondary};
520+
font-size: ${theme.typography.bodySmall.fontSize};
521+
`,
526522
tooltip: css({
527523
label: 'tooltip',
528524
fontSize: '14px',

0 commit comments

Comments
 (0)