From 9eec0112f1e0f0a5012ec7830c781675e6334731 Mon Sep 17 00:00:00 2001
From: Kevin Yu <kevinwcyu@users.noreply.github.com>
Date: Wed, 19 Jun 2024 10:50:33 -0700
Subject: [PATCH] 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
---
 src/sql/ResourceSelector.tsx | 2 ++
 src/sql/utils/utils.ts       | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/sql/ResourceSelector.tsx b/src/sql/ResourceSelector.tsx
index a9ea69b..0e41750 100644
--- a/src/sql/ResourceSelector.tsx
+++ b/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}
diff --git a/src/sql/utils/utils.ts b/src/sql/utils/utils.ts
index b08e08f..d432755 100644
--- a/src/sql/utils/utils.ts
+++ b/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,