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

fix: priority filters for db graphs

Browse Source
This commit is contained in:
Gabriel Horner
2024-06-07 17:34:44 -04:00
parent 214eefbf67
commit 7f3e22c8eb
4 changed files with 85 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
src/test/frontend/db/query_dsl_test.cljs
View File

@@ -171,24 +171,23 @@ prop-d:: [[nada]]"}])
(defn- page-property-queries-test
[]
(load-test-files [{:file/path "pages/page1.md"
:file/content "parent:: [[child page 1]], [[child-no-space]]\ninteresting:: true"}
:file/content "parent:: [[child page 1]], [[child-no-space]]\ninteresting:: true\nfoo:: baz"}
{:file/path "pages/page2.md"
:file/content "foo:: #bar\ninteresting:: false"}
:file/content "foo:: bar\ninteresting:: false"}
{:file/path "pages/page3.md"
:file/content "parent:: [[child page 1]], [[child page 2]]\nfoo:: bar\ninteresting:: false"}
{:file/path "pages/page4.md"
:file/content "parent:: [[child page 2]]\nfoo:: baz"}])
(is (= ["page1" "page3" "page4"]
(map :block/name (dsl-query "(page-property parent)")))
"Pages have given property")
(is (= ["page1" "page3"]
(map :block/name (dsl-query "(page-property parent [[child page 1]])")))
(is (= #{"page1" "page3"}
(set (map :block/name (dsl-query "(page-property parent [[child page 1]])"))))
"Pages have property value that is a page and query is a page")
(is (= ["page1" "page3"]
(map :block/name (dsl-query "(page-property parent \"child page 1\")")))
(is (= #{"page1" "page3"}
(set (map :block/name (dsl-query "(page-property parent \"child page 1\")"))))
"Pages have property value that is a page and query is a string")
(is (= ["page1"]
@@ -201,38 +200,40 @@ prop-d:: [[nada]]"}])
(dsl-query "(and (page-property parent [[child page 1]]) (page-property parent [[child page 2]]))")))
"Page property queries ANDed")
(is (= ["page1" "page3" "page4"]
(map
:block/name
(dsl-query "(or (page-property parent [[child page 1]]) (page-property parent [[child page 2]]))")))
(is (= #{"page1" "page3" "page4"}
(set
(map
:block/name
(dsl-query "(or (page-property parent [[child page 1]]) (page-property parent [[child page 2]]))"))))
"Page property queries ORed")
(is (= ["page1" "page3"]
(map :block/name
(dsl-query "(and (page-property parent [[child page 1]]) (or (page-property interesting true) (page-property parent [[child page 2]])))"))))
(map :block/name
(dsl-query "(and (page-property parent [[child page 1]]) (or (page-property foo baz) (page-property parent [[child page 2]])))"))))
(is (= ["page4"]
(map
:block/name
(dsl-query "(and (page-property parent [[child page 2]]) (not (page-property foo bar)))")))
"Page property queries nested NOT in second clause")
(map
:block/name
(dsl-query "(and (page-property parent [[child page 2]]) (not (page-property foo bar)))")))
"Page property queries nested NOT in second clause")
(is (= ["page4"]
(map
:block/name
(dsl-query "(and (not (page-property foo bar)) (page-property parent [[child page 2]]))")))
"Page property queries nested NOT in first clause")
;; TODO: Enable when boolean queries work
#_(testing "boolean values"
(is (= ["page1"]
(map :block/name (dsl-query "(page-property interesting true)")))
"Boolean true")
(testing "boolean values"
(is (= ["page1"]
(map :block/name (dsl-query "(page-property interesting true)")))
"Boolean true")
(is (= ["page2" "page3"]
(map :block/name (dsl-query "(page-property interesting false)")))
"Boolean false")))
(is (= ["page2" "page3"]
(map :block/name (dsl-query "(page-property interesting false)")))
"Boolean false")))
(deftest page-property-queries
(deftest ^:done page-property-queries
(testing "page property tests with default config"
(test-helper/with-config {}
(page-property-queries-test))))
@@ -287,29 +288,43 @@ prop-d:: [[nada]]"}])
(count (dsl-query "(and (page-property foo) (sample 1))")))
"Correctly limits page results"))
(deftest priority-queries
(load-test-files [{:file/path "pages/page1.md"
:file/content "foo:: bar
(deftest ^:done priority-queries
(load-test-files (if js/process.env.DB_GRAPH
[{:page {:block/original-name "page1"}
:blocks [{:block/content "[#A] b1"
:build/properties {:logseq.task/priority :logseq.task/priority.high}}
{:block/content "[#B] b2"
:build/properties {:logseq.task/priority :logseq.task/priority.medium}}
{:block/content "[#A] b3"
:build/properties {:logseq.task/priority :logseq.task/priority.high}}]}]
[{:file/path "pages/page1.md"
:file/content "foo:: bar
- [#A] b1
- [#B] b2
- [#A] b3"}])
- [#A] b3"}]))
(testing "one arg queries"
(is (= ["[#A] b1" "[#A] b3"]
(map :block/content (dsl-query "(priority A)"))))
(is (= ["[#A] b1" "[#A] b3"]
(map :block/content (dsl-query "(priority a)")))))
(is (= #{"[#A] b1" "[#A] b3"}
(set (map :block/content
(dsl-query (if js/process.env.DB_GRAPH "(priority high)" "(priority a)"))))))
(is (= #{"[#A] b1" "[#A] b3"}
(set (map :block/content
(dsl-query (if js/process.env.DB_GRAPH "(priority high)" "(priority a)")))))))
(testing "two arg queries"
(is (= ["[#A] b1" "[#B] b2" "[#A] b3"]
(map :block/content (dsl-query "(priority a b)"))))
(is (= ["[#A] b1" "[#B] b2" "[#A] b3"]
(map :block/content (dsl-query "(priority [a b])")))
"Arguments with vector notation"))
(is (= #{"[#A] b1" "[#B] b2" "[#A] b3"}
(set (map :block/content
(dsl-query (if js/process.env.DB_GRAPH "(priority high medium)" "(priority a b)"))))))
(is (= #{"[#A] b1" "[#B] b2" "[#A] b3"}
(set (map :block/content
(dsl-query (if js/process.env.DB_GRAPH "(priority [high medium])" "(priority [a b])")))))
"Arguments with vector notation"))
(is (= ["[#A] b1" "[#B] b2" "[#A] b3"]
(map :block/content (dsl-query "(priority a b c)")))
"Three arg queries and args that have no match"))
(is (= #{"[#A] b1" "[#B] b2" "[#A] b3"}
(set (map :block/content
(dsl-query (if js/process.env.DB_GRAPH "(priority high medium low)" "(priority a b c)")))))
"Three arg queries and args that have no match"))
(deftest ^:done nested-boolean-queries
(load-test-files [{:file/path "pages/page1.md"