Skip to content

Commit f85546c

Browse files
committed
fix: cmd+k shows configure tag but creating a new page
related to logseq/db-test#583
1 parent b931828 commit f85546c

File tree

1 file changed

+22
-17
lines changed

1 file changed

+22
-17
lines changed

src/main/frontend/components/cmdk/core.cljs

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -89,21 +89,24 @@
8989
(not config/publishing?))
9090
(let [class? (string/starts-with? q "#")
9191
class-name (get-class-from-input q)
92-
class (ldb/class? (db/get-case-page class-name))]
92+
class (let [class (db/get-case-page class-name)]
93+
(when (ldb/class? class)
94+
class))]
9395
(->> [{:text (cond
9496
class "Configure tag"
9597
class? "Create tag"
9698
:else "Create page")
9799
:icon "new-page"
98100
:icon-theme :gray
99-
:info (if class?
100-
(let [class-name (get-class-from-input q)
101-
class (db/get-case-page class-name)]
102-
(if class
103-
(str "Configure #" class-name)
104-
(str "Create tag called '" class-name "'")))
101+
:info (cond
102+
class
103+
(str "Configure #" class-name)
104+
class?
105+
(str "Create tag called '" class-name "'")
106+
:else
105107
(str "Create page called '" q "'"))
106-
:source-create :page}]
108+
:source-create :page
109+
:class class}]
107110
(remove nil?)))))
108111

109112
;; Take the results, decide how many items to show, and order the results appropriately
@@ -564,15 +567,17 @@
564567
create-whiteboard? (= :whiteboard (:source-create item))
565568
create-page? (= :page (:source-create item))
566569
class (when create-class? (get-class-from-input @!input))]
567-
(p/let [result (cond
568-
create-class?
569-
(db-page-handler/<create-class! class
570-
{:redirect? false})
571-
create-whiteboard? (whiteboard-handler/<create-new-whiteboard-and-redirect! @!input)
572-
create-page? (page-handler/<create! @!input {:redirect? true}))]
573-
(shui/dialog-close! :ls-dialog-cmdk)
574-
(when (and create-class? result)
575-
(state/pub-event! [:dialog/show-block result {:tag-dialog? true}])))))
570+
(if (and (= (:text item) "Configure tag") (:class item))
571+
(state/pub-event! [:dialog/show-block (:class item) {:tag-dialog? true}])
572+
(p/let [result (cond
573+
create-class?
574+
(db-page-handler/<create-class! class
575+
{:redirect? false})
576+
create-whiteboard? (whiteboard-handler/<create-new-whiteboard-and-redirect! @!input)
577+
create-page? (page-handler/<create! @!input {:redirect? true}))]
578+
(shui/dialog-close! :ls-dialog-cmdk)
579+
(when (and create-class? result)
580+
(state/pub-event! [:dialog/show-block (:class item) {:tag-dialog? true}]))))))
576581

577582
(defn- get-filter-user-input
578583
[input]

0 commit comments

Comments
 (0)