[ngrams] make table work in offline mode

src/Gargantext/Components/NgramsTable.purs

@@ -143,7 +143,7 @@ tableContainerCpt { dispatch
                   , tabNgramType
                   } = R.hooksComponent "G.C.NT.tableContainer" cpt
   where
-    cpt props _ =
+    cpt props _ = do
       pure $ H.div {className: "container-fluid"} [
         H.div {className: "jumbotron1"}
         [ R2.row
@@ -457,22 +457,39 @@ mainNgramsTable :: Record MainNgramsTableProps -> R.Element
 mainNgramsTable props = R.createElement mainNgramsTableCpt props []
 
 mainNgramsTableCpt :: R.Component MainNgramsTableProps
-mainNgramsTableCpt = R.hooksComponent "MainNgramsTable" cpt
+mainNgramsTableCpt = R.hooksComponent "G.C.NT.mainNgramsTable" cpt
   where
     cpt {nodeId, defaultListId, tabType, session, tabNgramType, withAutoUpdate} _ = do
-      path /\ setPath <- R.useState' $ initialPageParams session nodeId [defaultListId] tabType
-      let paint versioned = loadedNgramsTable' {
-              path: path /\ setPath
-            , tabNgramType
-            , versioned
-            , withAutoUpdate
-            }
+      let path = initialPageParams session nodeId [defaultListId] tabType
 
       pure $ loader path loadNgramsTableAll \loaded -> do
         case Map.lookup tabType loaded of
-          Just (versioned :: VersionedNgramsTable) -> paint versioned
+          Just (versioned :: VersionedNgramsTable) -> mainNgramsTablePaint {path, tabNgramType, versioned, withAutoUpdate}
           Nothing -> loadingSpinner {}
 
+type MainNgramsTablePaintProps =
+  (
+    path :: PageParams
+  , tabNgramType  :: CTabNgramType
+  , versioned :: VersionedNgramsTable
+  , withAutoUpdate :: Boolean
+  )
+
+mainNgramsTablePaint :: Record MainNgramsTablePaintProps -> R.Element
+mainNgramsTablePaint p = R.createElement mainNgramsTablePaintCpt p []
+
+mainNgramsTablePaintCpt :: R.Component MainNgramsTablePaintProps
+mainNgramsTablePaintCpt = R.hooksComponent "G.C.NT.mainNgramsTablePaint" cpt
+  where
+    cpt {path, tabNgramType, versioned, withAutoUpdate} _ = do
+      pathS <- R.useState' path
+      pure $ loadedNgramsTable' {
+        path: pathS
+      , tabNgramType
+      , versioned
+      , withAutoUpdate
+      }
+
 type NgramsDepth = {ngrams :: NgramsTerm, depth :: Int}
 type NgramsClick = NgramsDepth -> Maybe (Effect Unit)
 
@@ -641,5 +658,5 @@ nextTermList StopTerm      = CandidateTerm
 nextTermList CandidateTerm = GraphTerm
 
 optps1 :: forall a. Show a => { desc :: String, mval :: Maybe a } -> R.Element
-optps1 { desc, mval } = H.option { defaultValue: value } [H.text desc]
+optps1 { desc, mval } = H.option { value: value } [H.text desc]
   where value = maybe "" show mval

src/Gargantext/Components/Table.purs

@@ -134,31 +134,25 @@ tableCpt :: R.Component Props
 tableCpt = R.hooksComponent "G.C.Table.table" cpt
   where
     cpt {container, colNames, wrapColElts, totalRecords, rows, params} _ = do
-      let initialState = paramsState $ fst params
-      pageSize@(pageSize' /\ setPageSize) <- R.useState' initialState.pageSize
-      (page /\ setPage) <- R.useState' initialState.page
-      (orderBy /\ setOrderBy) <- R.useState' initialState.orderBy
       let
-        state = {pageSize: pageSize', orderBy, page}
-        ps = pageSizes2Int pageSize'
+        state = paramsState $ fst params
+        ps = pageSizes2Int state.pageSize
         totalPages = (totalRecords / ps) + min 1 (totalRecords `mod` ps)
         colHeader :: ColumnName -> R.Element
         colHeader c = H.th {scope: "col"} [ H.b {} cs ]
           where
-            lnk mc = effectLink (setOrderBy (const mc))
+            lnk mc = effectLink $ snd params $ _ { orderBy = mc }
             cs :: Array R.Element
             cs =
               wrapColElts c $
-              case orderBy of
+              case state.orderBy of
                 Just (ASC d)  | c == d -> [lnk (Just (DESC c)) "ASC ", lnk Nothing (columnName c)]
                 Just (DESC d) | c == d -> [lnk (Just (ASC  c)) "DESC ",  lnk Nothing (columnName c)]
                 _ -> [lnk (Just (ASC c)) (columnName c)]
-      R.useEffect2' (fst params) state do
-        when (fst params /= stateParams state) $ (snd params) (const $ stateParams state)
       pure $ container
-        { pageSizeControl: sizeDD pageSize
-        , pageSizeDescription: textDescription page pageSize' totalRecords
-        , paginationLinks: pagination setPage totalPages page
+        { pageSizeControl: sizeDD params
+        , pageSizeDescription: textDescription state.page state.pageSize totalRecords
+        , paginationLinks: pagination params totalPages
         , tableHead: H.tr {} (colHeader <$> colNames)
         , tableBody: map _.row rows
         }
@@ -203,12 +197,13 @@ graphContainer {title} props =
    -- , props.pageSizeDescription
    -- , props.paginationLinks
 
-sizeDD :: R.State PageSizes -> R.Element
-sizeDD (ps /\ setPageSize) =
-  H.span {} [ R2.select { className, defaultValue: ps, on: {change} } sizes ]
+sizeDD :: R.State Params -> R.Element
+sizeDD (params /\ setParams) =
+  H.span {} [ R2.select { className, defaultValue: pageSize, on: {change} } sizes ]
   where
+    {pageSize} = paramsState params
     className = "form-control"
-    change e = setPageSize $ const (string2PageSize $ R2.unsafeEventValue e)
+    change e = setParams $ \p -> stateParams $ (paramsState p) { pageSize = string2PageSize $ R2.unsafeEventValue e }
     sizes = map option pageSizes
     option size = H.option {value} [H.text value]
       where value = show size
@@ -222,51 +217,53 @@ textDescription currPage pageSize totalRecords =
     end  = if end' > totalRecords then totalRecords else end'
     msg = "Showing " <> show start <> " to " <> show end <> " of " <> show totalRecords
 
-pagination :: (R2.Setter Int) -> Int -> Int -> R.Element
-pagination changePage tp cp =
+pagination :: R.State Params -> Int -> R.Element
+pagination (params /\ setParams) tp =
   H.span {} $
     [ H.text " ", prev, first, ldots]
     <>
     lnums
     <>
-    [H.b {} [H.text $ " " <> show cp <> " "]]
+    [H.b {} [H.text $ " " <> show page <> " "]]
     <>
     rnums
     <>
     [ rdots, last, next ]
     where
-      prev = if cp == 1 then
+      {page} = paramsState params
+      changePage page = setParams $ \p -> stateParams $ (paramsState p) { page = page }
+      prev = if page == 1 then
                H.text " Prev. "
              else
-               changePageLink (cp - 1) "Prev."
-      next = if cp == tp then
+               changePageLink (page - 1) "Prev."
+      next = if page == tp then
                H.text " Next "
              else
-               changePageLink (cp + 1) "Next"
-      first = if cp == 1 then
+               changePageLink (page + 1) "Next"
+      first = if page == 1 then
                 H.text ""
               else
                 changePageLink' 1
-      last = if cp == tp then
+      last = if page == tp then
                H.text ""
              else
                changePageLink' tp
-      ldots = if cp >= 5 then
+      ldots = if page >= 5 then
                 H.text " ... "
                 else
                 H.text ""
-      rdots = if cp + 3 < tp then
+      rdots = if page + 3 < tp then
                 H.text " ... "
                 else
                 H.text ""
-      lnums = map changePageLink' $ A.filter (1  < _) [cp - 2, cp - 1]
-      rnums = map changePageLink' $ A.filter (tp > _) [cp + 1, cp + 2]
+      lnums = map changePageLink' $ A.filter (1  < _) [page - 2, page - 1]
+      rnums = map changePageLink' $ A.filter (tp > _) [page + 1, page + 2]
 
       changePageLink :: Int -> String -> R.Element
       changePageLink i s =
         H.span {}
           [ H.text " "
-          , effectLink (changePage (const i)) s
+          , effectLink (changePage i) s
           , H.text " "
           ]
 

[Nicolas Pouillard]

This looks like that mainNgramsTableCpt is now a pure component.

[Nicolas Pouillard]

I'm not sure to understand this change. Here the loader is loading only the initial path. In the previous version a setPath would cause path at line 463 to change and thus the loader to load a different path.

[Przemyslaw Kaminski]

Well, I didn't see any use of setPath when refactoring to offline so I removed it I guess.