Merge branch '323-dev-fix-node-update-serialization' of...

Merge branch '323-dev-fix-node-update-serialization' of ssh://gitlab.iscpif.fr:20022/gargantext/purescript-gargantext into dev-merge

src/Gargantext/Components/Forest/Tree/Node/Action/Contact/Types.purs

 module Gargantext.Components.Forest.Tree.Node.Action.Contact.Types where
 
 import Data.Generic.Rep (class Generic)
-import Data.Newtype (class Newtype)
 import Data.Show.Generic (genericShow)
+import Gargantext.Utils.SimpleJSON as GUSJ
 import Simple.JSON as JSON
 
 import Gargantext.Prelude (class Eq, class Show)
 
-newtype AddContactParams =
+data AddContactParams =
     AddContactParams { firstname :: String, lastname :: String }
+  | AddContactParamsAdvanced { firstname :: String, lastname :: String }
 derive instance Eq AddContactParams
 derive instance Generic AddContactParams _
-derive instance Newtype AddContactParams _
 instance Show AddContactParams where show = genericShow
-derive newtype instance JSON.ReadForeign AddContactParams
-derive newtype instance JSON.WriteForeign AddContactParams
+instance JSON.ReadForeign AddContactParams where readImpl = GUSJ.taggedSumRep
+instance JSON.WriteForeign AddContactParams where
+  writeImpl (AddContactParams { firstname, lastname }) =
+    JSON.writeImpl { type: "AddContactParams"
+                   , values: { firstname, lastname } }
+  writeImpl (AddContactParamsAdvanced { firstname, lastname }) =
+    JSON.writeImpl { type: "AddContactParamsAdvanced"
+                   , values: { firstname, lastname } }
+
 

src/Gargantext/Components/Forest/Tree/Node/Action/Update/Types.purs

@@ -18,10 +18,18 @@ derive instance Generic UpdateNodeParams _
 instance Show UpdateNodeParams where show = genericShow
 instance JSON.ReadForeign UpdateNodeParams where readImpl = JSONG.untaggedSumRep
 instance JSON.WriteForeign UpdateNodeParams where
-  writeImpl (UpdateNodeParamsList { methodList }) = JSON.writeImpl { methodList }
-  writeImpl (UpdateNodeParamsGraph { methodGraph }) = JSON.writeImpl { methodGraph }
-  writeImpl (UpdateNodeParamsTexts { methodTexts }) = JSON.writeImpl { methodTexts }
-  writeImpl (UpdateNodeParamsBoard { methodBoard }) = JSON.writeImpl { methodBoard }
+  writeImpl (UpdateNodeParamsList { methodList }) =
+    JSON.writeImpl { type: "UpdateNodeParamsList"
+                   , values: methodList }
+  writeImpl (UpdateNodeParamsGraph { methodGraph }) =
+    JSON.writeImpl { type: "UpdateNodeParamsGraph"
+                   , methodGraph }
+  writeImpl (UpdateNodeParamsTexts { methodTexts }) =
+    JSON.writeImpl { type: "UpdateNodeParamsTexts"
+                   , methodTexts }
+  writeImpl (UpdateNodeParamsBoard { methodBoard }) =
+    JSON.writeImpl { type: "UpdateNodeParamsBoard"
+                   , methodBoard }
 
 ----------------------------------------------------------------------
 data Method = Basic | Advanced | WithModel

src/Gargantext/Components/Nodes/Home/Public.purs

@@ -9,7 +9,6 @@ import Effect.Aff (Aff)
 import Reactix as R
 import Reactix.DOM.HTML as H
 import Simple.JSON as JSON
-import Simple.JSON.Generics as JSONG
 
 import Gargantext.Config (publicBackend)
 import Gargantext.Config.REST (get, RESTError)
@@ -17,6 +16,7 @@ import Gargantext.Ends (backendUrl)
 import Gargantext.Hooks.Loader (useLoader)
 import Gargantext.Prelude
 import Gargantext.Utils.Reactix as R2
+import Gargantext.Utils.SimpleJSON as GUSJ
 
 here :: R2.Here
 here = R2.here "Gargantext.Components.Nodes.Home.Public"
@@ -35,9 +35,8 @@ data PublicData = PublicData
 
 derive instance Eq PublicData
 derive instance Generic PublicData _
-instance JSON.ReadForeign PublicData where readImpl = JSONG.untaggedSumRep
-instance Show PublicData where
-  show = genericShow
+instance JSON.ReadForeign PublicData where readImpl = GUSJ.taggedSumRep
+instance Show PublicData where show = genericShow
 
 ------------------------------------------------------------------------
 type LoadData :: forall k. Row k