Browse Source

fix(regression): table properties are not displayed for file graphs

fixes https://github.com/logseq/db-test/issues/265
Tienson Qin 7 months ago
parent
commit
d3b2f99b2e

+ 10 - 6
deps/db/src/logseq/db/common/initial_data.cljs

@@ -6,9 +6,9 @@
             [logseq.common.config :as common-config]
             [logseq.common.util :as common-util]
             [logseq.common.util.date-time :as date-time-util]
+            [logseq.db.common.entity-plus :as entity-plus]
             [logseq.db.common.entity-util :as common-entity-util]
             [logseq.db.common.order :as db-order]
-            [logseq.db.common.entity-plus :as entity-plus]
             [logseq.db.frontend.entity-util :as entity-util]))
 
 (defn- get-pages-by-name
@@ -309,10 +309,14 @@
                             (get-structured-datoms db))
         recent-updated-pages (let [pages (get-recent-updated-pages db)]
                                (mapcat (fn [p] (d/datoms db :eavt (:db/id p))) pages))
-        pages-datoms (let [contents-id (get-first-page-by-title db "Contents")
-                           views-id (get-first-page-by-title db common-config/views-page-name)]
-                       (mapcat #(d/datoms db :eavt %)
-                               (remove nil? [contents-id views-id])))
+        pages-datoms (if db-graph?
+                       (let [contents-id (get-first-page-by-title db "Contents")
+                             views-id (get-first-page-by-title db common-config/views-page-name)]
+                         (mapcat #(d/datoms db :eavt %)
+                                 (remove nil? [contents-id views-id])))
+                       ;; load all pages for file graphs
+                       (->> (d/datoms db :avet :block/name)
+                            (mapcat (fn [d] (d/datoms db :eavt (:e d))))))
         data (distinct
               (concat idents
                       structured-datoms
@@ -322,4 +326,4 @@
                       all-files
                       pages-datoms))]
     {:schema schema
-     :initial-data data}))
+     :initial-data data}))

+ 6 - 5
src/main/frontend/components/file_based/query_table.cljs

@@ -152,13 +152,14 @@
                (date/int->local-time-2 updated-at))]
 
     [:string
-     (if comma-separated-property?
+     (let [value (get-in row [:block/properties column])]
+       (if (or comma-separated-property? (coll? value))
          ;; Return original properties since comma properties need to
          ;; return collections for display purposes
-       (get-in row [:block/properties column])
-       (or (get-in row [:block/properties-text-values column])
-             ;; Fallback to original properties for page blocks
-           (get-in row [:block/properties column])))]))
+         value
+         (or (get-in row [:block/properties-text-values column])
+           ;; Fallback to original properties for page blocks
+             value)))]))
 
 (defn- render-column-value
   [{:keys [row-block row-format cell-format value]} page-cp inline-text]

+ 1 - 1
src/main/frontend/components/table.css

@@ -107,7 +107,7 @@ html.is-resizing-buf {
 }
 
 .query-table, .classic-table {
-  @apply my-2 rounded overflow-hidden;
+  @apply my-2 rounded;
 
   &.force-visible-scrollbar {
     @apply !overflow-x-auto pb-1;