소스 검색

enhance: importer can import :logseq.task/scheduled

Follow up to #11654. Fixes
https://test.logseq.com/#/page/677d36f0-5d8f-4b82-85ad-486d81a46e7e
Gabriel Horner 9 달 전
부모
커밋
2a4f49e541

+ 5 - 5
deps/common/src/logseq/common/util/date_time.cljs

@@ -100,8 +100,8 @@
 (defn ms->journal-day
   "Converts a milliseconds timestamp to the nearest :block/journal-day"
   [ms]
-  (->> ms
-       tc/from-long
-       t/to-default-time-zone
-       (tf/unparse (tf/formatter "yyyyMMdd"))
-       parse-long))
+  (some->> ms
+           tc/from-long
+           t/to-default-time-zone
+           (tf/unparse (tf/formatter "yyyyMMdd"))
+           parse-long))

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

@@ -322,10 +322,11 @@
                                       :block/uuid (common-uuid/gen-uuid :journal-page-uuid date-int)
                                       :block/journal-day date-int)))
                          (assoc :block/tags #{:logseq.class/Journal}))
-          time-long (tc/to-long (date-time-util/int->local-date date-int))]
+          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)]
       {:block
        (-> block
-           (assoc :logseq.task/deadline time-long)
+           (assoc datetime-property time-long)
            (dissoc :block/deadline :block/scheduled :block/repeated?))
        :properties-tx (when-not existing-journal-page [deadline-page])})
     {:block block :properties-tx []}))

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

@@ -304,7 +304,7 @@
 
       (is (= 20221125
              (-> (readable-properties @conn (db-test/find-block-by-content @conn "only scheduled"))
-                 :logseq.task/deadline
+                 :logseq.task/scheduled
                  date-time-util/ms->journal-day))
           "scheduled block converted to correct deadline")