Răsfoiți Sursa

fix: test and lints

also remove unused binding not caught by linter b/c it's used
Gabriel Horner 1 an în urmă
părinte
comite
58b2888729

+ 1 - 1
.clj-kondo/config.edn

@@ -102,7 +102,6 @@
              frontend.idb idb
              frontend.loader loader
              frontend.mixins mixins
-             frontend.modules.outliner.op outliner-op
              frontend.modules.outliner.ui ui-outliner-tx
              frontend.mobile.util mobile-util
              frontend.page page
@@ -150,6 +149,7 @@
              logseq.graph-parser.property gp-property
              logseq.graph-parser.util.db db-util
              logseq.outliner.core outliner-core
+             logseq.outliner.op outliner-op
              logseq.outliner.pipeline outliner-pipeline
              logseq.outliner.datascript-report ds-report
              medley.core medley

+ 1 - 3
deps/db/src/logseq/db/sqlite/common_db.cljs

@@ -99,9 +99,7 @@
 
 (defn get-latest-journals
   [db n]
-  (let [date (js/Date.)
-        _ (.setDate date (- (.getDate date) (dec n)))
-        today (date-time-util/date->int (js/Date.))]
+  (let [today (date-time-util/date->int (js/Date.))]
     (->>
      (d/q '[:find [(pull ?page [*]) ...]
             :in $ ?today

+ 12 - 6
deps/db/test/logseq/db/sqlite/common_db_test.cljs

@@ -5,7 +5,9 @@
             [datascript.core :as d]
             [logseq.db.sqlite.common-db :as sqlite-common-db]
             [logseq.db.frontend.schema :as db-schema]
-            [logseq.db.sqlite.db :as sqlite-db]))
+            [logseq.common.util.date-time :as date-time-util]
+            [logseq.db.sqlite.db :as sqlite-db]
+            [clojure.string :as string]))
 
 (use-fixtures
   :each
@@ -40,16 +42,20 @@
           "Correct file with content is found"))))
 
 (deftest restore-initial-data
-  (testing "Restore a journal page with its block"
+  (testing "Restore a journal page"
     (create-graph-dir "tmp/graphs" "test-db")
     (let [conn* (sqlite-db/open-db! "tmp/graphs" "test-db")
           page-uuid (random-uuid)
           block-uuid (random-uuid)
           created-at (js/Date.now)
+          date-int (date-time-util/date->int (js/Date.))
+          date-title (date-time-util/int->journal-title date-int "MMM do, yyyy")
           blocks [{:db/id 100001
                    :block/uuid page-uuid
-                   :block/journal-day 20230629
-                   :block/name "jun 29th, 2023"
+                   :block/journal? true
+                   :block/journal-day date-int
+                   :block/name (string/lower-case date-title)
+                   :block/original-name date-title
                    :block/created-at created-at
                    :block/updated-at created-at}
                   {:db/id 100002
@@ -62,9 +68,9 @@
           ;; Simulate getting data from sqlite and restoring it for frontend
           conn (-> (sqlite-common-db/get-initial-data @conn*)
                    (sqlite-common-db/restore-initial-data db-schema/schema-for-db-based-graph))]
-      (is (= blocks
+      (is (= (take 1 blocks)
              (->> (d/q '[:find (pull ?b [*])
                          :where [?b :block/created-at]]
                        @conn)
                   (map first)))
-          "Datascript db matches data inserted into sqlite"))))
+          "Journal page is included in initial restore while its block is not"))))

+ 2 - 0
deps/outliner/.carve/ignore

@@ -4,3 +4,5 @@ logseq.outliner.cli.pipeline/add-listener
 logseq.outliner.core/*transaction-opts*
 ;; API fn
 logseq.outliner.datascript/transact!
+;; API fn
+logseq.outliner.op/apply-ops!