From c0e3a5f81cb72f73229daecdc42334491822719f Mon Sep 17 00:00:00 2001 From: Tienson Qin Date: Fri, 16 May 2025 23:34:14 +0800 Subject: [PATCH] fix: lint --- deps/db/src/logseq/db/sqlite/create_graph.cljs | 2 +- deps/db/test/logseq/db_test.cljs | 2 +- deps/graph-parser/src/logseq/graph_parser/block.cljs | 10 ---------- src/main/frontend/worker/db/migrate.cljs | 2 +- .../frontend/worker/handler/page/db_based/page.cljs | 12 +++++++++++- src/test/frontend/worker/migrate_test.cljs | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/deps/db/src/logseq/db/sqlite/create_graph.cljs b/deps/db/src/logseq/db/sqlite/create_graph.cljs index 6d4d78861b..a633f74afd 100644 --- a/deps/db/src/logseq/db/sqlite/create_graph.cljs +++ b/deps/db/src/logseq/db/sqlite/create_graph.cljs @@ -128,7 +128,7 @@ :properties (filter entity-util/property? properties-tx)})) (def built-in-pages-names - #{"Library"}) + #{"Library" "Contents"}) (defn- validate-tx-for-duplicate-idents [tx] (when-let [conflicting-idents diff --git a/deps/db/test/logseq/db_test.cljs b/deps/db/test/logseq/db_test.cljs index f6d22c1f09..1d01d5a6ad 100644 --- a/deps/db/test/logseq/db_test.cljs +++ b/deps/db/test/logseq/db_test.cljs @@ -48,7 +48,7 @@ (let [conn (db-test/create-conn)] (d/transact! conn class-parents-data) (is (= #{"x" "y"} - (->> (ldb/get-class-parents (ldb/get-page @conn "z") {:node-class? true}) + (->> (ldb/get-class-extends (ldb/get-page @conn "z") {:node-class? true}) (map :block/title) set))))) diff --git a/deps/graph-parser/src/logseq/graph_parser/block.cljs b/deps/graph-parser/src/logseq/graph_parser/block.cljs index af8ca72dea..19ec659e52 100644 --- a/deps/graph-parser/src/logseq/graph_parser/block.cljs +++ b/deps/graph-parser/src/logseq/graph_parser/block.cljs @@ -364,16 +364,6 @@ [s] (string/replace s "#" "HashTag-")) -(defn page-with-parent-and-order - "Apply to namespace pages" - [db page & {:keys [parent]}] - (let [library (ldb/get-built-in-page db "Library")] - (when (nil? library) - (throw (ex-info "Library page doesn't exist" {}))) - (assoc page - :block/parent (or parent (:db/id library)) - :block/order (db-order/gen-key)))) - ;; TODO: refactor (defn page-name->map "Create a page's map structure given a original page name (string). diff --git a/src/main/frontend/worker/db/migrate.cljs b/src/main/frontend/worker/db/migrate.cljs index e0e1185357..2225c09ae2 100644 --- a/src/main/frontend/worker/db/migrate.cljs +++ b/src/main/frontend/worker/db/migrate.cljs @@ -859,7 +859,7 @@ :logseq.task/scheduled :logseq.property/scheduled}) conn)) -(defn- fix-rename-parent-to-extends +(defn fix-rename-parent-to-extends [conn _search-db] (let [db @conn parent-entity (d/entity db :logseq.property/parent)] diff --git a/src/main/frontend/worker/handler/page/db_based/page.cljs b/src/main/frontend/worker/handler/page/db_based/page.cljs index 515306ffdf..536dc35757 100644 --- a/src/main/frontend/worker/handler/page/db_based/page.cljs +++ b/src/main/frontend/worker/handler/page/db_based/page.cljs @@ -102,6 +102,16 @@ first (d/entity db))) +(defn- page-with-parent-and-order + "Apply to namespace pages" + [db page & {:keys [parent]}] + (let [library (ldb/get-built-in-page db "Library")] + (when (nil? library) + (throw (ex-info "Library page doesn't exist" {}))) + (assoc page + :block/parent (or parent (:db/id library)) + :block/order (db-order/gen-key)))) + (defn- split-namespace-pages [db page date-formatter create-class?] (let [{:block/keys [title] block-uuid :block/uuid} page] @@ -160,7 +170,7 @@ (db-class/build-new-class db (assoc page :logseq.property.class/extends parent-eid))) (if (de/entity? page) page - (gp-block/page-with-parent-and-order db page {:parent parent-eid}))))) + (page-with-parent-and-order db page {:parent parent-eid}))))) pages))) [page]) (remove nil?)))) diff --git a/src/test/frontend/worker/migrate_test.cljs b/src/test/frontend/worker/migrate_test.cljs index 4ab1f314d5..1be457359d 100644 --- a/src/test/frontend/worker/migrate_test.cljs +++ b/src/test/frontend/worker/migrate_test.cljs @@ -5,7 +5,7 @@ [frontend.worker.db.migrate :as db-migrate] [logseq.db :as ldb])) -(deftest ^:focus test-fix-rename-parent-to-extends +(deftest test-fix-rename-parent-to-extends (testing "Rename parent to extends" (let [db-transit (str (fs-node/readFileSync "src/test/migration/64.8.transit")) db (ldb/read-transit-str db-transit)