WIP

src/Gargantext/Components/NgramsTable.purs

@@ -332,7 +332,8 @@ loadedNgramsTableSpec = Thermite.simpleSpec performAction render
     render dispatch { path: path@({searchQuery, scoreType, params, termListFilter} /\ setPath)
                     , versioned: Versioned { data: initTable }
                     , tabNgramType }
-                    state@{ ngramsParent, ngramsChildren, ngramsLocalPatch
+                    state@{ ngramsParent, ngramsChildren
+                          , ngramsLocalPatch, ngramsStagePatch, ngramsValidPatch
                           , ngramsSelection, ngramsSelectAll }
                     _reactChildren =
       [ autoUpdateElt { duration: 3000, effect: dispatch Synchronize }
@@ -394,9 +395,15 @@ loadedNgramsTableSpec = Thermite.simpleSpec performAction render
           -- ^ unless they are scheduled to be removed.
           || tablePatchHasNgrams ngramsLocalPatch ngrams
           -- ^ unless they are being processed at the moment.
+          || tablePatchHasNgrams ngramsStagePatch ngrams
+          -- ^ unless they are being processed at the moment.
+          || tablePatchHasNgrams ngramsValidPatch ngrams
+          -- ^ unless they are part of our local patches.
         convertRow (Tuple ngrams ngramsElement) =
           { row: R2.buff <$> renderNgramsItem { ngramsTable, ngrams,
                                                 ngramsLocalPatch,
+                                                ngramsStagePatch,
+                                                ngramsValidPatch,
                                                 ngramsParent, ngramsElement,
                                                 ngramsSelection, dispatch }
           , delete: false

src/Gargantext/Components/NgramsTable/Core.purs

@@ -616,7 +616,7 @@ 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)
+  where p = PostNgrams tabType (head listIds) mayList (Just nodeId)
 
 postNewElems :: forall s. NewElems -> CoreParams s -> Aff Unit
 postNewElems newElems params = void $ traverseWithIndex postNewElem newElems
@@ -630,7 +630,7 @@ addNewNgram ngrams list =
 
 putNgramsPatches :: forall s. CoreParams s -> VersionedNgramsPatches -> Aff VersionedNgramsPatches
 putNgramsPatches {session, nodeId, listIds, tabType} = put session putNgrams
-  where putNgrams = PutNgrams tabType (head listIds) Nothing (Just nodeId)
+  where putNgrams = PutNgrams tabType (unsafePartial $ head listIds) (Just nodeId)
 
 syncPatches :: forall p s. CoreParams p -> CoreState s -> StateCoTransformer (CoreState s) Unit
 syncPatches props { ngramsLocalPatch: ngramsLocalPatch@{ngramsNewElems, ngramsPatches}

src/Gargantext/Ends.purs

@@ -9,7 +9,9 @@ import Data.Generic.Rep (class Generic)
 import Data.Generic.Rep.Eq (genericEq)
 import Data.Maybe (Maybe(..), maybe)
 import Gargantext.Routes as R
-import Gargantext.Types (ApiVersion, Limit, NodePath, NodeType(..), Offset, TabType(..), TermSize(..), nodePath, nodeTypePath, showTabType')
+import Gargantext.Types (ApiVersion, Limit, NodePath, NodeType(..), Offset,
+    TabType(..), TermSize(..), nodePath, nodeTypePath, showTabType', ListId,
+    TermList)
 import Prelude (class Eq, class Show, identity, show, ($), (<>), bind, pure, (<<<), (==))
 
 -- | A means of generating a url to visit, a destination
@@ -124,8 +126,8 @@ sessionPath (R.GetNgrams opts i)    =
     <> offsetUrl opts.offset
     <> limitUrl opts.limit
     <> orderByUrl opts.orderBy
-    <> foldMap (\x -> "&list=" <> show x) opts.listIds
-    <> foldMap (\x -> "&listType=" <> show x) opts.termListFilter
+    <> foldMap listUrl opts.listIds
+    <> foldMap listTypeUrl opts.termListFilter
     <> foldMap termSizeFilter opts.termSizeFilter
     <> "&scoreType=" <> show opts.scoreType
     <> search opts.searchQuery
@@ -138,12 +140,17 @@ sessionPath (R.GetNgrams opts i)    =
     search s = "&search=" <> s
 sessionPath (R.ListDocument lId dId) =
   sessionPath $ R.NodeAPI NodeList lId ("document/" <> (show $ maybe 0 identity dId))
-sessionPath (R.PutNgrams t listId termList i) =
+sessionPath (R.PutNgrams t listId i) =
   sessionPath $ R.NodeAPI Node i
       $ "ngrams?ngramsType="
      <> showTabType' t
-     <> maybe "" (\x -> "&list=" <> show x) listId
-     <> foldMap (\x -> "&listType=" <> show x) termList
+     <> listUrl listId
+sessionPath (R.PostNgrams t listId termList i) =
+  sessionPath $ R.NodeAPI Node i
+      $ "ngrams?ngramsType="
+     <> showTabType' t
+     <> listUrl listId
+     <> foldMap listTypeUrl termList
 sessionPath (R.NodeAPI nt i p) = nodeTypePath nt
                               <> (maybe "" (\i' -> "/" <> show i') i)
                               <> (if p == "" then "" else "/" <> p)
@@ -193,6 +200,12 @@ orderUrl = maybe "" (\x -> "&order=" <> show x)
 orderByUrl :: forall a. Show a => Maybe a -> String
 orderByUrl = maybe "" (\x -> "&orderBy=" <> show x)
 
+listUrl :: ListId -> String
+listUrl l = "&list=" <> show l
+
+listTypeUrl :: TermList -> String
+listTypeUrl l = "&listType=" <> show l
+
 -- nodeTypePath :: NodeType -> Path
 -- nodeTypePath = NodeAPI
 

src/Gargantext/Routes.purs

@@ -28,8 +28,8 @@ data SessionRoute
   = Tab TabType (Maybe Id)
   | Children NodeType Offset Limit (Maybe OrderBy) (Maybe Id)
   | GetNgrams NgramsGetOpts (Maybe Id)
-  | PutNgrams TabType (Maybe ListId) (Maybe TermList) (Maybe Id)
-  -- ^ This name is not good. In particular this URL is used both in PUT and POST.
+  | PutNgrams TabType ListId (Maybe Id)
+  | PostNgrams TabType ListId (Maybe TermList) (Maybe Id)
   | NodeAPI NodeType (Maybe Id) String
   | ListDocument (Maybe ListId) (Maybe Id)
   | Search SearchOpts (Maybe Id)