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

feat(loki-monaco-editor): fix imports

Browse Source
This commit is contained in:
Matias Chomicki 2022-09-16 15:36:38 +02:00
parent 3f76b123eb
commit e9fe90ed96
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
public/app/plugins/datasource/loki/components/monaco-query-field/MonacoQueryField.tsx
View File

@ -1,13 +1,15 @@
import React, { useRef, useEffect } from 'react';
import { useTheme2, ReactMonacoEditor, Monaco, monacoTypes } from '@grafana/ui';
import { GrafanaTheme2 } from '@grafana/data';
import { css } from '@emotion/css'; import { css } from '@emotion/css';
import { languageConfiguration, monarchlanguage } from '@grafana/monaco-logql'; import React, { useRef, useEffect } from 'react';
import { useLatest } from 'react-use'; import { useLatest } from 'react-use';
import { GrafanaTheme2 } from '@grafana/data';
import { selectors } from '@grafana/e2e-selectors'; import { selectors } from '@grafana/e2e-selectors';
import { getCompletionProvider, getSuggestOptions } from './monaco-completion-provider'; import { languageConfiguration, monarchlanguage } from '@grafana/monaco-logql';
import { useTheme2, ReactMonacoEditor, Monaco, monacoTypes } from '@grafana/ui';
import { Props } from './MonacoQueryFieldProps'; import { Props } from './MonacoQueryFieldProps';
import { getOverrideServices } from './getOverrideServices'; import { getOverrideServices } from './getOverrideServices';
import { getCompletionProvider, getSuggestOptions } from './monaco-completion-provider';
const options: monacoTypes.editor.IStandaloneEditorConstructionOptions = { const options: monacoTypes.editor.IStandaloneEditorConstructionOptions = {
codeLens: false, codeLens: false,
@ -80,7 +82,7 @@ const MonacoQueryField = (props: Props) => {
const containerRef = useRef<HTMLDivElement>(null); const containerRef = useRef<HTMLDivElement>(null);
const { languageProvider, history, onBlur, onRunQuery, initialValue } = props; const { languageProvider, history, onBlur, onRunQuery, initialValue } = props;
const lpRef = useLatest(languageProvider); const langProviderRef = useLatest(languageProvider);
const historyRef = useLatest(history); const historyRef = useLatest(history);
const onRunQueryRef = useLatest(onRunQuery); const onRunQueryRef = useLatest(onRunQuery);
const onBlurRef = useLatest(onBlur); const onBlurRef = useLatest(onBlur);
@ -120,16 +122,16 @@ const MonacoQueryField = (props: Props) => {
// we construct a DataProvider object // we construct a DataProvider object
const getSeriesLabels = (selector: string) => const getSeriesLabels = (selector: string) =>
lpRef.current.getSeriesLabels(selector).then((data) => data ?? {}); langProviderRef.current.getSeriesLabels(selector).then((data) => data ?? {});
const getHistory = () => const getHistory = () =>
Promise.resolve(historyRef.current.map((h) => h.query.expr).filter((expr) => expr !== undefined)); Promise.resolve(historyRef.current.map((h) => h.query.expr).filter((expr) => expr !== undefined));
const getAllLabelNames = () => Promise.resolve(lpRef.current.getLabelKeys()); const getAllLabelNames = () => Promise.resolve(langProviderRef.current.getLabelKeys());
const getLabelValues = (labelName: string) => lpRef.current.getLabelValues(labelName); const getLabelValues = (labelName: string) => langProviderRef.current.getLabelValues(labelName);
const getLogInfo = (selector: string) => lpRef.current.getLogInfo(selector); const getLogInfo = (selector: string) => langProviderRef.current.getLogInfo(selector);
const dataProvider = { getSeriesLabels, getHistory, getAllLabelNames, getLabelValues, getLogInfo }; const dataProvider = { getSeriesLabels, getHistory, getAllLabelNames, getLabelValues, getLogInfo };
const completionProvider = getCompletionProvider(monaco, dataProvider); const completionProvider = getCompletionProvider(monaco, dataProvider);

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

@ -1,5 +1,7 @@
import { parser } from '@grafana/lezer-logql';
import type { Tree, SyntaxNode } from '@lezer/common'; import type { Tree, SyntaxNode } from '@lezer/common';
import { parser } from '@grafana/lezer-logql';
import { NeverCaseError } from './util'; import { NeverCaseError } from './util';
type Direction = 'parent' | 'firstChild' | 'lastChild' | 'nextSibling'; type Direction = 'parent' | 'firstChild' | 'lastChild' | 'nextSibling';
@ -553,7 +555,8 @@ export function getSituation(text: string, pos: number): Situation | null {
// so first we check if there is an error-node at the cursor-position // so first we check if there is an error-node at the cursor-position
const maybeErrorNode = getErrorNode(tree, text, pos); const maybeErrorNode = getErrorNode(tree, text, pos);
const cur = maybeErrorNode != null ? maybeErrorNode.cursor : tree.cursor(pos); const cur = maybeErrorNode != null ? maybeErrorNode.cursor() : tree.cursor(pos);
const currentNode = cur.node; const currentNode = cur.node;
const names = [cur.name]; const names = [cur.name];