[ngrams table] fix for versioned table total rows count

The pagination on ngramstable is still broken – pages > 1 don't render
any results even if network analysis shows data wasn't empty.

src/Gargantext/Components/NgramsTable.purs

@@ -14,7 +14,7 @@ import Data.Lens.Index (ix)
 import Data.Lens.Record (prop)
 import Data.Map (Map)
 import Data.Map as Map
-import Data.Maybe (Maybe(..), isNothing, maybe)
+import Data.Maybe (Maybe(..), fromMaybe, isNothing, maybe)
 import Data.Monoid.Additive (Additive(..))
 import Data.Ord.Down (Down(..))
 import Data.Sequence (Seq, length) as Seq
@@ -290,14 +290,15 @@ type CommonProps = (
   )
 
 type Props = (
-    path              :: R.State PageParams
+    mTotalRows        :: Maybe Int
+  , path              :: R.State PageParams
   , state             :: R.State State
   , versioned         :: VersionedNgramsTable
   | CommonProps
   )
 
-loadedNgramsTable :: Record Props -> R.Element
-loadedNgramsTable p = R.createElement loadedNgramsTableCpt p []
+loadedNgramsTable :: R2.Component Props
+loadedNgramsTable = R.createElement loadedNgramsTableCpt
   where
     loadedNgramsTableCpt :: R.Component Props
     loadedNgramsTableCpt = R.hooksComponentWithModule thisModule "loadedNgramsTable" cpt
@@ -305,6 +306,7 @@ loadedNgramsTable p = R.createElement loadedNgramsTableCpt p []
     cpt { afterSync
         , appReload
         , asyncTasksRef
+        , mTotalRows
         , path: path@(path'@{ listIds, nodeId, params, searchQuery, scoreType, termListFilter, termSizeFilter } /\ setPath)
         , sidePanelTriggers
         , state: (state@{ ngramsChildren
@@ -399,7 +401,7 @@ loadedNgramsTable p = R.createElement loadedNgramsTableCpt p []
               commitPatch (Versioned {version: ngramsVersion, data: pt}) (state /\ setState)
         performAction (CoreAction a) = coreDispatch path' (state /\ setState) a
 
-        totalRecords = Seq.length rows
+        totalRecords = fromMaybe (Seq.length rows) mTotalRows
         filteredConvertedRows :: T.Rows
         filteredConvertedRows = convertRow <$> filteredRows
         filteredRows :: PreConversionRows
@@ -520,8 +522,8 @@ type MainNgramsTableProps = (
   | CommonProps
   )
 
-mainNgramsTable :: Record MainNgramsTableProps -> R.Element
-mainNgramsTable props = R.createElement mainNgramsTableCpt props []
+mainNgramsTable :: R2.Component MainNgramsTableProps
+mainNgramsTable = R.createElement mainNgramsTableCpt
   where
     mainNgramsTableCpt :: R.Component MainNgramsTableProps
     mainNgramsTableCpt = R.hooksComponentWithModule thisModule "mainNgramsTable" cpt
@@ -552,7 +554,7 @@ mainNgramsTable props = R.createElement mainNgramsTableCpt props []
                                                       , tabNgramType
                                                       , treeReloadRef
                                                       , versioned
-                                                      , withAutoUpdate }
+                                                      , withAutoUpdate } []
           useLoaderWithCacheAPI {
               cacheEndpoint: versionEndpoint props
             , handleResponse
@@ -562,22 +564,23 @@ mainNgramsTable props = R.createElement mainNgramsTableCpt props []
             }
         (NT.CacheOff /\ _) -> do
           -- pathS <- R.useState' path
-          let render versioned = mainNgramsTablePaintNoCache { afterSync
-                                                             , appReload
-                                                             , asyncTasksRef
-                                                             , pathS
-                                                             , sidePanelTriggers
-                                                             , tabNgramType
-                                                             , treeReloadRef
-                                                             , versioned
-                                                             , withAutoUpdate }
+          let render versionedWithCount = mainNgramsTablePaintNoCache { afterSync
+                                                                      , appReload
+                                                                      , asyncTasksRef
+                                                                      , pathS
+                                                                      , sidePanelTriggers
+                                                                      , tabNgramType
+                                                                      , treeReloadRef
+                                                                      , versionedWithCount
+                                                                      , withAutoUpdate } []
           useLoader (fst pathS) loader render
 
+    -- NOTE With cache on
     versionEndpoint :: Record MainNgramsTableProps -> PageParams -> Aff Version
     versionEndpoint { defaultListId, nodeId, session, tabType } _ = get session $ R.GetNgramsTableVersion { listId: defaultListId, tabType } (Just nodeId)
 
     -- NOTE With cache off
-    loader :: PageParams -> Aff VersionedNgramsTable
+    loader :: PageParams -> Aff VersionedWithCountNgramsTable
     loader path@{ listIds
                 , nodeId
                 , params: { limit, offset, orderBy }
@@ -623,8 +626,8 @@ type MainNgramsTablePaintProps = (
   | CommonProps
   )
 
-mainNgramsTablePaint :: Record MainNgramsTablePaintProps -> R.Element
-mainNgramsTablePaint p = R.createElement mainNgramsTablePaintCpt p []
+mainNgramsTablePaint :: R2.Component MainNgramsTablePaintProps
+mainNgramsTablePaint = R.createElement mainNgramsTablePaintCpt
   where
     mainNgramsTablePaintCpt :: R.Component MainNgramsTablePaintProps
     mainNgramsTablePaintCpt = R.hooksComponentWithModule thisModule "mainNgramsTablePaint" cpt
@@ -643,6 +646,7 @@ mainNgramsTablePaint p = R.createElement mainNgramsTablePaintCpt p []
       pure $ loadedNgramsTable { afterSync
                                , appReload
                                , asyncTasksRef
+                               , mTotalRows: Nothing
                                , path: pathS
                                , sidePanelTriggers
                                , state
@@ -650,20 +654,20 @@ mainNgramsTablePaint p = R.createElement mainNgramsTablePaintCpt p []
                                , treeReloadRef
                                , versioned
                                , withAutoUpdate
-                               }
+                               } []
 
 type MainNgramsTablePaintNoCacheProps =
-  ( pathS             :: R.State PageParams
-  , versioned         :: VersionedNgramsTable
+  ( pathS              :: R.State PageParams
+  , versionedWithCount :: VersionedWithCountNgramsTable
   | CommonProps
   )
 
-mainNgramsTablePaintNoCache :: Record MainNgramsTablePaintNoCacheProps -> R.Element
-mainNgramsTablePaintNoCache p = R.createElement mainNgramsTablePaintNoCacheCpt p []
-
-mainNgramsTablePaintNoCacheCpt :: R.Component MainNgramsTablePaintNoCacheProps
-mainNgramsTablePaintNoCacheCpt = R.hooksComponentWithModule thisModule "mainNgramsTablePaintNoCache" cpt
+mainNgramsTablePaintNoCache :: R2.Component MainNgramsTablePaintNoCacheProps
+mainNgramsTablePaintNoCache = R.createElement mainNgramsTablePaintNoCacheCpt
   where
+    mainNgramsTablePaintNoCacheCpt :: R.Component MainNgramsTablePaintNoCacheProps
+    mainNgramsTablePaintNoCacheCpt = R.hooksComponentWithModule thisModule "mainNgramsTablePaintNoCache" cpt
+
     cpt props@{ afterSync
               , appReload
               , asyncTasksRef
@@ -671,14 +675,17 @@ mainNgramsTablePaintNoCacheCpt = R.hooksComponentWithModule thisModule "mainNgra
               , sidePanelTriggers
               , tabNgramType
               , treeReloadRef
-              , versioned
+              , versionedWithCount
               , withAutoUpdate } _ = do
+      let count /\ versioned = toVersioned versionedWithCount
+
       state <- R.useState' $ initialState versioned
 
       pure $ loadedNgramsTable {
         afterSync
       , appReload
       , asyncTasksRef
+      , mTotalRows: Just count
       , path: pathS
       , sidePanelTriggers
       , state
@@ -686,35 +693,7 @@ mainNgramsTablePaintNoCacheCpt = R.hooksComponentWithModule thisModule "mainNgra
       , treeReloadRef
       , versioned
       , withAutoUpdate
-      }
-
--- type MainNgramsTablePaintWithStateProps = (
---     afterSync      :: Unit -> Aff Unit
---   , asyncTasksRef  :: R.Ref (Maybe GAT.Reductor)
---   , path           :: R.State PageParams
---   , tabNgramType   :: CTabNgramType
---   , versioned      :: VersionedNgramsTable
---   , withAutoUpdate :: Boolean
---   )
-
--- mainNgramsTablePaintWithState :: Record MainNgramsTablePaintWithStateProps -> R.Element
--- mainNgramsTablePaintWithState p = R.createElement mainNgramsTablePaintWithStateCpt p []
-
--- mainNgramsTablePaintWithStateCpt :: R.Component MainNgramsTablePaintWithStateProps
--- mainNgramsTablePaintWithStateCpt = R.hooksComponentWithModule thisModule "mainNgramsTablePaintWithState" cpt
---   where
---     cpt { afterSync, asyncTasksRef, path, tabNgramType, versioned, withAutoUpdate } _ = do
---       state <- R.useState' $ initialState versioned
-
---       pure $ loadedNgramsTable {
---         afterSync
---       , asyncTasksRef
---       , path
---       , state
---       , tabNgramType
---       , versioned
---       , withAutoUpdate
---       }
+      } []
 
 type NgramsOcc = { occurrences :: Additive Int, children :: Set NgramsTerm }
 

src/Gargantext/Components/NgramsTable/Core.purs

@@ -18,9 +18,13 @@ module Gargantext.Components.NgramsTable.Core
   , findNgramTermList
   , Version
   , Versioned(..)
+  , Count
+  , VersionedWithCount(..)
+  , toVersioned
   , VersionedNgramsPatches
   , AsyncNgramsChartsUpdate
   , VersionedNgramsTable
+  , VersionedWithCountNgramsTable
   , NgramsTablePatch
   , NgramsPatch(..)
   , CoreState
@@ -164,6 +168,32 @@ instance decodeJsonVersioned :: DecodeJson a => DecodeJson (Versioned a) where
     version <- obj .: "version"
     data_   <- obj .: "data"
     pure $ Versioned {version, data: data_}
+------------------------------------------------------------------------
+type Count = Int
+
+newtype VersionedWithCount a = VersionedWithCount
+  { version :: Version
+  , count   :: Count
+  , data    :: a
+  }
+
+instance encodeJsonVersionedWithCount :: EncodeJson a => EncodeJson (VersionedWithCount a) where
+  encodeJson (VersionedWithCount {count, version, data: data_})
+     = "version" := version
+    ~> "count" := count
+    ~> "data" := data_
+    ~> jsonEmptyObject
+
+instance decodeJsonVersionedWithCount :: DecodeJson a => DecodeJson (VersionedWithCount a) where
+  decodeJson json = do
+    obj     <- decodeJson json
+    count   <- obj .: "count"
+    data_   <- obj .: "data"
+    version <- obj .: "version"
+    pure $ VersionedWithCount {count, version, data: data_}
+
+toVersioned :: forall a. VersionedWithCount a -> Tuple Count (Versioned a)
+toVersioned (VersionedWithCount { count, data: d, version }) = Tuple count $ Versioned { data: d, version }
 
 ------------------------------------------------------------------------
 -- TODO replace by NgramsPatches directly
@@ -535,6 +565,7 @@ highlightNgrams ntype table@(NgramsTable {ngrams_repo_elements: elts}) input0 =
 -----------------------------------------------------------------------------------
 
 type VersionedNgramsTable = Versioned NgramsTable
+type VersionedWithCountNgramsTable = VersionedWithCount NgramsTable
 
 -----------------------------------------------------------------------------------
 data Replace a

src/Gargantext/Components/Nodes/Annuaire/User/Contacts/Tabs.purs

@@ -21,6 +21,7 @@ import Gargantext.Components.Nodes.Texts.Types as TTypes
 import Gargantext.Ends (Frontends)
 import Gargantext.Sessions (Session)
 import Gargantext.Types (CTabNgramType(..), NodeID, PTabNgramType(..), TabType(..), TabSubType(..))
+import Gargantext.Utils.Reactix as R2
 import Gargantext.Utils.Reload as GUR
 
 thisModule :: String
@@ -80,9 +81,9 @@ tabsCpt = R.hooksComponentWithModule thisModule "tabs" cpt
       where
         tabs' trg =
           [ "Documents"     /\ docs trg
-          , "Patents"       /\ ngramsView patentsView
-          , "Books"         /\ ngramsView booksView
-          , "Communication" /\ ngramsView commView
+          , "Patents"       /\ ngramsView patentsView []
+          , "Books"         /\ ngramsView booksView []
+          , "Communication" /\ ngramsView commView []
           , "Trash"         /\ docs trg -- TODO pass-in trash mode
           ]
           where
@@ -141,12 +142,12 @@ type NgramsViewTabsProps = (
   , treeReloadRef     :: GUR.ReloadWithInitializeRef
   )
 
-ngramsView :: Record NgramsViewTabsProps -> R.Element
-ngramsView props = R.createElement ngramsViewCpt props []
-
-ngramsViewCpt :: R.Component NgramsViewTabsProps
-ngramsViewCpt = R.hooksComponentWithModule thisModule "ngramsView" cpt
+ngramsView :: R2.Component NgramsViewTabsProps
+ngramsView = R.createElement ngramsViewCpt
   where
+    ngramsViewCpt :: R.Component NgramsViewTabsProps
+    ngramsViewCpt = R.hooksComponentWithModule thisModule "ngramsView" cpt
+
     cpt { appReload
         , asyncTasksRef
         , cacheState
@@ -172,7 +173,7 @@ ngramsViewCpt = R.hooksComponentWithModule thisModule "ngramsView" cpt
         , tabNgramType
         , treeReloadRef
         , withAutoUpdate: false
-        }
+        } []
       where
         tabNgramType = modeTabType' mode
         tabType      = TabPairing $ TabNgramType $ modeTabType mode

src/Gargantext/Components/Nodes/Lists/Tabs.purs

@@ -130,7 +130,7 @@ ngramsViewCpt = R.hooksComponentWithModule thisModule "ngramsView" cpt
                                 , tabType
                                 , treeReloadRef
                                 , withAutoUpdate: false
-                                }
+                                } []
            ]
         )
       where