Skip to content

Commit 5fd2d41

Browse files
committed
fix: better code and design
1 parent 3afc177 commit 5fd2d41

File tree

5 files changed

+21
-43
lines changed

5 files changed

+21
-43
lines changed

src/components/QueriesActivityBar/QueriesActivityAlert.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
}
1515

1616
&__content {
17-
padding: var(--g-spacing-5) var(--g-spacing-4);
17+
padding: calc(var(--g-spacing-5) - 1px) var(--g-spacing-4);
1818
}
1919

2020
&__title {

src/components/QueriesActivityBar/QueriesActivityBar.tsx

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import {QueriesActivityAlert} from './QueriesActivityAlert';
22
import {QueriesActivityExpandable} from './QueriesActivityExpandable';
33
import {QueriesActivitySkeleton} from './QueriesActivitySkeleton';
4-
import {useChartAvailability} from './useChartAvailability';
54
import {useQueriesActivityData} from './useQueriesActivityData';
65

76
import './QueriesActivityBar.scss';
@@ -11,10 +10,7 @@ interface QueriesActivityBarProps {
1110
}
1211

1312
export function QueriesActivityBar({tenantName}: QueriesActivityBarProps) {
14-
// Check chart availability without rendering hidden components
15-
const areChartsAvailable = useChartAvailability(tenantName);
16-
17-
const {runningQueriesCount, uniqueApplications, uniqueUsers, qps, latency} =
13+
const {runningQueriesCount, uniqueApplications, uniqueUsers, qps, latency, areChartsAvailable} =
1814
useQueriesActivityData(tenantName);
1915

2016
// Show skeleton while determining chart availability

src/components/QueriesActivityBar/useChartAvailability.ts

Lines changed: 0 additions & 35 deletions
This file was deleted.

src/components/QueriesActivityBar/useQueriesActivityData.ts

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ interface UseQueriesActivityDataResult {
1818
uniqueUsers: number;
1919
qps: ReturnType<typeof calculateQueriesPerSecond>;
2020
latency: ReturnType<typeof calculateLatency>;
21+
areChartsAvailable: boolean | null; // null = loading, boolean = result
2122
}
2223

2324
export function useQueriesActivityData(tenantName: string): UseQueriesActivityDataResult {
@@ -33,7 +34,11 @@ export function useQueriesActivityData(tenantName: string): UseQueriesActivityDa
3334
{pollingInterval: shouldRefresh},
3435
);
3536

36-
const {data: queriesPerSecData} = chartApi.useGetChartDataQuery(
37+
const {
38+
data: queriesPerSecData,
39+
isSuccess: queriesSuccess,
40+
isError: queriesError,
41+
} = chartApi.useGetChartDataQuery(
3742
{
3843
database: tenantName,
3944
metrics: [{target: 'queries.requests'}],
@@ -55,6 +60,17 @@ export function useQueriesActivityData(tenantName: string): UseQueriesActivityDa
5560

5661
const runningQueriesCount = runningQueriesData?.resultSets?.[0]?.result?.length || 0;
5762

63+
// Determine chart availability from queries API success/error state
64+
const areChartsAvailable = React.useMemo(() => {
65+
if (queriesSuccess) {
66+
return true;
67+
}
68+
if (queriesError) {
69+
return false;
70+
}
71+
return null; // Still loading
72+
}, [queriesSuccess, queriesError]);
73+
5874
const qps = React.useMemo(
5975
() => calculateQueriesPerSecond(queriesPerSecData?.metrics?.[0]?.data),
6076
[queriesPerSecData?.metrics?.[0]?.data],
@@ -91,5 +107,6 @@ export function useQueriesActivityData(tenantName: string): UseQueriesActivityDa
91107
uniqueUsers,
92108
qps,
93109
latency,
110+
areChartsAvailable,
94111
};
95112
}

src/containers/Tenant/Diagnostics/TenantOverview/Healthcheck/HealthcheckPreview.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
&__skeleton {
66
width: 100%;
7-
height: 60px;
7+
height: 62px;
88
}
99

1010
&__alert-message {

0 commit comments

Comments
 (0)