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
2ff62c42
Commit
2ff62c42
authored
Jan 28, 2019
by
Dominik Prokop
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Prevents query result cleaning when new query trransaction starts
parent
c7e50a79
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
9 deletions
+9
-9
public/app/features/explore/Logs.tsx
+6
-1
public/app/features/explore/LogsContainer.tsx
+2
-1
public/app/features/explore/state/reducers.ts
+1
-7
No files found.
public/app/features/explore/Logs.tsx
View file @
2ff62c42
...
...
@@ -49,7 +49,7 @@ function renderMetaItem(value: any, kind: LogsMetaKind) {
}
interface
Props
{
data
:
LogsModel
;
data
?
:
LogsModel
;
exploreId
:
string
;
highlighterExpressions
:
string
[];
loading
:
boolean
;
...
...
@@ -165,6 +165,11 @@ export default class Logs extends PureComponent<Props, State> {
scanning
,
scanRange
,
}
=
this
.
props
;
if
(
!
data
)
{
return
null
;
}
const
{
dedup
,
deferLogs
,
hiddenLogLevels
,
renderAll
,
showLocalTime
,
showUtc
}
=
this
.
state
;
let
{
showLabels
}
=
this
.
state
;
const
hasData
=
data
&&
data
.
rows
&&
data
.
rows
.
length
>
0
;
...
...
public/app/features/explore/LogsContainer.tsx
View file @
2ff62c42
...
...
@@ -47,12 +47,13 @@ export class LogsContainer extends PureComponent<LogsContainerProps> {
scanning
,
scanRange
,
}
=
this
.
props
;
return
(
<
Panel
label=
"Logs"
loading=
{
loading
}
isOpen=
{
showingLogs
}
onToggle=
{
this
.
onClickLogsButton
}
>
<
Logs
data=
{
logsResult
}
exploreId=
{
exploreId
}
key=
{
logsResult
.
id
}
key=
{
logsResult
&&
logsResult
.
id
}
highlighterExpressions=
{
logsHighlighterExpressions
}
loading=
{
loading
}
onChangeTime=
{
onChangeTime
}
...
...
public/app/features/explore/state/reducers.ts
View file @
2ff62c42
...
...
@@ -278,7 +278,7 @@ export const itemReducer = (state, action: Action): ExploreItemState => {
}
case
ActionTypes
.
QueryTransactionStart
:
{
const
{
datasourceInstance
,
queryIntervals
,
queryTransactions
}
=
state
;
const
{
queryTransactions
}
=
state
;
const
{
resultType
,
rowIndex
,
transaction
}
=
action
.
payload
;
// Discarding existing transactions of same type
const
remainingTransactions
=
queryTransactions
.
filter
(
...
...
@@ -288,15 +288,9 @@ export const itemReducer = (state, action: Action): ExploreItemState => {
// Append new transaction
const
nextQueryTransactions
:
QueryTransaction
[]
=
[...
remainingTransactions
,
transaction
];
const
results
=
calculateResultsFromQueryTransactions
(
nextQueryTransactions
,
datasourceInstance
,
queryIntervals
.
intervalMs
);
return
{
...
state
,
...
results
,
queryTransactions
:
nextQueryTransactions
,
showingStartPage
:
false
,
};
...
...
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