clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-04 02:46:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: filters not working for children blocks in linked references

Browse Source 
related to #6457

fix #6462
fix #6458
This commit is contained in:
Tienson Qin
2022-08-24 19:42:55 +08:00
parent 43124f2c12
commit 1ee294e047
4 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/frontend/handler/block.cljs
View File

@@ -249,14 +249,17 @@
(defn get-blocks-refed-pages
[aliases ref-blocks]
(let [refs (->> (mapcat (fn [b] (conj (:block/path-refs b) (:block/page b))) ref-blocks)
distinct
(remove #(aliases (:db/id %))))]
(let [refs (->> (mapcat :block/refs ref-blocks)
(remove #(aliases (:db/id %))))
pages (->> (map :block/page ref-blocks)
(distinct)
(remove #(aliases (:db/id %))))
all-refs (concat pages refs)]
(keep (fn [ref]
(when (:block/name ref)
{:db/id (:db/id ref)
:block/name (:block/name ref)
:block/original-name (:block/original-name ref)})) refs)))
:block/original-name (:block/original-name ref)})) all-refs)))
(defn filter-blocks
[ref-blocks filters]
@@ -276,3 +279,15 @@
(filter (fn [block]
(let [ids (set (map :db/id (:block/path-refs block)))]
(set/subset? include-ids ids))))))))
(defn get-filtered-ref-blocks-with-parents
[all-ref-blocks filtered-ref-blocks]
(when (seq filtered-ref-blocks)
(let [id->block (zipmap (map :db/id all-ref-blocks) all-ref-blocks)
get-parents (fn [block]
(loop [block block
result [block]]
(if-let [parent (id->block (:db/id (:block/parent block)))]
(recur parent (conj result parent))
result)))]
(distinct (mapcat get-parents filtered-ref-blocks)))))