Skip to content
Snippets Groups Projects
Commit 0838c740 authored by Allen Gilliland's avatar Allen Gilliland
Browse files

update api endpoints for adding/updating DashboardCards to allow for... 

update api endpoints for adding/updating DashboardCards to allow for specifying the `:series` of additional cards to apply.
parent ee0dbbce
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/metabase/api/dashboard.clj
+ 14
− 8
View file @ 0838c740
......@@ -69,15 +69,19 @@
(defendpoint POST "/:id/cards"
"Add a `Card` to a `Dashboard`."
[id :as {{:keys [cardId]} :body}]
[id :as {{:keys [cardId series] :as dashboard-card} :body}]
{cardId [Required Integer]}
(write-check Dashboard id)
(check-400 (db/exists? Card :id cardId))
(let [result (create-dashboard-card {:dashboard_id id
:card_id cardId
:creator_id *current-user-id*})]
(events/publish-event :dashboard-add-cards {:id id :actor_id *current-user-id* :dashcards [result]})
result))
(let [defaults {:dashboard_id id
:card_id cardId
:creator_id *current-user-id*
:series (or series [])}
dashboard-card (-> (merge dashboard-card defaults)
(update :series #(filter identity (map :id %))))]
(let-500 [result (create-dashboard-card dashboard-card)]
(events/publish-event :dashboard-add-cards {:id id :actor_id *current-user-id* :dashcards [result]})
result)))
(defendpoint PUT "/:id/cards"
"Reposition `Cards` on a `Dashboard`. Request body should have the form:
......@@ -86,14 +90,16 @@
:sizeX ...
:sizeY ...
:row ...
:col} ...]}"
:col ...
:series [{:id 123
...}]} ...]}"
[id :as {{:keys [cards]} :body}]
(write-check Dashboard id)
(let [dashcard-ids (set (db/sel :many :field [DashboardCard :id] :dashboard_id id))]
(doseq [{dashcard-id :id :as dashboard-card} cards]
;; ensure the dashcard we are updating is part of the given dashboard
(when (contains? dashcard-ids dashcard-id)
(update-dashboard-card dashboard-card))))
(update-dashboard-card (update dashboard-card :series #(filter identity (map :id %)))))))
(events/publish-event :dashboard-reposition-cards {:id id :actor_id *current-user-id* :dashcards cards})
{:status :ok})
......
test/metabase/api/dashboard_test.clj
+ 107
− 22
View file @ 0838c740
......@@ -9,7 +9,8 @@
(metabase.models [hydrate :refer [hydrate]]
[card :refer [Card]]
[dashboard :refer [Dashboard]]
[dashboard-card :refer [DashboardCard]]
[dashboard-card :refer [DashboardCard retrieve-dashboard-card]]
[dashboard-card-series :refer [DashboardCardSeries]]
[user :refer [User]])
[metabase.test.data :refer :all]
[metabase.test.data.users :refer :all]
......@@ -18,6 +19,21 @@
;; ## Helper Fns
(defn remove-ids-and-boolean-timestamps [m]
(let [f (fn [v]
(cond
(map? v) (remove-ids-and-boolean-timestamps v)
(coll? v) (mapv remove-ids-and-boolean-timestamps v)
:else v))]
(into {} (for [[k v] m]
(when-not (or (= :id k)
(.endsWith (name k) "_id"))
(if (or (= :created_at k)
(= :updated_at k))
[k (not (nil? v))]
[k (f v)]))))))
(defn user-details [user]
(tu/match-$ user
{:id $
......@@ -168,18 +184,19 @@
;; # DASHBOARD CARD ENDPOINTS
;; ## POST /api/dashboard/:id/cards
;; simple creation with no additional series
(expect
[{:sizeX 2
:sizeY 2
:col nil
:row nil
:col 4
:row 4
:series []
:created_at true
:updated_at true}
[{:sizeX 2
:sizeY 2
:col nil
:row nil}]]
:col 4
:row 4}]]
(tu/with-temp Dashboard [{dashboard-id :id} {:name "Test Dashboard"
:public_perms 0
:creator_id (user->id :rasta)}]
......@@ -189,12 +206,55 @@
:display "scalar"
:dataset_query {:something "simple"}
:visualization_settings {:global {:title nil}}}]
[(-> ((user->client :rasta) :post 200 (format "dashboard/%d/cards" dashboard-id) {:cardId card-id})
[(-> ((user->client :rasta) :post 200 (format "dashboard/%d/cards" dashboard-id) {:cardId card-id
:row 4
:col 4})
(dissoc :id :dashboard_id :card_id)
(update :created_at #(not (nil? %)))
(update :updated_at #(not (nil? %))))
(db/sel :many :fields [DashboardCard :sizeX :sizeY :col :row] :dashboard_id dashboard-id)])))
;; new dashboard card w/ additional series
(expect
[{:sizeX 2
:sizeY 2
:col 4
:row 4
:series [{:name "Series Card"
:description nil
:display "scalar"
:dataset_query {:something "simple"}
:visualization_settings {}}]
:created_at true
:updated_at true}
[{:sizeX 2
:sizeY 2
:col 4
:row 4}]
[0]]
(tu/with-temp Dashboard [{dashboard-id :id} {:name "Test Dashboard"
:public_perms 0
:creator_id (user->id :rasta)}]
(tu/with-temp Card [{card-id :id} {:name "Dashboard Test Card"
:creator_id (user->id :rasta)
:public_perms 0
:display "scalar"
:dataset_query {:something "simple"}
:visualization_settings {}}]
(tu/with-temp Card [{series-id1 :id} {:name "Series Card"
:creator_id (user->id :rasta)
:public_perms 0
:display "scalar"
:dataset_query {:something "simple"}
:visualization_settings {}}]
(let [dashboard-card ((user->client :rasta) :post 200 (format "dashboard/%d/cards" dashboard-id) {:cardId card-id
:row 4
:col 4
:series [{:id series-id1}]})]
[(remove-ids-and-boolean-timestamps dashboard-card)
(db/sel :many :fields [DashboardCard :sizeX :sizeY :col :row] :dashboard_id dashboard-id)
(db/sel :many :field [DashboardCardSeries :position] :dashboardcard_id (:id dashboard-card))])))))
;; ## DELETE /api/dashboard/:id/cards
(expect
......@@ -223,20 +283,36 @@
[[{:sizeX 2
:sizeY 2
:col nil
:row nil}
:row nil
:series []
:created_at true
:updated_at true}
{:sizeX 2
:sizeY 2
:col nil
:row nil}]
:row nil
:series []
:created_at true
:updated_at true}]
{:status "ok"}
[{:sizeX 4
:sizeY 2
:col 0
:row 0}
:row 0
:series [{:name "Series Card"
:description nil
:display :scalar
:dataset_query {:something "simple"}
:visualization_settings {}}]
:created_at true
:updated_at true}
{:sizeX 1
:sizeY 1
:col 1
:row 3}]]
:row 3
:series []
:created_at true
:updated_at true}]]
;; fetch a dashboard WITH a dashboard card on it
(tu/with-temp Dashboard [{dashboard-id :id} {:name "Test Dashboard"
:public_perms 0
......@@ -251,15 +327,24 @@
:card_id card-id}]
(tu/with-temp DashboardCard [{dashcard-id2 :id} {:dashboard_id dashboard-id
:card_id card-id}]
[(db/sel :many :fields [DashboardCard :sizeX :sizeY :row :col] :dashboard_id dashboard-id (k/order :id :asc))
((user->client :rasta) :put 200 (format "dashboard/%d/cards" dashboard-id) {:cards [{:id dashcard-id1
:sizeX 4
:sizeY 2
:col 0
:row 0}
{:id dashcard-id2
:sizeX 1
:sizeY 1
:col 1
:row 3}]})
(db/sel :many :fields [DashboardCard :sizeX :sizeY :row :col] :dashboard_id dashboard-id (k/order :id :asc))])))))
(tu/with-temp Card [{series-id1 :id} {:name "Series Card"
:creator_id (user->id :rasta)
:public_perms 0
:display "scalar"
:dataset_query {:something "simple"}
:visualization_settings {}}]
[[(remove-ids-and-boolean-timestamps (retrieve-dashboard-card dashcard-id1))
(remove-ids-and-boolean-timestamps (retrieve-dashboard-card dashcard-id2))]
((user->client :rasta) :put 200 (format "dashboard/%d/cards" dashboard-id) {:cards [{:id dashcard-id1
:sizeX 4
:sizeY 2
:col 0
:row 0
:series [{:id series-id1}]}
{:id dashcard-id2
:sizeX 1
:sizeY 1
:col 1
:row 3}]})
[(remove-ids-and-boolean-timestamps (retrieve-dashboard-card dashcard-id1))
(remove-ids-and-boolean-timestamps (retrieve-dashboard-card dashcard-id2))]]))))))
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment