WIP Set up server side paging for incomes

1 files changed, 50 insertions, 51 deletions

diff --git a/client/src/View/Income/Income.hs b/client/src/View/Income/Income.hs
index 2f0b8f5..c48f325 100644
--- a/client/src/View/Income/Income.hs
+++ b/client/src/View/Income/Income.hs
@@ -4,19 +4,23 @@ module View.Income.Income
   , In(..)
   ) where
 
-import           Data.Aeson         (FromJSON)
-import           Prelude            hiding (init)
-import           Reflex.Dom         (Dynamic, Event, MonadWidget)
-import qualified Reflex.Dom         as R
+import           Data.Aeson          (FromJSON)
+import           Prelude             hiding (init)
+import           Reflex.Dom          (Dynamic, Event, MonadWidget)
+import qualified Reflex.Dom          as R
 
-import           Common.Model       (Currency, Income (..), UserId)
+import           Common.Model        (Currency, Income (..),
+                                      IncomesAndCount (..), UserId)
 
-import           Loadable           (Loadable (..))
+import qualified Component.Pages     as Pages
+import           Loadable            (Loadable (..))
 import qualified Loadable
-import qualified Util.Ajax          as AjaxUtil
-import qualified View.Income.Header as Header
-import           View.Income.Init   (Init (..))
-import qualified View.Income.Table  as Table
+import qualified Util.Ajax           as AjaxUtil
+import qualified Util.Reflex         as ReflexUtil
+-- import qualified View.Income.Header as Header
+import           View.Income.Init    (Init (..))
+import qualified View.Income.Reducer as Reducer
+import qualified View.Income.Table   as Table
 
 data In t = In
   { _in_currentUser :: UserId
@@ -37,50 +41,45 @@ init = do
 
 view :: forall t m. MonadWidget t m => In t -> m ()
 view input = do
-  R.dyn . R.ffor (_in_init input) . Loadable.view $ \init ->
+  -- rec
+    -- incomes <- Reducer.reducer
+    --   { Reducer._in_newPage      = ReflexUtil.flatten (Table._out_newPage <$> table)
+    --   , Reducer._in_currentPage  = ReflexUtil.flatten (Table._out_currentPage <$> table)
+    --   , Reducer._in_addIncome    = ReflexUtil.flatten (Table._out_add <$> table)
+    --   , Reducer._in_editIncome   = ReflexUtil.flatten (Table._out_edit <$> table)
+    --   , Reducer._in_deleteIncome = ReflexUtil.flatten (Table._out_delete <$> table)
+    --   }
 
-    R.elClass "main" "income" $ do
+  rec
+    incomes <- Reducer.reducer $ Reducer.In
+      { Reducer._in_newPage      = Pages._out_newPage pages
+      , Reducer._in_currentPage  = Pages._out_currentPage pages
+      , Reducer._in_addIncome    = Table._out_add table
+      , Reducer._in_editIncome   = Table._out_edit table
+      , Reducer._in_deleteIncome = Table._out_delete table
+      }
 
-      rec
-        let addIncome = R.leftmost
-              [ Header._out_add header
-              , Table._out_add table
-              ]
+    table <- Table.view $ Table.In
+      { Table._in_currentUser = _in_currentUser input
+      , Table._in_currency = _in_currency input
+      , Table._in_incomes = R.ffor incomes $ \case
+          Loaded (IncomesAndCount xs _) -> xs
+          _         -> []
+      }
 
-        incomes <- reduceIncomes
-          (_init_incomes init)
-          addIncome
-          (Table._out_edit table)
-          (Table._out_delete table)
+    pages <- Pages.view $ Pages.In
+      { Pages._in_total = R.ffor incomes $ \case
+          Loaded (IncomesAndCount _ n) -> n
+          _         -> 0
+      , Pages._in_perPage = Reducer.perPage
+      }
 
-        header <- Header.view $ Header.In
-          { Header._in_init = init
-          , Header._in_currency = _in_currency input
-          , Header._in_incomes = incomes
-          }
-
-        table <- Table.view $ Table.In
-          { Table._in_currentUser = _in_currentUser input
-          , Table._in_init = init
-          , Table._in_currency = _in_currency input
-          , Table._in_incomes = incomes
-          , Table._in_resetPage = () <$ addIncome
-          }
-
-      return ()
+  -- -- table :: Event t (Maybe (Table.Out t))
+  -- table <- R.dyn . R.ffor incomes . Loadable.view $ \incomes ->
+  --   Table.view $ Table.In
+  --     { Table._in_currentUser = _in_currentUser input
+  --     , Table._in_currency = _in_currency input
+  --     , Table._in_incomes = incomes
+  --     }
 
   return ()
-
-reduceIncomes
-  :: forall t m. MonadWidget t m
-  => [Income]
-  -> Event t Income -- add
-  -> Event t Income -- edit
-  -> Event t Income -- delete
-  -> m (Dynamic t [Income])
-reduceIncomes initIncomes add edit delete =
-  R.foldDyn id initIncomes $ R.leftmost
-    [ (:) <$> add
-    , R.ffor edit (\p -> (p:) . filter ((/= (_income_id p)) . _income_id))
-    , R.ffor delete (\p -> filter ((/= (_income_id p)) . _income_id))
-    ]