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
[search] make verified dashboards appear when filtering for "verified" (#64462)
Oleksandr Solovyov54b3ad3455d2
diff --git a/src/metabase/dashboards/models/dashboard.clj b/src/metabase/dashboards/models/dashboard.cljindex ce6d8d9d7fd..f7a423096ce 100644--- a/src/metabase/dashboards/models/dashboard.clj+++ b/src/metabase/dashboards/models/dashboard.clj@@ -464,6 +464,7 @@:last-edited-at :r.timestamp:last-viewed-at true:pinned [:> [:coalesce :collection_position [:inline 0]] [:inline 0]]+ :verified [:= "verified" :mr.status]:view-count true:created-at true:updated-at true}diff --git a/src/metabase/search/appdb/core.clj b/src/metabase/search/appdb/core.cljindex 05c84ec8b9e..81a3f0b8360 100644--- a/src/metabase/search/appdb/core.clj+++ b/src/metabase/search/appdb/core.clj@@ -101,7 +101,7 @@;; Sync, in case we're just out of sync with the database.found-active (:active (#'search.index/sync-tracking-atoms!));; If there's really no index, and we're running in prod - gulp, try to initialize now.- init-now? (and (not found-active) config/is-prod?)]+ init-now? (and (not found-active) config/is-prod?)](when init-now?(log/warnf "Triggering a late initialization of the %s search index." search-engine)(try@@ -131,13 +131,13 @@(log/warn "Returning search results even though they may be stale. Queue size:" (pending-updates)))))(let [weights (search.config/weights search-ctx)- scorers (search.scoring/scorers search-ctx)]- (->> (search.index/search-query search-string search-ctx [:legacy_input])- (add-collection-join-and-where-clauses search-ctx)- (add-table-where-clauses search-ctx)- (search.scoring/with-scores search-ctx scorers)- (search.filter/with-filters search-ctx)- t2/query+ scorers (search.scoring/scorers search-ctx)+ query (->> (search.index/search-query search-string search-ctx [:legacy_input])+ (add-collection-join-and-where-clauses search-ctx)+ (add-table-where-clauses search-ctx)+ (search.scoring/with-scores search-ctx scorers)+ (search.filter/with-filters search-ctx))]+ (->> (t2/query query)(map (partial rehydrate weights (keys scorers)))))(catch Exception e;; Rule out the error coming from stale index metadata.diff --git a/src/metabase/search/in_place/filter.clj b/src/metabase/search/in_place/filter.cljindex 01c3878d5ef..90586ba19d6 100644--- a/src/metabase/search/in_place/filter.clj+++ b/src/metabase/search/in_place/filter.clj@@ -149,6 +149,19 @@[filter _model query verified](build-optional-filter-query filter "card" query verified))+(defmethod build-optional-filter-query [:verified "dashboard"]+ [_filter model query verified]+ (assert (true? verified) "filter for non-verified dashboards is not supported")+ (if (premium-features/has-feature? :content-verification)+ (-> query+ (sql.helpers/join :moderation_review+ [:= :moderation_review.moderated_item_id+ (search.config/column-with-model-alias model :id)])+ (sql.helpers/where [:= :moderation_review.status "verified"]+ [:= :moderation_review.moderated_item_type "dashboard"]+ [:= :moderation_review.most_recent true]))+ (sql.helpers/where query false-clause)))+;; Created at filters(defn- date-range-filter-clausediff --git a/test/metabase/search/api_test.clj b/test/metabase/search/api_test.cljindex d2383ab9952..5d561b17022 100644--- a/test/metabase/search/api_test.clj+++ b/test/metabase/search/api_test.clj@@ -419,12 +419,12 @@:model/Collection {_v-coll-id :id} {:name (format "%s Verified Collection" search-term) :authority_level "official"}](testing "when has both :content-verification features"(mt/with-premium-features #{:content-verification}- (mt/with-verified-cards! [v-card-id v-model-id v-metric-id]+ (mt/with-verified! {:card [v-card-id v-model-id v-metric-id]}(is (= #{"card" "dataset" "metric"}(get-available-models :q search-term :verified true))))))(testing "when has :content-verification feature only"(mt/with-premium-features #{:content-verification}- (mt/with-verified-cards! [v-card-id]+ (mt/with-verified! {:card [v-card-id]}(is (= #{"card"}(get-available-models :q search-term :verified true))))))))(testing "return a subset of model for created_at filter"@@ -485,8 +485,10 @@named #(str search-name "-" %)](mt/with-temp [:model/Collection {parent-id :id} {}:model/Dashboard {dash :id} {:collection_id parent-id :name (named "dashboard")}- :model/Card {card :id} {:collection_id parent-id :name (named "card")}- :model/Card {model :id} {:collection_id parent-id :type :model :name (named "model")}]+ :model/Card {card :id} {:collection_id parent-id :name (named "card")+ :dataset_query (mt/native-query {:query "select 1"})}+ :model/Card {model :id} {:collection_id parent-id :type :model :name (named "model")+ :dataset_query (mt/native-query {:query "select 1"})}](mt/with-full-data-perms-for-all-users!(perms/revoke-collection-permissions! (perms/all-users-group) parent-id)(testing "sanity check: before archiving, we can't see these items"@@ -1199,8 +1201,10 @@[:model/Card {v-card-id :id} {:name (format "%s Verified Card" search-term)}:model/Card {_card-id :id} {:name (format "%s Normal Card" search-term)}:model/Card {_model-id :id} {:name (format "%s Normal Model" search-term) :type :model}- :model/Card {v-model-id :id} {:name (format "%s Verified Model" search-term) :type :model}]- (mt/with-verified-cards! [v-card-id v-model-id]+ :model/Card {v-model-id :id} {:name (format "%s Verified Model" search-term) :type :model}+ :model/Dashboard {v-dash-id :id} {:name (format "%s Verified Dashboard" search-term)}]+ (mt/with-verified! {:card [v-card-id v-model-id]+ :dashboard [v-dash-id]}(mt/with-premium-features #{:content-verification}(testing "Able to filter only verified items"(let [resp (mt/user-http-request :crowberto :get 200 "search"@@ -1214,23 +1218,24 @@count))))(testing "only a subset of models are applicable"- (is (= #{"card" "dataset"} (set (:available_models resp)))))+ (is (= #{"card" "dataset" "dashboard"} (set (:available_models resp)))))(testing "results contains only verified entities"(is (= #{[v-card-id "card" "Verified filter Verified Card"]- [v-model-id "dataset" "Verified filter Verified Model"]}+ [v-model-id "dataset" "Verified filter Verified Model"]+ [v-dash-id "dashboard" "Verified filter Verified Dashboard"]}(->> (:data resp)(map (juxt :id :model :name))set))))))- (testing "Returns schema error if attempt to serach for non-verified items"+ (testing "Returns schema error if attempt to search for non-verified items"(is (= {:verified "nullable true"}(:errors (mt/user-http-request :crowberto :get 400 "search" :q "x" :verified false)))))(testing "Works with models filter"(testing "return intersections of supported models with provided models"- (is (= #{"card"}+ (is (= #{"card" "dashboard"}(->> (mt/user-http-request :crowberto :get 200 "search":q search-term :verified true :models "card" :models "dashboard" :model "table"):data@@ -1245,11 +1250,12 @@:calculate_available_models true)](testing "only a subset of models are applicable"- (is (= #{"card" "dataset"} (set (:available_models resp)))))+ (is (= #{"card" "dataset" "dashboard"} (set (:available_models resp)))))(testing "results contains only verified entities"(is (= #{[v-card-id "card" "Verified filter Verified Card"]- [v-model-id "dataset" "Verified filter Verified Model"]}+ [v-model-id "dataset" "Verified filter Verified Model"]+ [v-dash-id "dashboard" "Verified filter Verified Dashboard"]}(->> (:data resp)(map (juxt :id :model :name))set)))))))diff --git a/test/metabase/search/in_place/filter_test.clj b/test/metabase/search/in_place/filter_test.cljindex 19acc94f9ce..a2ef3c0231c 100644--- a/test/metabase/search/in_place/filter_test.clj+++ b/test/metabase/search/in_place/filter_test.clj@@ -64,12 +64,12 @@:created-at "past3days"})))))(testing "verified"- (is (= #{"dataset" "card" "metric"}+ (is (= #{"dashboard" "dataset" "card" "metric"}(search.filter/search-context->applicable-models(merge default-search-ctx{:verified true}))))- (is (= #{"dataset"}+ (is (= #{"dashboard" "dataset"}(search.filter/search-context->applicable-models(merge default-search-ctx{:models #{"dashboard" "dataset" "table"}diff --git a/test/metabase/test.clj b/test/metabase/test.cljindex 0464ffdd074..1e57e2419b0 100644--- a/test/metabase/test.clj+++ b/test/metabase/test.clj@@ -299,7 +299,7 @@with-temporary-setting-valueswith-temporary-raw-setting-valueswith-user-in-groups- with-verified-cards!+ with-verified!works-after][tu.asyncdiff --git a/test/metabase/test/util.clj b/test/metabase/test/util.cljindex 79b7dfe0479..4797457f1e0 100644--- a/test/metabase/test/util.clj+++ b/test/metabase/test/util.clj@@ -902,30 +902,29 @@(testing "Shouldn't delete other Cards"(is (pos? (t2/count :model/Card)))))))))-(defn do-with-verified-cards!- "Impl for [[with-verified-cards!]]."- [card-or-ids thunk]+(defn do-with-verified!+ "Impl for [[with-verified!]]."+ [cards-or-dashes thunk](with-model-cleanup [:model/ModerationReview]- (doseq [card-or-id card-or-ids]+ (doseq [[item-type model-or-ids] cards-or-dashes+ model-or-id model-or-ids](doseq [status ["verified" nil "verified"]];; create multiple moderation review for a card, but the end result is it's still verified(moderation-review/create-review!- {:moderated_item_id (u/the-id card-or-id)- :moderated_item_type "card"- :moderator_id ((requiring-resolve 'metabase.test.data.users/user->id) :rasta)- :status status})))+ {:moderated_item_id (u/the-id model-or-id)+ :moderated_item_type (name item-type)+ :moderator_id ((requiring-resolve 'metabase.test.data.users/user->id) :rasta)+ :status status})))(thunk)))-(defmacro with-verified-cards!+(defmacro with-verified!"Execute the body with all `card-or-ids` verified."- [card-or-ids & body]- `(do-with-verified-cards! ~card-or-ids (fn [] ~@body)))+ [cards-or-dashes & body]+ `(do-with-verified! ~cards-or-dashes (fn [] ~@body)))-(deftest with-verified-cards-test- #_{:clj-kondo/ignore [:discouraged-var]}- (t2.with-temp/with-temp- [:model/Card {card-id :id} {}]- (with-verified-cards! [card-id]+(deftest with-verified-test+ (t2.with-temp/with-temp [:model/Card {card-id :id} {}]+ (with-verified! {:card [card-id]}(is (=? #{{:moderated_item_id card-id:moderated_item_type :card:most_recent true