[patch] fixes for missing transformWith clause in patch apply

src/Gargantext/API/Ngrams.hs

@@ -212,7 +212,7 @@ ngramsStatePatchConflictResolution
 ngramsStatePatchConflictResolution _ngramsType _ngramsTerm
    = (ours, (const ours, ours), (False, False))
                              -- (False, False) mean here that Mod has always priority.
---  = (ours, (const ours, ours), (True, False))
+ -- = (ours, (const ours, ours), (True, False))
                              -- (True, False) <- would mean priority to the left (same as ours).
   -- undefined {- TODO think this through -}, listTypeConflictResolution)
 
@@ -311,7 +311,11 @@ commitStatePatch listId (Versioned _p_version p) = do
       --q = mconcat $ take (a ^. a_version - p_version) (a ^. a_history)
       q = mconcat $ a ^. a_history
 
-    printDebug "transformWith" (p,q)
+    --printDebug "[commitStatePatch] transformWith" (p,q)
+    -- let tws s = case s of
+    --       (Mod p) -> "Mod"
+    --       _ -> "Rpl"
+    -- printDebug "[commitStatePatch] transformWith" (tws $ p ^. _NgramsPatch, tws $ q ^. _NgramsPatch)
 
     let
       (p', q') = transformWith ngramsStatePatchConflictResolution p q

stack.yaml

@@ -93,8 +93,10 @@ extra-deps:
 - git: https://github.com/delanoe/patches-map
   commit: 76cae88f367976ff091e661ee69a5c3126b94694
   #- git: https://gitlab.com/npouillard/patches-class.git  
-- git: https://gitlab.iscpif.fr/gargantext/patches-class.git
-  commit: d3e971d4e78d1dfcc853f2fb86bde1995faf22ae
+#- git: https://gitlab.iscpif.fr/gargantext/patches-class.git
+#  commit: d3e971d4e78d1dfcc853f2fb86bde1995faf22ae
+- git: https://gitlab.iscpif.fr/cgenie/patches-class.git
+  commit: 125c7cb90ab8f0cd6ac4a526dbdf302d10c945e9
 
   # Graph libs
 #- git: https://github.com/kaizhang/haskell-igraph.git