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

fix: query table sorting for property columns

Browse Source 
also fixes sorting indicator
This commit is contained in:
Gabriel Horner
2023-08-23 16:20:21 -04:00
parent 9fba34dd22
commit 1e4cc1b4f2
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/frontend/components/query_table.cljs
View File

@@ -17,8 +17,7 @@
[medley.core :as medley]
[rum.core :as rum]
[logseq.graph-parser.text :as text]
[frontend.handler.property.util :as pu]
[frontend.handler.property :as property-handler]))
[frontend.handler.property.util :as pu]))
;; Util fns
;; ========
@@ -72,13 +71,12 @@
desc? (if (some? p-desc?) p-desc? true)
properties (:block/properties current-block)
query-sort-by (pu/lookup properties :query-sort-by)
p-sort-by (keyword query-sort-by)
;; Starting with #6105, we started putting properties under namespaces.
nlp-date? (pu/lookup properties :logseq.query/nlp-date)
sort-by-column (or (some-> p-sort-by keyword)
(if (query-dsl/query-contains-filter? (:block/content current-block) "sort-by")
nil
:updated-at))]
sort-by-column (or (if (uuid? query-sort-by) query-sort-by (keyword query-sort-by))
(if (query-dsl/query-contains-filter? (:block/content current-block) "sort-by")
nil
:updated-at))]
{:sort-desc? desc?
:sort-by-column sort-by-column
:sort-nlp-date? nlp-date?}))
@@ -90,7 +88,7 @@
(let [repo (state/get-current-repo)]
[:th.whitespace-nowrap
[:a {:on-click (fn []
(property-handler/set-block-property! repo block-id :query-sort-by (if (uuid? column) uuid (name column)))
(property-handler/set-block-property! repo block-id :query-sort-by (if (uuid? column) column (name column)))
(property-handler/set-block-property! repo block-id :query-sort-desc (not sort-desc?)))}
[:div.flex.items-center
[:span.mr-1 title]