From 06b43ba5b7758201d87f0e93b87962fb9621b15c Mon Sep 17 00:00:00 2001 From: Gabriel Horner Date: Thu, 29 May 2025 15:29:26 -0400 Subject: [PATCH] fix(regression): publishing not starting Weird loading issue for publishing with :block/tags. Put in workaround for now. Also disabled more rtc tasks for publishing --- src/main/frontend/components/header.cljs | 4 +- .../frontend/components/rtc/indicator.cljs | 41 ++++++++++--------- 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/src/main/frontend/components/header.cljs b/src/main/frontend/components/header.cljs index e7292861ba..560af744bd 100644 --- a/src/main/frontend/components/header.cljs +++ b/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?) diff --git a/src/main/frontend/components/rtc/indicator.cljs b/src/main/frontend/components/rtc/indicator.cljs index e39786acc5..ae834801d2 100644 --- a/src/main/frontend/components/rtc/indicator.cljs +++ b/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]