diff --git a/src/metabase/models/dashboard.clj b/src/metabase/models/dashboard.clj index a3d25db93fe00fda3f8d938619735512520b199f..0475c47bf21d768debb9fc867aa571f844a5bac1 100644 --- a/src/metabase/models/dashboard.clj +++ b/src/metabase/models/dashboard.clj @@ -5,7 +5,6 @@ [clojure.set :as set] [clojure.string :as str] [clojure.tools.logging :as log] - [medley.core :as m] [metabase.automagic-dashboards.populate :as populate] [metabase.events :as events] [metabase.models.card :as card :refer [Card]] @@ -15,9 +14,7 @@ :refer [DashboardCard]] [metabase.models.field-values :as field-values] [metabase.models.interface :as mi] - [metabase.models.parameter-card - :as parameter-card - :refer [ParameterCard]] + [metabase.models.parameter-card :as parameter-card] [metabase.models.params :as params] [metabase.models.permissions :as perms] [metabase.models.pulse :as pulse :refer [Pulse]] @@ -147,23 +144,6 @@ [dashboard] (update-dashboard-subscription-pulses! dashboard)) -(defn- card-ids-by-param-id - "Returns a map from parameter IDs to card IDs for the given dashboard (for parameters whose filter values come from a - card via a ParameterCard)." - [dashboard-id] - (->> (db/select ParameterCard :parameterized_object_id dashboard-id :parameterized_object_type "dashboard") - (group-by :parameter_id) - (m/map-vals (comp :card_id first)))) - -(defn- populate-card-id-for-parameters - [{dashboard-id :id parameters :parameters :as dashboard}] - (assoc dashboard :parameters - (let [param-id->card-id (card-ids-by-param-id dashboard-id)] - (for [{:keys [id values_source_type values_source_config] :as param} parameters] - (if (= values_source_type "card") - (assoc-in param [:values_source_config :card_id] (get param-id->card-id id (:card_id values_source_config))) - param))))) - (mi/define-methods Dashboard {:properties (constantly {::mi/timestamped? true @@ -174,7 +154,7 @@ :post-insert post-insert :pre-update pre-update :post-update post-update - :post-select (comp populate-card-id-for-parameters public-settings/remove-public-uuid-if-public-sharing-is-disabled)}) + :post-select public-settings/remove-public-uuid-if-public-sharing-is-disabled}) (defmethod serdes.hash/identity-hash-fields Dashboard [_dashboard] diff --git a/test/metabase/api/dashboard_test.clj b/test/metabase/api/dashboard_test.clj index b2b2ab3a44347606ccdbe193993b97bd105fba92..2a7b7245fcc838a2d3603abcf17918f2e8c795a5 100644 --- a/test/metabase/api/dashboard_test.clj +++ b/test/metabase/api/dashboard_test.clj @@ -197,7 +197,7 @@ (mt/user-http-request :rasta :post 200 "dashboard" {:name dashboard-name :collection_id (u/the-id collection) :collection_position 1000}) - (is (= #metabase.models.dashboard.DashboardInstance{:collection_id true, :collection_position 1000, :parameters []} + (is (= #metabase.models.dashboard.DashboardInstance{:collection_id true, :collection_position 1000} (some-> (db/select-one [Dashboard :collection_id :collection_position] :name dashboard-name) (update :collection_id (partial = (u/the-id collection)))))) (finally diff --git a/test/metabase/events/activity_feed_test.clj b/test/metabase/events/activity_feed_test.clj index 2ee7acd0906ae6f23008fd5aac2396c7e24c3fbf..6db6687394c4f798b380e1a70cafc5e9d065b54f 100644 --- a/test/metabase/events/activity_feed_test.clj +++ b/test/metabase/events/activity_feed_test.clj @@ -134,7 +134,6 @@ :table_id nil :details {:name "My Cool Dashboard" :description nil - :parameters [] :dashcards [{:description (:description card) :name (:name card) :id (:id dashcard) @@ -159,7 +158,6 @@ :table_id nil :details {:name "My Cool Dashboard" :description nil - :parameters [] :dashcards [{:description (:description card) :name (:name card) :id (:id dashcard) diff --git a/test/metabase/events/revision_test.clj b/test/metabase/events/revision_test.clj index bc6a78c85f39e0ed1152d2f0ff8c7c996d187d61..4ba85eb5b3b0689a894f086fb02fe3244f2e0120 100644 --- a/test/metabase/events/revision_test.clj +++ b/test/metabase/events/revision_test.clj @@ -46,7 +46,6 @@ (defn- dashboard->revision-object [dashboard] {:description nil :cache_ttl nil - :parameters [] :name (:name dashboard)}) (deftest card-create-test