IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Reversed history direction for explore

Browse Source 
- _.reverse() was modifying state.history
This commit is contained in:
David Kaltschmidt 2018-08-03 11:40:44 +02:00
parent eaff7b0f68
commit cda3b01781
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/containers/Explore/Explore.tsx
View File

@ -289,10 +289,10 @@ export class Explore extends React.Component<any, IExploreState> {
const ts = Date.now();
queries.forEach(q => {
const { query } = q;
history = [...history, { query, ts }];
history = [{ query, ts }, ...history];
});
if (history.length > MAX_HISTORY_ITEMS) {
history = history.slice(history.length - MAX_HISTORY_ITEMS);
history = history.slice(0, MAX_HISTORY_ITEMS);
}
// Combine all queries of a datasource type into one history
const historyKey = `grafana.explore.history.${datasourceId}`;

5
public/app/containers/Explore/PromQueryField.tsx
View File

@ -35,7 +35,7 @@ export function addHistoryMetadata(item: Suggestion, history: any[]): Suggestion
const cutoffTs = Date.now() - HISTORY_COUNT_CUTOFF;
const historyForItem = history.filter(h => h.ts > cutoffTs && h.query === item.label);
const count = historyForItem.length;
const recent = historyForItem.pop();
const recent = historyForItem[0];
let hint = `Queried ${count} times in the last 24h.`;
if (recent) {
const lastQueried = moment(recent.ts).fromNow();
@ -189,11 +189,10 @@ class PromQueryField extends React.Component<PromQueryFieldProps, PromQueryField
if (history && history.length > 0) {
const historyItems = _.chain(history)
.uniqBy('query')
.takeRight(HISTORY_ITEM_COUNT)
.take(HISTORY_ITEM_COUNT)
.map(h => h.query)
.map(wrapLabel)
.map(item => addHistoryMetadata(item, history))
.reverse()
.value();
suggestions.push({