clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-04-27 23:54:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #4101 by moving todo/task and priority to rules

Browse Source 
Task and priority weren't composable in most boolean settings. Rules
fixes that
This commit is contained in:
Gabriel Horner
2022-03-03 16:40:48 -05:00
committed by Tienson Qin
parent ed82b3677e
commit 80ef31f4c0
3 changed files with 105 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/frontend/db/query_dsl.cljs
View File

@@ -196,7 +196,9 @@
(or (= current-filter 'or)
nested-and?)
(apply concat clauses)
(if (list? (first clauses))
(cons 'and clauses)
(apply concat clauses))
:else
(->> (map (fn [result]
@@ -277,8 +279,8 @@
(rest e))]
(when (seq markers)
(let [markers (set (map (comp string/upper-case name) markers))]
[['?b :block/marker '?marker]
[(list 'contains? markers '?marker)]]))))
{:query (list 'task '?b markers)
:rules [:task]}))))
(defn- build-query-priority
[e]
@@ -287,8 +289,8 @@
(rest e))]
(when (seq priorities)
(let [priorities (set (map (comp string/upper-case name) priorities))]
[['?b :block/priority '?priority]
[(list 'contains? priorities '?priority)]]))))
{:query (list 'priority '?b priorities)
:rules [:priority]}))))
(defn- build-page-property
[e]
@@ -378,10 +380,10 @@
{:query (build-query-property-one-arg e)}
(or (= 'todo fe) (= 'task fe))
{:query (build-query-todo e)}
(build-query-todo e)
(= 'priority fe)
{:query (build-query-priority e)}
(build-query-priority e)
(= 'sort-by fe)
(let [[k order] (rest e)