From 0284816f2279e98ccac38feb0defd4abf0c381bb Mon Sep 17 00:00:00 2001 From: Gabriel Horner Date: Thu, 16 May 2024 16:28:43 -0400 Subject: [PATCH] chore: replace uses of :string in tests and properties graph Also removed test which tested an unused fn --- .../db_graph/create_graph_with_properties.cljs | 6 +----- src/main/frontend/db/model.cljs | 6 ------ src/test/frontend/db/db_based_model_test.cljs | 16 ---------------- .../frontend/handler/db_based/property_test.cljs | 12 ++++++------ 4 files changed, 7 insertions(+), 33 deletions(-) diff --git a/scripts/src/logseq/tasks/db_graph/create_graph_with_properties.cljs b/scripts/src/logseq/tasks/db_graph/create_graph_with_properties.cljs index 939779ba89..c9ec7928c0 100644 --- a/scripts/src/logseq/tasks/db_graph/create_graph_with_properties.cljs +++ b/scripts/src/logseq/tasks/db_graph/create_graph_with_properties.cljs @@ -93,8 +93,6 @@ [{:block/content "default property block" :properties {:default "haha"}} {:block/content "default property block" :properties {:default-many #{"yee" "haw" "sir"}}} {:block/content "default-closed property block" :properties {:default-closed (random-closed-value :default-closed)}} - {:block/content "string property block" :properties {:string "haha"}} - {:block/content "string-many property block" :properties {:string-many #{"yee" "haw" "sir"}}} {:block/content "url property block" :properties {:url "https://logseq.com"}} {:block/content "url-many property block" :properties {:url-many #{"https://logseq.com" "https://docs.logseq.com"}}} {:block/content "url-closed property block" :properties {:url-closed (random-closed-value :url-closed)}} @@ -133,8 +131,6 @@ {:page {:block/name "default page" :properties {:default "yolo"}}} {:page {:block/name "default-many page" :properties {:default-many #{"yee" "haw" "sir"}}}} {:page {:block/name "default-closed page" :properties {:default-closed (random-closed-value :default-closed)}}} - {:page {:block/name "string page" :properties {:string "yolo"}}} - {:page {:block/name "string-many page" :properties {:string-many #{"yee" "haw" "sir"}}}} {:page {:block/name "url page" :properties {:url "https://logseq.com"}}} {:page {:block/name "url-many page" :properties {:url-many #{"https://logseq.com" "https://docs.logseq.com"}}}} {:page {:block/name "url-closed page" :properties {:url-closed (random-closed-value :url-closed)}}} @@ -170,7 +166,7 @@ ;; Properties :properties - (->> [:default :string :url :checkbox :number :page :date] + (->> [:default :url :checkbox :number :page :date] (mapcat #(cond-> [[% {:block/schema {:type %}}]] (db-property-type/property-type-allows-schema-attribute? % :cardinality) (conj [(keyword (str (name %) "-many")) {:block/schema {:type % :cardinality :many}}]))) diff --git a/src/main/frontend/db/model.cljs b/src/main/frontend/db/model.cljs index f1b37e70eb..87d0389ee6 100644 --- a/src/main/frontend/db/model.cljs +++ b/src/main/frontend/db/model.cljs @@ -682,12 +682,6 @@ independent of format as format specific heading characters are stripped" [page-name] (ldb/journal-page? (ldb/get-page (conn/get-db) page-name))) -(defn get-block-property-values - "Get blocks which have this property." - [property-id] - (let [db (conn/get-db)] - (map :v (d/datoms db :avet property-id)))) - (defn get-classes-with-property "Get classes which have given property as a class property" [property-id] diff --git a/src/test/frontend/db/db_based_model_test.cljs b/src/test/frontend/db/db_based_model_test.cljs index 496b926d5d..c0f4eca94b 100644 --- a/src/test/frontend/db/db_based_model_test.cljs +++ b/src/test/frontend/db/db_based_model_test.cljs @@ -22,22 +22,6 @@ (use-fixtures :each start-and-destroy-db) -(deftest get-block-property-values-test - (let [conn (db/get-db false)] - (outliner-property/upsert-property! conn :user.property/property-1 {:type :string} {:property-name "property 1"}) - (outliner-property/set-block-property! conn fbid :user.property/property-1 "value 1") - (outliner-property/set-block-property! conn sbid :user.property/property-1 "value 2") - (is (= (model/get-block-property-values :user.property/property-1) - ["value 1" "value 2"])))) - -(deftest get-db-property-values-test - (let [conn (db/get-db false)] - (outliner-property/upsert-property! conn :user.property/property-1 {:type :number} {:property-name "property 1"}) - (outliner-property/set-block-property! conn fbid :user.property/property-1 "1") - (outliner-property/set-block-property! conn sbid :user.property/property-1 "2") - (is (= ["1" "2"] - (map (fn [id] (:block/content (d/entity @conn id))) (model/get-block-property-values :user.property/property-1)))))) - ;; (deftest get-db-property-values-test-with-pages ;; (let [opts {:redirect? false :create-first-block? false} ;; _ (page-handler/create! "page1" opts) diff --git a/src/test/frontend/handler/db_based/property_test.cljs b/src/test/frontend/handler/db_based/property_test.cljs index 381e92c83f..c67a9c7897 100644 --- a/src/test/frontend/handler/db_based/property_test.cljs +++ b/src/test/frontend/handler/db_based/property_test.cljs @@ -35,7 +35,7 @@ (deftest ^:large-vars/cleanup-todo block-property-test (testing "Add a property to a block" (let [conn (db/get-db false)] - (outliner-property/upsert-property! conn :user.property/property-1 {:type :string} + (outliner-property/upsert-property! conn :user.property/property-1 {:type :default} {:property-name "property 1"}) (outliner-property/set-block-property! conn fbid :user.property/property-1 "value")) (let [block (db/entity [:block/uuid fbid]) @@ -44,7 +44,7 @@ ;; ensure property exists (are [x y] (= x y) (:block/schema property) - {:type :string} + {:type :default} (:block/type property) #{"property"}) ;; check block's properties @@ -53,7 +53,7 @@ 1 (keyword? (ffirst properties)) true - (second (first properties)) + (:block/content (second (first properties))) "value"))) (testing "Add another property" @@ -146,14 +146,14 @@ (let [k :user.property/property-4 v "batch value" conn (db/get-db false)] - (outliner-property/upsert-property! conn :user.property/property-4 {:type :string} {}) + (outliner-property/upsert-property! conn :user.property/property-4 {:type :default} {}) (outliner-property/batch-set-property! conn [fbid sbid] k v) (let [fb (db/entity [:block/uuid fbid]) sb (db/entity [:block/uuid sbid])] (are [x y] (= x y) - (get (:block/properties fb) k) + (:block/content (get (:block/properties fb) k)) v - (get (:block/properties sb) k) + (:block/content (get (:block/properties sb) k)) v)))) (testing "Batch remove properties"