diff --git a/deps/db/src/logseq/db/frontend/property.cljs b/deps/db/src/logseq/db/frontend/property.cljs index 7fd765234b..08ae592b8f 100644 --- a/deps/db/src/logseq/db/frontend/property.cljs +++ b/deps/db/src/logseq/db/frontend/property.cljs @@ -92,7 +92,7 @@ :logseq.task/status {:original-name "Status" :schema - {:type :string + {:type :default :public? true} :closed-values (mapv (fn [[db-ident value icon]] @@ -109,7 +109,7 @@ :logseq.task/priority {:original-name "Priority" :schema - {:type :string + {:type :default :public? true} :closed-values (mapv (fn [[db-ident value]] @@ -135,7 +135,7 @@ :logseq.property/color {:name :logseq.color :schema - {:type :string :hide? true :public? true} + {:type :default :hide? true :public? true} :closed-values (mapv #(hash-map :db-ident (keyword "logseq.property" (str "color." %)) :value % @@ -150,7 +150,7 @@ :logseq.property.table/headers {:name :logseq.table.headers :schema - {:type :string :hide? true :public? true :view-context :block} + {:type :default :hide? true :public? true :view-context :block} :closed-values (mapv #(hash-map :db-ident (keyword "logseq.property.table" (str "headers." %)) :value % @@ -159,7 +159,7 @@ :logseq.property.table/hover {:name :logseq.table.hover :schema - {:type :string :hide? true :public? true :view-context :block} + {:type :default :hide? true :public? true :view-context :block} :closed-values (mapv #(hash-map :db-ident (keyword "logseq.property.table" (str "hover." %)) :value % diff --git a/deps/db/src/logseq/db/frontend/property/type.cljs b/deps/db/src/logseq/db/frontend/property/type.cljs index a01282dd0c..421460d3f3 100644 --- a/deps/db/src/logseq/db/frontend/property/type.cljs +++ b/deps/db/src/logseq/db/frontend/property/type.cljs @@ -18,10 +18,10 @@ [:default :number :date :checkbox :url :page :template]) (def closed-value-property-types - "Valid schema :type for closed values" - #{:default :string :number :url}) + "Valid property :type for closed values" + #{:default :number :url}) -(assert (set/subset? closed-value-property-types (set (conj user-built-in-property-types :string))) +(assert (set/subset? closed-value-property-types (set user-built-in-property-types)) "All closed value types are valid property types") (def value-ref-property-types 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 73ce14be9c..939779ba89 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 @@ -26,7 +26,7 @@ (defn- build-closed-values-config [{:keys [dates]}] - {:string-closed + {:default-closed (mapv #(hash-map :value % :uuid (random-uuid) :icon {:id % :name % :type :emoji}) @@ -92,9 +92,9 @@ :blocks [{: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 "string-closed property block" :properties {:string-closed (random-closed-value :string-closed)}} {: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)}} @@ -112,9 +112,9 @@ #_{:block/content "date-closed property block" :properties {:date-closed (random-closed-value :date-closed)}}]} {:page {:block/original-name "Block Property Queries"} :blocks - [{:block/content "{{query (property :string \"haha\")}}"} - {:block/content "{{query (property :string-many \"haw\")}}"} - {:block/content (str "{{query (property :string-closed " (pr-str (get-closed-value :string-closed)) ")}}")} + [{:block/content "{{query (property :default \"haha\")}}"} + {:block/content "{{query (property :default-many \"haw\")}}"} + {:block/content (str "{{query (property :default-closed " (pr-str (get-closed-value :default-closed)) ")}}")} {:block/content "{{query (property :url \"https://logseq.com\")}}"} {:block/content "{{query (property :url-many \"https://logseq.com\")}}"} {:block/content (str "{{query (property :url-closed " (pr-str (get-closed-value :url-closed)) ")}}")} @@ -132,9 +132,9 @@ ;; Page property pages and queries {: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 "string-closed page" :properties {:string-closed (random-closed-value :string-closed)}}} {: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)}}} @@ -151,9 +151,9 @@ #_{:page {:block/name "date-closed page" :properties {:date-closed (random-closed-value :date-closed)}}} {:page {:block/original-name "Page Property Queries"} :blocks - [{:block/content "{{query (page-property :string \"yolo\")}}"} - {:block/content "{{query (page-property :string-many \"haw\")}}"} - {:block/content (str "{{query (page-property :string-closed " (pr-str (get-closed-value :string-closed)) ")}}")} + [{:block/content "{{query (page-property :default \"yolo\")}}"} + {:block/content "{{query (page-property :default-many \"haw\")}}"} + {:block/content (str "{{query (page-property :default-closed " (pr-str (get-closed-value :default-closed)) ")}}")} {:block/content "{{query (page-property :url \"https://logseq.com\")}}"} {:block/content "{{query (page-property :url-many \"https://logseq.com\")}}"} {:block/content (str "{{query (page-property :url-closed " (pr-str (get-closed-value :url-closed)) ")}}")} @@ -177,7 +177,7 @@ (into (mapv #(vector (keyword (str (name %) "-closed")) {:closed-values (closed-values-config (keyword (str (name %) "-closed"))) :block/schema {:type %}}) - [:string :url :number #_:page #_:date])) + [:default :url :number #_:page #_:date])) (into {}))})) (def spec