Pass correct extraction to trackColumnExtractViaShortcut

metabase · May 3, 2024 · 5e9b1cc · 5e9b1cc
1 parent 3d1ab6b
commit 5e9b1cc
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/frontend/src/metabase/query_builder/analytics.js b/frontend/src/metabase/query_builder/analytics.js
@@ -42,10 +42,19 @@ export const trackColumnCombineViaShortcut = (query, question) => {
  });
 };
 
-export const trackColumnExtractViaShortcut = (query, tag, question) => {
+export const trackColumnExtractViaShortcut = (
+ query,
+ stageIndex,
+ extraction,
+ question,
+) => {
  trackSchemaEvent("question", "1-0-4", {
  event: "column_extract_via_shortcut",
- custom_expressions_used: Lib.functionsUsedByExtraction(tag),
+ custom_expressions_used: Lib.functionsUsedByExtraction(
+ query,
+ stageIndex,
+ extraction,
+ ),
  database_id: Lib.databaseID(query),
  question_id: question?.id() ?? 0,
  });

diff --git a/frontend/src/metabase/query_builder/components/expressions/ExpressionWidget.tsx b/frontend/src/metabase/query_builder/components/expressions/ExpressionWidget.tsx
@@ -164,9 +164,9 @@ export const ExpressionWidget = <Clause extends object = Lib.ExpressionClause>(
  const handleSubmit = (
  clause: Lib.ExpressionClause,
  name: string,
- tag: Lib.ColumnExtractionTag,
+ extraction: Lib.ColumnExtraction,
  ) => {
- trackColumnExtractViaShortcut(query, tag);
+ trackColumnExtractViaShortcut(query, stageIndex, extraction);
  const expression = Lib.legacyExpressionForExpressionClause(
  query,
  stageIndex,

diff --git a/frontend/src/metabase/query_builder/components/expressions/ExtractColumn/ExtractColumn.tsx b/frontend/src/metabase/query_builder/components/expressions/ExtractColumn/ExtractColumn.tsx
@@ -16,7 +16,7 @@ type Props = {
  onSubmit: (
  clause: Lib.ExpressionClause,
  name: string,
- tag: Lib.ColumnExtractionTag,
+ extraction: Lib.ColumnExtraction,
  ) => void;
  onCancel: () => void;
 };
@@ -55,7 +55,7 @@ export function ExtractColumn({
  const name = getName(query, stageIndex, info);
  const lastExpression = expressions.at(-1);
  if (lastExpression) {
- onSubmit(lastExpression, name, info.tag);
+ onSubmit(lastExpression, name, extraction);
  }
  }