greatbody
/
logseq
mirror of https://github.com/logseq/logseq
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

enhance: replace favorite related fns

pull/10981/head
rcmerci 2024-01-25 19:11:26 +08:00
parent 3365482d34
commit 7d54918ca6
3 changed files with 41 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/frontend/components/container.cljs
View File

@ -104,7 +104,7 @@
{:class "w-60"}
(when-not recent?
(shui/context-menu-item
{:on-click #(page-handler/unfavorite-page! original-name)}
{:on-click #(page-handler/<unfavorite-page! original-name)}
(ctx-icon "star-off")
(t :page/unfavorite)
(shui/context-menu-shortcut (some-> (shortcut-dh/shortcut-binding :command/toggle-favorite) (first)

8
src/main/frontend/components/page_menu.cljs
View File

@ -71,9 +71,7 @@
contents? (= page-name "contents")
properties (:block/properties page)
public? (true? (pu/lookup properties :public))
favorites (:favorites (state/sub-config))
favorited? (contains? (set (map util/page-name-sanity-lc favorites))
page-name)
favorited? (page-handler/favorited? page-name)
developer-mode? (state/sub [:ui/developer-mode?])
file-rpath (when (util/electron?) (page-util/get-page-file-rpath page-name))
_ (state/sub :auth/id-token)
@ -91,8 +89,8 @@
:options {:on-click
(fn []
(if favorited?
(page-handler/unfavorite-page! page-original-name)
(page-handler/favorite-page! page-original-name)))}})
(page-handler/<unfavorite-page! page-original-name)
(page-handler/<favorite-page! page-original-name)))}})
(when (or (util/electron?) file-sync-graph-uuid)
{:title (t :page/version-history)

47
src/main/frontend/handler/page.cljs
View File

@ -37,13 +37,41 @@
[electron.ipc :as ipc]
[frontend.context.i18n :refer [t]]
[frontend.persist-db.browser :as db-browser]
[cljs-bean.core :as bean]))
[cljs-bean.core :as bean]
[datascript.core :as d]
[frontend.db.conn :as conn]))
(def create! page-common-handler/create!)
(def <create! page-common-handler/<create!)
(def delete! page-common-handler/delete!)
(def unfavorite-page! page-common-handler/unfavorite-page!)
(def favorite-page! page-common-handler/favorite-page!)
(defn <unfavorite-page!
[page-name]
(let [repo (state/get-current-repo)]
(if (config/db-based-graph? repo)
(let [db (conn/get-db)]
(when-let [page-block-uuid (:block/uuid (d/entity db [:block/name (common-util/page-name-sanity-lc page-name)]))]
(page-common-handler/<unfavorite-page!-v2 page-block-uuid)))
(page-common-handler/unfavorite-page! page-name))))
(defn <favorite-page!
[page-name]
(let [repo (state/get-current-repo)]
(if (config/db-based-graph? repo)
(let [db (conn/get-db)]
(when-let [page-block-uuid (:block/uuid (d/entity db [:block/name (common-util/page-name-sanity-lc page-name)]))]
(page-common-handler/<favorite-page!-v2 page-block-uuid)))
(page-common-handler/favorite-page! page-name))))
(defn favorited?
[page-name]
(let [repo (state/get-current-repo)]
(if (config/db-based-graph? repo)
(when-let [db (conn/get-db)]
(boolean
(when-let [page-block-uuid (:block/uuid (d/entity db [:block/name (common-util/page-name-sanity-lc page-name)]))]
(page-common-handler/favorited?-v2 page-block-uuid))))
(page-common-handler/favorited? page-name))))
;; FIXME: add whiteboard
@ -65,12 +93,10 @@
(defn toggle-favorite! []
;; NOTE: in journals or settings, current-page is nil
(when-let [page-name (state/get-current-page)]
(let [favorites (:favorites (state/sub-config))
favorited? (contains? (set (map string/lower-case favorites))
(string/lower-case page-name))]
(let [favorited? (favorited? page-name)]
(if favorited?
(unfavorite-page! page-name)
(favorite-page! page-name)))))
(<unfavorite-page! page-name)
(<favorite-page! page-name)))))
(defn rename!
[old-name new-name & {:as _opts}]
@ -86,8 +112,9 @@
nil))))
(defn reorder-favorites!
[favorites]
(config-handler/set-config! :favorites favorites))
[_favorites]
;; TODO
nil)
(defn has-more-journals?
[]