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
Add research to search filters, the content view and the view log (#83287)
Denis Berezin373c557abfab
diff --git a/.clj-kondo/config/modules/config.edn b/.clj-kondo/config/modules/config.ednindex 6ad0af3238f..4e1127dee82 100644--- a/.clj-kondo/config/modules/config.edn+++ b/.clj-kondo/config/modules/config.edn@@ -433,6 +433,7 @@:model-imports #{:model/Card:model/Dashboard:model/Document+ :model/Exploration:model/Table}}auth-provider@@ -1029,6 +1030,7 @@analytics.interfaceapiapp-db+ audit-app.view-logcollectionscommentsdocumentsdiff --git a/frontend/src/metabase/common/search/constants.ts b/frontend/src/metabase/common/search/constants.tsindex dfd4b1edd02..7dd73430678 100644--- a/frontend/src/metabase/common/search/constants.ts+++ b/frontend/src/metabase/common/search/constants.ts@@ -23,6 +23,7 @@ export const enabledSearchTypes: EnabledSearchModel[] = ["action","indexed-entity","document",+ "exploration",];export const SearchContextTypes = {diff --git a/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterContent.unit.spec.tsx b/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterContent.unit.spec.tsxindex f9e3ce868de..d5915c0c667 100644--- a/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterContent.unit.spec.tsx+++ b/frontend/src/metabase/search/components/filters/TypeFilter/TypeFilterContent.unit.spec.tsx@@ -128,6 +128,13 @@ describe("TypeFilterContent", () => {});});+ it("should offer Research when explorations are available", async () => {+ await setup({ availableModels: ["exploration"] });++ expect(getCheckboxes()).toHaveLength(1);+ expect(screen.getByLabelText(MODEL_NAME.exploration)).toBeInTheDocument();+ });+it("should only display available types", async () => {await setup({ availableModels: TEST_TYPE_SUBSET });diff --git a/resources/migrations/065/20260929_content_view_v7_exploration.yaml b/resources/migrations/065/20260929_content_view_v7_exploration.yamlnew file mode 100644index 00000000000..f1d57b1312f--- /dev/null+++ b/resources/migrations/065/20260929_content_view_v7_exploration.yaml@@ -0,0 +1,34 @@+## Adds explorations to v_content as the `exploration` entity type, so usage analytics can report on+## them like any other content. Documents attached to an exploration (its Summary) are left out: they+## are reachable only through their exploration, which the view already counts.+databaseChangeLog:+ - changeSet:+ id: v65.2026-09-29T15:49:41+ author: denisberezin+ comment: Usage analytics; add explorations to the content view (v7)+ changes:+ - sqlFile:+ dbms: postgresql+ path: ../instance_analytics_views/content/v7/postgres-content.sql+ relativeToChangelogFile: true+ - sqlFile:+ dbms: mysql,mariadb+ path: ../instance_analytics_views/content/v7/mysql-content.sql+ relativeToChangelogFile: true+ - sqlFile:+ dbms: h2+ path: ../instance_analytics_views/content/v7/h2-content.sql+ relativeToChangelogFile: true+ rollback:+ - sqlFile:+ dbms: postgresql+ path: ../instance_analytics_views/content/v6/postgres-content.sql+ relativeToChangelogFile: true+ - sqlFile:+ dbms: mysql,mariadb+ path: ../instance_analytics_views/content/v6/mysql-content.sql+ relativeToChangelogFile: true+ - sqlFile:+ dbms: h2+ path: ../instance_analytics_views/content/v6/h2-content.sql+ relativeToChangelogFile: truediff --git a/resources/migrations/instance_analytics_views/content/v7/h2-content.sql b/resources/migrations/instance_analytics_views/content/v7/h2-content.sqlnew file mode 100644index 00000000000..e6f236a9200--- /dev/null+++ b/resources/migrations/instance_analytics_views/content/v7/h2-content.sql@@ -0,0 +1,235 @@+drop view if exists v_content;++create or replace view v_content as+select+ action.id as entity_id,+ 'action_' || action.id as entity_qualified_id,+ 'action' as entity_type,+ created_at,+ updated_at,+ creator_id,+ name,+ description,+ cast(null as int) as collection_id,+ made_public_by_id as made_public_by_user,+ cast(null as boolean) as is_embedding_enabled,+ cast(null as boolean) as is_verified,+ archived,+ type as action_type,+ model_id as action_model_id,+ null as collection_is_official,+ null as collection_is_personal,+ null as question_viz_type,+ null as question_database_id,+ cast(null as boolean) as question_is_native,+ cast(null as timestamp) as event_timestamp+ from action+union+select+ collection.id as entity_id,+ 'collection_' || collection.id as entity_qualified_id,+ 'collection' as entity_type,+ created_at,+ null as updated_at,+ null as creator_id,+ name,+ description,+ null as collection_id,+ null as made_public_by_user,+ null as is_embedding_enabled,+ cast(null as boolean) as is_verified,+ archived,+ null as action_type,+ null as action_model_id,+ case when authority_level='official' then true else false end as collection_is_official,+ case when personal_owner_id is not null then true else false end as collection_is_personal,+ null as question_viz_type,+ null as question_database_id,+ null as question_is_native,+ null as event_timestamp+ from collection+union+select+ report_card.id as entity_id,+ 'card_' || report_card.id as entity_qualified_id,+ type AS entity_type,+ created_at,+ updated_at,+ creator_id,+ name,+ description,+ collection_id as collection_id,+ made_public_by_id as made_public_by_user,+ enable_embedding as is_embedding_enabled,+ case when is_verified then true else false end as is_verified,+ archived,+ null as action_type,+ null as action_model_id,+ null as collection_is_official,+ null as collection_is_personal,+ display as question_viz_type,+ 'database_' || database_id as question_database_id,+ case when query_type='native' then true else false end as question_is_native,+ null as event_timestamp+ from report_card+ left join (+ select+ moderated_item_type || '_' || moderated_item_id as entity_qualified_id,+ case when status = 'verified' then true else false end as is_verified+ from moderation_review+ where most_recent+ ) as moderation on 'card_' || report_card.id = moderation.entity_qualified_id++union+select+ report_dashboard.id as entity_id,+ 'dashboard_' || report_dashboard.id as entity_qualified_id,+ 'dashboard' as entity_type,+ created_at,+ updated_at,+ creator_id,+ name,+ description,+ collection_id as collection_id,+ made_public_by_id as made_public_by_user,+ enable_embedding as is_embedding_enabled,+ case when is_verified then true else false end as is_verified,+ archived,+ null as action_type,+ null as action_model_id,+ null as collection_is_official,+ null as collection_is_personal,+ null as question_viz_type,+ null as question_database_id,+ null as question_is_native,+ null as event_timestamp+ from report_dashboard+ left join (+ select+ moderated_item_type || '_' || moderated_item_id as entity_qualified_id,+ case when status = 'verified' then true else false end as is_verified+ from moderation_review+ where most_recent+ ) as moderation on 'dashboard_' || report_dashboard.id = moderation.entity_qualified_id+union+select+ document.id as entity_id,+ 'document_' || document.id as entity_qualified_id,+ 'document' as entity_type,+ created_at,+ updated_at,+ creator_id,+ name,+ cast(null as varchar) as description,+ collection_id as collection_id,+ cast(null as int) as made_public_by_user,+ cast(null as boolean) as is_embedding_enabled,+ cast(null as boolean) as is_verified,+ archived,+ null as action_type,+ cast(null as int) as action_model_id,+ null as collection_is_official,+ null as collection_is_personal,+ null as question_viz_type,+ null as question_database_id,+ cast(null as boolean) as question_is_native,+ cast(null as timestamp) as event_timestamp+ from document+ where exploration_id is null+union+select+ exploration.id as entity_id,+ 'exploration_' || exploration.id as entity_qualified_id,+ 'exploration' as entity_type,+ created_at,+ updated_at,+ creator_id,+ name,+ description,+ collection_id as collection_id,+ cast(null as int) as made_public_by_user,+ cast(null as boolean) as is_embedding_enabled,+ cast(null as boolean) as is_verified,+ archived,+ null as action_type,+ cast(null as int) as action_model_id,+ null as collection_is_official,+ null as collection_is_personal,+ null as question_viz_type,+ null as question_database_id,+ cast(null as boolean) as question_is_native,+ cast(null as timestamp) as event_timestamp+ from exploration+union+select+ event.id as entity_id,+ 'event_' || event.id as entity_qualified_id,+ 'event' as entity_type,+ event.created_at,+ event.updated_at,+ event.creator_id,+ event.name,+ event.description,+ timeline.collection_id,+ null as made_public_by_user,+ null as is_embedding_enabled,+ cast(null as boolean) as is_verified,+ event.archived,+ null as action_type,+ null as action_model_id,+ null as collection_is_official,+ null as collection_is_personal,+ null as question_viz_type,+ null as question_database_id,+ null as question_is_native,+ timestamp as event_timestamp+ from timeline_event event+ left join timeline on event.timeline_id = timeline.id+union+select+ transform.id as entity_id,+ 'transform_' || transform.id as entity_qualified_id,+ 'transform' as entity_type,+ created_at,+ updated_at,+ creator_id,+ name,+ description,+ cast(null as int) as collection_id,+ cast(null as int) as made_public_by_user,+ cast(null as boolean) as is_embedding_enabled,+ cast(null as boolean) as is_verified,+ false as archived,+ null as action_type,+ cast(null as int) as action_model_id,+ null as collection_is_official,+ null as collection_is_personal,+ null as question_viz_type,+ null as question_database_id,+ cast(null as boolean) as question_is_native,+ cast(null as timestamp) as event_timestamp+ from transform+union+select+ glossary.id as entity_id,+ 'glossary_' || glossary.id as entity_qualified_id,+ 'glossary' as entity_type,+ created_at,+ updated_at,+ creator_id,+ term as name,+ definition as description,+ cast(null as int) as collection_id,+ cast(null as int) as made_public_by_user,+ cast(null as boolean) as is_embedding_enabled,+ cast(null as boolean) as is_verified,+ false as archived,+ null as action_type,+ cast(null as int) as action_model_id,+ null as collection_is_official,+ null as collection_is_personal,+ null as question_viz_type,+ null as question_database_id,+ cast(null as boolean) as question_is_native,+ cast(null as timestamp) as event_timestamp+ from glossarydiff --git a/resources/migrations/instance_analytics_views/content/v7/mysql-content.sql b/resources/migrations/instance_analytics_views/content/v7/mysql-content.sqlnew file mode 100644index 00000000000..e58b2937777--- /dev/null+++ b/resources/migrations/instance_analytics_views/content/v7/mysql-content.sql@@ -0,0 +1,236 @@+drop view if exists v_content;++create or replace+SQL SECURITY INVOKER+view v_content as+select+ action.id as entity_id,+ concat('action_', action.id) as entity_qualified_id,+ 'action' as entity_type,+ created_at,+ updated_at,+ creator_id,+ name,+ description,+ null as collection_id,+ made_public_by_id as made_public_by_user,+ null as is_embedding_enabled,+ null as is_verified,+ archived,+ type as action_type,+ model_id as action_model_id,+ null as collection_is_official,+ null as collection_is_personal,+ null as question_viz_type,+ null as question_database_id,+ null as question_is_native,+ null as event_timestamp+ from action+union+select+ collection.id as entity_id,+ concat('collection_', collection.id) as entity_qualified_id,+ 'collection' as entity_type,+ created_at,+ null as updated_at,+ null as creator_id,+ name,+ description,+ null as collection_id,+ null as made_public_by_user,+ null as is_embedding_enabled,+ null as is_verified,+ archived,+ null as action_type,+ null as action_model_id,+ case when authority_level='official' then true else false end as collection_is_official,+ case when personal_owner_id is not null then true else false end as collection_is_personal,+ null as question_viz_type,+ null as question_database_id,+ null as question_is_native,+ null as event_timestamp+ from collection+union+select+ report_card.id as entity_id,+ concat('card_', report_card.id) as entity_qualified_id,+ type as entity_type,+ created_at,+ updated_at,+ creator_id,+ name,+ description,+ collection_id as collection_id,+ made_public_by_id as made_public_by_user,+ enable_embedding as is_embedding_enabled,+ case when is_verified then true else false end as is_verified,+ archived,+ null as action_type,+ null as action_model_id,+ null as collection_is_official,+ null as collection_is_personal,+ display as question_viz_type,+ concat('database_', database_id) as question_database_id,+ case when query_type='native' then true else false end as question_is_native,+ null as event_timestamp+ from report_card+ left join (+ select+ concat(moderated_item_type, '_', moderated_item_id) as entity_qualified_id,+ case when status = 'verified' then true else false end as is_verified+ from moderation_review+ where most_recent+ ) as moderation on concat('card_', report_card.id) = moderation.entity_qualified_id+union+select+ report_dashboard.id as entity_id,+ concat('dashboard_', report_dashboard.id) as entity_qualified_id,+ 'dashboard' as entity_type,+ created_at,+ updated_at,+ creator_id,+ name,+ description,+ collection_id as collection_id,+ made_public_by_id as made_public_by_user,+ enable_embedding as is_embedding_enabled,+ case when is_verified then true else false end as is_verified,+ archived,+ null as action_type,+ null as action_model_id,+ null as collection_is_official,+ null as collection_is_personal,+ null as question_viz_type,+ null as question_database_id,+ null as question_is_native,+ null as event_timestamp+ from report_dashboard+ left join (+ select+ concat(moderated_item_type, '_', moderated_item_id) as entity_qualified_id,+ case when status = 'verified' then true else false end as is_verified+ from moderation_review+ where most_recent+ ) as moderation on concat('dashboard_', report_dashboard.id) = moderation.entity_qualified_id+union+select+ document.id as entity_id,+ concat('document_', document.id) as entity_qualified_id,+ 'document' as entity_type,+ created_at,+ updated_at,+ creator_id,+ name,+ null as description,+ collection_id as collection_id,+ null as made_public_by_user,+ null as is_embedding_enabled,+ null as is_verified,+ archived,+ null as action_type,+ null as action_model_id,+ null as collection_is_official,+ null as collection_is_personal,+ null as question_viz_type,+ null as question_database_id,+ null as question_is_native,+ null as event_timestamp+ from document+ where exploration_id is null+union+select+ exploration.id as entity_id,+ concat('exploration_', exploration.id) as entity_qualified_id,+ 'exploration' as entity_type,+ created_at,+ updated_at,+ creator_id,+ name,+ description,+ collection_id as collection_id,+ null as made_public_by_user,+ null as is_embedding_enabled,+ null as is_verified,+ archived,+ null as action_type,+ null as action_model_id,+ null as collection_is_official,+ null as collection_is_personal,+ null as question_viz_type,+ null as question_database_id,+ null as question_is_native,+ null as event_timestamp+ from exploration+union+select+ event.id as entity_id,+ concat('event_', event.id) as entity_qualified_id,+ 'event' as entity_type,+ event.created_at,+ event.updated_at,+ event.creator_id,+ event.name,+ event.description,+ timeline.collection_id,+ null as made_public_by_user,+ null as is_embedding_enabled,+ null as is_verified,+ event.archived,+ null as action_type,+ null as action_model_id,+ null as collection_is_official,+ null as collection_is_personal,+ null as question_viz_type,+ null as question_database_id,+ null as question_is_native,+ timestamp as event_timestamp+ from timeline_event event+ left join timeline on event.timeline_id = timeline.id+union+select+ transform.id as entity_id,+ concat('transform_', transform.id) as entity_qualified_id,+ 'transform' as entity_type,+ created_at,+ updated_at,+ creator_id,+ name,+ description,+ null as collection_id,+ null as made_public_by_user,+ null as is_embedding_enabled,+ null as is_verified,+ false as archived,+ null as action_type,+ null as action_model_id,+ null as collection_is_official,+ null as collection_is_personal,+ null as question_viz_type,+ null as question_database_id,+ null as question_is_native,+ null as event_timestamp+ from transform+union+select+ glossary.id as entity_id,+ concat('glossary_', glossary.id) as entity_qualified_id,+ 'glossary' as entity_type,+ created_at,+ updated_at,+ creator_id,+ term as name,+ definition as description,+ null as collection_id,+ null as made_public_by_user,+ null as is_embedding_enabled,+ null as is_verified,+ false as archived,+ null as action_type,+ null as action_model_id,+ null as collection_is_official,+ null as collection_is_personal,+ null as question_viz_type,+ null as question_database_id,+ null as question_is_native,+ null as event_timestamp+ from glossarydiff --git a/resources/migrations/instance_analytics_views/content/v7/postgres-content.sql b/resources/migrations/instance_analytics_views/content/v7/postgres-content.sqlnew file mode 100644index 00000000000..80948f1deb0--- /dev/null+++ b/resources/migrations/instance_analytics_views/content/v7/postgres-content.sql@@ -0,0 +1,234 @@+drop view if exists v_content;++create or replace view v_content as+select+ action.id as entity_id,+ 'action_' || action.id as entity_qualified_id,+ 'action' as entity_type,+ created_at,+ updated_at,+ creator_id,+ name,+ description,+ cast(null as int) as collection_id,+ made_public_by_id as made_public_by_user,+ cast(null as boolean) as is_embedding_enabled,+ null::bool as is_verified,+ archived,+ type as action_type,+ model_id as action_model_id,+ null as collection_is_official,+ null as collection_is_personal,+ null as question_viz_type,+ null as question_database_id,+ cast(null as boolean) as question_is_native,+ cast(null as timestamp) as event_timestamp+ from action+union+select+ collection.id as entity_id,+ 'collection_' || collection.id as entity_qualified_id,+ 'collection' as entity_type,+ created_at,+ null as updated_at,+ null as creator_id,+ name,+ description,+ null as collection_id,+ null as made_public_by_user,+ null as is_embedding_enabled,+ null::bool as is_verified,+ archived,+ null as action_type,+ null as action_model_id,+ case when authority_level='official' then true else false end as collection_is_official,+ case when personal_owner_id is not null then true else false end as collection_is_personal,+ null as question_viz_type,+ null as question_database_id,+ null as question_is_native,+ null as event_timestamp+ from collection+union+select+ report_card.id as entity_id,+ 'card_' || report_card.id as entity_qualified_id,+ type as entity_type,+ created_at,+ updated_at,+ creator_id,+ name,+ description,+ collection_id as collection_id,+ made_public_by_id as made_public_by_user,+ enable_embedding as is_embedding_enabled,+ case when is_verified then true else false end as is_verified,+ archived,+ null as action_type,+ null as action_model_id,+ null as collection_is_official,+ null as collection_is_personal,+ display as question_viz_type,+ 'database_' || database_id as question_database_id,+ case when query_type='native' then true else false end as question_is_native,+ null as event_timestamp+ from report_card+ left join (+ select+ moderated_item_type || '_' || moderated_item_id as entity_qualified_id,+ case when status = 'verified' then true else false end as is_verified+ from moderation_review+ where most_recent+ ) as moderation on 'card_' || report_card.id = moderation.entity_qualified_id+union+select+ report_dashboard.id as entity_id,+ 'dashboard_' || report_dashboard.id as entity_qualified_id,+ 'dashboard' as entity_type,+ created_at,+ updated_at,+ creator_id,+ name,+ description,+ collection_id as collection_id,+ made_public_by_id as made_public_by_user,+ enable_embedding as is_embedding_enabled,+ case when is_verified then true else false end as is_verified,+ archived,+ null as action_type,+ null as action_model_id,+ null as collection_is_official,+ null as collection_is_personal,+ null as question_viz_type,+ null as question_database_id,+ null as question_is_native,+ null as event_timestamp+ from report_dashboard+ left join (+ select+ moderated_item_type || '_' || moderated_item_id as entity_qualified_id,+ case when status = 'verified' then true else false end as is_verified+ from moderation_review+ where most_recent+ ) as moderation on 'dashboard_' || report_dashboard.id = moderation.entity_qualified_id+union+select+ document.id as entity_id,+ 'document_' || document.id as entity_qualified_id,+ 'document' as entity_type,+ created_at,+ updated_at,+ creator_id,+ name,+ cast(null as text) as description,+ collection_id as collection_id,+ cast(null as int) as made_public_by_user,+ cast(null as boolean) as is_embedding_enabled,+ null::bool as is_verified,+ archived,+ null as action_type,+ cast(null as int) as action_model_id,+ null as collection_is_official,+ null as collection_is_personal,+ null as question_viz_type,+ null as question_database_id,+ cast(null as boolean) as question_is_native,+ cast(null as timestamp) as event_timestamp+ from document+ where exploration_id is null+union+select+ exploration.id as entity_id,+ 'exploration_' || exploration.id as entity_qualified_id,+ 'exploration' as entity_type,+ created_at,+ updated_at,+ creator_id,+ name,+ description,+ collection_id as collection_id,+ cast(null as int) as made_public_by_user,+ cast(null as boolean) as is_embedding_enabled,+ null::bool as is_verified,+ archived,+ null as action_type,+ cast(null as int) as action_model_id,+ null as collection_is_official,+ null as collection_is_personal,+ null as question_viz_type,+ null as question_database_id,+ cast(null as boolean) as question_is_native,+ cast(null as timestamp) as event_timestamp+ from exploration+union+select+ event.id as entity_id,+ 'event_' || event.id as entity_qualified_id,+ 'event' as entity_type,+ event.created_at,+ event.updated_at,+ event.creator_id,+ event.name,+ event.description,+ timeline.collection_id,+ null as made_public_by_user,+ null as is_embedding_enabled,+ null::bool as is_verified,+ event.archived,+ null as action_type,+ null as action_model_id,+ null as collection_is_official,+ null as collection_is_personal,+ null as question_viz_type,+ null as question_database_id,+ null as question_is_native,+ timestamp as event_timestamp+ from timeline_event event+ left join timeline on event.timeline_id = timeline.id+union+select+ transform.id as entity_id,+ 'transform_' || transform.id as entity_qualified_id,+ 'transform' as entity_type,+ created_at,+ updated_at,+ creator_id,+ name,+ description,+ cast(null as int) as collection_id,+ cast(null as int) as made_public_by_user,+ cast(null as boolean) as is_embedding_enabled,+ null::bool as is_verified,+ false as archived,+ null as action_type,+ cast(null as int) as action_model_id,+ null as collection_is_official,+ null as collection_is_personal,+ null as question_viz_type,+ null as question_database_id,+ cast(null as boolean) as question_is_native,+ cast(null as timestamp) as event_timestamp+ from transform+union+select+ glossary.id as entity_id,+ 'glossary_' || glossary.id as entity_qualified_id,+ 'glossary' as entity_type,+ created_at,+ updated_at,+ creator_id,+ term as name,+ definition as description,+ cast(null as int) as collection_id,+ cast(null as int) as made_public_by_user,+ cast(null as boolean) as is_embedding_enabled,+ null::bool as is_verified,+ false as archived,+ null as action_type,+ cast(null as int) as action_model_id,+ null as collection_is_official,+ null as collection_is_personal,+ null as question_viz_type,+ null as question_database_id,+ cast(null as boolean) as question_is_native,+ cast(null as timestamp) as event_timestamp+ from glossarydiff --git a/src/metabase/explorations/api.clj b/src/metabase/explorations/api.cljindex 4c75c38da59..242bce23832 100644--- a/src/metabase/explorations/api.clj+++ b/src/metabase/explorations/api.clj@@ -775,6 +775,7 @@"Fetch an exploration with its thread, selections, and generated queries."[{:keys [id]} :- [:map {:closed true} [:id ms/PositiveInt]]](let [expl (api/read-check (get-exploration-or-404 id))]+ (events/publish-event! :event/exploration-read {:object-id id :user-id api/*current-user-id*})(hydrate-exploration expl)))(api.macros/defendpoint :put "/:id" :- ::HydratedExplorationdiff --git a/src/metabase/explorations/init.clj b/src/metabase/explorations/init.cljindex a9a4f5fcd7c..ce12e68304d 100644--- a/src/metabase/explorations/init.clj+++ b/src/metabase/explorations/init.clj@@ -12,7 +12,8 @@[metabase.explorations.models.exploration-thread-timeline][metabase.explorations.queues][metabase.explorations.settings]- [metabase.explorations.task.collect-orphaned-results]))+ [metabase.explorations.task.collect-orphaned-results]+ [metabase.explorations.view-log]));; Install the content-visibility gate into the documents module's read/write path, so the;; Summary doc's content is hidden from collaborators whose lens differs from the creator's.diff --git a/src/metabase/explorations/view_log.clj b/src/metabase/explorations/view_log.cljnew file mode 100644index 00000000000..cc0d83d3e2a--- /dev/null+++ b/src/metabase/explorations/view_log.clj@@ -0,0 +1,41 @@+(ns metabase.explorations.view-log+ "Records exploration reads in the view log.++ The exploration page polls `GET /api/exploration/:id` every couple of seconds while research is+ running, so repeated reads by one user within [[recent-read-window-ms]] count as a single view."+ (:require+ [clojure.core.cache.wrapped :as cache.wrapped]+ [metabase.events.core :as events]+ [metabase.util.log :as log]+ [metabase.view-log.core :as view-log]+ [methodical.core :as m]+ [steffan-westcott.clj-otel.api.trace.span :as span]))++(events/derive! ::exploration-read :metabase/event)+(events/derive! :event/exploration-read ::exploration-read)++(def ^:private recent-read-window-ms (* 10 60 1000))++(def ^:private recent-reads+ "`[user-id exploration-id]` of reads within [[recent-read-window-ms]]."+ (cache.wrapped/ttl-cache-factory {} :ttl recent-read-window-ms))++(defn- first-read-in-window?+ "True for the one caller that adds `[user-id exploration-id]` to [[recent-reads]]. `lookup-or-miss` runs the+ value function at most once per key, so concurrent readers of the same exploration cannot both claim the first read."+ [user-id exploration-id]+ (let [claim (Object.)]+ (identical? claim (cache.wrapped/lookup-or-miss recent-reads [user-id exploration-id] (constantly claim)))))++(m/defmethod events/publish-event! ::exploration-read+ "Log an exploration view, collapsing the page's polling reads into one view per user."+ [topic {:keys [object-id user-id] :as event}]+ (span/with-span!+ {:name "view-log-exploration-read"+ :topic topic+ :user-id user-id}+ (try+ (when (first-read-in-window? user-id object-id)+ (view-log/record-views! (view-log/generate-view :model :model/Exploration event)))+ (catch Throwable e+ (log/warnf "Failed to process exploration view event. %s: %s" topic (ex-message e))))))diff --git a/src/metabase/view_log/events/view_log.clj b/src/metabase/view_log/events/view_log.cljindex f0717239bb6..1da2c783e4f 100644--- a/src/metabase/view_log/events/view_log.clj+++ b/src/metabase/view_log/events/view_log.clj@@ -221,9 +221,8 @@"Handle processing for a generic read event notification"[topic {:keys [object] :as event}](try- ;; Only log permission check failures for Cards and Dashboards. This set can be expanded if we add view logging of- ;; other models.- (when (#{:model/Card :model/Dashboard} (t2/model object))+ ;; Only log permission check failures for models whose successful reads are view-logged too.+ (when (#{:model/Card :model/Dashboard :model/Exploration} (t2/model object))(-> eventgenerate-viewrecord-views!))diff --git a/test/metabase/explorations/models/exploration_usage_analytics_test.clj b/test/metabase/explorations/models/exploration_usage_analytics_test.cljnew file mode 100644index 00000000000..e392d4e9c7d--- /dev/null+++ b/test/metabase/explorations/models/exploration_usage_analytics_test.clj@@ -0,0 +1,44 @@+(ns metabase.explorations.models.exploration-usage-analytics-test+ (:require+ [clojure.test :refer :all]+ [metabase.documents.test-util :as documents.test-util]+ [metabase.test :as mt]+ [toucan2.core :as t2]))++(deftest exploration-in-content-view-test+ (testing "Explorations appear in the usage analytics v_content view"+ (mt/with-temp [:model/Exploration {expl-id :id} {:name "Why is revenue down"+ :description "Q3 dip"+ :creator_id (mt/user->id :rasta)}]+ (is (=? {:entity_id expl-id+ :entity_qualified_id (str "exploration_" expl-id)+ :entity_type "exploration"+ :name "Why is revenue down"+ :description "Q3 dip"+ :creator_id (mt/user->id :rasta)}+ (t2/query-one {:select [:*]+ :from [:v_content]+ :where [:and+ [:= :entity_type "exploration"]+ [:= :entity_id expl-id]]}))))))++(deftest exploration-document-excluded-from-content-view-test+ (testing "A document attached to an exploration is not counted as content; a standalone document is"+ (mt/with-temp [:model/Exploration {expl-id :id} {:name "Why is revenue down"+ :creator_id (mt/user->id :rasta)}+ :model/Document {summary-id :id} {:name "Exploration Summary"+ :document (documents.test-util/text->prose-mirror-ast "attached")+ :creator_id (mt/user->id :rasta)+ :exploration_id expl-id}+ :model/Document {doc-id :id} {:name "Standalone Doc"+ :document (documents.test-util/text->prose-mirror-ast "standalone")+ :creator_id (mt/user->id :rasta)}]+ (let [content-ids (fn [ids]+ (->> (t2/query {:select [:entity_id]+ :from [:v_content]+ :where [:and+ [:= :entity_type "document"]+ [:in :entity_id ids]]})+ (map :entity_id)+ set))]+ (is (= #{doc-id} (content-ids [summary-id doc-id])))))))diff --git a/test/metabase/explorations/view_log_test.clj b/test/metabase/explorations/view_log_test.cljnew file mode 100644index 00000000000..a78458c919e--- /dev/null+++ b/test/metabase/explorations/view_log_test.clj@@ -0,0 +1,80 @@+(ns ^:synchronized metabase.explorations.view-log-test+ (:require+ [clojure.test :refer :all]+ [metabase.collections.models.collection :as collection]+ [metabase.events.core :as events]+ [metabase.explorations.view-log :as explorations.view-log]+ [metabase.test :as mt]+ [toucan2.core :as t2]))++(set! *warn-on-reflection* true)++(use-fixtures :each (fn [thunk]+ (mt/with-temporary-setting-values [synchronous-batch-updates true]+ (thunk))))++(defn- views+ "All view log rows for `user-id` reading exploration `exploration-id`, newest first."+ [user-id exploration-id]+ (t2/select :model/ViewLog+ :user_id user-id+ :model "exploration"+ :model_id exploration-id+ {:order-by [[:id :desc]]}))++(deftest exploration-read-ee-test+ (mt/with-premium-features #{:audit-app}+ (mt/with-temp [:model/User user {}+ :model/Exploration exploration {:name "Why is revenue down" :creator_id (:id user)}]+ (testing "An exploration read event is recorded in the view log"+ (events/publish-event! :event/exploration-read {:object-id (:id exploration) :user-id (:id user)})+ (is (=? [{:user_id (:id user)+ :model "exploration"+ :model_id (:id exploration)+ :has_access true}]+ (views (:id user) (:id exploration)))))+ (testing "Repeated reads by the same user shortly after (the page polls while research runs) count once"+ (events/publish-event! :event/exploration-read {:object-id (:id exploration) :user-id (:id user)})+ (events/publish-event! :event/exploration-read {:object-id (:id exploration) :user-id (:id user)})+ (is (= 1 (count (views (:id user) (:id exploration)))))))))++(deftest exploration-read-oss-no-view-logging-test+ (mt/with-premium-features #{}+ (mt/with-temp [:model/User user {}+ :model/Exploration exploration {:name "Why is revenue down" :creator_id (:id user)}]+ (testing "An exploration read event is not recorded without audit-app"+ (events/publish-event! :event/exploration-read {:object-id (:id exploration) :user-id (:id user)})+ (is (empty? (views (:id user) (:id exploration))))))))++(deftest get-exploration-records-view-test+ (mt/with-premium-features #{:audit-app}+ (mt/with-temp [:model/Exploration exploration {:name "Why is revenue down" :creator_id (mt/user->id :crowberto)}]+ (testing "GET /api/exploration/:id records a view for the current user"+ (mt/user-http-request :crowberto :get 200 (format "exploration/%d" (:id exploration)))+ (is (=? [{:model "exploration" :model_id (:id exploration)}]+ (views (mt/user->id :crowberto) (:id exploration))))))))++(deftest get-exploration-without-access-records-failed-view-test+ (mt/with-premium-features #{:audit-app}+ (mt/with-temp [:model/User owner {}+ :model/User other {}+ :model/Exploration exploration {:name "Private"+ :creator_id (:id owner)+ :collection_id (:id (collection/user->personal-collection (:id owner)))}]+ (testing "A 403 on GET /api/exploration/:id records a view without access for the current user"+ (mt/user-http-request other :get 403 (format "exploration/%d" (:id exploration)))+ (is (=? [{:user_id (:id other)+ :model "exploration"+ :model_id (:id exploration)+ :has_access false}]+ (views (:id other) (:id exploration))))))))++(deftest first-read-in-window-concurrent-test+ (testing "Concurrent reads of one exploration by one user claim the first read exactly once"+ (let [first-read? #'explorations.view-log/first-read-in-window?+ user-id (- (rand-int 1000000))+ start (java.util.concurrent.CountDownLatch. 1)+ results (doall (for [_ (range 16)]+ (future (.await start) (first-read? user-id -1))))]+ (.countDown start)+ (is (= 1 (count (filter true? (map deref results))))))))