Browse Source

fix: db api fn using file graph attributes + fns

Gabriel Horner 2 months ago
parent
commit
f8b4277e60

+ 2 - 0
scripts/src/logseq/tasks/dev/db_and_file_graphs.clj

@@ -15,6 +15,7 @@
   (mapv escape-shell-regex
   (mapv escape-shell-regex
         ["logseq.db.sqlite." "logseq.db.frontend."
         ["logseq.db.sqlite." "logseq.db.frontend."
          "logseq.outliner.property" "logseq.outliner.validate" "logseq.outliner.page" "logseq.outliner.cli" "logseq.outliner.db-pipeline"
          "logseq.outliner.property" "logseq.outliner.validate" "logseq.outliner.page" "logseq.outliner.cli" "logseq.outliner.db-pipeline"
+         "logseq.api.db-based"
          "electron.db"
          "electron.db"
          "frontend.handler.db-based."
          "frontend.handler.db-based."
          "frontend.inference-worker"
          "frontend.inference-worker"
@@ -63,6 +64,7 @@
          "src/main/frontend/components/db_based"
          "src/main/frontend/components/db_based"
          "src/main/frontend/components/query/view.cljs"
          "src/main/frontend/components/query/view.cljs"
          "src/main/frontend/inference_worker"
          "src/main/frontend/inference_worker"
+         "src/main/logseq/api/db_based.cljs"
          "src/electron/electron/db.cljs"
          "src/electron/electron/db.cljs"
          "src/main/mobile"]))
          "src/main/mobile"]))
 
 

+ 3 - 2
src/main/logseq/api/db_based.cljs

@@ -16,6 +16,7 @@
             [frontend.util :as util]
             [frontend.util :as util]
             [logseq.api.block :as api-block]
             [logseq.api.block :as api-block]
             [logseq.db :as ldb]
             [logseq.db :as ldb]
+            [logseq.db.common.entity-util :as common-entity-util]
             [logseq.outliner.core :as outliner-core]
             [logseq.outliner.core :as outliner-core]
             [logseq.sdk.core]
             [logseq.sdk.core]
             [logseq.sdk.experiments]
             [logseq.sdk.experiments]
@@ -45,13 +46,13 @@
         {:keys [sibling before schema]} opts
         {:keys [sibling before schema]} opts
         block (if before
         block (if before
                 (db/pull (:db/id (ldb/get-left-sibling (db/entity (:db/id target))))) target)
                 (db/pull (:db/id (ldb/get-left-sibling (db/entity (:db/id target))))) target)
-        sibling? (if (ldb/page? block) false sibling)
+        sibling? (if (common-entity-util/page? block) false sibling)
         uuid->properties (let [blocks (outliner-core/tree-vec-flatten blocks' :children)]
         uuid->properties (let [blocks (outliner-core/tree-vec-flatten blocks' :children)]
                            (when (some (fn [b] (seq (:properties b))) blocks)
                            (when (some (fn [b] (seq (:properties b))) blocks)
                              (zipmap (map :uuid blocks)
                              (zipmap (map :uuid blocks)
                                      (map :properties blocks))))]
                                      (map :properties blocks))))]
     (p/let [result (editor-handler/insert-block-tree-after-target
     (p/let [result (editor-handler/insert-block-tree-after-target
-                    (:db/id block) sibling? blocks' (get block :block/format :markdown) true)
+                    (:db/id block) sibling? blocks' :markdown true)
             blocks (:blocks result)]
             blocks (:blocks result)]
       (when (seq blocks)
       (when (seq blocks)
         (p/doseq [block blocks]
         (p/doseq [block blocks]