NgramsTable: fix and refactor (reactix/thermite, session, loader...)

src/Gargantext/Components/NgramsTable/Core.purs

@@ -16,12 +16,9 @@ module Gargantext.Components.NgramsTable.Core
   , Versioned(..)
   , VersionedNgramsTable
   , CoreState
-  , LoadedNgramsTableProps
   , highlightNgrams
   , initialPageParams
   , loadNgramsTable
-  , ngramsLoader
-  , ngramsLoaderClass
   , convOrderBy
   , Replace(..) -- Ideally we should keep the constructors hidden
   , replace
@@ -86,7 +83,6 @@ import Partial (crashWith)
 import Partial.Unsafe (unsafePartial)
 
 import Gargantext.Components.Table as T
-import Gargantext.Components.OldLoader as Loader
 import Gargantext.Ends (url)
 import Gargantext.Routes (SessionRoute(..))
 import Gargantext.Sessions (Session, get, put, post)
@@ -98,6 +94,7 @@ type CoreParams s =
     -- ^ This node can be a corpus or contact.
   , listIds :: Array Int
   , tabType :: TabType
+  , session :: Session
   | s
   }
 
@@ -107,7 +104,6 @@ type PageParams =
     , searchQuery    :: String
     , termListFilter :: Maybe TermList -- Nothing means all
     , termSizeFilter :: Maybe TermSize -- Nothing means all
-    , session        :: Session
     )
 
 initialPageParams :: Session -> Int -> Array Int -> TabType -> PageParams
@@ -564,41 +560,41 @@ type CoreState s =
   | s
   }
 
-postNewNgrams :: forall s. Session -> Array NgramsTerm -> Maybe TermList -> CoreParams s -> Aff Unit
-postNewNgrams session newNgrams mayList {nodeId, listIds, tabType} =
+postNewNgrams :: forall s. Array NgramsTerm -> Maybe TermList -> CoreParams s -> Aff Unit
+postNewNgrams newNgrams mayList {nodeId, listIds, tabType, session} =
   when (not (A.null newNgrams)) $ do
     (_ :: Array Unit) <- post session p newNgrams
     pure unit
   where p = PutNgrams tabType (head listIds) mayList (Just nodeId)
 
-postNewElems :: forall s. Session -> NewElems -> CoreParams s -> Aff Unit
-postNewElems session newElems params = void $ traverseWithIndex postNewElem newElems
+postNewElems :: forall s. NewElems -> CoreParams s -> Aff Unit
+postNewElems newElems params = void $ traverseWithIndex postNewElem newElems
   where
-    postNewElem ngrams list = postNewNgrams session [ngrams] (Just list) params
+    postNewElem ngrams list = postNewNgrams [ngrams] (Just list) params
 
 addNewNgram :: CTabNgramType -> NgramsTerm -> TermList -> NgramsTablePatch
 addNewNgram ntype ngrams list = { ngramsPatches: mempty
                           , ngramsNewElems: Map.singleton (normNgram ntype ngrams) list }
 
-putNgramsPatches :: Session -> {nodeId :: Int, listIds :: Array Int, tabType :: TabType} -> Versioned NgramsPatches -> Aff (Versioned NgramsPatches)
-putNgramsPatches session {nodeId, listIds, tabType} = put session putNgrams
+putNgramsPatches :: forall s. CoreParams s -> Versioned NgramsPatches -> Aff (Versioned NgramsPatches)
+putNgramsPatches {session, nodeId, listIds, tabType} = put session putNgrams
   where putNgrams = PutNgrams tabType (head listIds) Nothing (Just nodeId)
 
-commitPatch :: forall s. Session -> {nodeId :: Int, listIds :: Array Int, tabType :: TabType}
+commitPatch :: forall p s. CoreParams p
             -> Versioned NgramsTablePatch -> StateCoTransformer (CoreState s) Unit
-commitPatch session props (Versioned {version, data: tablePatch@{ngramsPatches, ngramsNewElems}}) = do
+commitPatch props (Versioned {version, data: tablePatch@{ngramsPatches, ngramsNewElems}}) = do
   let pt = Versioned { version, data: ngramsPatches }
-  lift $ postNewElems session ngramsNewElems props
-  Versioned {version: newVersion, data: newPatch} <- lift $ putNgramsPatches session props pt
+  lift $ postNewElems ngramsNewElems props
+  Versioned {version: newVersion, data: newPatch} <- lift $ putNgramsPatches props pt
   modifyState_ $ \s ->
     s { ngramsVersion    = newVersion
       , ngramsTablePatch = fromNgramsPatches newPatch <> tablePatch <> s.ngramsTablePatch
       }
     -- TODO: check that pt.version == s.ngramsTablePatch.version
 
-loadNgramsTable :: Session -> PageParams -> Aff VersionedNgramsTable
-loadNgramsTable session
-  { nodeId, listIds, termListFilter, termSizeFilter
+loadNgramsTable :: PageParams -> Aff VersionedNgramsTable
+loadNgramsTable
+  { nodeId, listIds, termListFilter, termSizeFilter, session
   , searchQuery, tabType, params: {offset, limit, orderBy}}
   = get session query
   where query = GetNgrams { tabType, offset, limit, listIds
@@ -611,11 +607,3 @@ convOrderBy (T.ASC  (T.ColumnName "Score (Occurrences)")) = ScoreAsc
 convOrderBy (T.DESC (T.ColumnName "Score (Occurrences)")) = ScoreDesc
 convOrderBy (T.ASC  _) = TermAsc
 convOrderBy (T.DESC _) = TermDesc
-
-ngramsLoaderClass :: Session -> Loader.LoaderClass PageParams VersionedNgramsTable
-ngramsLoaderClass session = Loader.createLoaderClass "NgramsTableLoader" (loadNgramsTable session)
-
-ngramsLoader :: Session -> Loader.Props' PageParams VersionedNgramsTable -> ReactElement
-ngramsLoader session props = React.createElement (ngramsLoaderClass session) props []
-
-type LoadedNgramsTableProps = ( path :: PageParams, loaded :: VersionedNgramsTable )

src/Gargantext/Components/Nodes/Corpus/Document.purs

 module Gargantext.Components.Nodes.Corpus.Document where
 
-import Prelude (class Show, bind, identity, mempty, pure, ($), (<<<))
+import Prelude (class Show, bind, identity, mempty, pure, ($))
 import Data.Argonaut (class DecodeJson, decodeJson, (.:), (.:?))
 import Data.Generic.Rep (class Generic)
 import Data.Generic.Rep.Show (genericShow)
@@ -19,14 +19,18 @@ import Gargantext.Components.NgramsTable.Core
   , VersionedNgramsTable, addNewNgram, applyNgramsTablePatch, commitPatch
   , loadNgramsTable, replace, singletonNgramsTablePatch )
 import Gargantext.Components.Annotation.AnnotatedField as AnnotatedField
-import Gargantext.Ends (url)
 import Gargantext.Hooks.Loader (useLoader)
 import Gargantext.Routes (SessionRoute(..))
 import Gargantext.Sessions (Session, get)
 import Gargantext.Types (CTabNgramType(..), NodeType(..), TabSubType(..), TabType(..), TermList)
 import Gargantext.Utils.Reactix as R2
 
-type DocPath = { nodeId :: Int, listIds :: Array Int, corpusId :: Maybe Int, tabType :: TabType }
+type DocPath =
+  { nodeId   :: Int
+  , listIds  :: Array Int
+  , corpusId :: Maybe Int
+  , tabType  :: TabType
+  , session  :: Session }
 
 type NodeDocument = NodePoly Document
 
@@ -38,7 +42,6 @@ type LoadedData =
 type Props =
   { loaded :: LoadedData
   , path   :: DocPath
-  , session   :: Session
   }
 
 -- This is a subpart of NgramsTable.State.
@@ -286,15 +289,15 @@ docViewSpec :: Spec State Props Action
 docViewSpec = simpleSpec performAction render
   where
     performAction :: PerformAction State Props Action
-    performAction Refresh {path: {nodeId, listIds, tabType}, session} {ngramsVersion} = do
-        commitPatch session {nodeId, listIds, tabType} (Versioned {version: ngramsVersion, data: mempty})
-    performAction (SetTermListItem n pl) {path: {nodeId, listIds, tabType}, session} {ngramsVersion} =
-        commitPatch session {nodeId, listIds, tabType} (Versioned {version: ngramsVersion, data: pt})
+    performAction Refresh {path} {ngramsVersion} = do
+        commitPatch path (Versioned {version: ngramsVersion, data: mempty})
+    performAction (SetTermListItem n pl) {path} {ngramsVersion} =
+        commitPatch path (Versioned {version: ngramsVersion, data: pt})
       where
         pe = NgramsPatch { patch_list: pl, patch_children: mempty }
         pt = singletonNgramsTablePatch CTabTerms n pe
-    performAction (AddNewNgram ngram termList) {path: {nodeId, listIds, tabType},session} {ngramsVersion} =
-        commitPatch session {nodeId, listIds, tabType} (Versioned {version: ngramsVersion, data: pt})
+    performAction (AddNewNgram ngram termList) {path} {ngramsVersion} =
+        commitPatch path (Versioned {version: ngramsVersion, data: pt})
       where
         pt = addNewNgram CTabTerms ngram termList
 
@@ -342,12 +345,9 @@ docViewSpec = simpleSpec performAction render
           badge s = span [className "badge badge-default badge-pill"] [text s]
           NodePoly {hyperdata : Document doc} = document
 
-docViewClass
-  :: ReactClass
-     { session     :: Session
-     , children :: Children
-     , loaded   :: LoadedData
-     , path     :: DocPath }
+docViewClass :: ReactClass { children :: Children
+                           , loaded   :: LoadedData
+                           , path     :: DocPath }
 docViewClass = createClass "DocumentView" docViewSpec initialState
 
 type LayoutProps = ( session :: Session, nodeId :: Int, listId :: Int, corpusId :: Maybe Int )
@@ -359,24 +359,24 @@ documentLayoutCpt :: R.Component LayoutProps
 documentLayoutCpt = R.hooksComponent "G.P.Corpus.Document.documentLayout" cpt
   where
     cpt {session, nodeId, listId, corpusId} _ = do
-      useLoader path (loadData session) $ \loaded ->
-        R2.createElement' docViewClass {session, path, loaded} []
+      useLoader path loadData $ \loaded ->
+        R2.createElement' docViewClass {path, loaded} []
       where
         tabType = TabDocument (TabNgramType CTabTerms)
-        path = {nodeId, listIds: [listId], corpusId, tabType}
+        path = {session, nodeId, listIds: [listId], corpusId, tabType}
 
 ------------------------------------------------------------------------
 
 loadDocument :: Session -> Int -> Aff NodeDocument
 loadDocument session nodeId = get session $ NodeAPI Node (Just nodeId) ""
 
-loadData :: Session -> DocPath -> Aff LoadedData
-loadData session {nodeId, listIds, tabType} = do
+loadData :: DocPath -> Aff LoadedData
+loadData {session, nodeId, listIds, tabType} = do
   document <- loadDocument session nodeId
-  ngramsTable <- loadNgramsTable session
+  ngramsTable <- loadNgramsTable
     { session
     , nodeId
-    , listIds: listIds
+    , listIds
     , params: { offset : 0, limit : 100, orderBy: Nothing}
     , tabType
     , searchQuery : ""