Skip to content

Commit 5d98458

Browse files
github-actions[bot]Kishore Kumaar Natarajan
and
Kishore Kumaar Natarajan
committed
Fix-Query-Insights-Dashboards-Trineo-style-integration-GroupQueryDetails-Tests&lint (#70)
Signed-off-by: Kishore Kumaar Natarajan <[email protected]> Co-authored-by: Kishore Kumaar Natarajan <[email protected]> (cherry picked from commit 69a60c5) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
1 parent e420af0 commit 5d98458

File tree

4 files changed

+229
-165
lines changed

4 files changed

+229
-165
lines changed

public/pages/QueryGroupDetails/Components/QueryGroupAggregateSummary.tsx

+25-9
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,14 @@
44
*/
55

66
import React from 'react';
7-
import { EuiFlexGrid, EuiFlexItem, EuiHorizontalRule, EuiPanel, EuiText } from '@elastic/eui';
7+
import {
8+
EuiFlexGrid,
9+
EuiFlexItem,
10+
EuiHorizontalRule,
11+
EuiPanel,
12+
EuiTitle,
13+
EuiDescriptionList,
14+
} from '@elastic/eui';
815
import {
916
AVERAGE_CPU_TIME,
1017
AVERAGE_LATENCY,
@@ -17,28 +24,37 @@ import { calculateMetric } from '../../../../common/utils/MetricUtils';
1724
// Panel component for displaying query group detail values
1825
const PanelItem = ({ label, value }: { label: string; value: string | number }) => (
1926
<EuiFlexItem>
20-
<EuiText size="xs">
21-
<h4>{label}</h4>
22-
</EuiText>
23-
<EuiText size="xs">{value}</EuiText>
27+
<EuiDescriptionList
28+
compressed={true}
29+
listItems={[
30+
{
31+
title: <h4>{label}</h4>,
32+
description: value,
33+
},
34+
]}
35+
/>
2436
</EuiFlexItem>
2537
);
2638

2739
export const QueryGroupAggregateSummary = ({ query }: { query: any }) => {
2840
if (!query) {
29-
return <EuiText size="s">No query data available.</EuiText>;
41+
return (
42+
<EuiTitle size="s">
43+
<h2>No query data available.</h2>
44+
</EuiTitle>
45+
);
3046
}
3147
const { measurements, id: id, group_by: groupBy } = query;
3248
const queryCount =
3349
measurements.latency?.count || measurements.cpu?.count || measurements.memory?.count || 1;
3450
return (
3551
<EuiPanel>
36-
<EuiText size="xs">
52+
<EuiTitle size="s">
3753
<h2>
3854
Aggregate summary for {queryCount} {queryCount === 1 ? 'query' : 'queries'}
3955
</h2>
40-
</EuiText>
41-
<EuiHorizontalRule margin="m" />
56+
</EuiTitle>
57+
<EuiHorizontalRule margin="xs" />
4258
<EuiFlexGrid columns={4}>
4359
<PanelItem label={ID} value={id} />
4460
<PanelItem

public/pages/QueryGroupDetails/Components/QueryGroupSampleQuerySummary.tsx

+25-9
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,14 @@
44
*/
55

66
import React from 'react';
7-
import { EuiFlexGrid, EuiFlexItem, EuiHorizontalRule, EuiPanel, EuiText } from '@elastic/eui';
7+
import {
8+
EuiFlexGrid,
9+
EuiFlexItem,
10+
EuiHorizontalRule,
11+
EuiPanel,
12+
EuiTitle,
13+
EuiDescriptionList,
14+
} from '@elastic/eui';
815
import {
916
INDICES,
1017
NODE_ID,
@@ -15,16 +22,25 @@ import {
1522

1623
const PanelItem = ({ label, value }: { label: string; value: string | number }) => (
1724
<EuiFlexItem>
18-
<EuiText size="xs">
19-
<h4>{label}</h4>
20-
</EuiText>
21-
<EuiText size="xs">{value}</EuiText>
25+
<EuiDescriptionList
26+
compressed={true}
27+
listItems={[
28+
{
29+
title: <h4>{label}</h4>,
30+
description: value,
31+
},
32+
]}
33+
/>
2234
</EuiFlexItem>
2335
);
2436

2537
export const QueryGroupSampleQuerySummary = ({ query }: { query: any }) => {
2638
if (!query) {
27-
return <EuiText size="s">No query data available.</EuiText>;
39+
return (
40+
<EuiTitle size="s">
41+
<h2>No query data available.</h2>
42+
</EuiTitle>
43+
);
2844
}
2945
const convertTime = (unixTime: number) => {
3046
const date = new Date(unixTime);
@@ -41,10 +57,10 @@ export const QueryGroupSampleQuerySummary = ({ query }: { query: any }) => {
4157
} = query;
4258
return (
4359
<EuiPanel>
44-
<EuiText size="xs">
60+
<EuiTitle size="s">
4561
<h2>Sample query summary</h2>
46-
</EuiText>
47-
<EuiHorizontalRule margin="m" />
62+
</EuiTitle>
63+
<EuiHorizontalRule margin="xs" />
4864
<EuiFlexGrid columns={4}>
4965
<PanelItem label={TIMESTAMP} value={convertTime(timestamp)} />
5066
<PanelItem label={INDICES} value={indices.toString()} />

public/pages/QueryGroupDetails/QueryGroupDetails.tsx

+6-6
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import {
1818
EuiHorizontalRule,
1919
EuiPanel,
2020
EuiSpacer,
21-
EuiText,
2221
EuiTitle,
2322
EuiIconTip,
2423
} from '@elastic/eui';
@@ -193,12 +192,13 @@ export const QueryGroupDetails = ({
193192
<EuiPanel>
194193
<EuiFlexGroup alignItems="center" justifyContent="spaceBetween">
195194
<EuiFlexItem>
196-
<EuiText size="xs">
195+
<EuiTitle size="xs">
197196
<h2>Query</h2>
198-
</EuiText>
197+
</EuiTitle>
199198
</EuiFlexItem>
200199
<EuiFlexItem grow={false}>
201200
<EuiButton
201+
size="s"
202202
iconSide="right"
203203
iconType="popout"
204204
target="_blank"
@@ -223,10 +223,10 @@ export const QueryGroupDetails = ({
223223
</EuiFlexItem>
224224
<EuiFlexItem grow={1} style={{ alignSelf: 'start' }}>
225225
<EuiPanel>
226-
<EuiText size="xs">
226+
<EuiTitle size="s">
227227
<h2>Latency</h2>
228-
</EuiText>
229-
<EuiHorizontalRule margin="m" />
228+
</EuiTitle>
229+
<EuiHorizontalRule margin="xs" />
230230
<div id="latency" />
231231
</EuiPanel>
232232
</EuiFlexItem>

0 commit comments

Comments
 (0)