IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-24 09:50:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

feat(loki-query-autocomplete): suggest unique history items (#60262)

Browse Source
This commit is contained in:
Matias Chomicki 2022-12-14 13:43:06 +01:00 committed by GitHub
parent 9a41277ecd
commit 2c1b65021d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/CompletionDataProvider.test.ts
View File

@ -23,6 +23,13 @@ const history = [
expr: '{unit: test}', expr: '{unit: test}',
}, },
}, },
{
ts: 87654321,
query: {
refId: 'test-1',
expr: '{unit: test}',
},
},
{ {
ts: 0, ts: 0,
query: { query: {

17
public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/CompletionDataProvider.ts
View File

@ -1,3 +1,5 @@
import { chain } from 'lodash';
import { HistoryItem } from '@grafana/data'; import { HistoryItem } from '@grafana/data';
import { escapeLabelValueInExactSelector } from 'app/plugins/datasource/prometheus/language_utils'; import { escapeLabelValueInExactSelector } from 'app/plugins/datasource/prometheus/language_utils';
@ -7,7 +9,10 @@ import { LokiQuery } from '../../../types';
import { Label } from './situation'; import { Label } from './situation';
export class CompletionDataProvider { export class CompletionDataProvider {
constructor(private languageProvider: LanguageProvider, private history: Array<HistoryItem<LokiQuery>> = []) {} private history: string[] = [];
constructor(private languageProvider: LanguageProvider, history: Array<HistoryItem<LokiQuery>> = []) {
this.setHistory(history);
}
private buildSelector(labels: Label[]): string { private buildSelector(labels: Label[]): string {
const allLabelTexts = labels.map( const allLabelTexts = labels.map(
@ -17,8 +22,16 @@ export class CompletionDataProvider {
return `{${allLabelTexts.join(',')}}`; return `{${allLabelTexts.join(',')}}`;
} }
setHistory(history: Array<HistoryItem<LokiQuery>> = []) {
this.history = chain(history)
.map((history: HistoryItem<LokiQuery>) => history.query.expr)
.filter()
.uniq()
.value();
}
getHistory() { getHistory() {
return this.history.map((entry) => entry.query.expr).filter((expr) => expr !== undefined); return this.history;
} }
async getLabelNames(otherLabels: Label[] = []) { async getLabelNames(otherLabels: Label[] = []) {

2
public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/completions.test.ts
View File

@ -197,7 +197,7 @@ describe('getCompletions', () => {
const situation = { type } as Situation; const situation = { type } as Situation;
const completions = await getCompletions(situation, completionProvider); const completions = await getCompletions(situation, completionProvider);
expect(completions).toHaveLength(25); expect(completions).toHaveLength(24);
}); });
test('Returns completion options when the situation is IN_DURATION', async () => { test('Returns completion options when the situation is IN_DURATION', async () => {