clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-06-01 19:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(editor): remove duplicate blocks in references

Browse Source 
Closes #1006, closes #846, closes #600
This commit is contained in:
Tienson Qin
2021-01-05 19:10:59 +08:00
parent 4f67387d85
commit b0a6700ab9
3 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/frontend/components/block.cljs
View File

@@ -1276,11 +1276,7 @@
(when (seq parents)
(let [parents (for [{:block/keys [uuid content]} parents]
(let [title (->> (take 24
(-> (string/split content #"\n")
first
(text/remove-level-spaces format)))
(apply str))]
(let [title (string/trim (text/remove-level-spaces content format))]
(when (and (not (string/blank? title))
(not= (string/lower-case page-name) (string/lower-case title)))
[:a {:href (rfe/href :page {:name uuid})}

32
src/main/frontend/db/model.cljs
View File

@@ -840,6 +840,15 @@
db-utils/seq-flatten)]
(mapv (fn [page] [page (get-page-alias repo page)]) mentioned-pages))))
(defn- remove-children!
[blocks]
(let [childrens (->> (mapcat :block/children blocks)
(map :db/id)
(set))]
(if (seq childrens)
(remove (fn [block] (contains? childrens (:db/id block))) blocks)
blocks)))
(defn get-page-referenced-blocks
([page]
(get-page-referenced-blocks (state/get-current-repo) page))
@@ -870,14 +879,17 @@
:where
[?block :block/ref-pages ?ref-page]
[(contains? ?pages ?ref-page)]]
pages))]
(->> query-result
react
db-utils/seq-flatten
(remove (fn [block]
(= page-id (:db/id (:block/page block)))))
sort-blocks
db-utils/group-by-page))))))
pages))
result (->> query-result
react
db-utils/seq-flatten
(remove (fn [block]
(= page-id (:db/id (:block/page block)))))
sort-blocks
db-utils/group-by-page
(map (fn [[k blocks]]
[k (remove-children! blocks)])))]
result)))))
(defn get-date-scheduled-or-deadlines
[journal-title]
@@ -939,7 +951,9 @@
ref-pages
pages))))))
sort-blocks
db-utils/group-by-page)))))
db-utils/group-by-page
(map (fn [[k blocks]]
[k (remove-children! blocks)])))))))
(defn get-block-referenced-blocks
[block-uuid]

8
src/main/frontend/db/utils.cljs
View File

@@ -72,8 +72,8 @@
(when-let [conn (conn/get-conn repo)]
(try
(d/pull conn
selector
eid)
selector
eid)
(catch js/Error e
nil)))))
@@ -95,7 +95,7 @@
([repo-url tx-data]
(when-not config/publishing?
(let [tx-data (->> (util/remove-nils tx-data)
(remove nil?))]
(remove nil?))]
(when (seq tx-data)
(when-let [conn (conn/get-conn repo-url false)]
(d/transact! conn (vec tx-data))))))))
@@ -106,4 +106,4 @@
([repo-url key]
(when-let [db (conn/get-conn repo-url)]
(some-> (d/entity db key)
key))))
key))))