clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-02 18:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add timestamp support to sort-by for db graphs

Browse Source
This commit is contained in:
Gabriel Horner
2023-07-31 16:34:33 -04:00
parent 8e360405d6
commit 81ae67cdbe
3 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -344,9 +344,9 @@
:desc)
comp (if (= order :desc) >= <=)]
(reset! sort-by_
(fn sort-results [result block-attribute]
(fn sort-results [result property-val-fn]
;; first because there is one binding result in query-wrapper
(sort-by #(-> % first (get-in [block-attribute k]))
(sort-by #(-> % first (property-val-fn k))
comp
result)))
;; blank b/c this post-process filter doesn't effect query
@@ -612,6 +612,15 @@ Some bindings in this fn:
col))
col))
(defn get-db-property-value
"Fetch a property's value given a block map and proeprty name. Similar to
query-table/sort-by-fn. We should standardize this soon"
[m prop]
(case prop
:created-at (:block/created-at m)
:updated-at (:block/updated-at m)
(get-in m [:block/properties-by-name prop])))
(defn query
"Runs a dsl query with query as a string. Primary use is from '{{query }}'"
([repo query-string]
@@ -626,8 +635,8 @@ Some bindings in this fn:
identity)
sort-by' (if sort-by
(if (config/db-based-graph? repo)
(comp (fn [col] (sort-by col :block/properties-by-name)) sort-by-prep)
#(sort-by % :block/properties))
(comp (fn [col] (sort-by col get-db-property-value)) sort-by-prep)
#(sort-by % (fn [m prop] (get-in m [:block/properties prop]))))
identity)
transform-fn (comp sort-by' random-samples)]
(query-react/react-query repo
@@ -654,9 +663,10 @@ Some bindings in this fn:
(merge
query-opts
(when sort-by
{:transform-fn (if (config/db-based-graph? repo)
(comp (fn [col] (sort-by col :block/properties-by-name)) sort-by-prep)
#(sort-by % :block/properties))})))))))
{:transform-fn
(if (config/db-based-graph? repo)
(comp (fn [col] (sort-by col get-db-property-value)) sort-by-prep)
#(sort-by % (fn [m prop] (get-in m [:block/properties prop]))))})))))))
(defn query-contains-filter?
[query filter-name]