The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
UXW-2209 Update datamodel tracking triggered_from (#66259)
Brad Andersone67f25b40185
diff --git a/e2e/test/scenarios/data-studio/data-model/datamodel-data-studio.cy.spec.ts b/e2e/test/scenarios/data-studio/data-model/datamodel-data-studio.cy.spec.tsindex 72441ecde03..604d9f82118 100644--- a/e2e/test/scenarios/data-studio/data-model/datamodel-data-studio.cy.spec.ts+++ b/e2e/test/scenarios/data-studio/data-model/datamodel-data-studio.cy.spec.ts@@ -1856,7 +1856,7 @@ describe("scenarios > data studio > datamodel", () => {H.expectUnstructuredSnowplowEvent({event: "metadata_edited",event_detail: "type_casting",- triggered_from: "admin",+ triggered_from: "data_studio",});verifyAndCloseToast("Casting enabled for Rating");@@ -1974,7 +1974,7 @@ describe("scenarios > data studio > datamodel", () => {H.expectUnstructuredSnowplowEvent({event: "metadata_edited",event_detail: "semantic_type_change",- triggered_from: "admin",+ triggered_from: "data_studio",});H.undoToast().should("contain.text",@@ -2376,7 +2376,7 @@ describe("scenarios > data studio > datamodel", () => {H.expectUnstructuredSnowplowEvent({event: "metadata_edited",event_detail: "visibility_change",- triggered_from: "admin",+ triggered_from: "data_studio",});verifyAndCloseToast("Visibility of Tax updated");FieldSection.getVisibilityInput().should("have.value", "Everywhere");@@ -2569,7 +2569,7 @@ describe("scenarios > data studio > datamodel", () => {H.expectUnstructuredSnowplowEvent({event: "metadata_edited",event_detail: "filtering_change",- triggered_from: "admin",+ triggered_from: "data_studio",});verifyAndCloseToast("Filtering of Quantity updated");@@ -2735,7 +2735,7 @@ describe("scenarios > data studio > datamodel", () => {H.expectUnstructuredSnowplowEvent({event: "metadata_edited",event_detail: "display_values",- triggered_from: "admin",+ triggered_from: "data_studio",});H.undoToast().should("contain.text",@@ -2829,7 +2829,7 @@ describe("scenarios > data studio > datamodel", () => {H.expectUnstructuredSnowplowEvent({event: "metadata_edited",event_detail: "display_values",- triggered_from: "admin",+ triggered_from: "data_studio",});H.undoToast().should("contain.text",@@ -3195,7 +3195,7 @@ describe("scenarios > data studio > datamodel", () => {H.expectUnstructuredSnowplowEvent({event: "metadata_edited",event_detail: "json_unfolding",- triggered_from: "admin",+ triggered_from: "data_studio",});H.undoToast().should("contain.text",@@ -3321,7 +3321,7 @@ describe("scenarios > data studio > datamodel", () => {H.expectUnstructuredSnowplowEvent({event: "metadata_edited",event_detail: "formatting",- triggered_from: "admin",+ triggered_from: "data_studio",});verifyAndCloseToast("Formatting of Quantity updated");diff --git a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.tsx b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.tsxindex b92c253972b..5b4ba9dee9f 100644--- a/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.tsx+++ b/enterprise/frontend/src/metabase-enterprise/data-studio/data-model/pages/DataModel/DataModel.tsx@@ -235,6 +235,7 @@ function DataModelContent({ params }: Props) {key={getRawTableFieldId(field)}parent={parentField}table={table}+ eventSource="data_studio"onFieldValuesClick={openFieldValuesModal}onPreviewClick={togglePreview}/>diff --git a/frontend/src/metabase-types/analytics/event.ts b/frontend/src/metabase-types/analytics/event.tsindex 5f169df16c0..f5a179546df 100644--- a/frontend/src/metabase-types/analytics/event.ts+++ b/frontend/src/metabase-types/analytics/event.ts@@ -3,7 +3,10 @@ import type {ChecklistItemCTA,ChecklistItemValue,} from "metabase/home/components/Onboarding/types";-import type { MetadataEditAnalyticsDetail } from "metabase/metadata/pages/DataModelV1/types";+import type {+ MetadataEditAnalyticsDetail,+ MetadataEventSource,+} from "metabase/metadata/pages/DataModelV1/types";import type { KeyboardShortcutId } from "metabase/palette/shortcuts";import type { ClickActionSection } from "metabase/visualizations/types";import type {@@ -410,7 +413,7 @@ export type LearnAboutDataClickedEvent = ValidateEvent<{export type MetadataEditEvent = ValidateEvent<{event: "metadata_edited";event_detail: MetadataEditAnalyticsDetail;- triggered_from: "admin";+ triggered_from: MetadataEventSource;}>;export type BookmarkQuestionEvent = ValidateEvent<{diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.tsx b/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.tsxindex 9f48818c8ab..60212a7bfaa 100644--- a/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.tsx+++ b/frontend/src/metabase/metadata/pages/DataModelV1/DataModelV1.tsx@@ -186,6 +186,7 @@ export const DataModelV1 = ({ children, location, params }: Props) => {key={getRawTableFieldId(field)}parent={parentField}table={table}+ eventSource="admin"onFieldValuesClick={openFieldValuesModal}onPreviewClick={togglePreview}/>diff --git a/frontend/src/metabase/metadata/pages/DataModelV1/types.ts b/frontend/src/metabase/metadata/pages/DataModelV1/types.tsindex 64bf04bb48c..bbf5774e49b 100644--- a/frontend/src/metabase/metadata/pages/DataModelV1/types.ts+++ b/frontend/src/metabase/metadata/pages/DataModelV1/types.ts@@ -36,3 +36,5 @@ export type MetadataEditAnalyticsDetail =| "display_values"| "json_unfolding"| "formatting";++export type MetadataEventSource = "admin" | "data_studio";diff --git a/frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/BehaviorSection.tsx b/frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/BehaviorSection.tsxindex e8c0b409c58..fb7b69d9374 100644--- a/frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/BehaviorSection.tsx+++ b/frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/BehaviorSection.tsx@@ -9,6 +9,7 @@ import {} from "metabase/metadata/components";import { TitledSection } from "metabase/metadata/components/TitledSection";import { useMetadataToasts } from "metabase/metadata/hooks";+import type { MetadataEventSource } from "metabase/metadata/pages/DataModelV1/types";import {canFieldUnfoldJson,getRawTableFieldId,@@ -29,9 +30,10 @@ import { RemappingPicker } from "./RemappingPicker";interface Props {databaseId: DatabaseId;field: Field;+ eventSource: MetadataEventSource;}-const BehaviorSectionBase = ({ databaseId, field }: Props) => {+const BehaviorSectionBase = ({ databaseId, field, eventSource }: Props) => {const id = getRawTableFieldId(field);const { data: database } = useGetDatabaseQuery({id: databaseId,@@ -49,7 +51,7 @@ const BehaviorSectionBase = ({ databaseId, field }: Props) => {visibility_type: visibilityType,});- trackMetadataChange("visibility_change");+ trackMetadataChange("visibility_change", eventSource);if (error) {sendErrorToast(t`Failed to update visibility of ${field.display_name}`);@@ -73,7 +75,7 @@ const BehaviorSectionBase = ({ databaseId, field }: Props) => {has_field_values: hasFieldValues,});- trackMetadataChange("filtering_change");+ trackMetadataChange("filtering_change", eventSource);if (error) {sendErrorToast(t`Failed to update filtering of ${field.display_name}`);@@ -106,7 +108,7 @@ const BehaviorSectionBase = ({ databaseId, field }: Props) => {: t`Failed to disable JSON unfolding for ${field.display_name}`,);} else {- trackMetadataChange("json_unfolding");+ trackMetadataChange("json_unfolding", eventSource);sendSuccessToast(jsonUnfolding@@ -145,6 +147,7 @@ const BehaviorSectionBase = ({ databaseId, field }: Props) => {description={t`Choose to show the original value from the database, or have this field display associated or custom information.`}field={field}label={t`Display values`}+ eventSource={eventSource}/>)}diff --git a/frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/RemappingPicker/RemappingPicker.tsx b/frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/RemappingPicker/RemappingPicker.tsxindex 08dee1d96cd..2e07a3d0cac 100644--- a/frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/RemappingPicker/RemappingPicker.tsx+++ b/frontend/src/metabase/metadata/pages/shared/FieldSection/BehaviorSection/RemappingPicker/RemappingPicker.tsx@@ -11,6 +11,7 @@ import {useUpdateFieldValuesMutation,} from "metabase/api";import { useMetadataToasts } from "metabase/metadata/hooks";+import type { MetadataEventSource } from "metabase/metadata/pages/DataModelV1/types";import { getRawTableFieldId } from "metabase/metadata/utils/field";import { PLUGIN_FEATURE_LEVEL_PERMISSIONS } from "metabase/plugins";import { FieldDataSelector } from "metabase/query_builder/components/DataSelector";@@ -51,12 +52,14 @@ import {interface Props extends Omit<SelectProps, "data" | "value" | "onChange"> {database: Database;field: Field;+ eventSource: MetadataEventSource;}export const RemappingPicker = ({comboboxProps,database,field,+ eventSource,...props}: Props) => {const { sendErrorToast, sendSuccessToast, sendUndoToast } =@@ -131,7 +134,7 @@ export const RemappingPicker = ({t`Failed to update display values of ${field.display_name}`,);} else {- trackMetadataChange("display_values");+ trackMetadataChange("display_values", eventSource);sendSuccessToast(t`Display values of ${field.display_name} updated`,async () => {diff --git a/frontend/src/metabase/metadata/pages/shared/FieldSection/DataSection/DataSection.tsx b/frontend/src/metabase/metadata/pages/shared/FieldSection/DataSection/DataSection.tsxindex c4f0ca4c36e..8f2208e5bea 100644--- a/frontend/src/metabase/metadata/pages/shared/FieldSection/DataSection/DataSection.tsx+++ b/frontend/src/metabase/metadata/pages/shared/FieldSection/DataSection/DataSection.tsx@@ -8,6 +8,7 @@ import {TitledSection,} from "metabase/metadata/components";import { useMetadataToasts } from "metabase/metadata/hooks";+import type { MetadataEventSource } from "metabase/metadata/pages/DataModelV1/types";import {canCoerceFieldType,getFieldRawName,@@ -24,9 +25,10 @@ import SubInputIllustration from "./illustrations/sub-input.svg?component";interface Props {field: Field;+ eventSource: MetadataEventSource;}-const DataSectionBase = ({ field }: Props) => {+const DataSectionBase = ({ field, eventSource }: Props) => {const id = getRawTableFieldId(field);const [isCasting, setIsCasting] = useState(field ? field.coercion_strategy != null : false,@@ -90,7 +92,7 @@ const DataSectionBase = ({ field }: Props) => {: t`Failed to update casting for ${field.display_name}`,);} else {- trackMetadataChange("type_casting");+ trackMetadataChange("type_casting", eventSource);sendSuccessToast(field.coercion_strategy == nulldiff --git a/frontend/src/metabase/metadata/pages/shared/FieldSection/FieldSection.tsx b/frontend/src/metabase/metadata/pages/shared/FieldSection/FieldSection.tsxindex f23458f3ea3..51dc34b4356 100644--- a/frontend/src/metabase/metadata/pages/shared/FieldSection/FieldSection.tsx+++ b/frontend/src/metabase/metadata/pages/shared/FieldSection/FieldSection.tsx@@ -10,6 +10,7 @@ import { Group, Stack, Text } from "metabase/ui";import * as Lib from "metabase-lib";import type { DatabaseId, Field, Table } from "metabase-types/api";+import type { MetadataEventSource } from "../../DataModelV1/types";import { ResponsiveButton } from "../ResponsiveButton";import { BehaviorSection } from "./BehaviorSection";@@ -23,6 +24,7 @@ interface Props {field: Field;table: Table;parent?: Field;+ eventSource: MetadataEventSource;onFieldValuesClick: () => void;onPreviewClick: () => void;}@@ -32,6 +34,7 @@ const FieldSectionBase = ({field,parent,table,+ eventSource,onFieldValuesClick,onPreviewClick,}: Props) => {@@ -137,10 +140,19 @@ const FieldSectionBase = ({</Stack><Stack gap="xl" px="lg">- <DataSection field={field} />- <MetadataSection databaseId={databaseId} field={field} table={table} />- <BehaviorSection databaseId={databaseId} field={field} />- <FormattingSection field={field} />+ <DataSection field={field} eventSource={eventSource} />+ <MetadataSection+ databaseId={databaseId}+ field={field}+ table={table}+ eventSource={eventSource}+ />+ <BehaviorSection+ databaseId={databaseId}+ field={field}+ eventSource={eventSource}+ />+ <FormattingSection field={field} eventSource={eventSource} /></Stack></Stack>);diff --git a/frontend/src/metabase/metadata/pages/shared/FieldSection/FormattingSection.tsx b/frontend/src/metabase/metadata/pages/shared/FieldSection/FormattingSection.tsxindex 26f08cfcf4d..ade581638f7 100644--- a/frontend/src/metabase/metadata/pages/shared/FieldSection/FormattingSection.tsx+++ b/frontend/src/metabase/metadata/pages/shared/FieldSection/FormattingSection.tsx@@ -13,13 +13,15 @@ import type {FieldFormattingSettings as FieldSettings,} from "metabase-types/api";+import type { MetadataEventSource } from "../../DataModelV1/types";import { trackMetadataChange } from "../analytics";interface Props {field: Field;+ eventSource: MetadataEventSource;}-const FormattingSectionBase = ({ field }: Props) => {+const FormattingSectionBase = ({ field, eventSource }: Props) => {const id = getRawTableFieldId(field);const [updateField] = useUpdateFieldMutation();const { sendErrorToast, sendSuccessToast, sendUndoToast } =@@ -37,7 +39,7 @@ const FormattingSectionBase = ({ field }: Props) => {if (error) {sendErrorToast(t`Failed to update formatting of ${field.display_name}`);} else {- trackMetadataChange("formatting");+ trackMetadataChange("formatting", eventSource);sendSuccessToast(t`Formatting of ${field.display_name} updated`,diff --git a/frontend/src/metabase/metadata/pages/shared/FieldSection/MetadataSection.tsx b/frontend/src/metabase/metadata/pages/shared/FieldSection/MetadataSection.tsxindex aa5856bb943..5def9859ca1 100644--- a/frontend/src/metabase/metadata/pages/shared/FieldSection/MetadataSection.tsx+++ b/frontend/src/metabase/metadata/pages/shared/FieldSection/MetadataSection.tsx@@ -12,6 +12,7 @@ import { getRawTableFieldId } from "metabase/metadata/utils/field";import { PLUGIN_FEATURE_LEVEL_PERMISSIONS } from "metabase/plugins";import type { DatabaseId, Field, Table } from "metabase-types/api";+import type { MetadataEventSource } from "../../DataModelV1/types";import { DataModelContext } from "../DataModelContext";import { trackMetadataChange } from "../analytics";@@ -25,9 +26,15 @@ interface Props {databaseId: DatabaseId;field: Field;table: Table;+ eventSource: MetadataEventSource;}-const MetadataSectionBase = ({ databaseId, field, table }: Props) => {+const MetadataSectionBase = ({+ databaseId,+ field,+ table,+ eventSource,+}: Props) => {const id = getRawTableFieldId(field);const { data: idFields = [] } = useListDatabaseIdFieldsQuery({id: databaseId,@@ -49,7 +56,7 @@ const MetadataSectionBase = ({ databaseId, field, table }: Props) => {t`Failed to update semantic type of ${field.display_name}`,);} else {- trackMetadataChange("semantic_type_change");+ trackMetadataChange("semantic_type_change", eventSource);sendSuccessToast(t`Semantic type of ${field.display_name} updated`,diff --git a/frontend/src/metabase/metadata/pages/shared/analytics.ts b/frontend/src/metabase/metadata/pages/shared/analytics.tsindex 4a8a157fc08..f7225f45b06 100644--- a/frontend/src/metabase/metadata/pages/shared/analytics.ts+++ b/frontend/src/metabase/metadata/pages/shared/analytics.ts@@ -1,11 +1,17 @@import { trackSimpleEvent } from "metabase/lib/analytics";-import type { MetadataEditAnalyticsDetail } from "../DataModelV1/types";+import type {+ MetadataEditAnalyticsDetail,+ MetadataEventSource,+} from "../DataModelV1/types";-export const trackMetadataChange = (detail: MetadataEditAnalyticsDetail) => {+export const trackMetadataChange = (+ detail: MetadataEditAnalyticsDetail,+ triggered_from: MetadataEventSource,+) => {trackSimpleEvent({event: "metadata_edited",event_detail: detail,- triggered_from: "admin",+ triggered_from,});};