瀏覽代碼

fix: remove table v2 properties

Finish removal started by 82a1a187622d8afdee4b0498254a91e4bd7f70a0.
Still need names in exporter so they aren't incorrectly imported
into db graphs
Gabriel Horner 1 年之前
父節點
當前提交
980c88b60d

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

@@ -131,47 +131,6 @@
 
    ;; TODO: Add more props :Assignee, :Estimate, :Cycle, :Project
 
-   ;; color props
-   :logseq.property/color
-   {:name :logseq.color
-    :schema
-    {:type :default :hide? true :public? true}
-    :closed-values
-    (mapv #(hash-map :db-ident (keyword "logseq.property" (str "color." %))
-                     :value %
-                     :uuid (random-uuid))
-          ;; Stringified version of frontend.colors/COLORS. Too basic to couple
-          ["tomato" "red" "crimson" "pink" "plum" "purple" "violet" "indigo" "blue" "cyan" "teal" "green" "grass" "orange" "brown"])}
-   ;; table-v2 props
-   :logseq.property.table/version {:name :logseq.table.version
-                                   :schema {:type :number :hide? true :public? true :view-context :block}}
-   :logseq.property.table/compact {:name :logseq.table.compact
-                                   :schema {:type :checkbox :hide? true :public? true :view-context :block}}
-   :logseq.property.table/headers
-   {:name :logseq.table.headers
-    :schema
-    {:type :default :hide? true :public? true :view-context :block}
-    :closed-values
-    (mapv #(hash-map :db-ident (keyword "logseq.property.table" (str "headers." %))
-                     :value %
-                     :uuid (random-uuid))
-          ["uppercase" "capitalize" "capitalize-first" "lowercase"])}
-   :logseq.property.table/hover
-   {:name :logseq.table.hover
-    :schema
-    {:type :default :hide? true :public? true :view-context :block}
-    :closed-values
-    (mapv #(hash-map :db-ident (keyword "logseq.property.table" (str "hover." %))
-                     :value %
-                     :uuid (random-uuid))
-          ["row" "col" "both" "none"])}
-   :logseq.property.table/borders {:name :logseq.table.borders
-                                   :schema {:type :checkbox :hide? true :public? true :view-context :block}}
-   :logseq.property.table/stripes {:name :logseq.table.stripes
-                                   :schema {:type :checkbox :hide? true :public? true :view-context :block}}
-   :logseq.property.table/max-width {:name :logseq.table.max-width
-                                     :schema {:type :number :hide? true :public? true :view-context :block}}
-
    :logseq.property/icon {:original-name "Icon"
                           :schema {:type :map}}
    :logseq.property/public {:schema

+ 3 - 5
deps/graph-parser/src/logseq/graph_parser/exporter.cljs

@@ -283,10 +283,6 @@
                         []))
                     :query-sort-by
                     (if (#{:page :block :created-at :updated-at} val) val (get-pid db val))
-                    (:logseq.color :logseq.table.headers :logseq.table.hover)
-                    (:block/uuid (db-property/get-closed-value-entity-by-name db prop val))
-                    :logseq.table.version
-                    (parse-long val)
                     :filters
                     (try (edn/read-string val)
                          (catch :default e
@@ -401,7 +397,9 @@
    ;; Not supported as they have been ignored for a long time and cause invalid built-in pages
    :now :later :doing :done :canceled :cancelled :in-progress :todo :wait :waiting
    ;; deprecated in db graphs
-   :macros :logseq.query/nlp-date])
+   :macros :logseq.query/nlp-date
+   :logseq.color :logseq.table.borders :logseq.table.stripes :logseq.table.max-width
+   :logseq.table.version :logseq.table.compact :logseq.table.headers :logseq.table.hover])
 
 (defn- pre-update-properties
   "Updates page and block properties before their property types are inferred"

+ 1 - 11
deps/graph-parser/src/logseq/graph_parser/property.cljs

@@ -49,15 +49,6 @@
   "Properties used by logseq that user can edit and that can have linkable property values"
   #{:alias :aliases :tags})
 
-;; file based graphs only (or maybe not for backward compatibility with markdown tables)
-(def editable-view-and-table-properties
-  "Properties used by view and table component"
-  #{;; view props
-    :logseq.color
-    ;; table props
-    :logseq.table.version :logseq.table.compact :logseq.table.headers :logseq.table.hover
-    :logseq.table.borders :logseq.table.stripes :logseq.table.max-width})
-
 (defn editable-built-in-properties
   "Properties used by logseq that user can edit"
   []
@@ -65,8 +56,7 @@
                :logseq.query/nlp-date
                ;; org-mode only
                :macro :filetags}
-             editable-linkable-built-in-properties
-             editable-view-and-table-properties))
+             editable-linkable-built-in-properties))
 
 (defn hidden-built-in-properties
   "Properties used by logseq that user can't edit or see"

+ 1 - 2
src/main/frontend/handler/file_based/property/util.cljs

@@ -199,8 +199,7 @@
 
 (def hidden-editable-block-properties
   "Properties that are hidden in a block (block property)"
-  (into #{:logseq.query/nlp-date}
-        gp-property/editable-view-and-table-properties))
+  #{:logseq.query/nlp-date})
 
 (assert (set/subset? hidden-editable-block-properties (gp-property/editable-built-in-properties))
         "Hidden editable page properties must be valid editable properties")

+ 0 - 5
src/test/frontend/util/property_test.cljs

@@ -127,9 +127,4 @@
       {:title "foo"} [:title] {:pre-block? true :page-id 1}
       '()
       {:title "foo" :foo "bar"} [:title :foo] {:pre-block? true :page-id 1}
-      [[:foo "bar"]]
-      ;; normal block
-      {:logseq.table.version 2} [:logseq.table.version] {:pre-block? false}
-      '()
-      {:logseq.table.version 2 :foo "bar"} [:logseq.table.version :foo] {:pre-block? false}
       [[:foo "bar"]])))