fix: tag and page names collision in query dsl

related to logseq/db-test#548

Author: tiensonqin

deps/outliner/src/logseq/outliner/core.cljs

@@ -327,11 +327,6 @@
                        (:block/title m*)
                        (not= (:block/title m*) (:block/title block-entity)))
               (outliner-validate/validate-block-title db (:block/title m*) block-entity))
-          _ (when (and db-based? (seq (:block/tags m*)))
-              ;; Add built-in? b/c it's not available here
-              (doseq [tag (map #(assoc % :logseq.property/built-in?
-                                       (contains? sqlite-create-graph/built-in-pages-names (:block/title %))) (:block/tags m*))]
-                (outliner-validate/validate-built-in-pages tag {:message "Built-in page can't be a tag"})))
           m (cond-> m*
               db-based?
               (dissoc :block/format :block/pre-block? :block/priority :block/marker :block/properties-order))]

src/main/frontend/components/query/builder.cljs

@@ -218,12 +218,15 @@
        (let [result (db-model/get-all-readable-classes repo {:except-root-class? true})]
          (set-values! result)))
      [])
-    (let [items (->> values
-                     (map :block/title)
-                     sort)]
+    (let [items (->> (sort-by :block/title values)
+                     (map (fn [block]
+                            {:label (:block/title block)
+                             :value (:block/uuid block)})))]
       (select items
-              (fn [{:keys [value]}]
-                (append-tree! *tree opts loc [(if db-based? :tags :page-tags) value]))))))
+              (fn [{:keys [value label]}]
+                (append-tree! *tree opts loc [(if db-based? :tags :page-tags)
+                                              (if db-based? (str value) label)]))
+              {:extract-fn :label}))))
 
 (rum/defc page-search
   [on-chosen]

src/main/frontend/db/query_dsl.cljs

@@ -427,7 +427,9 @@
                         (let [db (db-conn/get-db)]
                           (->> tags
                                (mapcat (fn [tag-name]
-                                         (when-let [tag-id (first (ldb/page-exists? db tag-name #{:logseq.class/Tag}))]
+                                         (when-let [tag-id (if (common-util/uuid-string? tag-name)
+                                                             [:block/uuid (uuid tag-name)]
+                                                             (first (ldb/page-exists? db tag-name #{:logseq.class/Tag})))]
                                            (when-let [tag (db-utils/entity tag-id)]
                                              (->> (db-class/get-structured-children db (:db/id tag))
                                                   (cons (:db/id tag)))))))