feat: simple query builder (#8774)

Simple query builder --------- Co-authored-by: Gabriel Horner <gabriel@logseq.com> Co-authored-by: charlie <xyhp915@qq.com>
logseq · Mar 21, 2023 · db6fc6b · db6fc6b
1 parent 7a90558
commit db6fc6b
Show file tree

Hide file tree

Showing 37 changed files with 1,269 additions and 301 deletions.
diff --git a/.clj-kondo/config.edn b/.clj-kondo/config.edn
@@ -68,6 +68,7 @@
              frontend.handler.page page-handler
              frontend.handler.plugin plugin-handler
              frontend.handler.plugin-config plugin-config-handler
+             frontend.handler.query.builder query-builder
              frontend.handler.repo repo-handler
              frontend.handler.repo-config repo-config-handler
              frontend.handler.route route-handler

diff --git a/deps/db/src/logseq/db/default.cljs b/deps/db/src/logseq/db/default.cljs
@@ -1,9 +1,19 @@
 (ns logseq.db.default
   "Provides fns for seeding default data in a logseq db"
-  (:require [clojure.string :as string]))
+  (:require [clojure.string :as string]
+            [clojure.set :as set]))
+
+(defonce built-in-markers
+  ["NOW" "LATER" "DOING" "DONE" "CANCELED" "CANCELLED" "IN-PROGRESS" "TODO" "WAIT" "WAITING"])
+
+(defonce built-in-priorities
+  ["A" "B" "C"])
 
 (defonce built-in-pages-names
-  #{"NOW" "LATER" "DOING" "DONE" "CANCELED" "CANCELLED" "IN-PROGRESS" "TODO" "WAIT" "WAITING" "A" "B" "C" "Favorites" "Contents" "card"})
+  (set/union
+   (set built-in-markers)
+   (set built-in-priorities)
+   #{"Favorites" "Contents" "card"}))
 
 (def built-in-pages
   (mapv (fn [p]

diff --git a/deps/db/src/logseq/db/schema.cljs b/deps/db/src/logseq/db/schema.cljs
@@ -118,6 +118,7 @@
     :block/properties
     :block/properties-order
     :block/properties-text-values
+    :block/macros
     :block/invalid-properties
     :block/created-at
     :block/updated-at

diff --git a/deps/graph-parser/src/logseq/graph_parser/util.cljs b/deps/graph-parser/src/logseq/graph_parser/util.cljs
@@ -254,12 +254,14 @@
     (legacy-title-parsing file-name-body)))
 
 (defn safe-read-string
-  [content]
-  (try
-    (reader/read-string content)
-    (catch :default e
-      (log/error :parse/read-string-failed e)
-      {})))
+  ([content]
+   (safe-read-string {} content))
+  ([opts content]
+   (try
+     (reader/read-string opts content)
+     (catch :default e
+       (log/error :parse/read-string-failed e)
+       {}))))
 
 ;; Copied from Medley
 ;; https://github.com/weavejester/medley/blob/d1e00337cf6c0843fb6547aadf9ad78d981bfae5/src/medley/core.cljc#L22

diff --git a/resources/css/common.css b/resources/css/common.css
@@ -915,3 +915,10 @@ html.is-mobile {
     margin-top: 5px;
   }
 }
+
+@layer base {
+    .ls-grid-cols {
+        @apply grid grid-flow-col auto-cols-max;
+        place-items: center;
+    }
+}
diff --git a/scripts/src/logseq/tasks/lang.clj b/scripts/src/logseq/tasks/lang.clj
@@ -110,7 +110,7 @@
              :page/make-private :page/make-public]
    "(t (name" [] ;; shortcuts related
    "(t (dh/decorate-namespace" [] ;; shortcuts related
-   "(t prompt-key" [:select/default-prompt :select.graph/prompt]
+   "(t prompt-key" [:select/default-prompt :select/default-select-multiple :select.graph/prompt]
    ;; All args to ui/make-confirm-modal are not keywords
    "(t title" []
    "(t subtitle" [:asset/physical-delete]})

diff --git a/src/main/frontend/commands.cljs b/src/main/frontend/commands.cljs
@@ -268,7 +268,8 @@
 
     ;; advanced
 
-    [["Query" [[:editor/input "{{query }}" {:backward-pos 2}]] query-doc]
+    [["Query" [[:editor/input "{{query }}" {:backward-pos 2}]
+               [:editor/exit]] query-doc]
      ["Zotero" (zotero-steps) "Import Zotero journal article"]
      ["Query table function" [[:editor/input "{{function }}" {:backward-pos 2}]] "Create a query table function"]
      ["Calculator" [[:editor/input "```calc\n\n```" {:backward-pos 4}]
@@ -667,6 +668,9 @@
   (when-let [input-file (gdom/getElement "upload-file")]
     (.click input-file)))
 
+(defmethod handle-step :editor/exit [[_]]
+  (state/clear-edit!))
+
 (defmethod handle-step :default [[type & _args]]
   (prn "No handler for step: " type))