clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-04-29 00:24:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feat/outliner-core

Browse Source
This commit is contained in:
Tienson Qin
2021-04-18 15:40:56 +08:00
parent 1712fef15a 2a48fba72c
commit 1375d1fab5
52 changed files with 7013 additions and 1469 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/frontend/handler/graph.cljs
View File

@@ -42,7 +42,7 @@
(if dark? "orange" "green")
color)]
{:id p
:name name
:name p
:val (get-connections p edges)
:autoColorBy "group"
:group (js/Math.ceil (* (js/Math.random) 12))
@@ -50,6 +50,19 @@
pages)
(remove nil?))))
(defn- uuid-or-asset?
[id]
(or (util/uuid-string? id)
(string/starts-with? id "../assets/")
(= id "..")
(string/starts-with? id "assets/")))
(defn- remove-uuids-and-files!
[nodes]
(remove
(fn [node] (uuid-or-asset? (:id node)))
nodes))
(defn- normalize-page-name
[{:keys [nodes links] :as g}]
(let [all-pages (->> (set (apply concat
@@ -61,10 +74,15 @@
names (zipmap (map :block/name names)
(map (fn [x] (get x :block/original-name (:block/name x))) names))
nodes (mapv (fn [node] (assoc node :id (get names (:id node)))) nodes)
links (mapv (fn [{:keys [source target]}]
{:source (get names source)
:target (get names target)})
links)]
links (->>
(mapv (fn [{:keys [source target]}]
(when (and (not (uuid-or-asset? source))
(not (uuid-or-asset? target)))
{:source (get names source)
:target (get names target)}))
links)
(remove nil?))
nodes (remove-uuids-and-files! nodes)]
{:nodes nodes
:links links}))
@@ -187,5 +205,6 @@
(distinct)
;; FIXME: get block tags
(build-nodes dark? block edges #{}))]
{:nodes nodes
:links edges}))))
(normalize-page-name
{:nodes nodes
:links edges})))))