From 3ae276934360aec859aa240d54378f52f43d54de Mon Sep 17 00:00:00 2001 From: Matias Chomicki Date: Wed, 5 Oct 2022 17:12:10 +0200 Subject: [PATCH] fix(loki-completions): remove rate_interval Not supported --- .../completions.test.ts | 11 +++++++++- .../monaco-completion-provider/completions.ts | 22 ++++++------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/completions.test.ts b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/completions.test.ts index d86eac0c527..6fcb67ff375 100644 --- a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/completions.test.ts +++ b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/completions.test.ts @@ -160,7 +160,16 @@ describe('getCompletions', () => { const situation: Situation = { type: 'IN_DURATION' }; const completions = await getCompletions(situation, completionProvider); - expect(completions).toHaveLength(9); + expect(completions).toEqual([ + { insertText: '$__interval', label: '$__interval', type: 'DURATION' }, + { insertText: '$__range', label: '$__range', type: 'DURATION' }, + { insertText: '1m', label: '1m', type: 'DURATION' }, + { insertText: '5m', label: '5m', type: 'DURATION' }, + { insertText: '10m', label: '10m', type: 'DURATION' }, + { insertText: '30m', label: '30m', type: 'DURATION' }, + { insertText: '1h', label: '1h', type: 'DURATION' }, + { insertText: '1d', label: '1d', type: 'DURATION' }, + ]); }); test('Returns completion options when the situation is IN_GROUPING', async () => { diff --git a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/completions.ts b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/completions.ts index b94d66c29cd..098c02c1c04 100644 --- a/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/completions.ts +++ b/public/app/plugins/datasource/loki/components/monaco-query-field/monaco-completion-provider/completions.ts @@ -55,21 +55,13 @@ const FUNCTION_COMPLETIONS: Completion[] = RANGE_VEC_FUNCTIONS.map((f) => ({ documentation: f.documentation, })); -const DURATION_COMPLETIONS: Completion[] = [ - '$__interval', - '$__range', - '$__rate_interval', - '1m', - '5m', - '10m', - '30m', - '1h', - '1d', -].map((text) => ({ - type: 'DURATION', - label: text, - insertText: text, -})); +const DURATION_COMPLETIONS: Completion[] = ['$__interval', '$__range', '1m', '5m', '10m', '30m', '1h', '1d'].map( + (text) => ({ + type: 'DURATION', + label: text, + insertText: text, + }) +); const LINE_FILTER_COMPLETIONS: Completion[] = ['|=', '!=', '|~', '!~'].map((item) => ({ type: 'LINE_FILTER',