clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-04-27 23:54:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: don't store broken config in DB (#8578)

Browse Source 
* fix: don't store broken config in DB

Also, all configs should be clojure maps.

* fix: editor should show the corresponding file's content from disk
This commit is contained in:
Tienson Qin
2023-02-12 14:33:52 +08:00
committed by GitHub
parent 32d23a7f44
commit dcf9559094
3 changed files with 95 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/main/frontend/components/file.cljs
View File

@@ -11,11 +11,15 @@
[frontend.handler.export :as export-handler]
[frontend.state :as state]
[frontend.util :as util]
[frontend.fs :as fs]
[frontend.config :as config]
[frontend.ui :as ui]
[logseq.graph-parser.config :as gp-config]
[logseq.graph-parser.util :as gp-util]
[goog.object :as gobj]
[reitit.frontend.easy :as rfe]
[rum.core :as rum]))
[rum.core :as rum]
[promesa.core :as p]))
(defn- get-path
[state]
@@ -66,18 +70,25 @@
(files-all)
])
(rum/defcs file < rum/reactive
{:did-mount (fn [state]
(rum/defcs file-inner < rum/reactive
{:will-mount (fn [state]
(let [*content (atom nil)
[path format] (:rum/args state)]
(when (and format (contains? (gp-config/text-formats) format))
(p/let [content (fs/read-file
(config/get-repo-dir (state/get-current-repo)) path)]
(reset! *content content)))
(assoc state ::file-content *content)))
:did-mount (fn [state]
(state/set-file-component! (:rum/react-component state))
state)
:will-unmount (fn [state]
(state/clear-file-component!)
state)}
[state]
(let [path (get-path state)
format (gp-util/get-format path)
original-name (db/get-file-page path)
random-id (str (d/squuid))]
[state path format]
(let [original-name (db/get-file-page path)
random-id (str (d/squuid))
content (rum/react (::file-content state))]
[:div.file {:id (str "file-edit-wrapper-" random-id)
:key path}
[:h1.title
@@ -107,16 +118,27 @@
(and format (contains? (gp-config/img-formats) format))
[:img {:src (util/node-path.join "file://" path)}]
(and format (contains? (gp-config/text-formats) format))
(when-let [file-content (or (db/get-file path) "")]
(let [content (string/trim file-content)
mode (util/get-file-ext path)]
(lazy-editor/editor {:file? true
:file-path path}
(str "file-edit-" random-id)
{:data-lang mode}
content
{})))
(and format
(contains? (gp-config/text-formats) format)
content)
(let [content' (string/trim content)
mode (util/get-file-ext path)]
(lazy-editor/editor {:file? true
:file-path path}
(str "file-edit-" random-id)
{:data-lang mode}
content'
{}))
(and format
(contains? (gp-config/text-formats) format))
(ui/loading "Loading ...")
:else
[:div (t :file/format-not-supported (name format))])]))
(rum/defcs file
[state]
(let [path (get-path state)
format (gp-util/get-format path)]
(rum/with-key (file-inner path format) path)))