Better pagination behavior on filter change.

This commit is contained in:
Bryce Covert
2020-08-18 07:24:53 -07:00
parent 441077169f
commit 0c93e84cd2
5 changed files with 19 additions and 7 deletions

View File

@@ -40,6 +40,11 @@
(fn [url] (fn [url]
(.open js/window url))) (.open js/window url)))
#_(re-frame/reg-fx
:dispatch-sync
(fn [event]
(re-frame/dispatch-sync event)))
(re-frame/reg-fx (re-frame/reg-fx
:set-local-storage :set-local-storage
(fn [[name value]] (fn [[name value]]

View File

@@ -142,7 +142,9 @@
(let [children (r/children (r/current-component))] (let [children (r/children (r/current-component))]
[:> Consumer {} [:> Consumer {}
(fn [consume] (fn [consume]
(let [{:strs [on-params-change params check-boxes? on-check-changed checked] :as consume} (js->clj consume)] (let [on-check-changed (aget consume "on-check-changed")
check-boxes? (aget consume "check-boxes?")
checked (aget consume "checked")]
(apply r/create-element "tr" #js {:className class} (apply r/create-element "tr" #js {:className class}
(when check-boxes? (when check-boxes?
(r/as-element [:th {:style {:width "35px"}} (r/as-element [:th {:style {:width "35px"}}

View File

@@ -68,6 +68,7 @@
(re-frame/reg-event-db (re-frame/reg-event-db
::dispose ::dispose
(fn [db [_ id]] (fn [db [_ id]]
(println "TABLE" (::table-params db) (::table-params (update db ::table-params dissoc id)))
(-> db (-> db
(update ::data dissoc id) (update ::data dissoc id)
(update ::checked dissoc id) (update ::checked dissoc id)
@@ -132,7 +133,9 @@
(re-frame/reg-event-fx (re-frame/reg-event-fx
::filters-settled ::filters-settled
(fn [{:keys [db]} [_ id]] (fn [{:keys [db]} [_ id]]
{:db (assoc-in db [::settled-filters id] @(re-frame/subscribe [::filters id]))})) {:db (-> db
(assoc-in [::settled-filters id] @(re-frame/subscribe [::filters id]))
(update-in [::table-params id ] dissoc :start))}))
(re-frame/reg-sub (re-frame/reg-sub
::settled-filters ::settled-filters
@@ -146,7 +149,8 @@
[which val] (if (= 3 (count params)) [which val] (if (= 3 (count params))
[(into [a] b) c] [(into [a] b) c]
[[a] b])] [[a] b])]
{:db (assoc-in db (into [::filters id] which) val) {:db (-> db
(assoc-in (into [::filters id] which) val))
:dispatch-debounce :dispatch-debounce
{:event [::filters-settled id] {:event [::filters-settled id]
:time 800 :time 800

View File

@@ -97,13 +97,13 @@
::forward/register [{:id ::received ::forward/register [{:id ::received
:events #{::data-page/received} :events #{::data-page/received}
:event-fn (fn [[_ _ {:keys [data]}]] :event-fn (fn [[_ _ {:keys [data]}]]
[::received data])}] [::received data])}]}))
:dispatch [::data-page/dispose :import-invoices]}))
(re-frame/reg-event-fx (re-frame/reg-event-fx
::unmounted ::unmounted
(fn [cofx [_ params]] (fn [cofx [_ params]]
{::track/dispose {:id ::params}})) {::track/dispose {:id ::params}
:dispatch [::data-page/dispose :import-invoices]}))
(re-frame/reg-event-fx (re-frame/reg-event-fx

View File

@@ -61,6 +61,7 @@
(re-frame/reg-event-fx (re-frame/reg-event-fx
::mounted ::mounted
(fn [{:keys [db]} _] (fn [{:keys [db]} _]
(println "MOUNTING")
{::track/register [{:id ::params {::track/register [{:id ::params
:subscription [::data-page/params :invoices] :subscription [::data-page/params :invoices]
:event-fn (fn [params] :event-fn (fn [params]
@@ -195,7 +196,7 @@
(defn unpaid-invoices-page [params] (defn unpaid-invoices-page [params]
(r/create-class (r/create-class
{:display-name "invoices-page" {:display-name "invoices-page"
:component-will-unmount #(re-frame/dispatch [::unmounted]) :component-will-unmount #(re-frame/dispatch-sync [::unmounted])
:component-did-mount #(re-frame/dispatch [::mounted]) :component-did-mount #(re-frame/dispatch [::mounted])
:reagent-render :reagent-render
(fn [] (fn []