Commit dcb600e2 authored by Fabien Manière's avatar Fabien Manière

adding pagination at the bottom of tables (terms + documents)

parent 7a09b5c9
Pipeline #3950 failed with stage
in 0 seconds
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -225,10 +225,10 @@ tableContainerCpt { addCallback ...@@ -225,10 +225,10 @@ tableContainerCpt { addCallback
B.wad B.wad
[] []
[ [
H.i { className: "fa fa-lightbulb-o mr-2" } [] H.i { className: "fa fa-lightbulb-o mr-1" } []
, H.text "adding" , H.text "adding"
, H.text $ nbsp 1 , H.text $ nbsp 1
, B.b_ $ "« " <> searchQuery <> " »" , H.span { className: "text-primary" } [ B.b_ $ "« " <> searchQuery <> " »" ]
, H.text $ nbsp 1 , H.text $ nbsp 1
, H.text "to" , H.text "to"
] ]
...@@ -252,29 +252,11 @@ tableContainerCpt { addCallback ...@@ -252,29 +252,11 @@ tableContainerCpt { addCallback
] ]
] ]
, ,
ngrams_controls
H.div
{ className: "ngrams-table-container__navigation" }
[
props.pageSizeDescription
,
props.paginationLinks
,
B.wad
[ "d-flex", "align-items-center" ]
[
B.label_ "per page"
,
B.wad_ [ "virtual-space", "w-1" ]
,
props.pageSizeControl
]
]
, ,
H.div H.div
{ className: "ngrams-table-container__table-wrapper" } { className: "ngrams-table-container__table-wrapper" }
[ [
H.div H.div
{ className: intercalate " " { className: intercalate " "
[ "ngrams-table-container__actions" [ "ngrams-table-container__actions"
...@@ -317,7 +299,21 @@ tableContainerCpt { addCallback ...@@ -317,7 +299,21 @@ tableContainerCpt { addCallback
ngramsTreeEdit (treeEdit) ngramsTreeEdit (treeEdit)
] ]
] ]
,
ngrams_controls
] ]
where
ngrams_controls = H.div { className: "ngrams-table-container__navigation" }
[ props.pageSizeDescription
, props.paginationLinks
, B.wad
[ "d-flex", "align-items-center" ]
[ B.label_ "per page"
, B.wad_ [ "virtual-space", "w-1" ]
, props.pageSizeControl
]
]
-- WHY setPath f = origSetPageParams (const $ f path) -- WHY setPath f = origSetPageParams (const $ f path)
setTermListFilter x = T.modify (_ { termListFilter = x }) path setTermListFilter x = T.modify (_ { termListFilter = x }) path
......
...@@ -788,9 +788,20 @@ filterRows { params: { limit, offset } } rs = newRs ...@@ -788,9 +788,20 @@ filterRows { params: { limit, offset } } rs = newRs
newRs = Seq.take limit $ Seq.drop offset $ rs newRs = Seq.take limit $ Seq.drop offset $ rs
defaultContainer :: Record TableContainerProps -> R.Element defaultContainer :: Record TableContainerProps -> R.Element
defaultContainer props = R.fragment $ props.syncResetButton <> controls defaultContainer props = R.fragment $ props.syncResetButton <> table_data
where where
controls = [ H.div { className: "d-flex align-items-center mb-2" } table_data = [
controls
, R2.row [
H.table {className: "col-md-12 table"}
[ H.thead {className: ""} [ props.tableHead ]
, H.tbody {} props.tableBody
]
]
, controls
]
where
controls = H.div { className: "table-container__navigation d-flex align-items-center mb-2" }
[ H.div {className: "col-md-4"} [ props.pageSizeDescription ] [ H.div {className: "col-md-4"} [ props.pageSizeDescription ]
, H.div {className: "col-md-4"} [ props.paginationLinks ] , H.div {className: "col-md-4"} [ props.paginationLinks ]
, H.div {className: "col-md-4"} , H.div {className: "col-md-4"}
...@@ -801,13 +812,6 @@ defaultContainer props = R.fragment $ props.syncResetButton <> controls ...@@ -801,13 +812,6 @@ defaultContainer props = R.fragment $ props.syncResetButton <> controls
] ]
] ]
] ]
, R2.row [
H.table {className: "col-md-12 table"}
[ H.thead {className: ""} [ props.tableHead ]
, H.tbody {} props.tableBody
]
]
]
-- TODO: this needs to be in Gargantext.Pages.Corpus.Graph.Tabs -- TODO: this needs to be in Gargantext.Pages.Corpus.Graph.Tabs
graphContainer :: Record TableContainerProps -> R.Element graphContainer :: Record TableContainerProps -> R.Element
......
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
// see Gargantext.Components.Router) // see Gargantext.Components.Router)
margin-left: - space-x(2) margin-left: - space-x(2)
margin-right: - space-x(2) margin-right: - space-x(2)
margin-bottom: - space-x(4) // (+ another trimmed gutter) margin-bottom: - space-x(2) // (+ another trimmed gutter)
&__actions &__actions
display: flex display: flex
......
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