Browse Source

chore: rename task class ident

Only class ident name that wasn't capitalized and didn't match its
title. Considered renaming :logseq.task but unsure if it even makes
sense for their names to match since they aren't sharing a common ns.
:logseq.task may be better off under :logseq.property.*
Gabriel Horner 1 year ago
parent
commit
3767f1d3c7

+ 1 - 1
deps/db/src/logseq/db/frontend/class.cljs

@@ -7,7 +7,7 @@
   "Map of built-in classes for db graphs with their :db/ident as keys"
   {:logseq.class/Root {:title "Root class"}
 
-   :logseq.class/task
+   :logseq.class/Task
    {:title "Task"
     :schema {:properties [:logseq.task/status :logseq.task/priority :logseq.task/deadline]}}
 

+ 1 - 1
deps/db/src/logseq/db/frontend/schema.cljs

@@ -2,7 +2,7 @@
   "Main datascript schemas for the Logseq app"
   (:require [clojure.set :as set]))
 
-(def version 8)
+(def version 9)
 ;; A page is a special block, a page can corresponds to multiple files with the same ":block/name".
 (def ^:large-vars/data-var schema
   {:db/ident        {:db/unique :db.unique/identity}

+ 1 - 1
deps/db/test/logseq/db/sqlite/create_graph_test.cljs

@@ -61,7 +61,7 @@
 (deftest new-graph-creates-class
   (let [conn (d/create-conn db-schema/schema-for-db-based-graph)
         _ (d/transact! conn (sqlite-create-graph/build-db-initial-data "{}"))
-        task (d/entity @conn :logseq.class/task)]
+        task (d/entity @conn :logseq.class/Task)]
     (is (contains? (:block/type task) "class")
         "Task class has correct type")
     (is (= 3 (count (:class/schema.properties task)))

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

@@ -158,11 +158,11 @@
       (-> block
           (assoc :logseq.task/status status-ident)
           (update :block/title string/replace-first (re-pattern (str marker "\\s*")) "")
-          (update :block/tags (fnil conj []) :logseq.class/task)
+          (update :block/tags (fnil conj []) :logseq.class/Task)
           ;; FIXME: block/refs property calculation should be handled by a listener
           (update :block/refs (fn [refs]
                                 (into (remove #(= marker (:block/title %)) refs)
-                                      [:logseq.class/task :logseq.task/status])))
+                                      [:logseq.class/Task :logseq.task/status])))
           (dissoc :block/marker)))
     block))
 

+ 3 - 3
deps/graph-parser/test/logseq/graph_parser/exporter_test.cljs

@@ -268,7 +268,7 @@
              (readable-properties @conn (find-block-by-content @conn "high priority")))
           "priority block has correct property")
 
-      (is (= {:logseq.task/status "Doing" :logseq.task/priority "Medium" :block/tags [:logseq.class/task]}
+      (is (= {:logseq.task/status "Doing" :logseq.task/priority "Medium" :block/tags [:logseq.class/Task]}
              (readable-properties @conn (find-block-by-content @conn "status test")))
           "status block has correct task properties and class")
 
@@ -347,14 +347,14 @@
     (testing "block refs and path-refs"
       (let [block (find-block-by-content @conn "old todo block")]
         (is (set/subset?
-             #{:logseq.task/status :logseq.class/task}
+             #{:logseq.task/status :logseq.class/Task}
              (->> block
                   :block/path-refs
                   (map #(:db/ident (d/entity @conn (:db/id %))))
                   set))
             "Correct :block/refs")
         (is (set/subset?
-             #{:logseq.task/status :logseq.class/task}
+             #{:logseq.task/status :logseq.class/Task}
              (->> block
                   :block/path-refs
                   (map #(:db/ident (d/entity @conn (:db/id %))))

+ 1 - 1
deps/outliner/src/logseq/outliner/property.cljs

@@ -34,7 +34,7 @@
                         property-id value)
            block-tx-data (cond-> block
                            status?
-                           (assoc :block/tags :logseq.class/task))]
+                           (assoc :block/tags :logseq.class/Task))]
        [(when multiple-values-empty?
           [:db/retract (:db/id block) property-id :logseq.property/empty-placeholder])
         block-tx-data]))))

+ 1 - 1
src/main/frontend/components/block.cljs

@@ -2385,7 +2385,7 @@
 
 (rum/defc tags
   [config block]
-  (let [block-tags (remove (fn [t] (= (:db/ident t) :logseq.class/task)) (:block/tags block))]
+  (let [block-tags (remove (fn [t] (= (:db/ident t) :logseq.class/Task)) (:block/tags block))]
     (when (seq block-tags)
       [:div.flex.flex-row.flex-wrap.items-center.gap-1
        (for [tag block-tags]

+ 9 - 3
src/main/frontend/worker/db/migrate.cljs

@@ -13,8 +13,8 @@
   [conn search-db]
   (search/truncate-table! search-db)
   (d/transact! conn
-    [{:db/ident :block/title
-      :db/index true}])
+               [{:db/ident :block/title
+                 :db/index true}])
   (let [datoms (d/datoms @conn :avet :block/uuid)
         tx-data (mapcat
                  (fn [d]
@@ -38,6 +38,11 @@
           {:db/id (:db/id p)
            :block/schema (assoc (:block/schema p) :type :node)}))))
 
+(defn- update-task-ident
+  [conn _search-db]
+  [{:db/id (:db/id (d/entity @conn :logseq.class/task))
+    :db/ident :logseq.class/Task}])
+
 (def schema-version->updates
   [[3 {:properties [:logseq.property/table-sorting :logseq.property/table-filters
                     :logseq.property/table-hidden-columns :logseq.property/table-ordered-columns]
@@ -52,7 +57,8 @@
        :classes    []}]
    [6 {:properties [:logseq.property.asset/remote-metadata]}]
    [7 {:fix replace-original-name-content-with-title}]
-   [8 {:fix replace-object-and-page-type-with-node}]])
+   [8 {:fix replace-object-and-page-type-with-node}]
+   [9 {:fix update-task-ident}]])
 
 (let [max-schema-version (apply max (map first schema-version->updates))]
   (assert (<= db-schema/version max-schema-version))

+ 1 - 1
src/test/frontend/test/helper.cljs

@@ -115,7 +115,7 @@
         (mapv #(if-let [status (some-> (second (re-find status/bare-marker-pattern (:block/title %)))
                                        file-to-db-statuses)]
                  (-> %
-                     (assoc :block/tags [{:db/ident :logseq.class/task}])
+                     (assoc :block/tags [{:db/ident :logseq.class/Task}])
                      (update :build/properties merge {:logseq.task/status status}))
                  %)
               blocks*)]