Skip to content

Commit 6b09c85

Browse files
authored
Merge pull request #12 from grafana/ismail/remove-timesrv-imports
Remove timeSrv imports
2 parents dec5548 + b480bc3 commit 6b09c85

17 files changed

+434
-323
lines changed

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,12 @@
8989
"dependencies": {
9090
"@emotion/css": "11.11.2",
9191
"@grafana/aws-sdk": "0.1.3",
92-
"@grafana/data": "10.1.4",
92+
"@grafana/data": "10.2.0-nightly.150d4d68",
9393
"@grafana/experimental": "1.7.3",
9494
"@grafana/faro-web-sdk": "1.2.1",
95-
"@grafana/runtime": "10.1.4",
96-
"@grafana/schema": "10.1.4",
97-
"@grafana/ui": "10.1.4",
95+
"@grafana/runtime": "10.2.0-nightly.150d4d68",
96+
"@grafana/schema": "10.2.0-nightly.150d4d68",
97+
"@grafana/ui": "10.2.0-nightly.150d4d68",
9898
"@leeoniya/ufuzzy": "1.0.8",
9999
"@lezer/common": "1.1.0",
100100
"@lezer/highlight": "1.1.3",

src/components/PromQueryField.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,11 @@ class PromQueryField extends React.PureComponent<PromQueryFieldProps, PromQueryF
173173

174174
refreshMetrics = async () => {
175175
const {
176+
range,
176177
datasource: { languageProvider },
177178
} = this.props;
178179

179-
this.languageProviderInitializationPromise = makePromiseCancelable(languageProvider.start());
180+
this.languageProviderInitializationPromise = makePromiseCancelable(languageProvider.start(range));
180181

181182
try {
182183
const remainingTasks = await this.languageProviderInitializationPromise.promise;

src/components/VariableQueryEditor.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
import { QueryEditorProps, SelectableValue } from '@grafana/data';
32
import { InlineField, InlineFieldRow, Input, Select, TextArea } from '@grafana/ui';
43
import React, { FormEvent, useCallback, useEffect, useState } from 'react';
@@ -80,7 +79,7 @@ export const PromVariableQueryEditor = ({ onChange, query, datasource }: Props)
8079
const variables = datasource.getVariables().map((variable: string) => ({ label: variable, value: variable }));
8180
if (!metric) {
8281
// get all the labels
83-
datasource.getTagKeys().then((labelNames: Array<{ text: string }>) => {
82+
datasource.getTagKeys({ filters: [] }).then((labelNames: Array<{ text: string }>) => {
8483
const names = labelNames.map(({ text }) => ({ label: text, value: text }));
8584
setLabelOptions([...variables, ...names]);
8685
});

0 commit comments

Comments
 (0)