Skip to content

Commit 43794c8

Browse files
committed
fix: styles
1 parent 7e8909c commit 43794c8

File tree

2 files changed

+51
-47
lines changed

2 files changed

+51
-47
lines changed

src/components/QueriesActivityBar/QueriesActivityBar.tsx

Lines changed: 40 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -162,45 +162,47 @@ export function QueriesActivityBar({tenantName}: QueriesActivityBarProps) {
162162
)}
163163
</Disclosure.Summary>
164164

165-
<div className={b('content')}>
166-
<div className={b('stats')}>
167-
<Label
168-
theme="unknown"
169-
icon={<Icon data={CirclePlay} />}
170-
size="s"
171-
value={String(runningQueriesCount)}
172-
>
173-
{i18n('running-queries')}
174-
</Label>
175-
176-
<Label
177-
theme="unknown"
178-
icon={<Icon data={Display} />}
179-
size="s"
180-
value={String(uniqueApplications)}
181-
>
182-
{i18n('applications')}
183-
</Label>
184-
185-
<Label
186-
theme="unknown"
187-
icon={<Icon data={Person} />}
188-
size="s"
189-
value={String(uniqueUsers)}
190-
>
191-
{i18n('users')}
192-
</Label>
193-
194-
<Button
195-
view="outlined"
196-
size="s"
197-
onClick={handleOpenRunningQueries}
198-
className={b('open-queries-button')}
199-
>
200-
{i18n('open-running-queries')}
201-
</Button>
165+
{expanded ? (
166+
<div className={b('content')}>
167+
<div className={b('stats')}>
168+
<Label
169+
theme="unknown"
170+
icon={<Icon data={CirclePlay} />}
171+
size="s"
172+
value={String(runningQueriesCount)}
173+
>
174+
{i18n('running-queries')}
175+
</Label>
176+
177+
<Label
178+
theme="unknown"
179+
icon={<Icon data={Display} />}
180+
size="s"
181+
value={String(uniqueApplications)}
182+
>
183+
{i18n('applications')}
184+
</Label>
185+
186+
<Label
187+
theme="unknown"
188+
icon={<Icon data={Person} />}
189+
size="s"
190+
value={String(uniqueUsers)}
191+
>
192+
{i18n('users')}
193+
</Label>
194+
195+
<Button
196+
view="outlined"
197+
size="s"
198+
onClick={handleOpenRunningQueries}
199+
className={b('open-queries-button')}
200+
>
201+
{i18n('open-running-queries')}
202+
</Button>
203+
</div>
202204
</div>
203-
</div>
205+
) : null}
204206
</Disclosure>
205207
<QueriesActivityCharts tenantName={tenantName} expanded={expanded} />
206208
</div>

src/components/QueriesActivityBar/QueriesActivityCharts.tsx

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,13 @@ interface QueriesActivityChartsProps {
1414
expanded: boolean;
1515
}
1616

17+
const ACTIVITY_CHART_HEIGHT = 292;
18+
1719
export function QueriesActivityCharts({tenantName, expanded}: QueriesActivityChartsProps) {
1820
const [autoRefreshInterval] = useAutoRefreshInterval();
1921
const [queriesTimeFrame, setQueriesTimeFrame] = React.useState<TimeFrame>('1h');
2022
const [latenciesTimeFrame, setLatenciesTimeFrame] = React.useState<TimeFrame>('1h');
21-
const [areChartsHidden, setAreChartsHidden] = React.useState(true);
23+
const [hasChartsLoaded, setHasChartsLoaded] = React.useState(false);
2224

2325
// Extract chart configurations from defaultDashboardConfig
2426
const getChartByTarget = (target: string) => {
@@ -36,12 +38,12 @@ export function QueriesActivityCharts({tenantName, expanded}: QueriesActivityCha
3638
return null;
3739
}
3840

39-
// Refetch data only if charts successfully loaded
40-
const shouldRefresh = areChartsHidden ? 0 : autoRefreshInterval;
41+
// Refetch data only if charts have successfully loaded at least once
42+
const shouldRefresh = hasChartsLoaded ? autoRefreshInterval : 0;
4143

4244
const handleChartDataStatusChange = React.useCallback((status: ChartDataStatus) => {
4345
if (status === 'success') {
44-
setAreChartsHidden(false);
46+
setHasChartsLoaded(true);
4547
}
4648
}, []);
4749

@@ -66,18 +68,18 @@ export function QueriesActivityCharts({tenantName, expanded}: QueriesActivityCha
6668
}
6769

6870
return (
69-
<div className={b('charts')} style={{display: areChartsHidden ? 'none' : undefined}}>
71+
<div className={b('charts')}>
7072
<div className={b('chart-container')}>
7173
<MetricChart
7274
database={tenantName}
7375
title={queriesChartConfig.title}
7476
metrics={queriesChartConfig.metrics}
7577
timeFrame={queriesTimeFrame}
7678
autorefresh={shouldRefresh}
77-
height={260}
79+
height={ACTIVITY_CHART_HEIGHT}
7880
chartOptions={queriesChartConfig.options}
7981
onChartDataStatusChange={handleChartDataStatusChange}
80-
isChartVisible={!areChartsHidden}
82+
isChartVisible={hasChartsLoaded}
8183
noBorder={true}
8284
fullWidth={true}
8385
withTimeframeSelector={true}
@@ -93,10 +95,10 @@ export function QueriesActivityCharts({tenantName, expanded}: QueriesActivityCha
9395
metrics={latenciesChartConfig.metrics}
9496
timeFrame={latenciesTimeFrame}
9597
autorefresh={shouldRefresh}
96-
height={260}
98+
height={ACTIVITY_CHART_HEIGHT}
9799
chartOptions={latenciesChartConfig.options}
98100
onChartDataStatusChange={handleChartDataStatusChange}
99-
isChartVisible={!areChartsHidden}
101+
isChartVisible={hasChartsLoaded}
100102
noBorder={true}
101103
fullWidth={true}
102104
withTimeframeSelector={true}

0 commit comments

Comments
 (0)