Chore: associate label with input element and update applySQLTemplateVariables type (#88)

* Chore: update applySQLTemplateVariables type to extend SQLQuery

* associate label with input for ResourceSelector

* keep id

Author: kevinwcyu

src/sql/ResourceSelector.tsx

@@ -121,6 +121,7 @@ export function ResourceSelector(props: ResourceSelectorProps) {
         <Select
           {...props}
           id={props.id}
+          inputId={props.id}
           aria-label={props.label}
           options={options}
           onChange={onChange}
@@ -141,6 +142,7 @@ export function ResourceSelector(props: ResourceSelectorProps) {
             <Select
               {...props}
               id={props.id}
+              inputId={props.id}
               aria-label={props.label}
               options={options}
               onChange={onChange}

src/sql/utils/utils.ts

@@ -9,11 +9,11 @@ export function filterSQLQuery(query: SQLQuery): boolean {
   return !!query.rawSQL;
 }
 
-export function applySQLTemplateVariables(
-  query: SQLQuery,
+export function applySQLTemplateVariables<T extends SQLQuery>(
+  query: T,
   scopedVars: ScopedVars,
   getTemplateSrv: () => any
-): SQLQuery {
+): T {
   const templateSrv = getTemplateSrv();
   return {
     ...query,