so many small tweaks due to the fact that the grid was slow.
This commit is contained in:
@@ -44,7 +44,8 @@
|
||||
:<- [::specific-table-params]
|
||||
:<- [::subs/query-params]
|
||||
(fn [[specific-table-params query-params]]
|
||||
(merge (select-keys query-params #{:start :sort}) specific-table-params )))
|
||||
(update (merge (select-keys query-params #{:start :sort}) specific-table-params )
|
||||
:sort seq)))
|
||||
|
||||
(re-frame/reg-event-fx
|
||||
::params-changed
|
||||
@@ -128,7 +129,7 @@
|
||||
|
||||
[grid/cell {:class "has-text-right"} (nf total )]
|
||||
[grid/cell {:class "has-text-right"} (nf outstanding-balance )]
|
||||
[grid/cell {:style {:overflow "visible"}}
|
||||
[grid/button-cell {}
|
||||
[:div.buttons
|
||||
(when (seq expense-accounts)
|
||||
[drop-down {:id [::expense-accounts id ]
|
||||
@@ -188,9 +189,12 @@
|
||||
{:keys [sort]} @(re-frame/subscribe [::table-params])
|
||||
{:keys [invoices outstanding]} invoice-page
|
||||
selected-client @(re-frame/subscribe [::subs/client])
|
||||
is-loading? (= :loading status)
|
||||
is-loading? (= :loading (:state status))
|
||||
is-sorted-by-vendor? (and (= "vendor" (:sort-key (first sort)))
|
||||
(not is-loading?))
|
||||
(not is-loading?)
|
||||
(or (apply <= (map (comp :name :vendor) (:invoices invoice-page)))
|
||||
(apply >= (map (comp :name :vendor) (:invoices invoice-page)))))
|
||||
|
||||
[invoice-groups] (if is-sorted-by-vendor?
|
||||
(reduce
|
||||
(fn [[acc last-vendor] invoice]
|
||||
@@ -203,7 +207,9 @@
|
||||
[[] nil]
|
||||
(:invoices invoice-page))
|
||||
[[(:invoices invoice-page)]])]
|
||||
^{:key (str @(re-frame/subscribe [::table-params]))}
|
||||
[grid/grid {:on-params-change (fn [p]
|
||||
|
||||
(re-frame/dispatch [::params-changed p]))
|
||||
:params @(re-frame/subscribe [::table-params])
|
||||
:status status
|
||||
@@ -242,7 +248,6 @@
|
||||
[row {:invoice i
|
||||
:check-boxes check-boxes
|
||||
:checked checked
|
||||
:on-check-changed on-check-changed
|
||||
:selected-client selected-client
|
||||
:overrides overrides
|
||||
:expense-event expense-event}])]])]))
|
||||
|
||||
Reference in New Issue
Block a user