Просмотр исходного кода

fix: published graphs failing on class pages

Bring back get-namespace-pages impl that doesn't add :block/file
to db graphs. :block/file isn't used in db graphs.
Also got kondo lint back to green
Gabriel Horner 2 лет назад
Родитель
Сommit
98dd1c2b5c

+ 4 - 3
deps/db/src/logseq/db.cljs

@@ -480,11 +480,12 @@
 
 (defn get-namespace-pages
   "Accepts both sanitized and unsanitized namespaces"
-  [db namespace]
+  [db namespace {:keys [db-graph?]}]
   (assert (string? namespace))
   (let [namespace (common-util/page-name-sanity-lc namespace)
-        pull-attrs [:db/id :block/name :block/original-name :block/namespace
-                    {:block/file [:db/id :file/path]}]]
+        pull-attrs  (cond-> [:db/id :block/name :block/original-name :block/namespace]
+                      (not db-graph?)
+                      (conj {:block/file [:db/id :file/path]}))]
     (d/q
      [:find [(list 'pull '?c pull-attrs) '...]
       :in '$ '% '?namespace

+ 1 - 1
deps/db/src/logseq/db/frontend/schema.cljs

@@ -122,7 +122,7 @@
 (def schema-for-db-based-graph
   (merge
    (dissoc schema
-           :block/properties-text-values :block/pre-block? :recent/pages :file/handle
+           :block/properties-text-values :block/pre-block? :recent/pages :file/handle :block/file
            :block/properties-order)
    {:file/last-modified-at {}}
    {:asset/uuid {:db/unique :db.unique/identity}

+ 1 - 1
src/main/frontend/db/model.cljs

@@ -1012,7 +1012,7 @@ independent of format as format specific heading characters are stripped"
 (defn get-namespace-pages
   "Accepts both sanitized and unsanitized namespaces"
   [repo namespace]
-  (ldb/get-namespace-pages (conn/get-db repo) namespace))
+  (ldb/get-namespace-pages (conn/get-db repo) namespace {:db-graph? (config/db-based-graph? repo)}))
 
 (defn- tree [flat-col root]
   (let [sort-fn #(sort-by :block/name %)

+ 1 - 1
src/main/frontend/worker/handler/page/rename.cljs

@@ -191,7 +191,7 @@
 (defn- rename-namespace-pages!
   "Original names (unsanitized only)"
   [repo conn config old-name new-name]
-  (let [pages (ldb/get-namespace-pages @conn old-name)
+  (let [pages (ldb/get-namespace-pages @conn old-name {:db-graph? (sqlite-util/db-based-graph? repo)})
         page (d/pull @conn '[*] [:block/name (common-util/page-name-sanity-lc old-name)])
         pages (cons page pages)]
     (doseq [{:block/keys [name original-name]} pages]

+ 1 - 2
src/main/frontend/worker/state.cljs

@@ -1,7 +1,6 @@
 (ns frontend.worker.state
   "State hub for worker"
-  (:require [logseq.common.util :as common-util]
-            [frontend.worker.date :as date]))
+  (:require [logseq.common.util :as common-util]))
 
 (defonce *state (atom {:worker/object nil