Enhance: Add :remove-block-children? query option for advanced queries and an advanced query :template fix

[logseq-cldwalker]

This PR adds an option to make removing block children optional for a query and fixes bugs #3260 and #9045. The query option :remove-block-children? is added because there are times when we want to see block children e.g. when using the :current-block input. I still left children removal as the default as most users probably want the parent block when doing tag/page-ref searches e.g. #6406. To QA this option, try:

- #+BEGIN_QUERY
{:title "Count under current block"
:inputs [:current-block]
:query [:find (count ?b)
  :in $ ?current-block
  :where [?b :block/parent ?current-block]]
  ;; This query only works when this option is added
:remove-block-children? false}
   - b1
   - b2
#+END_QUERY

The second commit removes the removal of template blocks as it prevents using from querying their template blocks e.g. #3260.

[logseq-cldwalker]

tree filtering was moved here because modifying results outside of get-query-result results in the query counts being wrong

[tiensonqin]

QAed and works as described!

I made a minor change to apply only tree/filter-top-level-blocks when the query results are blocks, so the blocks count and other queries that return non-blocks don't have to include :remove-block-children: false.

[andelf]

LGTM, work as expected.

[logseq-cldwalker]

I made a minor change to apply only tree/filter-top-level-blocks when the query results are blocks, so the blocks count and other queries that return non-blocks don't have to include :remove-block-children: false.

Makes sense

[stdword]

@logseq-cldwalker is it a way now to position result on the same line as title?

I've tryed to use view, but result appears only on the second line:

#+BEGIN_QUERY
{:title "Count under current block"
:inputs [:current-block]
:query [:find (count ?b)
:in $ ?current-block
:where [?b :block/parent ?current-block]]
:view (fn [count] count)
:remove-block-children? false}
#+END_QUERY

[logseq-cldwalker]

Hi. :title and :view query options are unrelated to this PR. This PR allows that query to return correct results. Having those two query options give you a desired display sounds like a feature request for the forum

…

On Tue, 25 Apr 2023 at 17:16, Sergey Kolesnik ***@***.***> wrote: @logseq-cldwalker <https://github.com/logseq-cldwalker> is it a way now to position result on the same line as title? I've tryed to use view, but result appears only on the second line: #+BEGIN_QUERY {:title "Count under current block" :inputs [:current-block] :query [:find (count ?b) :in $ ?current-block :where [?b :block/parent ?current-block]] :view (fn [count] count) :remove-block-children? false} #+END_QUERY <https://user-images.githubusercontent.com/1984175/234405620-4f5f5466-7e87-4fde-9fd8-53af8d96358d.png> — Reply to this email directly, view it on GitHub <#9229 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AXFVC55Q7RR6KBOUOJDVCY3XDA5JJANCNFSM6AAAAAAXKEXUXY> . You are receiving this because you were mentioned.Message ID: ***@***.***>