diff --git a/public/app/containers/Explore/Explore.tsx b/public/app/containers/Explore/Explore.tsx index e4de96dbdf2..31fd082c94c 100644 --- a/public/app/containers/Explore/Explore.tsx +++ b/public/app/containers/Explore/Explore.tsx @@ -289,10 +289,10 @@ export class Explore extends React.Component { 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}`; diff --git a/public/app/containers/Explore/PromQueryField.tsx b/public/app/containers/Explore/PromQueryField.tsx index 274f604a7fb..a527589e7b2 100644 --- a/public/app/containers/Explore/PromQueryField.tsx +++ b/public/app/containers/Explore/PromQueryField.tsx @@ -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 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({