Commit 7dcf1f97 authored by James Laver's avatar James Laver

fix pagination in docstable

parent 5b4c92cf
...@@ -7,6 +7,7 @@ import Data.Generic.Rep.Show (genericShow) ...@@ -7,6 +7,7 @@ import Data.Generic.Rep.Show (genericShow)
import Data.Maybe (Maybe(..)) import Data.Maybe (Maybe(..))
import Data.Tuple (fst, snd) import Data.Tuple (fst, snd)
import Data.Tuple.Nested ((/\)) import Data.Tuple.Nested ((/\))
import DOM.Simple.Console (log2)
import Effect (Effect) import Effect (Effect)
import Reactix as R import Reactix as R
import Reactix.DOM.HTML as H import Reactix.DOM.HTML as H
...@@ -126,16 +127,16 @@ tableCpt :: R.Component Props ...@@ -126,16 +127,16 @@ tableCpt :: R.Component Props
tableCpt = R.hooksComponent "Table" cpt tableCpt = R.hooksComponent "Table" cpt
where where
cpt {container, colNames, totalRecords, rows, params} _ = do cpt {container, colNames, totalRecords, rows, params} _ = do
(pageSize /\ setPageSize) <- R.useState' PS10 pageSize@(pageSize' /\ setPageSize) <- R.useState' PS10
(page /\ setPage) <- R.useState' 1 (page /\ setPage) <- R.useState' 1
(orderBy /\ setOrderBy) <- R.useState' Nothing (orderBy /\ setOrderBy) <- R.useState' Nothing
let state = {pageSize, orderBy, page} let state = {pageSize: pageSize', orderBy, page}
let ps = pageSizes2Int pageSize let ps = pageSizes2Int pageSize'
let totalPages = (totalRecords / ps) + min 1 (totalRecords `mod` ps) let totalPages = (totalRecords / ps) + min 1 (totalRecords `mod` ps)
R.useEffect1' state $ when (fst params /= stateParams state) $ (snd params) (const $ stateParams state) R.useEffect1' state $ when (fst params /= stateParams state) $ (snd params) (const $ stateParams state)
pure $ container pure $ container
{ pageSizeControl: sizeDD pageSize setPageSize { pageSizeControl: sizeDD pageSize
, pageSizeDescription: textDescription page pageSize totalRecords , pageSizeDescription: textDescription page pageSize' totalRecords
, paginationLinks: pagination setPage totalPages page , paginationLinks: pagination setPage totalPages page
, tableHead: H.tr {} (colHeader setOrderBy orderBy <$> colNames) , tableHead: H.tr {} (colHeader setOrderBy orderBy <$> colNames)
, tableBody: map (H.tr {} <<< map (\c -> H.td {} [c]) <<< _.row) rows , tableBody: map (H.tr {} <<< map (\c -> H.td {} [c]) <<< _.row) rows
...@@ -178,12 +179,15 @@ graphContainer {title} props = ...@@ -178,12 +179,15 @@ graphContainer {title} props =
-- , props.pageSizeDescription -- , props.pageSizeDescription
-- , props.paginationLinks -- , props.paginationLinks
sizeDD :: PageSizes -> R2.Setter PageSizes -> R.Element sizeDD :: R.State PageSizes -> R.Element
sizeDD ps setPageSize = H.span {} [ R2.select { className, defaultValue: ps, on: {change} } sizes ] sizeDD (ps /\ setPageSize) =
H.span {} [ R2.select { className, defaultValue: ps, on: {change} } sizes ]
where where
className = "form-control" className = "form-control"
change e = setPageSize $ const (string2PageSize $ R2.unsafeEventValue e) change e = setPageSize $ const (string2PageSize $ R2.unsafeEventValue e)
sizes = map (optps ps) pageSizes sizes = map option pageSizes
option size = H.option {value} [H.text value]
where value = show size
textDescription :: Int -> PageSizes -> Int -> R.Element textDescription :: Int -> PageSizes -> Int -> R.Element
textDescription currPage pageSize totalRecords = textDescription currPage pageSize totalRecords =
...@@ -276,6 +280,3 @@ string2PageSize "50" = PS50 ...@@ -276,6 +280,3 @@ string2PageSize "50" = PS50
string2PageSize "100" = PS100 string2PageSize "100" = PS100
string2PageSize "200" = PS200 string2PageSize "200" = PS200
string2PageSize _ = PS10 string2PageSize _ = PS10
optps :: PageSizes -> PageSizes -> R.Element
optps _cv val = H.option {value: show val} [R2.showText val]
...@@ -18,8 +18,8 @@ import FFI.Simple ((...), defineProperty, delay, args2, args3) ...@@ -18,8 +18,8 @@ import FFI.Simple ((...), defineProperty, delay, args2, args3)
import React (class ReactPropFields, Children, ReactClass, ReactElement) import React (class ReactPropFields, Children, ReactClass, ReactElement)
import React as React import React as React
import Reactix as R import Reactix as R
import Reactix.DOM.HTML (ElemFactory, text) import Reactix.DOM.HTML (ElemFactory, createDOM, text)
import Reactix.React (react, createDOMElement) import Reactix.React (react)
import Reactix.SyntheticEvent as RE import Reactix.SyntheticEvent as RE
import Reactix.Utils (currySecond, hook, tuple) import Reactix.Utils (currySecond, hook, tuple)
import Unsafe.Coerce (unsafeCoerce) import Unsafe.Coerce (unsafeCoerce)
...@@ -88,10 +88,10 @@ overState :: forall t. (t -> t) -> R.State t -> Effect Unit ...@@ -88,10 +88,10 @@ overState :: forall t. (t -> t) -> R.State t -> Effect Unit
overState f (_state /\ setState) = setState f overState f (_state /\ setState) = setState f
select :: ElemFactory select :: ElemFactory
select = createDOMElement "select" select = createDOM "select"
menu :: ElemFactory menu :: ElemFactory
menu = createDOMElement "menu" menu = createDOM "menu"
effToggler :: forall e. R.State Boolean -> EffectFn1 e Unit effToggler :: forall e. R.State Boolean -> EffectFn1 e Unit
effToggler (value /\ setValue) = mkEffectFn1 $ \e -> setValue $ const $ not value effToggler (value /\ setValue) = mkEffectFn1 $ \e -> setValue $ const $ not value
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment