From 3ff3a3e716d1cf35bd87cf107a5d40e32909777f Mon Sep 17 00:00:00 2001
From: adam-james <21064735+adam-james-v@users.noreply.github.com>
Date: Wed, 30 Mar 2022 11:58:28 -0700
Subject: [PATCH] Bookmarks remove favorites (#21353)
* Remove errant :bookmarked hydration key
This was left over from an incorrect implementation of :bookmarked status. No :bookmarked hydration function exists
anyway, the key does nothing.
* Remove old favorites models that are superceded by bookmarks
* Remove dashboard favorite require
---
src/metabase/api/card.clj | 1 -
src/metabase/models.clj | 2 --
src/metabase/models/card_favorite.clj | 10 ----------
src/metabase/models/dashboard_favorite.clj | 4 ----
4 files changed, 17 deletions(-)
delete mode 100644 src/metabase/models/card_favorite.clj
delete mode 100644 src/metabase/models/dashboard_favorite.clj
diff --git a/src/metabase/api/card.clj b/src/metabase/api/card.clj
index 4966a447133..2f58a724264 100644
--- a/src/metabase/api/card.clj
+++ b/src/metabase/api/card.clj
@@ -153,7 +153,6 @@
[id]
(u/prog1 (-> (Card id)
(hydrate :creator
- :bookmarked
:dashboard_count
:can_write
:average_query_time
diff --git a/src/metabase/models.clj b/src/metabase/models.clj
index c2125fb976a..c875c984227 100644
--- a/src/metabase/models.clj
+++ b/src/metabase/models.clj
@@ -7,7 +7,6 @@
[metabase.models.dashboard :as dashboard]
[metabase.models.dashboard-card :as dashboard-card]
[metabase.models.dashboard-card-series :as dashboard-card-series]
- [metabase.models.dashboard-favorite :as dashboard-favorite]
[metabase.models.database :as database]
[metabase.models.dependency :as dependency]
[metabase.models.dimension :as dimension]
@@ -51,7 +50,6 @@
dashboard/keep-me
dashboard-card/keep-me
dashboard-card-series/keep-me
- dashboard-favorite/keep-me
database/keep-me
dependency/keep-me
dimension/keep-me
diff --git a/src/metabase/models/card_favorite.clj b/src/metabase/models/card_favorite.clj
deleted file mode 100644
index 9e2f1cb5389..00000000000
--- a/src/metabase/models/card_favorite.clj
+++ /dev/null
@@ -1,10 +0,0 @@
-(ns metabase.models.card-favorite
- (:require [metabase.util :as u]
- [toucan.models :as models]))
-
-(models/defmodel CardFavorite :report_cardfavorite)
-
-(u/strict-extend (class CardFavorite)
- models/IModel
- (merge models/IModelDefaults
- {:properties (constantly {:timestamped? true})}))
diff --git a/src/metabase/models/dashboard_favorite.clj b/src/metabase/models/dashboard_favorite.clj
deleted file mode 100644
index c603e1b8361..00000000000
--- a/src/metabase/models/dashboard_favorite.clj
+++ /dev/null
@@ -1,4 +0,0 @@
-(ns metabase.models.dashboard-favorite
- (:require [toucan.models :as models]))
-
-(models/defmodel DashboardFavorite :dashboard_favorite)
--
GitLab