IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-01-07 22:53:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

sort alphabetically unique labels, labels and parsed fields (#29030)

Browse Source
This commit is contained in:
Ivana Huckova 2020-11-13 14:17:00 +01:00 committed by GitHub
parent e503188b6f
commit 71df15738f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
packages/grafana-ui/src/components/Logs/LogDetails.tsx
View File

@ -112,20 +112,22 @@ class UnThemedLogDetails extends PureComponent<Props> {
</td>
</tr>
)}
{Object.keys(labels).map(key => {
const value = labels[key];
return (
<LogDetailsRow
key={`${key}=${value}`}
parsedKey={key}
parsedValue={value}
isLabel={true}
getStats={() => calculateLogsLabelStats(getRows(), key)}
onClickFilterOutLabel={onClickFilterOutLabel}
onClickFilterLabel={onClickFilterLabel}
/>
);
})}
{Object.keys(labels)
.sort()
.map(key => {
const value = labels[key];
return (
<LogDetailsRow
key={`${key}=${value}`}
parsedKey={key}
parsedValue={value}
isLabel={true}
getStats={() => calculateLogsLabelStats(getRows(), key)}
onClickFilterOutLabel={onClickFilterOutLabel}
onClickFilterLabel={onClickFilterLabel}
/>
);
})}
{parsedFieldsAvailable && (
<tr>
@ -134,7 +136,7 @@ class UnThemedLogDetails extends PureComponent<Props> {
</td>
</tr>
)}
{fields.map(field => {
{fields.sort().map(field => {
const { key, value, links, fieldIndex } = field;
return (
<LogDetailsRow

2
packages/grafana-ui/src/components/Logs/LogLabels.tsx
View File

@ -57,7 +57,7 @@ export const UnThemedLogLabels: FunctionComponent<Props> = ({ labels, theme }) =
return (
<span className={cx([styles.logsLabels])}>
{displayLabels.map(label => {
{displayLabels.sort().map(label => {
const value = labels[label];
const tooltip = `${label}: ${value}`;
return (