refactor: rename :logseq.task properties to :logseq.property

These are the only built-in properties that don't start with
:logseq.property

deps/common/resources/templates/config.edn

@@ -207,7 +207,7 @@
  ;; Example usage for DB graphs:
 ;;  :query/result-transforms
 ;;  {:sort-by-priority
-;;   (fn [result] (sort-by (fn [h] (get h :logseq.task/priority "Z")) result))}
+;;   (fn [result] (sort-by (fn [h] (get h :logseq.property/priority "Z")) result))}
 
 ;; Queries will be displayed at the bottom of today's journal page.
 ;; Example usage:

deps/db/src/logseq/db/common/initial_data.cljs

@@ -183,7 +183,7 @@
                                               (or children-props
                                                   [:db/id :block/uuid :block/parent :block/order :block/collapsed? :block/title
                                                    ;; pre-loading feature-related properties to avoid UI refreshing
-                                                   :logseq.task/status :logseq.property.node/display-type]))]
+                                                   :logseq.property/status :logseq.property.node/display-type]))]
                          (map
                           (fn [block]
                             (if (= children-props '[*])

deps/db/src/logseq/db/frontend/class.cljs

@@ -35,7 +35,7 @@
 
      :logseq.class/Task
      {:title "Task"
-      :schema {:properties [:logseq.task/status :logseq.task/priority :logseq.task/deadline :logseq.task/scheduled]}}
+      :schema {:properties [:logseq.property/status :logseq.property/priority :logseq.property/deadline :logseq.property/scheduled]}}
 
      :logseq.class/Query
      {:title "Query"

deps/db/src/logseq/db/frontend/property.cljs

@@ -277,7 +277,7 @@
                :hide? true}
       :queryable? false}
      ;; Task props
-     :logseq.task/status
+     :logseq.property/status
      {:title "Status"
       :schema
       {:type :default
@@ -291,17 +291,17 @@
                :icon {:type :tabler-icon :id icon}
                :properties (when (some? checkbox-state)
                              {:logseq.property/choice-checkbox-state checkbox-state})})
-            [[:logseq.task/status.backlog "Backlog" "Backlog"]
-             [:logseq.task/status.todo "Todo" "Todo" false]
-             [:logseq.task/status.doing "Doing" "InProgress50"]
-             [:logseq.task/status.in-review "In Review" "InReview"]
-             [:logseq.task/status.done "Done" "Done" true]
-             [:logseq.task/status.canceled "Canceled" "Cancelled"]])
+            [[:logseq.property/status.backlog "Backlog" "Backlog"]
+             [:logseq.property/status.todo "Todo" "Todo" false]
+             [:logseq.property/status.doing "Doing" "InProgress50"]
+             [:logseq.property/status.in-review "In Review" "InReview"]
+             [:logseq.property/status.done "Done" "Done" true]
+             [:logseq.property/status.canceled "Canceled" "Cancelled"]])
       :properties {:logseq.property/hide-empty-value true
-                   :logseq.property/default-value :logseq.task/status.todo
+                   :logseq.property/default-value :logseq.property/status.todo
                    :logseq.property/enable-history? true}
       :queryable? true}
-     :logseq.task/priority
+     :logseq.property/priority
      {:title "Priority"
       :schema
       {:type :default
@@ -313,13 +313,13 @@
                :value value
                :uuid (common-uuid/gen-uuid :db-ident-block-uuid db-ident)
                :icon {:type :tabler-icon :id icon}})
-            [[:logseq.task/priority.low "Low" "priorityLvlLow"]
-             [:logseq.task/priority.medium "Medium" "priorityLvlMedium"]
-             [:logseq.task/priority.high "High" "priorityLvlHigh"]
-             [:logseq.task/priority.urgent "Urgent" "priorityLvlUrgent"]])
+            [[:logseq.property/priority.low "Low" "priorityLvlLow"]
+             [:logseq.property/priority.medium "Medium" "priorityLvlMedium"]
+             [:logseq.property/priority.high "High" "priorityLvlHigh"]
+             [:logseq.property/priority.urgent "Urgent" "priorityLvlUrgent"]])
       :properties {:logseq.property/hide-empty-value true
                    :logseq.property/enable-history? true}}
-     :logseq.task/deadline
+     :logseq.property/deadline
      {:title "Deadline"
       :schema {:type :datetime
                :public? true
@@ -327,7 +327,7 @@
       :properties {:logseq.property/hide-empty-value true
                    :logseq.property/description "Use it to finish something at a specific date(time)."}
       :queryable? true}
-     :logseq.task/scheduled
+     :logseq.property/scheduled
      {:title "Scheduled"
       :schema {:type :datetime
                :public? true
@@ -623,7 +623,7 @@
   (set (vals schema-properties-map)))
 
 (def logseq-property-namespaces
-  #{"logseq.property" "logseq.property.tldraw" "logseq.property.pdf" "logseq.property.fsrs" "logseq.task"
+  #{"logseq.property" "logseq.property.tldraw" "logseq.property.pdf" "logseq.property.fsrs"
     "logseq.property.linked-references" "logseq.property.asset" "logseq.property.table" "logseq.property.node"
     "logseq.property.code" "logseq.property.repeat"
     "logseq.property.journal" "logseq.property.class" "logseq.property.view"

deps/db/src/logseq/db/frontend/rules.cljc

@@ -219,13 +219,13 @@
     :task
     '[(task ?b ?statuses)
       ;; and needed to avoid binding error
-      (and (simple-query-property ?b :logseq.task/status ?val)
+      (and (simple-query-property ?b :logseq.property/status ?val)
            [(contains? ?statuses ?val)])]
 
     :priority
     '[(priority ?b ?priorities)
       ;; and needed to avoid binding error
-      (and (simple-query-property ?b :logseq.task/priority ?priority)
+      (and (simple-query-property ?b :logseq.property/priority ?priority)
            [(contains? ?priorities ?priority)])]}))
 
 (def rules-dependencies

deps/db/src/logseq/db/frontend/schema.cljs

@@ -37,7 +37,7 @@
          (map (juxt :major :minor)
               [(parse-schema-version x) (parse-schema-version y)])))
 
-(def version (parse-schema-version "64.7"))
+(def version (parse-schema-version "64.8"))
 
 (defn major-version
   "Return a number.

deps/db/test/logseq/db/sqlite/build_test.cljs

@@ -53,12 +53,12 @@
            conn
            [{:page {:block/title "page1"}
              :blocks [{:block/title "some todo"
-                       :build/properties {:logseq.task/status :logseq.task/status.doing}}
+                       :build/properties {:logseq.property/status :logseq.property/status.doing}}
                       {:block/title "some slide"
                        :build/properties {:logseq.property/background-image "https://placekitten.com/200/300"}}]}])]
-    (is (= :logseq.task/status.doing
+    (is (= :logseq.property/status.doing
            (->> (db-test/find-block-by-content @conn "some todo")
-                :logseq.task/status
+                :logseq.property/status
                 :db/ident))
         "built-in property with closed value is created and correctly associated to a block")
 
@@ -103,7 +103,7 @@
         (sqlite-build/build-blocks-tx
          {:pages-and-blocks [{:page (select-keys (:block/page block) [:block/uuid])
                               :blocks [(merge {:block/title "imported task" :block/uuid (:block/uuid block)}
-                                              {:build/properties {:logseq.task/status :logseq.task/status.todo}
+                                              {:build/properties {:logseq.property/status :logseq.property/status.todo}
                                                :build/tags [:logseq.class/Task]})]}]
           :build-existing-tx? true})
         _ (d/transact! conn init-tx)
@@ -129,7 +129,7 @@
           "Tx doesn't try to create new blocks or modify existing idents")
       (is (= "imported task" (:block/title updated-block)))
       (is (= {:block/tags [:logseq.class/Task]
-              :logseq.task/status :logseq.task/status.todo}
+              :logseq.property/status :logseq.property/status.todo}
              (db-test/readable-properties updated-block))
           "Block's properties and tags are updated"))
 

deps/db/test/logseq/db/sqlite/create_graph_test.cljs

@@ -104,19 +104,19 @@
 
     ;; testing :properties config
     (testing "A built-in property that has"
-      (is (= :logseq.task/status.todo
-             (-> (d/entity @conn :logseq.task/status)
+      (is (= :logseq.property/status.todo
+             (-> (d/entity @conn :logseq.property/status)
                  :logseq.property/default-value
                  :db/ident))
           "A property with a :db/ident property value is created correctly")
-      (is (-> (d/entity @conn :logseq.task/deadline)
+      (is (-> (d/entity @conn :logseq.property/deadline)
               :logseq.property/description
               db-property/property-value-content
               str
               (string/includes? "finish something"))
           "A :default property is created correctly")
       (is (= true
-             (-> (d/entity @conn :logseq.task/status)
+             (-> (d/entity @conn :logseq.property/status)
                  :logseq.property/enable-history?))
           "A :checkbox property is created correctly")
       (is (= 1

deps/db/test/logseq/db/sqlite/export_test.cljs

@@ -253,7 +253,7 @@
                     {:block/title "b2"
                      :build/tags [:user.class/MyClass]}
                     {:block/title "some task"
-                     :build/properties {:logseq.task/status :logseq.task/status.doing}
+                     :build/properties {:logseq.property/status :logseq.property/status.doing}
                      :build/tags [:logseq.class/Task]}]}]}
         conn (db-test/create-conn-with-blocks original-data)
         conn2 (db-test/create-conn)

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

@@ -268,22 +268,22 @@
   "If a block has a marker, convert it to a task object"
   [block {:keys [log-fn]}]
   (if-let [marker (:block/marker block)]
-    (let [old-to-new {"TODO" :logseq.task/status.todo
-                      "LATER" :logseq.task/status.todo
-                      "IN-PROGRESS" :logseq.task/status.doing
-                      "NOW" :logseq.task/status.doing
-                      "DOING" :logseq.task/status.doing
-                      "DONE" :logseq.task/status.done
-                      "WAIT" :logseq.task/status.backlog
-                      "WAITING" :logseq.task/status.backlog
-                      "CANCELED" :logseq.task/status.canceled
-                      "CANCELLED" :logseq.task/status.canceled}
+    (let [old-to-new {"TODO" :logseq.property/status.todo
+                      "LATER" :logseq.property/status.todo
+                      "IN-PROGRESS" :logseq.property/status.doing
+                      "NOW" :logseq.property/status.doing
+                      "DOING" :logseq.property/status.doing
+                      "DONE" :logseq.property/status.done
+                      "WAIT" :logseq.property/status.backlog
+                      "WAITING" :logseq.property/status.backlog
+                      "CANCELED" :logseq.property/status.canceled
+                      "CANCELLED" :logseq.property/status.canceled}
           status-ident (or (old-to-new marker)
                            (do
                              (log-fn :invalid-todo (str (pr-str marker) " is not a valid marker so setting it to TODO"))
-                             :logseq.task/status.todo))]
+                             :logseq.property/status.todo))]
       (-> block
-          (assoc :logseq.task/status status-ident)
+          (assoc :logseq.property/status status-ident)
           (update :block/title string/replace-first (re-pattern (str marker "\\s*")) "")
           (update :block/tags (fnil conj []) :logseq.class/Task)
           (dissoc :block/marker)))
@@ -292,15 +292,15 @@
 (defn- update-block-priority
   [block {:keys [log-fn]}]
   (if-let [priority (:block/priority block)]
-    (let [old-to-new {"A" :logseq.task/priority.high
-                      "B" :logseq.task/priority.medium
-                      "C" :logseq.task/priority.low}
+    (let [old-to-new {"A" :logseq.property/priority.high
+                      "B" :logseq.property/priority.medium
+                      "C" :logseq.property/priority.low}
           priority-value (or (old-to-new priority)
                              (do
                                (log-fn :invalid-priority (str (pr-str priority) " is not a valid priority so setting it to low"))
-                               :logseq.task/priority.low))]
+                               :logseq.property/priority.low))]
       (-> block
-          (assoc :logseq.task/priority priority-value)
+          (assoc :logseq.property/priority priority-value)
           (update :block/title string/replace-first (re-pattern (str "\\[#" priority "\\]" "\\s*")) "")
           (dissoc :block/priority)))
     block))
@@ -325,7 +325,7 @@
                                       :block/journal-day date-int)))
                          (assoc :block/tags #{:logseq.class/Journal}))
           time-long (tc/to-long (date-time-util/int->local-date date-int))
-          datetime-property (if (:block/deadline block) :logseq.task/deadline :logseq.task/scheduled)]
+          datetime-property (if (:block/deadline block) :logseq.property/deadline :logseq.property/scheduled)]
       {:block
        (-> block
            (assoc datetime-property time-long)

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

@@ -169,7 +169,7 @@
           "Created graph has no validation errors")
 
       ;; Counts
-      ;; Includes journals as property values e.g. :logseq.task/deadline
+      ;; Includes journals as property values e.g. :logseq.property/deadline
       (is (= 25 (count (d/q '[:find ?b :where [?b :block/tags :logseq.class/Journal]] @conn))))
 
       (is (= 4 (count (d/q '[:find ?b :where [?b :block/tags :logseq.class/Task]] @conn))))
@@ -288,13 +288,13 @@
 
       (is (= 20221126
              (-> (db-test/readable-properties (db-test/find-block-by-content @conn "only deadline"))
-                 :logseq.task/deadline
+                 :logseq.property/deadline
                  date-time-util/ms->journal-day))
           "deadline block has correct journal as property value")
 
       (is (= 20221125
              (-> (db-test/readable-properties (db-test/find-block-by-content @conn "only scheduled"))
-                 :logseq.task/scheduled
+                 :logseq.property/scheduled
                  date-time-util/ms->journal-day))
           "scheduled block converted to correct deadline")
 
@@ -304,17 +304,17 @@
                            @conn "Apr 1st, 2024")))
           "Only one journal page exists when deadline is on same day as journal")
 
-      (is (= {:logseq.task/priority :logseq.task/priority.high}
+      (is (= {:logseq.property/priority :logseq.property/priority.high}
              (db-test/readable-properties (db-test/find-block-by-content @conn "high priority")))
           "priority block has correct property")
 
-      (is (= {:logseq.task/status :logseq.task/status.doing
-              :logseq.task/priority :logseq.task/priority.medium
+      (is (= {:logseq.property/status :logseq.property/status.doing
+              :logseq.property/priority :logseq.property/priority.medium
               :block/tags [:logseq.class/Task]}
              (db-test/readable-properties (db-test/find-block-by-content @conn "status test")))
           "status block has correct task properties and class")
 
-      (is (= #{:logseq.task/status :block/tags}
+      (is (= #{:logseq.property/status :block/tags}
              (set (keys (db-test/readable-properties (db-test/find-block-by-content @conn "old todo block")))))
           "old task properties like 'todo' are ignored")
 
@@ -484,14 +484,14 @@
 
       (let [block (db-test/find-block-by-content @conn "old todo block")]
         (is (set/subset?
-             #{:logseq.task/status :logseq.class/Task}
+             #{:logseq.property/status :logseq.class/Task}
              (->> block
                   :block/refs
                   (map #(:db/ident (d/entity @conn (:db/id %))))
                   set))
             "Block has correct task tag and property :block/refs")
         (is (set/subset?
-             #{:logseq.task/status :logseq.class/Task}
+             #{:logseq.property/status :logseq.class/Task}
              (->> block
                   :block/path-refs
                   (map #(:db/ident (d/entity @conn (:db/id %))))

deps/outliner/src/logseq/outliner/property.cljs

@@ -39,7 +39,7 @@
           update-block-tx (cond-> (outliner-core/block-with-updated-at {:db/id (:db/id block)})
                             true
                             (assoc property-id value)
-                            (and (contains? #{:logseq.task/status :logseq.task/scheduled :logseq.task/deadline} property-id)
+                            (and (contains? #{:logseq.property/status :logseq.property/scheduled :logseq.property/deadline} property-id)
                                  (or (empty? (:block/tags block)) (ldb/internal-page? block)))
                             (assoc :block/tags :logseq.class/Task))]
       (cond-> []

deps/outliner/test/logseq/outliner/property_test.cljs

@@ -197,7 +197,7 @@
 
 (deftest status-property-setting-classes
   (let [conn (db-test/create-conn-with-blocks
-              {:classes {:Project {:build/class-properties [:logseq.task/status]}}
+              {:classes {:Project {:build/class-properties [:logseq.property/status]}}
                :pages-and-blocks
                [{:page {:block/title "page1"}
                  :blocks [{:block/title ""}
@@ -206,17 +206,17 @@
         [empty-task project]
         (map #(:block/uuid (db-test/find-block-by-content @conn %)) ["" "project task"])]
 
-    (outliner-property/batch-set-property! conn [empty-task] :logseq.task/status :logseq.task/status.doing)
+    (outliner-property/batch-set-property! conn [empty-task] :logseq.property/status :logseq.property/status.doing)
     (is (= [:logseq.class/Task]
            (mapv :db/ident (:block/tags (d/entity @conn [:block/uuid empty-task]))))
         "Adds Task to block when it is not tagged")
 
-    (outliner-property/batch-set-property! conn [page1] :logseq.task/status :logseq.task/status.doing)
+    (outliner-property/batch-set-property! conn [page1] :logseq.property/status :logseq.property/status.doing)
     (is (= #{:logseq.class/Task :logseq.class/Page}
            (set (map :db/ident (:block/tags (d/entity @conn [:block/uuid page1])))))
         "Adds Task to page without tag")
 
-    (outliner-property/batch-set-property! conn [project] :logseq.task/status :logseq.task/status.doing)
+    (outliner-property/batch-set-property! conn [project] :logseq.property/status :logseq.property/status.doing)
     (is (= [:user.class/Project]
            (mapv :db/ident (:block/tags (d/entity @conn [:block/uuid project]))))
         "Doesn't add Task to block when it is already tagged")))

deps/outliner/test/logseq/outliner/validate_test.cljs

@@ -138,7 +138,7 @@
     (is (thrown-with-msg?
          js/Error
          #"Can't set tag.*Priority"
-         (outliner-validate/validate-tags-property @conn [(:db/id block)] :logseq.task/priority))
+         (outliner-validate/validate-tags-property @conn [(:db/id block)] :logseq.property/priority))
         "Nodes can't be tagged with built-in non tags")))
 
 ;; Try as many of the validations against a new graph to confirm

src/main/frontend/commands.cljs

@@ -125,7 +125,7 @@
 (defn db-based-statuses
   []
   (map (fn [e] (:block/title e))
-       (db-pu/get-closed-property-values :logseq.task/status)))
+       (db-pu/get-closed-property-values :logseq.property/status)))
 
 (defn db-based-embed-page
   []
@@ -260,7 +260,7 @@
 (defn db-based-priorities
   []
   (map (fn [e] (:block/title e))
-       (db-pu/get-closed-property-values :logseq.task/priority)))
+       (db-pu/get-closed-property-values :logseq.property/priority)))
 
 (defn get-priorities
   []
@@ -757,7 +757,7 @@
 (defn- db-based-set-status
   [status]
   (when-let [block (state/get-edit-block)]
-    (db-property-handler/batch-set-property-closed-value! [(:block/uuid block)] :logseq.task/status status)))
+    (db-property-handler/batch-set-property-closed-value! [(:block/uuid block)] :logseq.property/status status)))
 
 (defmethod handle-step :editor/set-status [[_ status] format]
   (if (config/db-based-graph? (state/get-current-repo))
@@ -796,8 +796,8 @@
   [priority]
   (when-let [block (state/get-edit-block)]
     (if (nil? priority)
-      (db-property-handler/remove-block-property! (:block/uuid block) :logseq.task/priority)
-      (db-property-handler/batch-set-property-closed-value! [(:block/uuid block)] :logseq.task/priority priority))))
+      (db-property-handler/remove-block-property! (:block/uuid block) :logseq.property/priority)
+      (db-property-handler/batch-set-property-closed-value! [(:block/uuid block)] :logseq.property/priority priority))))
 
 (defmethod handle-step :editor/set-priority [[_ priority] _format]
   (if (config/db-based-graph? (state/get-current-repo))

src/main/frontend/components/block.cljs

@@ -2849,7 +2849,7 @@
        (fn []
          (p/let [result (db-async/<task-spent-time repo (:db/id block))]
            (set-result! result)))
-       [(:logseq.task/status block)])
+       [(:logseq.property/status block)])
       (when (and time-spent (> time-spent 0))
         [:div.text-sm.time-spent.ml-1
          (shui/button

src/main/frontend/components/property/config.cljs

@@ -33,7 +33,7 @@
 (defn- re-init-commands!
   "Update commands after task status and priority's closed values has been changed"
   [property]
-  (when (contains? #{:logseq.task/status :logseq.task/priority} (:db/ident property))
+  (when (contains? #{:logseq.property/status :logseq.property/priority} (:db/ident property))
     (state/pub-event! [:init/commands])))
 
 (defn- <upsert-closed-value!

src/main/frontend/components/property/value.cljs

@@ -293,7 +293,7 @@
                                                                                                (:db/id property))
                                                       (db-property-handler/remove-block-property! (:db/id block)
                                                                                                   :logseq.property.repeat/temporal-property)))))]
-       (if (#{:logseq.task/deadline :logseq.task/scheduled} (:db/ident property))
+       (if (#{:logseq.property/deadline :logseq.property/scheduled} (:db/ident property))
          [:div "Repeat task"]
          [:div "Repeat " (if (= :date (:logseq.property/type property)) "date" "datetime")])]]
      [:div.flex.flex-row.gap-2
@@ -312,14 +312,14 @@
                        (filter (fn [property]
                                  (and (not (ldb/built-in? property))
                                       (>= (count (:property/closed-values property)) 2))))
-                       (concat [(db/entity :logseq.task/status)])
+                       (concat [(db/entity :logseq.property/status)])
                        (util/distinct-by :db/id))
            status-property (or (:logseq.property.repeat/checked-property block)
-                               (db/entity :logseq.task/status))
+                               (db/entity :logseq.property/status))
            property-id (:db/id status-property)
            done-choice (or
                         (some (fn [choice] (when (true? (:logseq.property/choice-checkbox-state choice)) choice)) (:property/closed-values status-property))
-                        (db/entity :logseq.task/status.done))]
+                        (db/entity :logseq.property/status.done))]
        [:div.flex.flex-col.gap-2
         [:div.text-muted-foreground
          "When"]
@@ -463,7 +463,7 @@
                       (str (util/zero-pad hours)
                            ":"
                            (util/zero-pad minutes))])]]
-      (if (or repeated-task? (contains? #{:logseq.task/deadline :logseq.task/scheduled} property-id))
+      (if (or repeated-task? (contains? #{:logseq.property/deadline :logseq.property/scheduled} property-id))
         (overdue date content)
         content))))
 
@@ -534,7 +534,7 @@
                                         :meta-click? other-position?
                                         :label (human-date-label (t/to-default-time-zone date))} value)
                               (:db/id value)))]
-              (if (or repeated-task? (contains? #{:logseq.task/deadline :logseq.task/scheduled} (:db/id property)))
+              (if (or repeated-task? (contains? #{:logseq.property/deadline :logseq.property/scheduled} (:db/id property)))
                 (overdue compare-value content)
                 content))
 

src/main/frontend/components/query/builder.cljs

@@ -261,7 +261,7 @@
        (tags repo *tree opts loc)
 
        "task"
-       (let [items (let [values (:property/closed-values (db/entity :logseq.task/status))]
+       (let [items (let [values (:property/closed-values (db/entity :logseq.property/status))]
                      (mapv db-property/property-value-content values))]
          (select items
                  (constantly nil)
@@ -277,7 +277,7 @@
 
        "priority"
        (select (if (config/db-based-graph? repo)
-                 (let [values (:property/closed-values (db/entity :logseq.task/priority))]
+                 (let [values (:property/closed-values (db/entity :logseq.property/priority))]
                    (mapv db-property/property-value-content values))
                  gp-db/built-in-priorities)
                (constantly nil)
@@ -342,7 +342,7 @@
 
        "task"
        (select (if (config/db-based-graph? repo)
-                 (let [values (:property/closed-values (db/entity :logseq.task/status))]
+                 (let [values (:property/closed-values (db/entity :logseq.property/status))]
                    (mapv db-property/property-value-content values))
                  gp-db/built-in-markers)
                (constantly nil)
@@ -358,7 +358,7 @@
 
        "priority"
        (select (if (config/db-based-graph? repo)
-                 (let [values (:property/closed-values (db/entity :logseq.task/priority))]
+                 (let [values (:property/closed-values (db/entity :logseq.property/priority))]
                    (mapv db-property/property-value-content values))
                  gp-db/built-in-priorities)
                (constantly nil)

src/main/frontend/db/async.cljs

@@ -222,14 +222,14 @@
                       '[:find [(pull ?block ?block-attrs) ...]
                         :in $ ?start-time ?end-time ?block-attrs
                         :where
-                        (or [?block :logseq.task/scheduled ?n]
-                            [?block :logseq.task/deadline ?n])
+                        (or [?block :logseq.property/scheduled ?n]
+                            [?block :logseq.property/deadline ?n])
                         [(>= ?n ?start-time)]
                         [(<= ?n ?end-time)]
-                        [?block :logseq.task/status ?status]
+                        [?block :logseq.property/status ?status]
                         [?status :db/ident ?status-ident]
-                        [(not= ?status-ident :logseq.task/status.done)]
-                        [(not= ?status-ident :logseq.task/status.canceled)]]
+                        [(not= ?status-ident :logseq.property/status.done)]
+                        [(not= ?status-ident :logseq.property/status.canceled)]]
                       start-time
                       future-time
                       '[*])
@@ -342,7 +342,7 @@
   [graph block-id]
   (p/let [history (<get-block-properties-history graph block-id)
           status-history (filter
-                          (fn [b] (= :logseq.task/status (:db/ident (:logseq.property.history/property b))))
+                          (fn [b] (= :logseq.property/status (:db/ident (:logseq.property.history/property b))))
                           history)]
     (when (seq status-history)
       (let [time (loop [[last-item item & others] status-history
@@ -350,17 +350,17 @@
                    (if item
                      (let [last-status (:db/ident (:logseq.property.history/ref-value last-item))
                            this-status (:db/ident (:logseq.property.history/ref-value item))]
-                       (if (and (= this-status :logseq.task/status.doing)
+                       (if (and (= this-status :logseq.property/status.doing)
                                 (empty? others))
                          (-> (+ time (- (tc/to-long (t/now)) (:block/created-at item)))
                              (quot 1000))
                          (let [time' (if (or
-                                          (= last-status :logseq.task/status.doing)
+                                          (= last-status :logseq.property/status.doing)
                                           (and
-                                           (not (contains? #{:logseq.task/status.canceled
-                                                             :logseq.task/status.backlog
-                                                             :logseq.task/status.done} last-status))
-                                           (= this-status :logseq.task/status.done)))
+                                           (not (contains? #{:logseq.property/status.canceled
+                                                             :logseq.property/status.backlog
+                                                             :logseq.property/status.done} last-status))
+                                           (= this-status :logseq.property/status.done)))
                                        (+ time (- (:block/created-at item) (:block/created-at last-item)))
                                        time)]
                            (recur (cons item others) time'))))

src/main/frontend/handler/editor.cljs

@@ -659,19 +659,19 @@
 (defn db-based-cycle-todo!
   [block]
   (let [status-value (if (ldb/class-instance? (db/entity :logseq.class/Task) block)
-                       (:logseq.task/status block)
-                       (get block :logseq.task/status {}))
+                       (:logseq.property/status block)
+                       (get block :logseq.property/status {}))
         next-status (case (:db/ident status-value)
-                      :logseq.task/status.todo
-                      :logseq.task/status.doing
-                      :logseq.task/status.doing
-                      :logseq.task/status.done
-                      :logseq.task/status.done
+                      :logseq.property/status.todo
+                      :logseq.property/status.doing
+                      :logseq.property/status.doing
+                      :logseq.property/status.done
+                      :logseq.property/status.done
                       nil
-                      :logseq.task/status.todo)
+                      :logseq.property/status.todo)
         repo (state/get-current-repo)]
     (property-handler/set-block-property! repo (:block/uuid block)
-                                          :logseq.task/status
+                                          :logseq.property/status
                                           (:db/id (db/entity next-status)))))
 
 (defn cycle-todos!

src/main/frontend/worker/commands.cljs

@@ -33,7 +33,7 @@
   (if (= property :status)
     (or
      (:db/ident (:logseq.property.repeat/checked-property entity))
-     :logseq.task/status)
+     :logseq.property/status)
     property))
 
 (defn- get-value
@@ -49,7 +49,7 @@
          (some (fn [choice]
                  (when (:logseq.property/choice-checkbox-state choice)
                    (:db/id choice))) choices)))
-     :logseq.task/status.done)
+     :logseq.property/status.done)
     (and (= property :status) (= value :todo))
     (or
      (let [p (:logseq.property.repeat/checked-property entity)
@@ -60,7 +60,7 @@
          (some (fn [choice]
                  (when (false? (:logseq.property/choice-checkbox-state choice))
                    (:db/id choice))) choices)))
-     :logseq.task/status.todo)
+     :logseq.property/status.todo)
     :else
     value))
 
@@ -151,7 +151,7 @@
 
 (defmethod handle-command :reschedule [_ db entity _datoms]
   (let [property-ident (or (:db/ident (:logseq.property.repeat/temporal-property entity))
-                           :logseq.task/scheduled)
+                           :logseq.property/scheduled)
         frequency (db-property/property-value-content (:logseq.property.repeat/recur-frequency entity))
         unit (:logseq.property.repeat/recur-unit entity)
         property (d/entity db property-ident)

src/main/frontend/worker/db/migrate.cljs

@@ -706,6 +706,31 @@
                        :logseq.task/recur-status-property :logseq.property.repeat/checked-property})
    conn search-db))
 
+(defn- rename-task-properties
+  [conn search-db]
+  (when (ldb/db-based-graph? @conn)
+    (let [closed-values-tx (mapv (fn [[old new]]
+                                   {:db/id (:db/id (d/entity @conn old))
+                                    :db/ident new})
+                                 {:logseq.task/status.backlog :logseq.property/status.backlog
+                                  :logseq.task/status.todo :logseq.property/status.todo
+                                  :logseq.task/status.doing :logseq.property/status.doing
+                                  :logseq.task/status.in-review :logseq.property/status.in-review
+                                  :logseq.task/status.done :logseq.property/status.done
+                                  :logseq.task/status.canceled :logseq.property/status.canceled
+                                  :logseq.task/priority.low :logseq.property/priority.low
+                                  :logseq.task/priority.medium :logseq.property/priority.medium
+                                  :logseq.task/priority.high :logseq.property/priority.high
+                                  :logseq.task/priority.urgent :logseq.property/priority.urgent})]
+      (ldb/transact! conn closed-values-tx {:db-migrate? true})))
+
+  ;; This needs to be last as the returned tx are used
+  ((rename-properties {:logseq.task/status :logseq.property/status
+                       :logseq.task/priority :logseq.property/priority
+                       :logseq.task/deadline :logseq.property/deadline
+                       :logseq.task/scheduled :logseq.property/scheduled})
+   conn search-db))
+
 (def ^:large-vars/cleanup-todo schema-version->updates
   "A vec of tuples defining datascript migrations. Each tuple consists of the
    schema version integer and a migration map. A migration map can have keys of :properties, :classes
@@ -816,7 +841,8 @@
    ["64.4" {:properties [:logseq.property/created-by-ref]}]
    ["64.5" {:fix add-group-by-property-for-list-views}]
    ["64.6" {:fix cardinality-one-multiple-values}]
-   ["64.7" {:fix rename-repeated-properties}]])
+   ["64.7" {:fix rename-repeated-properties}]
+   ["64.8" {:fix rename-task-properties}]])
 
 (let [[major minor] (last (sort (map (comp (juxt :major :minor) db-schema/parse-schema-version first)
                                      schema-version->updates)))

src/rtc_e2e_test/client_steps.cljs

@@ -112,14 +112,14 @@
       (let [conn (helper/get-downloaded-test-conn)
             block1 (d/pull @conn
                            [{:block/tags [:db/ident]}
-                            {:logseq.task/status [:db/ident]}
-                            {:logseq.task/deadline [:block/journal-day]}]
+                            {:logseq.property/status [:db/ident]}
+                            {:logseq.property/deadline [:block/journal-day]}]
                            [:block/uuid const/block1-uuid])]
-        (when-not (= :logseq.task/status.doing (:db/ident (:logseq.task/status block1)))
+        (when-not (= :logseq.property/status.doing (:db/ident (:logseq.property/status block1)))
           (throw (ex-info "wait block1's task properties to be synced" {:missionary/retry true})))
         (is (= {:block/tags [{:db/ident :logseq.class/Task}],
-                :logseq.task/status {:db/ident :logseq.task/status.doing}
-                :logseq.task/deadline {:block/journal-day 20240907}}
+                :logseq.property/status {:db/ident :logseq.property/status.doing}
+                :logseq.property/deadline {:block/journal-day 20240907}}
                block1)))))})
 (def ^:private step4
   "client1:

src/rtc_e2e_test/const.cljs

@@ -85,14 +85,14 @@
     {:block/uuid block1-uuid
      :block/updated-at 1725454876718
      :block/tags :logseq.class/Task
-     :logseq.task/status :logseq.task/status.done
-     :logseq.task/deadline "id-0907"}]
+     :logseq.property/status :logseq.property/status.done
+     :logseq.property/deadline "id-0907"}]
    :step3-toggle-status-TODO
    [{:block/uuid block1-uuid
-     :logseq.task/status :logseq.task/status.todo}]
+     :logseq.property/status :logseq.property/status.todo}]
    :step3-toggle-status-DOING
    [{:block/uuid block1-uuid
-     :logseq.task/status :logseq.task/status.doing}]
+     :logseq.property/status :logseq.property/status.doing}]
    :move-blocks-concurrently-1
    [{:db/id "page"
      :block/uuid page3-uuid

src/test/frontend/db/query_dsl_test.cljs

@@ -447,11 +447,11 @@ prop-d:: [[nada]]"}])
   (load-test-files (if js/process.env.DB_GRAPH
                      [{:page {:block/title "page1"}
                        :blocks [{:block/title "[#A] b1"
-                                 :build/properties {:logseq.task/priority :logseq.task/priority.high}}
+                                 :build/properties {:logseq.property/priority :logseq.property/priority.high}}
                                 {:block/title "[#B] b2"
-                                 :build/properties {:logseq.task/priority :logseq.task/priority.medium}}
+                                 :build/properties {:logseq.property/priority :logseq.property/priority.medium}}
                                 {:block/title "[#A] b3"
-                                 :build/properties {:logseq.task/priority :logseq.task/priority.high}}]}]
+                                 :build/properties {:logseq.property/priority :logseq.property/priority.high}}]}]
 
                      [{:file/path "pages/page1.md"
                        :file/content "foo:: bar

src/test/frontend/test/helper.cljs

@@ -81,16 +81,16 @@
       (assoc :block/created-at (:created-at props)))))
 
 (def file-to-db-statuses
-  {"TODO" :logseq.task/status.todo
-   "LATER" :logseq.task/status.todo
-   "IN-PROGRESS" :logseq.task/status.doing
-   "NOW" :logseq.task/status.doing
-   "DOING" :logseq.task/status.doing
-   "DONE" :logseq.task/status.done
-   "WAIT" :logseq.task/status.backlog
-   "WAITING" :logseq.task/status.backlog
-   "CANCELED" :logseq.task/status.canceled
-   "CANCELLED" :logseq.task/status.canceled})
+  {"TODO" :logseq.property/status.todo
+   "LATER" :logseq.property/status.todo
+   "IN-PROGRESS" :logseq.property/status.doing
+   "NOW" :logseq.property/status.doing
+   "DOING" :logseq.property/status.doing
+   "DONE" :logseq.property/status.done
+   "WAIT" :logseq.property/status.backlog
+   "WAITING" :logseq.property/status.backlog
+   "CANCELED" :logseq.property/status.canceled
+   "CANCELLED" :logseq.property/status.canceled})
 
 (defn- parse-content
   "Given a file's content as markdown, returns blocks and page attributes for the file
@@ -117,7 +117,7 @@
                                        file-to-db-statuses)]
                  (-> %
                      (assoc :block/tags [{:db/ident :logseq.class/Task}])
-                     (update :build/properties merge {:logseq.task/status status}))
+                     (update :build/properties merge {:logseq.property/status status}))
                  %)
               blocks*)]
     {:blocks (mapv (fn [b] (update b :block/title #(string/replace-first % #"^-\s*" "")))

src/test/frontend/worker/rtc/remote_update_test.cljs

@@ -55,14 +55,14 @@
             ent (d/entity db [:block/uuid block-uuid])]
         (is (= [[:db/retract (:db/id ent) :block/updated-at]]
                (#'subject/remote-op-value->tx-data db ent {} nil)))))
-    (testing ":logseq.task/status, op-value don't have this attr, means remove this attr"
+    (testing ":logseq.property/status, op-value don't have this attr, means remove this attr"
       (let [db (d/db-with db [{:db/id "ref1"
                                :block/uuid ref-uuid1}
                               {:block/uuid block-uuid
-                               :logseq.task/status "ref1"}])
+                               :logseq.property/status "ref1"}])
             op-value {}
             ent (d/entity db [:block/uuid block-uuid])]
-        (is (= [[:db/retract (:db/id ent) :logseq.task/status]]
+        (is (= [[:db/retract (:db/id ent) :logseq.property/status]]
                (#'subject/remote-op-value->tx-data db ent op-value nil)))))
     (testing "dont update ignored attrs"
       (let [db (d/db-with db [{:block/uuid block-uuid

src/test/frontend/worker/rtc/rtc_fns_test.cljs

@@ -125,13 +125,13 @@
             536872312
             {:block-uuid uuid1
              :av-coll
-             [[:logseq.task/status status-value-uuid 536872312 true]]}]]
+             [[:logseq.property/status status-value-uuid 536872312 true]]}]]
           r (#'r.remote/update-remote-data-by-local-unpushed-ops affected-blocks-map unpushed-ops)]
       (is (= {uuid1
               {:op :update-attrs
                :self uuid1
                :parents [uuid2]
-               :logseq.task/status [status-value-uuid]}}
+               :logseq.property/status [status-value-uuid]}}
              r))))
   (testing "case7: toggle status(2)"
     (let [[uuid1 uuid2 status-value-uuid1 status-value-uuid2] (repeatedly random-uuid)
@@ -145,15 +145,15 @@
             536872314
             {:block-uuid uuid1
              :av-coll
-             [[:logseq.task/status status-value-uuid1 536872312 true]
-              [:logseq.task/status status-value-uuid1 536872312 false]
-              [:logseq.task/status status-value-uuid2 536872314 true]]}]]
+             [[:logseq.property/status status-value-uuid1 536872312 true]
+              [:logseq.property/status status-value-uuid1 536872312 false]
+              [:logseq.property/status status-value-uuid2 536872314 true]]}]]
           r (#'r.remote/update-remote-data-by-local-unpushed-ops affected-blocks-map unpushed-ops)]
       (is (= {uuid1
               {:op :update-attrs
                :self uuid1
                :parents [uuid2]
-               :logseq.task/status [status-value-uuid2]}}
+               :logseq.property/status [status-value-uuid2]}}
              r)))))
 
 (deftest apply-remote-move-ops-test