From 302f79805220cefab26da66eae1e18c69e165afb Mon Sep 17 00:00:00 2001
From: Tienson Qin <tiensonqin@gmail.com>
Date: Fri, 15 May 2026 19:52:47 +0800
Subject: [PATCH] fix(editor): open missing journal links from shortcut

fix https://github.com/logseq/db-test/issues/879
---
 src/main/frontend/handler/editor.cljs      | 15 ++++-
 src/test/frontend/handler/editor_test.cljs | 66 ++++++++++++++++++++++
 2 files changed, 78 insertions(+), 3 deletions(-)

diff --git a/src/main/frontend/handler/editor.cljs b/src/main/frontend/handler/editor.cljs
index d8ed2a0077..47658a3905 100644
--- a/src/main/frontend/handler/editor.cljs
+++ b/src/main/frontend/handler/editor.cljs
@@ -1094,6 +1094,17 @@
             (let [value (gobj/get input "value")]
               (extract-nearest-link-from-text value pos))))))))
 
+(defn- <follow-page-link!
+  [page]
+  (state/clear-edit!)
+  (if (util/uuid-string? page)
+    (route-handler/redirect-to-page! page)
+    (p/let [page-entity (or (db/get-page page)
+                            (db-async/<get-block (state/get-current-repo) page {:children? false}))]
+      (if page-entity
+        (route-handler/redirect-to-page! page)
+        (state/pub-event! [:page/create page])))))
+
 (defn follow-link-under-cursor!
   []
   (when-let [page (get-nearest-page-or-url)]
@@ -1103,9 +1114,7 @@
        (save-current-block!)
        (if (re-find url-regex page)
          (js/window.open page)
-         (do
-           (state/clear-edit!)
-           (route-handler/redirect-to-page! page)))))))
+         (<follow-page-link! page))))))
 
 (defn open-link-in-sidebar!
   []
diff --git a/src/test/frontend/handler/editor_test.cljs b/src/test/frontend/handler/editor_test.cljs
index da3374c6e8..92d6eeae40 100644
--- a/src/test/frontend/handler/editor_test.cljs
+++ b/src/test/frontend/handler/editor_test.cljs
@@ -6,6 +6,7 @@
             [frontend.db.async :as db-async]
             [frontend.db.model :as model]
             [frontend.handler.editor :as editor]
+            [frontend.handler.route :as route-handler]
             [frontend.state :as state]
             [frontend.test.helper :as test-helper]
             [frontend.util :as util]
@@ -59,6 +60,71 @@
           "[[https://github.com/logseq/logseq][logseq]] is #awesome :)" 0 editor/url-regex))
       "Finds url in org link correctly"))
 
+(defn- follow-page-link-result
+  [{:keys [page-title existing-page? worker-page?]}]
+  (let [events (atom [])
+        redirects (atom [])
+        worker-page-uuid (random-uuid)
+        input-id "edit-block-test"
+        input #js {:value (str "Open [[" page-title "]]")}]
+    (p/with-redefs [state/get-edit-block (constantly {:block/uuid (random-uuid)})
+                    state/get-edit-input-id (constantly input-id)
+                    gdom/getElement (fn [id]
+                                      (when (= input-id id)
+                                        input))
+                    cursor/pos (constantly 10)
+                    editor/save-current-block! (constantly nil)
+                    state/clear-editor-action! (constantly nil)
+                    state/clear-edit! (constantly nil)
+                    db/get-page (fn [title]
+                                  (when (and existing-page? (= page-title title))
+                                    {:block/title title
+                                     :block/uuid (random-uuid)}))
+                    db-async/<get-block (fn [_repo title _opts]
+                                          (p/resolved
+                                           (when (and worker-page? (= page-title title))
+                                             {:block/title title
+                                              :block/uuid worker-page-uuid})))
+                    state/pub-event! (fn [event]
+                                       (swap! events conj event)
+                                       (p/resolved nil))
+                    route-handler/redirect-to-page! (fn [& args]
+                                                      (swap! redirects conj args))]
+      (p/let [_ (editor/follow-link-under-cursor!)]
+        {:events @events
+         :redirects @redirects}))))
+
+(deftest follow-link-under-cursor-opens-existing-page-test
+  (async done
+    (-> (follow-page-link-result {:page-title "Project"
+                                  :existing-page? true})
+        (p/then
+         (fn [{:keys [events redirects]}]
+           (is (empty? events))
+           (is (= [["Project"]] redirects))
+           (done))))))
+
+(deftest follow-link-under-cursor-creates-missing-page-test
+  (async done
+    (-> (follow-page-link-result {:page-title "May 15th, 2026"
+                                  :existing-page? false})
+        (p/then
+         (fn [{:keys [events redirects]}]
+           (is (= [[:page/create "May 15th, 2026"]] events))
+           (is (empty? redirects))
+           (done))))))
+
+(deftest follow-link-under-cursor-uses-worker-page-before-creating-test
+  (async done
+    (-> (follow-page-link-result {:page-title "May 15th, 2026"
+                                  :existing-page? false
+                                  :worker-page? true})
+        (p/then
+         (fn [{:keys [events redirects]}]
+           (is (empty? events))
+           (is (= [["May 15th, 2026"]] redirects))
+           (done))))))
+
 (defn- keyup-handler
   "Spied version of editor/keyup-handler"
   [{:keys [value cursor-pos action commands]