mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-02-21 03:16:00 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #8719 from Nexucis/feature/cm-promql-v0.15

Browse source 
Bump cm-promql to v0.15.0
This commit is contained in:
Julien Pivotto 2021-04-15 01:21:49 +02:00 committed by GitHub
parent ea6f6bba74 bfc022fdf4
commit 39d79c3cfb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
web/ui/react-app/package.json
View file

@ -20,7 +20,7 @@
"@fortawesome/react-fontawesome": "^0.1.4", "@fortawesome/react-fontawesome": "^0.1.4",
"@reach/router": "^1.2.1", "@reach/router": "^1.2.1",
"bootstrap": "^4.2.1", "bootstrap": "^4.2.1",
"codemirror-promql": "^0.14.1", "codemirror-promql": "^0.15.0",
"css.escape": "^1.5.1", "css.escape": "^1.5.1",
"downshift": "^3.4.8", "downshift": "^3.4.8",
"enzyme-to-json": "^3.4.3", "enzyme-to-json": "^3.4.3",

2
web/ui/react-app/src/pages/graph/CMExpressionInput.test.tsx
View file

@ -1,7 +1,7 @@
import * as React from 'react'; import * as React from 'react';
import { mount, ReactWrapper } from 'enzyme'; import { mount, ReactWrapper } from 'enzyme';
import CMExpressionInput from './CMExpressionInput'; import CMExpressionInput from './CMExpressionInput';
import { Button, InputGroup, InputGroupAddon, Input } from 'reactstrap'; import { Button, InputGroup, InputGroupAddon } from 'reactstrap';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { faSearch, faSpinner } from '@fortawesome/free-solid-svg-icons'; import { faSearch, faSpinner } from '@fortawesome/free-solid-svg-icons';

6
web/ui/react-app/src/pages/graph/CMExpressionInput.tsx
View file

@ -11,15 +11,15 @@ import { closeBrackets, closeBracketsKeymap } from '@codemirror/closebrackets';
import { searchKeymap, highlightSelectionMatches } from '@codemirror/search'; import { searchKeymap, highlightSelectionMatches } from '@codemirror/search';
import { commentKeymap } from '@codemirror/comment'; import { commentKeymap } from '@codemirror/comment';
import { lintKeymap } from '@codemirror/lint'; import { lintKeymap } from '@codemirror/lint';
import { PromQLExtension } from 'codemirror-promql'; import { PromQLExtension, CompleteStrategy } from 'codemirror-promql';
import { autocompletion, completionKeymap, CompletionContext, CompletionResult } from '@codemirror/autocomplete'; import { autocompletion, completionKeymap, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
import { theme, promqlHighlighter } from './CMTheme'; import { theme, promqlHighlighter } from './CMTheme';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import { faSearch, faSpinner, faGlobeEurope } from '@fortawesome/free-solid-svg-icons'; import { faSearch, faSpinner, faGlobeEurope } from '@fortawesome/free-solid-svg-icons';
import MetricsExplorer from './MetricsExplorer'; import MetricsExplorer from './MetricsExplorer';
import { CompleteStrategy, newCompleteStrategy } from 'codemirror-promql/complete';
import { usePathPrefix } from '../../contexts/PathPrefixContext'; import { usePathPrefix } from '../../contexts/PathPrefixContext';
import { newCompleteStrategy } from 'codemirror-promql/cjs/complete';
const promqlExtension = new PromQLExtension(); const promqlExtension = new PromQLExtension();
@ -102,7 +102,7 @@ const CMExpressionInput: FC<CMExpressionInputProps> = ({
.setComplete({ .setComplete({
completeStrategy: new HistoryCompleteStrategy( completeStrategy: new HistoryCompleteStrategy(
newCompleteStrategy({ newCompleteStrategy({
remote: { url: pathPrefix }, remote: { url: pathPrefix, cache: { initialMetricList: metricNames } },
}), }),
queryHistory queryHistory
), ),

8
web/ui/react-app/yarn.lock
View file

@ -3418,10 +3418,10 @@ coa@^2.0.2:
chalk "^2.4.1" chalk "^2.4.1"
q "^1.1.2" q "^1.1.2"
codemirror-promql@^0.14.1: codemirror-promql@^0.15.0:
version "0.14.1" version "0.15.0"
resolved "https://registry.yarnpkg.com/codemirror-promql/-/codemirror-promql-0.14.1.tgz#ea927f347effd7f28e4c1f87dcd8898d1681ea40" resolved "https://registry.yarnpkg.com/codemirror-promql/-/codemirror-promql-0.15.0.tgz#dd6365ea5c2d18421d225cef12b74e64d8cab280"
integrity sha512-zAdvVrvehVToPBlwySVlTXCY3hzOMPgO1B0m7O6PBY5BUOYbNIDk+DSjrc7glUTwySUwkyWt/x7kDabGv4tXNg== integrity sha512-u5f6Narj8Kx79AHMPlr8vogGUhinZfsZVT00R7wStquDA3kRTvxfEBYK77UtWNNJshxC1B3EZnHzXN2K9RzVXw==
dependencies: dependencies:
lezer-promql "^0.18.0" lezer-promql "^0.18.0"
lru-cache "^6.0.0" lru-cache "^6.0.0"