Revert "[ngrams] remove ngramsValidPatch from state"

This reverts commit 058fa2fe.

src/Gargantext/Components/Document/Types.purs

@@ -42,6 +42,7 @@ initialState
 initialState {loaded: {ngramsTable: Versioned {version}}} =
   { ngramsLocalPatch: mempty
   , ngramsStagePatch: mempty
+  , ngramsValidPatch: mempty
   , ngramsSelection : mempty
   , ngramsVersion:    version
   }

src/Gargantext/Components/NgramsTable.purs

@@ -93,6 +93,7 @@ initialState =
   { ngramsLocalPatch: mempty
   , ngramsSelection:  mempty
   , ngramsStagePatch: mempty
+  , ngramsValidPatch: mempty
   , ngramsVersion:    0
   }
 

src/Gargantext/Components/NgramsTable/Tree.purs

@@ -340,6 +340,7 @@ renderNgramsItemCpt = here.component "renderNgramsItem" cpt
         tbl :: NgramsTable
         tbl = applyNgramsPatches { ngramsLocalPatch
                                  , ngramsStagePatch: mempty
+                                 , ngramsValidPatch: mempty
                                  , ngramsVersion: 0 } ngramsTable
         getNgramsChildren' :: NgramsTerm -> Array NgramsTerm
         getNgramsChildren' n = A.fromFoldable $ ngramsChildren n

src/Gargantext/Core/NgramsTable/Functions.purs

@@ -362,8 +362,8 @@ applyNgramsTablePatch (NgramsTablePatch ngramsPatches) (NgramsTable m) =
                       applyPatchMap applyNgramsPatch ngramsPatches m.ngrams_repo_elements }
 
 applyNgramsPatches :: forall s. CoreState s -> NgramsTable -> NgramsTable
-applyNgramsPatches { ngramsLocalPatch, ngramsStagePatch } =
-  applyNgramsTablePatch ( ngramsLocalPatch <> ngramsStagePatch )
+applyNgramsPatches {ngramsLocalPatch, ngramsStagePatch, ngramsValidPatch} =
+  applyNgramsTablePatch (ngramsLocalPatch <> ngramsStagePatch <> ngramsValidPatch)
   -- First the valid patch, then the stage patch, and finally the local patch.
 
 {-
@@ -436,7 +436,9 @@ syncPatches props state callback = do
               s {
                   ngramsLocalPatch = fromNgramsPatches mempty
                 , ngramsStagePatch = fromNgramsPatches mempty
-                -- First the local patch, then the newly received newPatch.
+                , ngramsValidPatch = fromNgramsPatches mempty
+                -- , ngramsValidPatch = fromNgramsPatches newPatch <> ngramsLocalPatch <> s.ngramsValidPatch
+                -- First the already valid patch, then the local patch, then the newly received newPatch.
                 , ngramsVersion    = newVersion
                 }) state
             here.log2 "[syncPatches] ngramsVersion" newVersion
@@ -447,6 +449,7 @@ syncPatchesAsync :: forall p s. CoreParams p -> R.State (CoreState s) -> (Unit -
 syncPatchesAsync props@{ listIds, tabType }
                  ({ ngramsLocalPatch: ngramsLocalPatch@{ ngramsPatches }
                   , ngramsStagePatch
+                  , ngramsValidPatch
                   , ngramsVersion
                   } /\ setState) callback = do
   when (isEmptyNgramsTablePatch ngramsStagePatch) $ do
@@ -460,7 +463,8 @@ syncPatchesAsync props@{ listIds, tabType }
           s {
               ngramsLocalPatch = fromNgramsPatches mempty
             , ngramsStagePatch = fromNgramsPatches mempty
-            -- First the local patch, then the newly received newPatch.
+            , ngramsValidPatch = fromNgramsPatches newPatch <> ngramsLocalPatch <> s.ngramsValidPatch
+                              -- First the already valid patch, then the local patch, then the newly received newPatch.
             , ngramsVersion    = newVersion
             }
         here.log2 "[syncPatches] ngramsVersion" newVersion
@@ -522,6 +526,7 @@ coreDispatch _ state (CommitPatch pt) =
 coreDispatch _ state ResetPatches =
   T.modify_ (_ { ngramsLocalPatch = mempty :: NgramsTablePatch
                , ngramsSelection  = mempty :: Set NgramsTerm
+               -- , ngramsValidPatch = mempty :: NgramsTablePatch
                }) state
 
 isSingleNgramsTerm :: NgramsTerm -> Boolean

src/Gargantext/Core/NgramsTable/Types.purs

@@ -507,6 +507,8 @@ type CoreState s =
   , ngramsStagePatch :: NgramsTablePatch
                      -- ^ These patches are staged (scheduled for synchronization).
                      --   Requests are being performed at the moment.
+  , ngramsValidPatch :: NgramsTablePatch
+                     -- ^ These patches have been synchronized with the server.
   , ngramsVersion    :: Version
   | s
   }