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

enhance: display invalid config on settings too

Browse Source
This commit is contained in:
Tienson Qin
2021-11-09 15:39:26 +08:00
parent f186ec9ab0
commit e881486a7c
3 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/frontend/handler/common.cljs
View File

@@ -117,21 +117,25 @@
(println error-message-or-handler))
{})))
(defn read-config
[content]
(safe-read-string content
(fn [_e]
(notification/show!
[:div {:style {:z-index 999}}
[:h1
"Invalid configuration."]
[:p "You can send the file \"config.edn\" to "
[:code
"help@logseq.com"]
[:span ", we'll repair and send it back to you."]]]
:error
false))))
(defn reset-config!
[repo-url content]
(when-let [content (or content (get-config repo-url))]
(let [config (safe-read-string content
(fn [e]
(notification/show!
[:div {:style {:z-index 999}}
[:h1
(str "Invalid configuration, error: " (ex-message e))]
[:p "You can send the file \"config.edn\" to "
[:code
"help@logseq.com"]
[:span ", we'll repair and send it back to you."]]]
:error
false)))]
(let [config (read-config content)]
(state/set-config! repo-url config)
config)))