Skip to content

feat: show coref count #1999

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
filipesilva wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

feat: show coref count #1999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7aecbfe
feat: show coref count
filipesilva Jan 25, 2022
8daf5dd
feat: filter inline refs by coref
filipesilva Jan 28, 2022
48bfd0f
fix: stable coref order
filipesilva Jan 28, 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
4 changes: 3 additions & 1 deletion src/cljs/athens/db.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,9 @@


(def block-document-pull-vector
'[:db/id :block/uid :block/string :block/open :block/order :block/header {:block/children ...} :block/refs :block/_refs])
'[:db/id :block/uid :block/string :block/open :block/order :block/header {:block/children ...} :block/refs
;; for backrefs, also return their refs and matching titles, if any, for coref analysis.
{:block/_refs [:db/id {:block/refs [:db/id :node/title]}]}])


(def node-document-pull-vector
Expand Down
66 changes: 52 additions & 14 deletions src/cljs/athens/views/blocks/core.cljs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,9 +213,19 @@
:margin-block-start "0"}]]})


(defn has-coref?
[set {:block/keys [refs] :as backref}]
(when (some set refs)
backref))


(defn inline-linked-refs-el
[block state]
(let [refs (db/get-linked-block-references block)]
(let [ref-filter (-> state deref :inline-refs/filter)
block' (if (seq ref-filter)
(update block :block/_refs #(vec (keep (partial has-coref? ref-filter) %)))
block)
refs (db/get-linked-block-references block')]
(when (not-empty refs)
[:div (stylefy/use-style references-style {:key "Inline Linked References"})
[:section
Expand All @@ -231,16 +241,35 @@

;; Components

(def coref-string-size-limit 3)


(defn block-refs-count-el
[count click-fn]
[:div (stylefy/use-style {:margin-left "1em"
:grid-area "refs"
:z-index (:zindex-dropdown style/ZINDICES)
:visibility (when-not (pos? count) "hidden")})
[:> Button {:on-click (fn [e]
(.. e stopPropagation)
(click-fn e))}
count]])
[backrefs click-fn]
(let [total (count backrefs)
coref-freqs (->> backrefs
(mapcat :block/refs)
(remove #(-> % :node/title not))
(remove #(> (count (:node/title %)) coref-string-size-limit))
(frequencies)
(seq)
(sort-by (fn [[{:node/keys [title]} _total]] title)))]

[:div (stylefy/use-style {:margin-left "1em"
:grid-area "refs"
:z-index (:zindex-dropdown style/ZINDICES)
:visibility (when-not (pos? total) "hidden")})
(doall
(for [[{:node/keys [title] :as coref} total] coref-freqs]
[:> Button {:key (str "coref-count-" title)
:on-click (fn [e]
(.. e stopPropagation)
(click-fn e #{coref}))}
[:span title " " [:sub total]]]))
[:> Button {:on-click (fn [e]
(.. e stopPropagation)
(click-fn e #{}))}
total]]))


(defn block-drag-over
Expand Down Expand Up @@ -397,6 +426,7 @@
:show-editable-dom false
:linked-ref/open (or (false? linked-ref) initial-open)
:inline-refs/open false
:inline-refs/filter #{}
:inline-refs/states {}
:block/uid uid})
save-fn #(db/transact-state-for-uid (or original-uid uid) state)
Expand Down Expand Up @@ -483,10 +513,18 @@
[presence/inline-presence-el uid]

(when (and (> (count _refs) 0) (not= :block-embed? opts))
[block-refs-count-el (count _refs) (fn [e]
(if (.. e -shiftKey)
(rf/dispatch [:right-sidebar/open-item uid])
(swap! state update :inline-refs/open not)))])]
[block-refs-count-el _refs (fn [e new-filter]
(let [{:inline-refs/keys [open filter]} @state]
(if (.. e -shiftKey)
;; shift-click always opens the block on the sidebar
(rf/dispatch [:right-sidebar/open-item uid])
(do
;; update the filter
(swap! state assoc :inline-refs/filter new-filter)

;; toggle open unless we're already open and just switching filters
(when-not (and open (not= filter new-filter))
(swap! state update :inline-refs/open not))))))])]

[autocomplete-search/inline-search-el block state]
[autocomplete-slash/slash-menu-el block state]
Expand Down