Browse Source

fix(regression): can't create template blocks on file graphs

Tienson Qin 8 months ago
parent
commit
d48be3bf47

+ 4 - 4
src/main/frontend/components/editor.cljs

@@ -350,11 +350,11 @@
 
 (rum/defc template-search-aux
   [id q]
-  (let [db-based? (config/db-based-graph?)
-        [matched-templates set-matched-templates!] (rum/use-state nil)]
+  (let [[matched-templates set-matched-templates!] (rum/use-state nil)]
     (hooks/use-effect! (fn []
                          (p/let [result (editor-handler/<get-matched-templates q)]
-                           (set-matched-templates! (sort-by :block/title result))))
+                           (set-matched-templates!
+                            (sort-by :block/title result))))
                        [q])
     (ui/auto-complete
      matched-templates
@@ -362,7 +362,7 @@
       :on-enter    (fn [_state] (state/clear-editor-action!))
       :empty-placeholder [:div.text-gray-500.px-4.py-2.text-sm "Search for a template"]
       :item-render (fn [template]
-                     (if db-based? (:block/title template) (:template template)))
+                     (:block/title template))
       :class       "black"})))
 
 (rum/defc template-search < rum/reactive

+ 4 - 1
src/main/frontend/db/async.cljs

@@ -42,7 +42,10 @@
                        :where
                        [?b :block/properties ?p]
                        [(get ?p :template) ?t]])]
-    (into {} result)))
+    (->> result
+         (map (fn [[template b]]
+                [template (assoc b :block/title template)]))
+         (into {}))))
 
 (defn <get-template-by-name
   [name]

+ 1 - 1
src/main/frontend/search.cljs

@@ -55,7 +55,7 @@
                              (p/let [result (db-async/<get-all-templates repo)]
                                (vals result)))]
            (when (seq templates)
-             (let [extract-fn (if db-based? :block/title :template)]
+             (let [extract-fn :block/title]
                (fuzzy/fuzzy-search templates q {:limit limit
                                                 :extract-fn extract-fn})))))))))