@@ -35,7 +35,7 @@ export class DataSource extends DataSourceWithBackend<HaystackQuery, HaystackDat
3535 constructor ( instanceSettings : DataSourceInstanceSettings < HaystackDataSourceOptions > ) {
3636 super ( instanceSettings ) ;
3737 this . variables = new HaystackVariableSupport ( ( request ) => {
38- return this . query ( request )
38+ return this . query ( request ) ;
3939 } ) ;
4040 }
4141
@@ -116,7 +116,12 @@ export class DataSource extends DataSourceWithBackend<HaystackQuery, HaystackDat
116116 }
117117}
118118
119- export class HaystackVariableSupport extends CustomVariableSupport < DataSource , HaystackVariableQuery , HaystackQuery , HaystackDataSourceOptions > {
119+ export class HaystackVariableSupport extends CustomVariableSupport <
120+ DataSource ,
121+ HaystackVariableQuery ,
122+ HaystackQuery ,
123+ HaystackDataSourceOptions
124+ > {
120125 editor : ComponentType < QueryEditorProps < DataSource , HaystackQuery , HaystackDataSourceOptions , HaystackVariableQuery > > ;
121126
122127 // Requests data from the backend. This allows this class to reuse the DataSource.query method to get data.
@@ -136,7 +141,7 @@ export class HaystackVariableSupport extends CustomVariableSupport<DataSource, H
136141 return observable . pipe (
137142 map ( ( response ) => {
138143 if ( response === undefined || response . errors !== undefined || response . data === undefined ) {
139- return response
144+ return response ;
140145 }
141146
142147 let variableValues = response . data . reduce ( ( acc : MetricFindValue [ ] , frame : DataFrame ) => {
@@ -154,9 +159,10 @@ export class HaystackVariableSupport extends CustomVariableSupport<DataSource, H
154159 let displayColumn = column ;
155160 if ( variableQuery . displayColumn !== undefined && variableQuery . displayColumn !== '' ) {
156161 // If a column was input, match the column name
157- displayColumn = frame . fields . find ( ( field : Field ) => {
158- return field . name === variableQuery . displayColumn
159- } ) ?? displayColumn ;
162+ displayColumn =
163+ frame . fields . find ( ( field : Field ) => {
164+ return field . name === variableQuery . displayColumn ;
165+ } ) ?? displayColumn ;
160166 }
161167
162168 let variableValues = column . values . map ( ( value , index ) => {
@@ -175,7 +181,6 @@ export class HaystackVariableSupport extends CustomVariableSupport<DataSource, H
175181 }
176182}
177183
178-
179184function variableValueFromCell ( value : string , columnType : FieldType ) : string {
180185 switch ( columnType ) {
181186 case FieldType . string :
0 commit comments