|
|
@@ -46,11 +46,11 @@
|
|
|
(.localeCompare x y (state/sub :preferred-language))
|
|
|
(< x y)))
|
|
|
|
|
|
-(defn- sort-result [result {:keys [sort-by-column sort-desc?]}]
|
|
|
+(defn- sort-result [result {:keys [sort-by-column sort-desc? sort-nlp-date?]}]
|
|
|
(if (some? sort-by-column)
|
|
|
(let [comp-fn (if sort-desc? #(locale-compare %2 %1) locale-compare)]
|
|
|
(sort-by (fn [item]
|
|
|
- (block/normalize-block (sort-by-fn sort-by-column item)))
|
|
|
+ (block/normalize-block (sort-by-fn sort-by-column item) sort-nlp-date?))
|
|
|
comp-fn
|
|
|
result))
|
|
|
result))
|
|
|
@@ -63,12 +63,14 @@
|
|
|
(let [p-desc? (get-in current-block [:block/properties :query-sort-desc])
|
|
|
desc? (if (some? p-desc?) p-desc? true)
|
|
|
p-sort-by (keyword (get-in current-block [:block/properties :query-sort-by]))
|
|
|
+ nlp-date? (get-in current-block [:block/properties :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-desc? desc?
|
|
|
- :sort-by-column sort-by-column}))
|
|
|
+ :sort-by-column sort-by-column
|
|
|
+ :sort-nlp-date? nlp-date?}))
|
|
|
|
|
|
;; Components
|
|
|
;; ==========
|