clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-03 18:36:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: filters

Browse Source
This commit is contained in:
Tienson Qin
2021-05-12 21:36:14 +08:00
parent 43f127fbaa
commit 0fee13bd62
3 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,6 +57,7 @@
(mapcat last ref-blocks)
ref-blocks)
(mapcat (fn [b] (concat (:block/refs b) (:block/children-refs b))))
(concat (when group-by-page? (map first ref-blocks)))
(distinct)
(map :db/id)
(db/pull-many repo '[:db/id :block/name]))
@@ -74,15 +75,19 @@
(seq exclude-ids)
(remove (fn [block]
(let [ids (set (concat (map :db/id (:block/refs block))
(map :db/id (:block/children-refs block))))]
(map :db/id (:block/children-refs block))
[(:db/id (:block/page block))]))]
(seq (set/intersection exclude-ids ids)))))
(seq include-ids)
(remove (fn [block]
(let [ids (set (concat (map :db/id (:block/refs block))
(let [page-block-id (:db/id (:block/page block))
ids (set (concat (map :db/id (:block/refs block))
(map :db/id (:block/children-refs block))))]
(empty? (set/intersection include-ids ids)))))
))]
(if (and (contains? include-ids page-block-id)
(= 1 (count include-ids)))
(not= page-block-id (first include-ids))
(empty? (set/intersection include-ids (set (conj ids page-block-id))))))))))]
(if group-by-page?
(->> (map (fn [[p ref-blocks]]
[p (filter-f ref-blocks)]) ref-blocks)