@@ -2,14 +2,17 @@ import defaults from 'lodash/defaults';
22
33import {
44 AnnotationEvent ,
5- AnnotationQueryRequest ,
65 DataQueryRequest ,
76 DataQueryResponse ,
87 DataSourceApi ,
98 MetricFindValue ,
109 DataSourceInstanceSettings ,
1110 ScopedVars ,
1211 TimeRange ,
12+ dateTime ,
13+ MutableDataFrame ,
14+ FieldType ,
15+ DataFrame ,
1316} from '@grafana/data' ;
1417
1518import {
@@ -20,10 +23,8 @@ import {
2023 MultiValueVariable ,
2124 TextValuePair ,
2225} from './types' ;
23- import { dateTime , MutableDataFrame , FieldType , DataFrame } from '@grafana/data' ;
2426import { getTemplateSrv } from '@grafana/runtime' ;
2527import _ from 'lodash' ;
26- import { isEqual } from 'lodash' ;
2728import { flatten , isRFC3339_ISO6801 } from './util' ;
2829
2930const supportedVariableTypes = [ 'constant' , 'custom' , 'query' , 'textbox' ] ;
@@ -222,7 +223,7 @@ export class DataSource extends DataSourceApi<MyQuery, MyDataSourceOptions> {
222223 return { data : dataFrameArray } ;
223224 } ) ;
224225 }
225- annotationQuery ( options : AnnotationQueryRequest < MyQuery > ) : Promise < AnnotationEvent [ ] > {
226+ annotationQuery ( options : any ) : Promise < AnnotationEvent [ ] > {
226227 const query = defaults ( options . annotation , defaultQuery ) ;
227228 return Promise . all ( [ this . createQuery ( query , options . range ) ] ) . then ( ( results : any ) => {
228229 const r : AnnotationEvent [ ] = [ ] ;
@@ -337,7 +338,7 @@ export class DataSource extends DataSourceApi<MyQuery, MyDataSourceOptions> {
337338 const supportedVariable = variable as MultiValueVariable ;
338339
339340 let variableValue = supportedVariable . current . value ;
340- if ( variableValue === '$__all' || isEqual ( variableValue , [ '$__all' ] ) ) {
341+ if ( variableValue === '$__all' || _ . isEqual ( variableValue , [ '$__all' ] ) ) {
341342 if ( supportedVariable . allValue === null || supportedVariable . allValue === '' ) {
342343 variableValue = supportedVariable . options . slice ( 1 ) . map ( ( textValuePair ) => textValuePair . value ) ;
343344 } else {
0 commit comments