IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-23 01:16:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

explore/logs: Hide empty duplicates column

Browse Source 
Signed-off-by: Steven Sheehy <ssheehy@firescope.com>
This commit is contained in:
Steven Sheehy 2019-03-13 11:10:09 -05:00
parent 304912f9b4
commit 17184257af
No known key found for this signature in database
GPG Key ID: 14CCAB401CBE86B7
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
public/app/features/explore/Logs.tsx
View File

@ -64,7 +64,7 @@ interface Props {
interface State {
deferLogs: boolean;
renderAll: boolean;
showLabels: boolean | null; // Tristate: null means auto
showLabels: boolean;
showLocalTime: boolean;
showUtc: boolean;
}
@ -76,7 +76,7 @@ export default class Logs extends PureComponent<Props, State> {
state = {
deferLogs: true,
renderAll: false,
showLabels: null,
showLabels: false,
showLocalTime: true,
showUtc: false,
};
@ -166,12 +166,11 @@ export default class Logs extends PureComponent<Props, State> {
return null;
}
const { deferLogs, renderAll, showLocalTime, showUtc } = this.state;
let { showLabels } = this.state;
const { deferLogs, renderAll, showLabels, showLocalTime, showUtc } = this.state;
const { dedupStrategy } = this.props;
const hasData = data && data.rows && data.rows.length > 0;
const showDuplicates = dedupStrategy !== LogsDedupStrategy.none;
const dedupCount = dedupedData.rows.reduce((sum, row) => sum + row.duplicates, 0);
const showDuplicates = dedupStrategy !== LogsDedupStrategy.none && dedupCount > 0;
const meta = [...data.meta];
if (dedupStrategy !== LogsDedupStrategy.none) {
@ -186,16 +185,6 @@ export default class Logs extends PureComponent<Props, State> {
const processedRows = dedupedData.rows;
const firstRows = processedRows.slice(0, PREVIEW_LIMIT);
const lastRows = processedRows.slice(PREVIEW_LIMIT);
// Check for labels
if (showLabels === null) {
if (hasData) {
showLabels = data.rows.some(row => _.size(row.uniqueLabels) > 0);
} else {
showLabels = true;
}
}
const scanText = scanRange ? `Scanning ${rangeUtil.describeTimeRange(scanRange)}` : 'Scanning...';
// React profiler becomes unusable if we pass all rows to all rows and their labels, using getter instead

2
public/sass/components/_panel_logs.scss
View File

@ -173,7 +173,7 @@ $column-horizontal-spacing: 10px;
.logs-row__duplicates {
text-align: right;
width: 4.5em;
width: 4em;
}
.logs-row__field-highlight {