From a6225e435ae2cdfe26d0dbdd5ec224632d813f7b Mon Sep 17 00:00:00 2001
From: Tienson Qin <tiensonqin@gmail.com>
Date: Fri, 2 May 2025 09:47:41 +0800
Subject: [PATCH] fix: application crash when re-indexing an MD graph

fixes https://github.com/logseq/db-test/issues/266
---
 src/main/frontend/components/journal.cljs | 14 +++++++-------
 src/main/frontend/util.cljc               |  7 ++++---
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/frontend/components/journal.cljs b/src/main/frontend/components/journal.cljs
index d0c998626a..e35332a08c 100644
--- a/src/main/frontend/components/journal.cljs
+++ b/src/main/frontend/components/journal.cljs
@@ -20,13 +20,13 @@
 (defn- sub-journals
   []
   (when-let [repo (state/get-current-repo)]
-    (-> (react/q repo
-                 [:frontend.worker.react/journals]
-                 {:query-fn (fn [_]
-                              (p/let [{:keys [data]} (views/<load-view-data nil {:journals? true})]
-                                (remove nil? data)))}
-                 nil)
-        util/react)))
+    (some-> (react/q repo
+                     [:frontend.worker.react/journals]
+                     {:query-fn (fn [_]
+                                  (p/let [{:keys [data]} (views/<load-view-data nil {:journals? true})]
+                                    (remove nil? data)))}
+                     nil)
+            util/react)))
 
 (rum/defc all-journals < rum/reactive db-mixins/query
   []
diff --git a/src/main/frontend/util.cljc b/src/main/frontend/util.cljc
index 653762bd6e..32c1eaf6a7 100644
--- a/src/main/frontend/util.cljc
+++ b/src/main/frontend/util.cljc
@@ -828,9 +828,10 @@
 #?(:cljs
    (defn react
      [ref]
-     (if rum/*reactions*
-       (rum/react ref)
-       @ref)))
+     (when ref
+       (if rum/*reactions*
+         (rum/react ref)
+         @ref))))
 
 #?(:cljs
    (def time-ms common-util/time-ms))