Skip to content

enhance: load unlinked references async and show contents #2210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jefftangx wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

enhance: load unlinked references async and show contents #2210

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d9ad540
query for unlinked refs after 500 ms, then show unlinked refs
jefftangx Jun 9, 2022
e1cbb9a
revert doall
jefftangx Jun 13, 2022
2de50f4
rfct
jefftangx Jun 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 35 additions & 34 deletions src/cljs/athens/views/pages/node_page.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,24 +336,23 @@
(dispatch [:unlinked-references/link-all unlinked-str-ids title]))
(swap! state assoc unlinked? false)
(reset! unlinked-refs []))]
[:> PageReferences {:defaultIsOpen false
:count (count @unlinked-refs)
:showIfEmpty true
:refs @unlinked-refs
:title "Unlinked References"
:extras (r/as-element [:> Button {:variant "link"
:size "sm"
:flexShrink 0
:onClick link-all-unlinked}
"Link all"])
:onOpen #(let [un-refs (get-unlinked-references (patterns/escape-str title))]
(swap! state assoc unlinked? true)
(reset! unlinked-refs un-refs))
:onClose #(swap! state assoc unlinked? false)}

[:> PageReferences {:defaultIsOpen (get @state unlinked?)
:count (count @unlinked-refs)
:showIfEmpty true
:refs @unlinked-refs
:title "Unlinked References"
:extras (r/as-element [:> Button {:variant "link"
:size "sm"
:flexShrink 0
:onClick link-all-unlinked}
"Link all"])
:onOpen #(swap! state assoc unlinked? true)
:onClose #(swap! state assoc unlinked? false)}
(doall
(for [[[group-title] group] @unlinked-refs]
[:> ReferenceGroup
{:title group-title
{:title group-title
:onClickTitle (fn [e]
(let [shift? (.-shiftKey e)
parsed-title (parse-renderer/parse-title group-title)]
Expand All @@ -366,22 +365,22 @@
(doall
(for [block group]
[:> ReferenceBlock
{:key (str "ref-" (:block/uid block))
{:key (str "ref-" (:block/uid block))
:actions (when unlinked?
(r/as-element [:> Button {:marginTop "1.5em"
:size "xs"
:flex "0 0"
:float "right"
:variant "link"
:onClick (fn []
(let [hm (into (hash-map) @unlinked-refs)
new-unlinked-refs (->> (update-in hm [group-title] #(filter (fn [{:keys [block/uid]}]
(= uid (:block/uid block)))
%))
seq)]
;; ctrl-z doesn't work though, because Unlinked Refs aren't reactive to datascript.
(reset! unlinked-refs new-unlinked-refs)
(dispatch [:unlinked-references/link block title])))}
:size "xs"
:flex "0 0"
:float "right"
:variant "link"
:onClick (fn []
(let [hm (into (hash-map) @unlinked-refs)
new-unlinked-refs (->> (update-in hm [group-title] #(filter (fn [{:keys [block/uid]}]
(= uid (:block/uid block)))
%))
seq)]
;; ctrl-z doesn't work though, because Unlinked Refs aren't reactive to datascript.
(reset! unlinked-refs new-unlinked-refs)
(dispatch [:unlinked-references/link block title])))}
"Link"]))}
[ref-comp block]]))]))]))

Expand All @@ -401,13 +400,15 @@
(reset! state init-state)
(reset! unlinked-refs [])
(reset! block-uid (:block/uid node)))
(let [{:block/keys [children uid] title :node/title} node
(let [{:block/keys [children uid] title :node/title} node
{:alert/keys [message confirm-fn cancel-fn confirm-text] alert-show :alert/show} @state
daily-note? (dates/is-daily-note uid)
on-daily-notes? (= :home @(subscribe [:current-route/name]))
is-current-route? (or (= @(subscribe [:current-route/uid]) uid)
(= @(subscribe [:current-route/page-title]) title))]
daily-note? (dates/is-daily-note uid)
on-daily-notes? (= :home @(subscribe [:current-route/name]))
is-current-route? (or (= @(subscribe [:current-route/uid]) uid)
(= @(subscribe [:current-route/page-title]) title))
get-and-reset-unlinked-refs #(reset! unlinked-refs (get-unlinked-references (patterns/escape-str title)))]

(js/setTimeout get-and-reset-unlinked-refs 500)
(sync-title title state)

[:<>
Expand Down