Skip to content

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

Exclude other users collections in metabot search (#65348)

Chris Truter8b90ffd90693
diff --git a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/search.clj b/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/search.clj
index e6613195562..a37cc4d377f 100644
--- a/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/search.clj
+++ b/enterprise/backend/src/metabase_enterprise/metabot_v3/tools/search.clj
@@ -137,6 +137,7 @@
:is-sandboxed-user? (perms/sandboxed-user?)
:is-superuser? api/*is-superuser?*
:current-user-perms @api/*current-user-permissions-set*
+ :filter-items-in-personal-collection "exclude-others"
:context :metabot
:archived false
:limit limit
diff --git a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/search_test.clj b/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/search_test.clj
index 80915400102..372c1f82147 100644
--- a/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/search_test.clj
+++ b/enterprise/backend/test/metabase_enterprise/metabot_v3/tools/search_test.clj
@@ -5,6 +5,7 @@
[metabase.api.common :as api]
[metabase.permissions.core :as perms]
[metabase.search.core :as search-core]
+ [metabase.search.test-util :as search.tu]
[metabase.test :as mt]
[toucan2.core :as t2]))
@@ -344,3 +345,20 @@
(search/search {:term-queries ["test"]
:entity-types ["card"]
:search-native-query nil}))))))
+
+(deftest other-user-collection-test
+ (testing "excludes entities from other users' collections"
+ (mt/with-test-user :crowberto
+ (search.tu/with-temp-index-table
+ (let [admins-coll-id (t2/select-one-pk :model/Collection :personal_owner_id api/*current-user-id*)
+ others-coll-id (t2/select-one-pk :model/Collection :personal_owner_id (mt/user->id :rasta))]
+ (mt/with-temp [:model/Collection {public-coll-id :id} {}
+ :model/Dashboard {dash-id-1 :id} {:name "Our Dashboard", :collection_id public-coll-id}
+ :model/Dashboard {dash-2-id :id} {:name "My Dashboard", :collection_id admins-coll-id}
+ :model/Dashboard {dash-id-3 :id} {:name "Your Dashboard", :collection_id others-coll-id}]
+ (let [test-id? #{dash-id-1 dash-2-id dash-id-3}]
+ (is (= #{"Our Dashboard" "My Dashboard"}
+ (->> (search/search {:term-queries ["Dashboard"]})
+ (filter (comp test-id? :id))
+ (map :name)
+ (set)))))))))))