diff --git a/public/app/features/expressions/components/SqlExpressions/hooks/useSQLSchemas.test.ts b/public/app/features/expressions/components/SqlExpressions/hooks/useSQLSchemas.test.ts index bc975dee05f..155276662e1 100644 --- a/public/app/features/expressions/components/SqlExpressions/hooks/useSQLSchemas.test.ts +++ b/public/app/features/expressions/components/SqlExpressions/hooks/useSQLSchemas.test.ts @@ -11,9 +11,9 @@ describe('isDashboardDatasource', () => { { refId: 'C', datasource: { uid: 'mysql-uid', type: 'mysql' } }, ]; - const backendQueries = queries.filter((q) => !isDashboardDatasource(q)); + const nonDashboardQueries = queries.filter((q) => !isDashboardDatasource(q)); - expect(backendQueries.map((q) => q.refId)).toEqual(['A', 'C']); + expect(nonDashboardQueries.map((q) => q.refId)).toEqual(['A', 'C']); }); it('returns true when query has dashboard datasource uid', () => { diff --git a/public/app/features/expressions/components/SqlExpressions/hooks/useSQLSchemas.ts b/public/app/features/expressions/components/SqlExpressions/hooks/useSQLSchemas.ts index c662e0039fc..c256d0da207 100644 --- a/public/app/features/expressions/components/SqlExpressions/hooks/useSQLSchemas.ts +++ b/public/app/features/expressions/components/SqlExpressions/hooks/useSQLSchemas.ts @@ -67,9 +67,9 @@ export function useSQLSchemas({ queries, enabled, timeRange }: UseSQLSchemasOpti try { // Filter out Dashboard datasource queries - they are frontend-only and can't be processed by backend - const backendQueries = currentQueries.filter((q) => !isDashboardDatasource(q)); + const nonDashboardQueries = currentQueries.filter((q) => !isDashboardDatasource(q)); - if (backendQueries.length === 0) { + if (nonDashboardQueries.length === 0) { setSchemas({ kind: 'SQLSchemaResponse', apiVersion: 'query.grafana.app/v0alpha1', sqlSchemas: {} }); setLoading(false); return; @@ -81,7 +81,7 @@ export function useSQLSchemas({ queries, enabled, timeRange }: UseSQLSchemasOpti const response = await getBackendSrv().post( `/apis/query.grafana.app/v0alpha1/namespaces/${namespace}/sqlschemas/name`, { - queries: backendQueries, + queries: nonDashboardQueries, from: currentTimeRange.from.toISOString(), to: currentTimeRange.to.toISOString(), }