Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
17184257
Unverified
Commit
17184257
authored
Mar 13, 2019
by
Steven Sheehy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
explore/logs: Hide empty duplicates column
Signed-off-by: Steven Sheehy <ssheehy@firescope.com>
parent
304912f9
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
16 deletions
+5
-16
public/app/features/explore/Logs.tsx
+4
-15
public/sass/components/_panel_logs.scss
+1
-1
No files found.
public/app/features/explore/Logs.tsx
View file @
17184257
...
...
@@ -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
...
...
public/sass/components/_panel_logs.scss
View file @
17184257
...
...
@@ -173,7 +173,7 @@ $column-horizontal-spacing: 10px;
.logs-row__duplicates
{
text-align
:
right
;
width
:
4
.5
em
;
width
:
4em
;
}
.logs-row__field-highlight
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment