Browse Source

Still treat properties as pages

Tienson Qin 1 year ago
parent
commit
298555d36c

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

@@ -63,7 +63,7 @@
   "Common attributes for pages"
   [[:block/name :string]
    [:block/original-name :string]
-   [:block/type {:optional true} [:enum #{"class"} #{"whiteboard"} #{"hidden"}]]
+   [:block/type {:optional true} [:enum #{"class"} #{"property"} #{"whiteboard"} #{"hidden"}]]
    [:block/journal? :boolean]
    [:block/namespace {:optional true} :int]
    [:block/alias {:optional true} [:set :int]]
@@ -105,12 +105,7 @@
   "Common attributes for properties"
   [[:db/index {:optional true} :boolean]
    [:db/valueType {:optional true} [:enum :db.type/ref]]
-   [:db/cardinality {:optional true} [:enum :db.cardinality/many :db.cardinality/one]]
-   [:block/original-name :string]
-   [:block/type {:optional true} [:enum #{"property"}]]
-   [:block/created-at :int]
-   [:block/updated-at :int]
-   [:block/tx-id {:optional true} :int]])
+   [:db/cardinality {:optional true} [:enum :db.cardinality/many :db.cardinality/one]]])
 
 (def normal-page
   (vec
@@ -171,7 +166,9 @@
          [:view-context {:optional true} [:enum :page :block]]]
         property-common-schema-attrs
         property-type-schema-attrs))]]
-    property-attrs)))
+    property-attrs
+    page-attrs
+    page-or-block-attrs)))
 
 (def user-property-schema
   (into
@@ -195,7 +192,9 @@
     [:map
      [:db/ident user-ident]
      [:block/schema {:optional true} user-property-schema]]
-    property-attrs)))
+    property-attrs
+    page-attrs
+    page-or-block-attrs)))
 
 (def property-page
   [:multi {:dispatch (fn [m]

+ 0 - 1
deps/db/src/logseq/db/frontend/property.cljs

@@ -2,7 +2,6 @@
   "Property related fns for DB graphs and frontend/datascript usage"
   (:require [logseq.db.sqlite.util :as sqlite-util]
             [datascript.core :as d]
-            [logseq.common.util :as common-util]
             [clojure.string :as string]))
 
 (def ^:large-vars/data-var built-in-properties*

+ 5 - 1
deps/db/src/logseq/db/sqlite/util.cljs

@@ -79,7 +79,11 @@
      (cond->
       {:db/ident db-ident'
        :block/type "property"
+       :block/journal? false
+       :block/format :markdown
        :block/schema (merge {:type :default} prop-schema)
+       :block/name (common-util/page-name-sanity-lc (name prop-name))
+       :block/uuid (d/squuid)
        :block/original-name (name prop-name)}
        (= :many (:cardinality prop-schema))
        (assoc :db/cardinality :db.cardinality/many)
@@ -107,4 +111,4 @@
    {:block/name (common-util/page-name-sanity-lc page-name)
     :block/original-name page-name
     :block/journal? false
-    :block/uuid (d/squuid)}))
+    :block/uuid (d/squuid)}))