From 4278acae757e58904c64d8953086baef7e3970ec Mon Sep 17 00:00:00 2001
From: Tim Macdonald <tim@metabase.com>
Date: Tue, 10 Jan 2023 11:14:04 +0000
Subject: [PATCH] =?UTF-8?q?Use=204=C3=974=20as=20the=20default=20dashcard?=
=?UTF-8?q?=20size=20(#27572)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
[Fixes #16293]
---
resources/migrations/000_migrations.yaml | 20 +++++++++
src/metabase/models/dashboard_card.clj | 6 +--
test/metabase/api/dashboard_test.clj | 44 ++++++++++----------
test/metabase/api/revision_test.clj | 6 +--
test/metabase/events/revision_test.clj | 6 +--
test/metabase/models/dashboard_card_test.clj | 18 ++++----
test/metabase/models/dashboard_test.clj | 32 +++++++-------
7 files changed, 76 insertions(+), 56 deletions(-)
diff --git a/resources/migrations/000_migrations.yaml b/resources/migrations/000_migrations.yaml
index e3496c03f39..021f9c13a31 100644
--- a/resources/migrations/000_migrations.yaml
+++ b/resources/migrations/000_migrations.yaml
@@ -13889,6 +13889,26 @@ databaseChangeLog:
constraintName: fk_app_ref_dashboard_id
onDelete: SET NULL
+ - changeSet:
+ id: v46.00-040
+ author: tsmacdonald
+ comment: Added 0.46.0 -- Bump default dashcard size to 4x4
+ changes:
+ - addDefaultValue:
+ tableName: report_dashboardcard
+ columnName: size_x
+ defaultValue: 4
+
+ - changeSet:
+ id: v46.00-041
+ author: tsmacdonald
+ comment: Added 0.46.0 -- Bump default dashcard size to 4x4
+ changes:
+ - addDefaultValue:
+ tableName: report_dashboardcard
+ columnName: size_y
+ defaultValue: 4
+
# >>>>>>>>>> DO NOT ADD NEW MIGRATIONS BELOW THIS LINE! ADD THEM ABOVE <<<<<<<<<<
########################################################################################################################
diff --git a/src/metabase/models/dashboard_card.clj b/src/metabase/models/dashboard_card.clj
index 98ef4f808c4..be295d7bbdd 100644
--- a/src/metabase/models/dashboard_card.clj
+++ b/src/metabase/models/dashboard_card.clj
@@ -188,14 +188,14 @@
DashboardCardSeries. Returns the newly created DashboardCard or throws an Exception."
[dashboard-card :- NewDashboardCard]
(let [{:keys [dashboard_id card_id action_id parameter_mappings visualization_settings size_x size_y row col series]
- :or {size_x 2, size_y 2, series []}} dashboard-card]
+ :or {size_x 4, size_y 4, series []}} dashboard-card]
(db/transaction
(let [dashboard-card (db/insert! DashboardCard
:dashboard_id dashboard_id
:card_id card_id
:action_id action_id
- :size_x size_x
- :size_y size_y
+ :size_x size_x
+ :size_y size_y
:row (or row 0)
:col (or col 0)
:parameter_mappings (or parameter_mappings [])
diff --git a/test/metabase/api/dashboard_test.clj b/test/metabase/api/dashboard_test.clj
index 8b3d5fe4801..b2b2ab3a443 100644
--- a/test/metabase/api/dashboard_test.clj
+++ b/test/metabase/api/dashboard_test.clj
@@ -244,8 +244,8 @@
:can_write false
:param_fields nil
:last-edit-info {:timestamp true :id true :first_name "Test" :last_name "User" :email "test@example.com"}
- :ordered_cards [{:size_x 2
- :size_y 2
+ :ordered_cards [{:size_x 4
+ :size_y 4
:col 0
:row 0
:collection_authority_level nil
@@ -293,8 +293,8 @@
:has_field_values "search"
:name_field nil
:dimensions []}}
- :ordered_cards [{:size_x 2
- :size_y 2
+ :ordered_cards [{:size_x 4
+ :size_y 4
:col 0
:row 0
:updated_at true
@@ -1075,8 +1075,8 @@
Card [{card-id :id}]]
(with-dashboards-in-writeable-collection [dashboard-id]
(api.card-test/with-cards-in-readable-collection [card-id]
- (is (= {:size_x 2
- :size_y 2
+ (is (= {:size_x 4
+ :size_y 4
:col 4
:row 4
:series []
@@ -1096,8 +1096,8 @@
(dissoc :id :dashboard_id :action_id :card_id :entity_id)
(update :created_at boolean)
(update :updated_at boolean))))
- (is (= [{:size_x 2
- :size_y 2
+ (is (= [{:size_x 4
+ :size_y 4
:col 4
:row 4
:parameter_mappings [{:parameter_id "abc", :card_id 123, :hash "abc", :target "foo"}]
@@ -1117,8 +1117,8 @@
:row 4
:col 4
:series [{:id series-id-1}]})]
- (is (= {:size_x 2
- :size_y 2
+ (is (= {:size_x 4
+ :size_y 4
:col 4
:row 4
:parameter_mappings []
@@ -1131,8 +1131,8 @@
:created_at true
:updated_at true}
(remove-ids-and-booleanize-timestamps dashboard-card)))
- (is (= [{:size_x 2
- :size_y 2
+ (is (= [{:size_x 4
+ :size_y 4
:col 4
:row 4}]
(map (partial into {})
@@ -1284,8 +1284,8 @@
DashboardCard [{dashcard-id-2 :id} {:dashboard_id dashboard-id, :card_id card-id}]
Card [{series-id-1 :id} {:name "Series Card"}]]
(with-dashboards-in-writeable-collection [dashboard-id]
- (is (= {:size_x 2
- :size_y 2
+ (is (= {:size_x 4
+ :size_y 4
:col 0
:row 0
:series []
@@ -1294,8 +1294,8 @@
:created_at true
:updated_at true}
(remove-ids-and-booleanize-timestamps (dashboard-card/retrieve-dashboard-card dashcard-id-1))))
- (is (= {:size_x 2
- :size_y 2
+ (is (= {:size_x 4
+ :size_y 4
:col 0
:row 0
:parameter_mappings []
@@ -1375,8 +1375,8 @@
:model_id dashboard-id
:object {:name "b"
:description nil
- :cards [{:size_x 2
- :size_y 2
+ :cards [{:size_x 4
+ :size_y 4
:row 0
:col 0
:card_id 123
@@ -1387,8 +1387,8 @@
:user_id (mt/user->id :crowberto)
:object {:name "c"
:description "something"
- :cards [{:size_x 4
- :size_y 3
+ :cards [{:size_x 5
+ :size_y 3
:row 0
:col 0
:card_id 123
@@ -1401,10 +1401,10 @@
(dissoc :email :date_joined :last_login :is_superuser :is_qbnewb))
:diff {:before {:name "b"
:description nil
- :cards [{:series nil, :size_y 2, :size_x 2}]}
+ :cards [{:series nil, :size_y 4, :size_x 4}]}
:after {:name "c"
:description "something"
- :cards [{:series [8 9], :size_y 3, :size_x 4}]}}
+ :cards [{:series [8 9], :size_y 3, :size_x 5}]}}
:description "renamed it from \"b\" to \"c\", added a description, rearranged the cards and added some series to card 123."}
{:is_reversion false
:is_creation true
diff --git a/test/metabase/api/revision_test.clj b/test/metabase/api/revision_test.clj
index 05caacf5d51..c535f45eb09 100644
--- a/test/metabase/api/revision_test.clj
+++ b/test/metabase/api/revision_test.clj
@@ -120,13 +120,13 @@
:message nil
:user @rasta-revision-info
:diff {:before {:cards nil}
- :after {:cards [{:size_x 2, :size_y 2, :row 0, :col 0, :card_id card-id, :series []}]}}
+ :after {:cards [{:size_x 4, :size_y 4, :row 0, :col 0, :card_id card-id, :series []}]}}
:description "added a card."}
{:is_reversion false
:is_creation false
:message nil
:user @rasta-revision-info
- :diff {:before {:cards [{:size_x 2, :size_y 2, :row 0, :col 0, :card_id card-id, :series []}]}
+ :diff {:before {:cards [{:size_x 4, :size_y 4, :row 0, :col 0, :card_id card-id, :series []}]}
:after {:cards nil}}
:description "removed a card."}
{:is_reversion false
@@ -134,7 +134,7 @@
:message nil
:user @rasta-revision-info
:diff {:before {:cards nil}
- :after {:cards [{:size_x 2, :size_y 2, :row 0, :col 0, :card_id card-id, :series []}]}}
+ :after {:cards [{:size_x 4, :size_y 4, :row 0, :col 0, :card_id card-id, :series []}]}}
:description "added a card."}
{:is_reversion false
:is_creation true
diff --git a/test/metabase/events/revision_test.clj b/test/metabase/events/revision_test.clj
index 00b77f005bc..bc6a78c85f3 100644
--- a/test/metabase/events/revision_test.clj
+++ b/test/metabase/events/revision_test.clj
@@ -159,7 +159,7 @@
(mt/with-temp* [Dashboard [{dashboard-id :id, :as dashboard}]
Card [{card-id :id} (card-properties)]
DashboardCard [dashcard {:card_id card-id, :dashboard_id dashboard-id}]]
- (db/update! DashboardCard (:id dashcard), :size_x 4)
+ (db/update! DashboardCard (:id dashcard), :size_x 3)
(revision/process-revision-event! {:topic :dashboard-reeposition-cards
:item {:id dashboard-id
:actor_id (mt/user->id :crowberto)
@@ -169,8 +169,8 @@
:user_id (mt/user->id :crowberto)
:object (assoc (dashboard->revision-object dashboard) :cards [{:id (:id dashcard)
:card_id card-id
- :size_x 4
- :size_y 2
+ :size_x 3
+ :size_y 4
:row 0
:col 0
:series []}])
diff --git a/test/metabase/models/dashboard_card_test.clj b/test/metabase/models/dashboard_card_test.clj
index a9583b1ad18..af8c2c0dd2b 100644
--- a/test/metabase/models/dashboard_card_test.clj
+++ b/test/metabase/models/dashboard_card_test.clj
@@ -36,8 +36,8 @@
(mt/with-temp* [Dashboard [{dashboard-id :id}]
Card [{card-id :id}]
DashboardCard [{dashcard-id :id} {:dashboard_id dashboard-id, :card_id card-id, :parameter_mappings [{:foo "bar"}]}]]
- (is (= {:size_x 2
- :size_y 2
+ (is (= {:size_x 4
+ :size_y 4
:col 0
:row 0
:parameter_mappings [{:foo "bar"}]
@@ -54,8 +54,8 @@
DashboardCard [{dashcard-id :id} {:dashboard_id dashboard-id, :card_id card-id}]
DashboardCardSeries [_ {:dashboardcard_id dashcard-id, :card_id series-id-1, :position 0}]
DashboardCardSeries [_ {:dashboardcard_id dashcard-id, :card_id series-id-2, :position 1}]]
- (is (= {:size_x 2
- :size_y 2
+ (is (= {:size_x 4
+ :size_y 4
:col 0
:row 0
:parameter_mappings []
@@ -160,8 +160,8 @@
Card [{card-id-1 :id} {:name "Test Card 1"}]
Card [{card-id-2 :id} {:name "Test Card 2"}]]
(testing "unmodified dashcard"
- (is (= {:size_x 2
- :size_y 2
+ (is (= {:size_x 4
+ :size_y 4
:col 0
:row 0
:parameter_mappings [{:foo "bar"}]
@@ -169,7 +169,7 @@
:series []}
(remove-ids-and-timestamps (dashboard-card/retrieve-dashboard-card dashcard-id)))))
(testing "return value from the update call"
- (is (= {:size_x 4
+ (is (= {:size_x 5
:size_y 3
:col 1
:row 1
@@ -191,7 +191,7 @@
:actor_id (mt/user->id :rasta)
:dashboard_id nil
:card_id nil
- :size_x 4
+ :size_x 5
:size_y 3
:row 1
:col 1
@@ -199,7 +199,7 @@
:visualization_settings {}
:series [card-id-2 card-id-1]})))))
(testing "validate db captured everything"
- (is (= {:size_x 4
+ (is (= {:size_x 5
:size_y 3
:col 1
:row 1
diff --git a/test/metabase/models/dashboard_test.clj b/test/metabase/models/dashboard_test.clj
index 9294880f986..b6bf59de301 100644
--- a/test/metabase/models/dashboard_test.clj
+++ b/test/metabase/models/dashboard_test.clj
@@ -41,8 +41,8 @@
(is (= {:name "Test Dashboard"
:description nil
:cache_ttl nil
- :cards [{:size_x 2
- :size_y 2
+ :cards [{:size_x 4
+ :size_y 4
:row 0
:col 0
:id true
@@ -76,8 +76,8 @@
:cards []}
{:name "Diff Test"
:description nil
- :cards [{:size_x 2
- :size_y 2
+ :cards [{:size_x 4
+ :size_y 4
:row 0
:col 0
:id 1
@@ -90,15 +90,15 @@
{:name "Diff Test"
:description nil
:cache_ttl 333
- :cards [{:size_x 2
- :size_y 2
+ :cards [{:size_x 4
+ :size_y 4
:row 0
:col 0
:id 1
:card_id 1
:series [5 6]}
- {:size_x 2
- :size_y 2
+ {:size_x 4
+ :size_y 4
:row 0
:col 0
:id 2
@@ -107,15 +107,15 @@
{:name "Diff Test"
:description nil
:cache_ttl 1227
- :cards [{:size_x 2
- :size_y 2
+ :cards [{:size_x 4
+ :size_y 4
:row 0
:col 0
:id 1
:card_id 1
:series [4 5]}
- {:size_x 2
- :size_y 2
+ {:size_x 4
+ :size_y 4
:row 2
:col 0
:id 2
@@ -144,8 +144,8 @@
(is (= {:name "Test Dashboard"
:description nil
:cache_ttl nil
- :cards [{:size_x 2
- :size_y 2
+ :cards [{:size_x 4
+ :size_y 4
:row 0
:col 0
:id true
@@ -166,8 +166,8 @@
(is (= {:name "Test Dashboard"
:description nil
:cache_ttl nil
- :cards [{:size_x 2
- :size_y 2
+ :cards [{:size_x 4
+ :size_y 4
:row 0
:col 0
:id false
--
GitLab