浏览代码

fix: rename logseq.property/status to logseq.task/status

Tienson Qin 1 年之前
父节点
当前提交
fe922ba035

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

@@ -257,6 +257,7 @@
   [k]
   (let [k-name (namespace k)]
     (or (string/starts-with? k-name "logseq.property")
+        (string/starts-with? k-name "logseq.task")
         (string/starts-with? k-name "user.property"))))
 
 ;; TODO: db ident should obey clojure's rules for keywords

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

@@ -300,7 +300,7 @@
   [conn m]
   (or
    (let [marker (:block/marker m)
-         property (d/entity @conn :logseq.property/status)
+         property (d/entity @conn :logseq.task/status)
          matched-status-id (when marker
                              (->> (get-in property [:block/schema :values])
                                  (some (fn [id]

+ 4 - 4
src/main/frontend/commands.cljs

@@ -125,7 +125,7 @@
 (defn db-based-statuses
   []
   (map (fn [id] (get-in (db/entity [:block/uuid id]) [:block/schema :value]))
-    (pu/get-closed-property-values :logseq.property/status)))
+    (pu/get-closed-property-values :logseq.task/status)))
 
 (defn db-based-embed-page
   []
@@ -161,7 +161,7 @@
 (defn db-based-priorities
   []
   (map (fn [id] (get-in (db/entity [:block/uuid id]) [:block/schema :value]))
-    (pu/get-closed-property-values :logseq.property/priority)))
+    (pu/get-closed-property-values :logseq.task/priority)))
 
 (defn get-priorities
   []
@@ -659,7 +659,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.property/status status)))
+    (db-property-handler/batch-set-property-closed-value! [(:block/uuid block)] :logseq.task/status status)))
 
 (defmethod handle-step :editor/set-status [[_ status] format]
   (if (config/db-based-graph? (state/get-current-repo))
@@ -679,7 +679,7 @@
 (defn- db-based-set-priority
   [priority]
   (when-let [block (state/get-edit-block)]
-    (db-property-handler/batch-set-property-closed-value! [(:block/uuid block)] :logseq.property/priority priority)))
+    (db-property-handler/batch-set-property-closed-value! [(:block/uuid block)] :logseq.task/priority priority)))
 
 (defmethod handle-step :editor/set-priority [[_ priority] _format]
   (if (config/db-based-graph? (state/get-current-repo))

+ 3 - 3
src/main/frontend/components/property.cljs

@@ -725,10 +725,10 @@
         alias-properties (when (seq alias)
                            [[:block/alias alias]])
         remove-built-in-properties (fn [properties]
-                                     (remove (fn [id]
+                                     (remove (fn [[id _]]
                                                (when-let [ent (db/entity id)]
-                                                   (and (not (get-in ent [:block/schema :public?]))
-                                                        (ldb/built-in? ent))))
+                                                 (and (not (get-in ent [:block/schema :public?]))
+                                                      (ldb/built-in? ent))))
                                              properties))
         {:keys [classes all-classes classes-properties]} (db-property-handler/get-block-classes-properties (:db/id block))
         one-class? (= 1 (count classes))

+ 3 - 3
src/main/frontend/handler/db_based/property.cljs

@@ -208,7 +208,7 @@
                   (let [msg' (str "\"" k-name "\"" " " (if (coll? msg) (first msg) msg))]
                     (notification/show! msg' :warning))
                   (let [_ (upsert-property! repo property-id (assoc property-schema :type property-type) {})
-                        status? (= :logseq.property/status (:db/ident property))
+                        status? (= :logseq.task/status (:db/ident property))
                         value (if (= value :property/empty-placeholder) [] value)
                         new-value (cond
                                     (and multiple-values? old-value
@@ -306,7 +306,7 @@
         infer-schema (when-not type (infer-schema-from-input-string v))
         property-type (or type infer-schema :default)
         {:keys [cardinality]} (:block/schema property)
-        status? (= :logseq.property/status (:db/ident property))
+        status? (= :logseq.task/status (:db/ident property))
         txs (mapcat
              (fn [eid]
                (when-let [block (db/entity eid)]
@@ -554,7 +554,7 @@
 (defn re-init-commands!
   "Update commands after task status and priority's closed values has been changed"
   [property]
-  (when (contains? #{:logseq.property/status :logseq.property/priority} (:db/ident property))
+  (when (contains? #{:logseq.task/status :logseq.task/priority} (:db/ident property))
     (state/pub-event! [:init/commands])))
 
 (defn replace-closed-value

+ 9 - 9
src/main/frontend/handler/editor.cljs

@@ -643,22 +643,22 @@
 (defn db-based-cycle-todo!
   [block]
   (let [task (db/entity :logseq.class/task)
-        status-value-id (:logseq.property/status block)
+        status-value-id (:logseq.task/status block)
         status-value (when status-value-id (db/entity [:block/uuid status-value-id]))
         next-status (case (:db/ident status-value)
-                      :logseq.property/status.todo
-                      :logseq.property/status.doing
-                      :logseq.property/status.doing
-                      :logseq.property/status.done
-                      :logseq.property/status.done
+                      :logseq.task/status.todo
+                      :logseq.task/status.doing
+                      :logseq.task/status.doing
+                      :logseq.task/status.done
+                      :logseq.task/status.done
                       nil
-                      :logseq.property/status.todo)]
+                      :logseq.task/status.todo)]
     (if next-status
       (outliner-op/save-block! {:db/id (:db/id block)
-                                :logseq.property/status (:block/uuid (db/entity next-status))
+                                :logseq.task/status (:block/uuid (db/entity next-status))
                                 :block/tags #{{:db/id (:db/id task)}}})
       (db/transact! (state/get-current-repo)
-        [[:db/retract (:db/id block) :logseq.property/status]]
+        [[:db/retract (:db/id block) :logseq.task/status]]
         {:outliner-op :save-block}))))
 
 (defn cycle-todos!