Fix table and view properties not hidden on display

fix #9489
pull/9525/head
Gabriel Horner 2023-05-25 10:12:45 -04:00 committed by Gabriel Horner
parent 6f50c1cc19
commit 33285a354d
2 changed files with 17 additions and 12 deletions

View File

@ -7,11 +7,11 @@
[goog.string.format])) [goog.string.format]))
(def colons "Property delimiter for markdown mode" "::") (def colons "Property delimiter for markdown mode" "::")
(defn colons-org (defn colons-org
"Property delimiter for org mode" "Property delimiter for org mode"
[property] [property]
(str ":" property ":")) (str ":" property ":"))
(defn ->block-content (defn ->block-content
"Creates a block content string from properties map" "Creates a block content string from properties map"
[properties] [properties]
@ -47,19 +47,23 @@
"Properties used by logseq that user can edit and that can have linkable property values" "Properties used by logseq that user can edit and that can have linkable property values"
#{:alias :aliases :tags}) #{:alias :aliases :tags})
(def editable-view-and-table-properties
"Properties used by view and table component"
#{;; view props
:logseq.color
;; table props
:logseq.table.version :logseq.table.compact :logseq.table.headers :logseq.table.hover
:logseq.table.borders :logseq.table.stripes :logseq.table.max-width})
(defn editable-built-in-properties (defn editable-built-in-properties
"Properties used by logseq that user can edit" "Properties used by logseq that user can edit"
[] []
(into #{:title :icon :template :template-including-parent :public :filters :exclude-from-graph-view (set/union #{:title :icon :template :template-including-parent :public :filters :exclude-from-graph-view
:logseq.query/nlp-date :logseq.query/nlp-date
;; view props
:logseq.color
;; table props
:logseq.table.version :logseq.table.compact :logseq.table.headers :logseq.table.hover
:logseq.table.borders :logseq.table.stripes :logseq.table.max-width
;; org-mode only ;; org-mode only
:macro :filetags} :macro :filetags}
editable-linkable-built-in-properties)) editable-linkable-built-in-properties
editable-view-and-table-properties))
(defn hidden-built-in-properties (defn hidden-built-in-properties
"Properties used by logseq that user can't edit or see" "Properties used by logseq that user can't edit or see"

View File

@ -2066,7 +2066,8 @@
(def hidden-editable-block-properties (def hidden-editable-block-properties
"Properties that are hidden in a block (block property)" "Properties that are hidden in a block (block property)"
#{:logseq.query/nlp-date}) (into #{:logseq.query/nlp-date}
gp-property/editable-view-and-table-properties))
(assert (set/subset? hidden-editable-block-properties (gp-property/editable-built-in-properties)) (assert (set/subset? hidden-editable-block-properties (gp-property/editable-built-in-properties))
"Hidden editable page properties must be valid editable properties") "Hidden editable page properties must be valid editable properties")