diff --git a/deps/db/test/logseq/db/frontend/rules_test.cljs b/deps/db/test/logseq/db/frontend/rules_test.cljs index 54f085843..2276d3d30 100644 --- a/deps/db/test/logseq/db/frontend/rules_test.cljs +++ b/deps/db/test/logseq/db/frontend/rules_test.cljs @@ -50,7 +50,7 @@ {:properties {:foo {:block/schema {:type :default}} :foo2 {:block/schema {:type :default}} :number-many {:block/schema {:type :number :cardinality :many}} - :page-many {:block/schema {:type :page :cardinality :many}}} + :page-many {:block/schema {:type :node :cardinality :many}}} :pages-and-blocks [{:page {:block/title "Page" :build/properties {:foo "bar" :number-many #{5 10} :page-many #{[:page "Page A"]}}}} diff --git a/src/main/frontend/db/query_dsl.cljs b/src/main/frontend/db/query_dsl.cljs index 07f763d67..523e419eb 100644 --- a/src/main/frontend/db/query_dsl.cljs +++ b/src/main/frontend/db/query_dsl.cljs @@ -268,7 +268,7 @@ (subs v' 1) (or (page-ref/get-page-name v') v')) ;; Convert number pages to string - (and (double? v) (= :page (get-in (db-utils/entity k) [:block/schema :type]))) + (and (double? v) (= :node (get-in (db-utils/entity k) [:block/schema :type]))) (str v) :else v'))) diff --git a/src/test/frontend/db/db_based_model_test.cljs b/src/test/frontend/db/db_based_model_test.cljs index 732c37462..834c9a232 100644 --- a/src/test/frontend/db/db_based_model_test.cljs +++ b/src/test/frontend/db/db_based_model_test.cljs @@ -26,7 +26,7 @@ ;; _ (test-helper/create-page! "page2" opts) ;; p1id (:block/uuid (db/get-page "page1")) ;; p2id (:block/uuid (db/get-page "page2"))] -;; (outliner-property/upsert-property! repo "property-1" {:type :page} {}) +;; (outliner-property/upsert-property! repo "property-1" {:type :node} {}) ;; (outliner-property/set-block-property! repo fbid "property-1" p1id {}) ;; (outliner-property/set-block-property! repo sbid "property-1" p2id {}) ;; (is (= '("[[page1]]" "[[page2]]") (model/get-db-property-values repo "property-1"))))) @@ -63,7 +63,7 @@ class1 (db/get-case-page "class1") class2 (db/get-case-page "class2") conn (db/get-db false)] - (outliner-property/upsert-property! conn :user.property/property-1 {:type :page} {}) + (outliner-property/upsert-property! conn :user.property/property-1 {:type :node} {}) (outliner-property/class-add-property! conn (:db/id class1) :user.property/property-1) (outliner-property/class-add-property! conn (:db/id class2) :user.property/property-1) (let [property (db/entity :user.property/property-1)