浏览代码

Revert "enhance: move :block/title to page-or-block-attrs"

This commit causing graph invalid errors and failing tests.
This reverts commit a02e842ea31ad503e5b3fbaf5b8b36e1550322c0.
Gabriel Horner 5 月之前
父节点
当前提交
a83285f705
共有 1 个文件被更改,包括 8 次插入6 次删除
  1. 8 6
      deps/db/src/logseq/db/frontend/malli_schema.cljs

+ 8 - 6
deps/db/src/logseq/db/frontend/malli_schema.cljs

@@ -249,7 +249,6 @@
 (def page-or-block-attrs
   "Common attributes for page and normal blocks"
   [[:block/uuid :uuid]
-   [:block/title :string]
    [:block/created-at :int]
    [:block/updated-at :int]
    ;; Injected by update-properties-in-ents
@@ -262,6 +261,7 @@
 (def page-attrs
   "Common attributes for pages"
   [[:block/name :string]
+   [:block/title :string]
    [:block/path-refs {:optional true} [:set :int]]])
 
 (def property-attrs
@@ -339,7 +339,8 @@
 
 (def block-attrs
   "Common attributes for normal blocks"
-  [[:block/parent :int]
+  [[:block/title :string]
+   [:block/parent :int]
    [:block/order block-order]
    ;; refs
    [:block/page :int]
@@ -352,7 +353,8 @@
   (vec
    (concat
     [:map]
-    [[:block/parent :int]
+    [[:block/title :string]
+     [:block/parent :int]
      ;; These blocks only associate with pages of type "whiteboard"
      [:block/page :int]
      [:block/path-refs {:optional true} [:set :int]]]
@@ -365,7 +367,7 @@
     [:map]
     [[:logseq.property/value [:or :string :double :boolean]]
      [:logseq.property/created-from-property :int]]
-    (remove #(#{:logseq.property/created-from-property} (first %)) block-attrs)
+    (remove #(#{:block/title :logseq.property/created-from-property} (first %)) block-attrs)
     page-or-block-attrs)))
 
 (def property-history-block*
@@ -398,8 +400,8 @@
      [:logseq.property/value {:optional true} [:or :string :double]]
      [:logseq.property/created-from-property :int]
      [:block/closed-value-property {:optional true} [:set :int]]]
-    (remove #(#{:logseq.property/created-from-property} (first %)) block-attrs)
-    (remove #(#{:block/title} (first %)) page-or-block-attrs))))
+    (remove #(#{:block/title :logseq.property/created-from-property} (first %)) block-attrs)
+    page-or-block-attrs)))
 
 (def closed-value-block
   "A closed value for a property with closed/allowed values"