Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Auto set template tags (#63691)

Thomas Schmidt1bba35237e54
diff --git a/e2e/test/scenarios/native-filters/native-filters-reproductions.cy.spec.js b/e2e/test/scenarios/native-filters/native-filters-reproductions.cy.spec.js
index 5db33bf6599..86c2ca2c4f6 100644
--- a/e2e/test/scenarios/native-filters/native-filters-reproductions.cy.spec.js
+++ b/e2e/test/scenarios/native-filters/native-filters-reproductions.cy.spec.js
@@ -953,8 +953,7 @@ describe("issue 29786", { tags: "@external" }, () => {
query: SQL_QUERY,
});
- // type a space to trigger fields
- H.NativeEditor.type(" ");
+ cy.findByTestId("native-query-top-bar").icon("variable").click();
cy.findByTestId("tag-editor-variable-f1")
.findByTestId("variable-type-select")
diff --git a/frontend/src/metabase/query_builder/actions/core/initializeQB.ts b/frontend/src/metabase/query_builder/actions/core/initializeQB.ts
index 30b3d5c1d19..e7233a76e7b 100644
--- a/frontend/src/metabase/query_builder/actions/core/initializeQB.ts
+++ b/frontend/src/metabase/query_builder/actions/core/initializeQB.ts
@@ -330,6 +330,17 @@ async function handleQBInit(
const query = question.query();
const { isNative, isEditable } = Lib.queryDisplayInfo(query);
+ // For unsaved native queries, ensure template tags are parsed from query text
+ // This handles cases like AI-generated queries with model references {{#1}}
+ if (isNative && !question.isSaved()) {
+ question = question.setQuery(
+ Lib.withNativeQuery(
+ question.query(),
+ Lib.rawNativeQuery(question.query()),
+ ),
+ );
+ }
+
if (question.isSaved()) {
const type = question.type();