浏览代码

Merge branch 'master' into feat/capacitor-new

charlie 4 月之前
父节点
当前提交
b740d80c35

+ 3 - 0
.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,7 @@
 contact_links:
+  - name: Database Version Issue
+    url: https://github.com/logseq/db-test/issues
+    about: For issues related to unreleased Database Version
   - name: Feature request
     url: https://discuss.logseq.com/new-topic?category=feature-requests
     about: Suggest an idea for Logseq

+ 2 - 2
README.md

@@ -70,9 +70,9 @@
 
 The Database version (DB version) of Logseq introduces DB graphs while maintaining support for file graphs. [See this page](https://github.com/logseq/docs/blob/feat/db/db-version.md) to get an overview of the main features for DB graphs. If you are an existing user, [see this page](https://github.com/logseq/docs/blob/feat/db/db-version-changes.md) to get an overview of changes with the DB version.
 
-The DB version of Logseq is alpha software. When using DB graphs, we recommend you create a dedicated test graph and choose one project/workflow (that’s not crucial for you) to test with it. **Data loss is possible**, which is why we recommend [automated backups](https://github.com/logseq/docs/blob/feat/db/db-version.md#automated-backup) or making [regular SQLite DB backups](https://github.com/logseq/docs/blob/feat/db/db-version.md#graph-export). When using file graphs, **data corruption is possible** as some file content can be duplicated. We only recommend using file graphs if you are making regular backups with git.
+The DB version of Logseq is alpha software. When using DB graphs, we recommend you create a dedicated test graph and choose one project/workflow that’s not crucial for you. **Data loss is possible**, which is why we recommend [automated backups](https://github.com/logseq/docs/blob/feat/db/db-version.md#automated-backup) or making [regular SQLite DB backups](https://github.com/logseq/docs/blob/feat/db/db-version.md#graph-export). When using file graphs, **data corruption is possible** as some file content can be duplicated. We only recommend using file graphs if you are making regular backups with git.
 
-To try the latest web version, go to https://test.logseq.com/.
+To try the latest web version, go to https://test.logseq.com/. For DB version issues, please report them to https://github.com/logseq/db-test/issues.
 
 ## 🤔 Why Logseq?
 

+ 3 - 1
src/main/frontend/components/header.cljs

@@ -118,7 +118,9 @@
 (rum/defc ^:large-vars/cleanup-todo toolbar-dots-menu < rum/reactive
   [{:keys [current-repo t]}]
   (let [page (some-> (sidebar/get-current-page) db/get-page)
-        page-menu (if (ldb/page? page)
+        ;; FIXME: in publishing? :block/tags incorrectly returns integer until fully restored
+        working-page? (if config/publishing? (not (state/sub :db/restoring?)) true)
+        page-menu (if (and working-page? (ldb/page? page))
                     (page-menu/page-menu page)
                     (when-not config/publishing?
                       (when (config/db-based-graph?)

+ 22 - 19
src/main/frontend/components/rtc/indicator.cljs

@@ -11,7 +11,8 @@
             [logseq.shui.hooks :as hooks]
             [logseq.shui.ui :as shui]
             [missionary.core :as m]
-            [rum.core :as rum]))
+            [rum.core :as rum]
+            [frontend.config :as config]))
 
 (comment
   (def rtc-state-schema
@@ -158,26 +159,28 @@
                                                          :queuing (pos? unpushed-block-update-count)}])})]]))
 
 (def ^:private *accumulated-download-logs (atom []))
-(c.m/run-background-task
- ::update-accumulated-download-logs
- (m/reduce
-  (fn [_ log]
-    (when log
-      (if (= :download-completed (:sub-type log))
-        (reset! *accumulated-download-logs [])
-        (swap! *accumulated-download-logs (fn [logs] (take 20 (conj logs log)))))))
-  rtc-flows/rtc-download-log-flow))
+(when-not config/publishing?
+  (c.m/run-background-task
+   ::update-accumulated-download-logs
+   (m/reduce
+    (fn [_ log]
+      (when log
+        (if (= :download-completed (:sub-type log))
+          (reset! *accumulated-download-logs [])
+          (swap! *accumulated-download-logs (fn [logs] (take 20 (conj logs log)))))))
+    rtc-flows/rtc-download-log-flow)))
 
 (def ^:private *accumulated-upload-logs (atom []))
-(c.m/run-background-task
- ::update-accumulated-upload-logs
- (m/reduce
-  (fn [_ log]
-    (when log
-      (if (= :upload-completed (:sub-type log))
-        (reset! *accumulated-upload-logs [])
-        (swap! *accumulated-upload-logs (fn [logs] (take 20 (conj logs log)))))))
-  rtc-flows/rtc-upload-log-flow))
+(when-not config/publishing?
+  (c.m/run-background-task
+   ::update-accumulated-upload-logs
+   (m/reduce
+    (fn [_ log]
+      (when log
+        (if (= :upload-completed (:sub-type log))
+          (reset! *accumulated-upload-logs [])
+          (swap! *accumulated-upload-logs (fn [logs] (take 20 (conj logs log)))))))
+    rtc-flows/rtc-upload-log-flow)))
 
 (defn- accumulated-logs-flow
   [*acc-logs]