mirror of
https://github.com/logseq/logseq.git
synced 2026-04-24 14:14:55 +00:00
more file-graph cleanup
This commit is contained in:
@@ -8,7 +8,6 @@
|
||||
[:meta/version :int]
|
||||
;; Loose since it looks like capitalization and string are possible
|
||||
[:preferred-format [:or :keyword :string]]
|
||||
[:preferred-workflow [:enum :now :todo]]
|
||||
[:hidden [:vector :string]]
|
||||
[:default-templates [:map
|
||||
[:journals {:optional true} :string]]]
|
||||
|
||||
@@ -498,23 +498,6 @@ should be done through this fn in order to get global config and config defaults
|
||||
(when-let [repo (get-current-repo)]
|
||||
(:journal/file-name-format (get-config repo))))
|
||||
|
||||
(defn get-preferred-workflow
|
||||
[]
|
||||
(keyword
|
||||
(or
|
||||
(when-let [workflow (:preferred-workflow (get-config))]
|
||||
(let [workflow (name workflow)]
|
||||
(if (util/safe-re-find #"now|NOW" workflow)
|
||||
:now
|
||||
:todo)))
|
||||
(get-in @state [:me :preferred_workflow] :now))))
|
||||
|
||||
(defn get-preferred-todo
|
||||
[]
|
||||
(if (= (get-preferred-workflow) :now)
|
||||
"LATER"
|
||||
"TODO"))
|
||||
|
||||
(defn get-date-formatter
|
||||
[]
|
||||
(or
|
||||
|
||||
@@ -58,8 +58,6 @@
|
||||
{:preferred-language (:preferred-language @state/state)
|
||||
:preferred-theme-mode (:ui/theme @state/state)
|
||||
:preferred-format (state/get-preferred-format)
|
||||
:preferred-workflow (state/get-preferred-workflow)
|
||||
:preferred-todo (state/get-preferred-todo)
|
||||
:preferred-date-format (state/get-date-formatter)
|
||||
:preferred-start-of-week (state/get-start-of-week)
|
||||
:current-graph (state/get-current-repo)
|
||||
|
||||
@@ -6,13 +6,9 @@
|
||||
(let [global-config
|
||||
{:shortcuts {:ui/toggle-theme "t z"}
|
||||
:hidden []
|
||||
:ui/enable-tooltip? true
|
||||
:preferred-workflow :todo
|
||||
:git-pull-secs 60}
|
||||
:ui/enable-tooltip? true}
|
||||
local-config {:hidden ["foo" "bar"]
|
||||
:ui/enable-tooltip? false
|
||||
:preferred-workflow :now
|
||||
:git-pull-secs 120}]
|
||||
:ui/enable-tooltip? false}]
|
||||
(is (= local-config
|
||||
(dissoc (state/merge-configs global-config local-config) :shortcuts))
|
||||
"Later config overrides all non-map values")
|
||||
|
||||
Reference in New Issue
Block a user