浏览代码

fix: file graphs showing buggy views tab

instead of page count
Gabriel Horner 7 月之前
父节点
当前提交
9d09ee9dc4

+ 1 - 1
scripts/src/logseq/tasks/lang.clj

@@ -133,7 +133,7 @@
    "(t prompt-key" [:select/default-prompt :select/default-select-multiple :select.graph/prompt]
    ;; All args to ui/make-confirm-modal are not keywords
    "(t title" []
-   "(t (or title-key" [:views.table/live-query-title :views.table/default-title]
+   "(t (or title-key" [:views.table/live-query-title :views.table/default-title :all-pages/table-title]
    "(t subtitle" [:asset/physical-delete]})
 
 (defn- whiteboard-dicts

+ 1 - 0
src/main/frontend/components/all_pages.cljs

@@ -64,6 +64,7 @@
                   :view-feature-type :all-pages
                   :show-items-count? true
                   :columns columns'
+                  :title-key :all-pages/table-title
                   :on-delete-rows (fn [table selected-rows]
                                     (shui/dialog-open!
                                      (component-page/batch-delete-dialog

+ 10 - 5
src/main/frontend/components/views.cljs

@@ -1549,16 +1549,21 @@
    set-input! add-new-object!
    {:keys [view-feature-type title-key additional-actions]
     :as option}]
-  (let [[hover? set-hover?] (hooks/use-state nil)]
+  (let [[hover? set-hover?] (hooks/use-state nil)
+        db-based? (config/db-based-graph? (state/get-current-repo))]
     [:div.flex.flex-1.flex-wrap.items-center.justify-between.gap-1
      {:on-mouse-over #(set-hover? true)
       :on-mouse-out #(set-hover? false)}
      [:div.flex.flex-row.items-center.gap-2
-      (if (= view-feature-type :query-result)
+      (if db-based?
+        (if (= view-feature-type :query-result)
+          [:div.font-medium.opacity-50.text-sm
+           (t (or title-key :views.table/default-title)
+              (count (:rows table)))]
+          (views-tab view-parent view-entity (:rows table) option hover?))
         [:div.font-medium.opacity-50.text-sm
          (t (or title-key :views.table/default-title)
-            (count (:rows table)))]
-        (views-tab view-parent view-entity (:rows table) option hover?))]
+            (count (:rows table)))])]
      [:div.view-actions.flex.items-center.gap-1.transition-opacity.ease-in.duration-300
       {:class (if hover? "opacity-100" "opacity-75")}
 
@@ -1576,7 +1581,7 @@
       [:div.text-muted-foreground.text-sm
        (pv/property-value view-entity (db/entity :logseq.property.view/type) {})]
 
-      (more-actions view-entity columns table)
+      (when db-based? (more-actions view-entity columns table))
 
       (when add-new-object! (new-record-button table view-entity))]]))
 

+ 2 - 0
src/resources/dicts/en.edn

@@ -472,6 +472,8 @@
  :export-save-to-file "Save to file"
  :all-graphs "All graphs"
  :all-pages "All pages"
+  ;; E.g. 1 Page or 2 Pages
+ :all-pages/table-title (fn [total] (str total (if (= total 1) " Page" " Pages")))
  :all-pages/failed-to-delete-pages "These pages had their content deleted but were unable to be deleted: {1}. See javascript console for more details."
  :all-whiteboards "All whiteboards"
  :all-files "All files"