Bladeren bron

fix: db tests and frontend+db lints

Gabriel Horner 1 jaar geleden
bovenliggende
commit
5167523521
3 gewijzigde bestanden met toevoegingen van 10 en 11 verwijderingen
  1. 7 7
      deps/db/src/logseq/db.cljs
  2. 3 3
      deps/db/test/logseq/db_test.cljs
  3. 0 1
      src/rtc_e2e_test/client_steps.cljs

+ 7 - 7
deps/db/src/logseq/db.cljs

@@ -611,23 +611,23 @@
   [node & {:keys [node-class?]}]
   (when-let [parent (:logseq.property/parent node)]
     (loop [current-parent parent
-           parents []]
+           parents' []]
       (if (and
            current-parent
            (if node-class? (class? current-parent) true)
-           (not (contains? parents current-parent)))
+           (not (contains? parents' current-parent)))
         (recur (:logseq.property/parent current-parent)
-               (conj parents current-parent))
-        (vec (reverse parents))))))
+               (conj parents' current-parent))
+        (vec (reverse parents'))))))
 
 (defn get-title-with-parents
   [entity]
   (if (contains? #{"page" "class"} (:block/type entity))
-    (let [parents (->> (get-page-parents entity)
-                       (remove (fn [e] (= :logseq.class/Root (:db/ident e)))))]
+    (let [parents' (->> (get-page-parents entity)
+                        (remove (fn [e] (= :logseq.class/Root (:db/ident e)))))]
       (string/join
        ns-util/parent-char
-       (map :block/title (conj parents entity))))
+       (map :block/title (conj parents' entity))))
     (:block/title entity)))
 
 (defn get-classes-parents

+ 3 - 3
deps/db/test/logseq/db_test.cljs

@@ -45,11 +45,11 @@
     :block/uuid #uuid "d95f2912-a7af-41b9-8ed5-28861f7fc0be"
     :logseq.property/parent [:block/uuid #uuid "7008db08-ba0c-4aa9-afc6-7e4783e40a99"]}])
 
-(deftest get-class-parents-test
+(deftest get-page-parents
   (let [conn (d/create-conn db-schema/schema-for-db-based-graph)]
     (d/transact! conn (sqlite-create-graph/build-db-initial-data "{}"))
     (d/transact! conn class-parents-data)
     (is (= #{"x" "y"}
-           (->> (ldb/get-class-parents (ldb/get-page @conn "z"))
-                (map #(:block/title (d/entity @conn %)))
+           (->> (ldb/get-page-parents (ldb/get-page @conn "z") {:node-class? true})
+                (map :block/title)
                 set)))))

+ 0 - 1
src/rtc_e2e_test/client_steps.cljs

@@ -7,7 +7,6 @@
             [frontend.worker.rtc.core :as rtc-core]
             [helper]
             [logseq.db :as ldb]
-            [logseq.outliner.batch-tx :as batch-tx]
             [missionary.core :as m]))
 
 (def ^:private step0