Skip to content

N
nexpie-grafana-theme
Commit 71df1573 by Ivana Huckova Committed by GitHub
Options

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

parent e503188b
Showing with 18 additions and 16 deletions
packages/grafana-ui/src/components/Logs/LogDetails.tsx
...@@ -112,20 +112,22 @@ class UnThemedLogDetails extends PureComponent<Props> { ...@@ -112,20 +112,22 @@ class UnThemedLogDetails extends PureComponent<Props> {
</td> </td>
</tr> </tr>
)} )}
{Object.keys(labels).map(key => { {Object.keys(labels)
const value = labels[key]; .sort()
return ( .map(key => {
<LogDetailsRow const value = labels[key];
key={`${key}=${value}`} return (
parsedKey={key} <LogDetailsRow
parsedValue={value} key={`${key}=${value}`}
isLabel={true} parsedKey={key}
getStats={() => calculateLogsLabelStats(getRows(), key)} parsedValue={value}
onClickFilterOutLabel={onClickFilterOutLabel} isLabel={true}
onClickFilterLabel={onClickFilterLabel} getStats={() => calculateLogsLabelStats(getRows(), key)}
/> onClickFilterOutLabel={onClickFilterOutLabel}
); onClickFilterLabel={onClickFilterLabel}
})} />
);
})}
{parsedFieldsAvailable && ( {parsedFieldsAvailable && (
<tr> <tr>
...@@ -134,7 +136,7 @@ class UnThemedLogDetails extends PureComponent<Props> { ...@@ -134,7 +136,7 @@ class UnThemedLogDetails extends PureComponent<Props> {
</td> </td>
</tr> </tr>
)} )}
{fields.map(field => { {fields.sort().map(field => {
const { key, value, links, fieldIndex } = field; const { key, value, links, fieldIndex } = field;
return ( return (
<LogDetailsRow <LogDetailsRow
......
packages/grafana-ui/src/components/Logs/LogLabels.tsx
...@@ -57,7 +57,7 @@ export const UnThemedLogLabels: FunctionComponent<Props> = ({ labels, theme }) = ...@@ -57,7 +57,7 @@ export const UnThemedLogLabels: FunctionComponent<Props> = ({ labels, theme }) =
return ( return (
<span className={cx([styles.logsLabels])}> <span className={cx([styles.logsLabels])}>
{displayLabels.map(label => { {displayLabels.sort().map(label => {
const value = labels[label]; const value = labels[label];
const tooltip = `${label}: ${value}`; const tooltip = `${label}: ${value}`;
return ( return (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment