From c88b0a2a4ed09f0762a4b22762d4e9ce676151bd Mon Sep 17 00:00:00 2001 From: Gabriel Horner Date: Mon, 30 Oct 2023 10:31:56 -0400 Subject: [PATCH] fix: remove broken built-in enum properties from app and script It's too complicated for now but hope to bring this back Part of LOG-2871 --- deps/db/src/logseq/db/frontend/property.cljs | 25 +++---------------- .../create_graph_with_properties.cljs | 18 ++----------- src/main/frontend/db/restore.cljs | 6 +---- 3 files changed, 7 insertions(+), 42 deletions(-) diff --git a/deps/db/src/logseq/db/frontend/property.cljs b/deps/db/src/logseq/db/frontend/property.cljs index 15e59506b5..8808daa3a2 100644 --- a/deps/db/src/logseq/db/frontend/property.cljs +++ b/deps/db/src/logseq/db/frontend/property.cljs @@ -42,15 +42,10 @@ :logseq.order-list-type {:schema {:type :default}} :logseq.tldraw.page {:schema {:type :map}} :logseq.tldraw.shape {:schema {:type :map}} + ;; TODO: Add enums for logseq.color, logseq.table.headers and logseq.table.hover ;; color props :logseq.color {:schema - {:type :enum - :hide? true - :enum-config - {:values - (into {} - (map #(vector (random-uuid) {:name % :description ""}) - ["red" "orange" "green" "blue" "purple"]))}} + {:type :default :hide? true} :visible true} ;; table-v2 props :logseq.table.version {:schema {:type :number :hide? true} @@ -58,22 +53,10 @@ :logseq.table.compact {:schema {:type :checkbox :hide? true} :visible true} :logseq.table.headers {:schema - {:type :enum - :hide? true - :enum-config - {:values - (into {} - (map #(vector (random-uuid) {:name % :description ""}) - ["uppercase" "capitalize" "capitalize-first" "lowercase"]))}} + {:type :default :hide? true} :visible true} :logseq.table.hover {:schema - {:type :enum - :hide? true - :enum-config - {:values - (into {} - (map #(vector (random-uuid) {:name % :description ""}) - ["row" "col" "both" "none"]))}} + {:type :default :hide? true} :visible true} :logseq.table.borders {:schema {:type :checkbox :hide? true} :visible true} 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 2a5ba8ad2a..e6dbe147e5 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 @@ -25,21 +25,10 @@ [date days] (new js/Date (- (.getTime date) (* days 24 60 60 1000)))) -(defn- build-enum-config - [] - (let [values (->> ["joy" "sob" "upside_down_face"] - (map #(vector (random-uuid) {:name % - :description "" - :icon {:id % :name % :type :emoji}})) - (into {}))] - {:values values - :order (vec (keys values))})) - (defn- create-init-data [] (let [today (new js/Date) - yesterday (subtract-days today 1) - enum-config (build-enum-config)] + yesterday (subtract-days today 1)] {:pages-and-blocks [{:page {:block/name (date-journal-title today) :block/journal? true :block/journal-day (date-journal-day today)} @@ -62,8 +51,7 @@ {:block/content "page-many property block" :properties {:page-many #{[:page "page 1"] [:page "page 2"]}}} {:block/content "date property block" :properties {:date [:page (date-journal-title today)]}} {:block/content "date-many property block" :properties {:date-many #{[:page (date-journal-title today)] - [:page (date-journal-title yesterday)]}}} - {:block/content "enum property block" :properties {:enum (-> enum-config :values keys first)}}]} + [:page (date-journal-title yesterday)]}}}]} {:page {:block/name "queries"} :blocks [{:block/content "{{query (property :default \"haha\")}}"} @@ -85,8 +73,6 @@ (mapcat #(cond-> [[% {:block/schema {:type %}}]] (not (#{:checkbox :default} %)) (conj [(keyword (str (name %) "-many")) {:block/schema {:type % :cardinality :many}}]))) - (into [[:enum {:block/schema {:type :enum - :enum-config enum-config}}]]) (into {}))})) (defn -main [args] diff --git a/src/main/frontend/db/restore.cljs b/src/main/frontend/db/restore.cljs index 6ae9f9c560..0439c6b85b 100644 --- a/src/main/frontend/db/restore.cljs +++ b/src/main/frontend/db/restore.cljs @@ -76,11 +76,7 @@ {:schema (:block/schema property) :original-name (:block/original-name property)}) (if property - {:block/schema (if-let [values (and (= :enum (:type schema)) - (get-in property [:block/schema :enum-config :values]))] - ;; Need to preserve existing uuids to avoid invalidating existing choices - (-> schema (dissoc :position) (assoc-in [:enum-config :values] values)) - schema) + {:block/schema schema :block/original-name (or original-name k-name) :block/name (util/page-name-sanity-lc k-name) :block/uuid (:block/uuid property)