Commit ba44095b authored by Przemyslaw Kaminski's avatar Przemyslaw Kaminski

Merge branch 'dev' into 78-dev-list-ids

parents 1b2ffbc3 eed1436a
Pipeline #1783 failed with stage
in 6 minutes and 31 seconds
name: gargantext name: gargantext
version: '0.0.3.1' version: '0.0.3.2'
synopsis: Search, map, share synopsis: Search, map, share
description: Please see README.md description: Please see README.md
category: Data category: Data
......
...@@ -30,6 +30,7 @@ import Gargantext.Database.Prelude ...@@ -30,6 +30,7 @@ import Gargantext.Database.Prelude
import Gargantext.Database.Query.Tree (findNodesWithType) import Gargantext.Database.Query.Tree (findNodesWithType)
import Gargantext.Database.Query.Table.Node.Error (HasNodeError(..)) import Gargantext.Database.Query.Table.Node.Error (HasNodeError(..))
import Gargantext.Prelude import Gargantext.Prelude
import qualified Gargantext.Utils.Aeson as GUA
import Servant import Servant
import Test.QuickCheck (elements) import Test.QuickCheck (elements)
import Test.QuickCheck.Arbitrary import Test.QuickCheck.Arbitrary
...@@ -42,9 +43,9 @@ data ShareNodeParams = ShareTeamParams { username :: Text } ...@@ -42,9 +43,9 @@ data ShareNodeParams = ShareTeamParams { username :: Text }
------------------------------------------------------------------------ ------------------------------------------------------------------------
-- TODO unPrefix "pn_" FromJSON, ToJSON, ToSchema, adapt frontend. -- TODO unPrefix "pn_" FromJSON, ToJSON, ToSchema, adapt frontend.
instance FromJSON ShareNodeParams where instance FromJSON ShareNodeParams where
parseJSON = genericParseJSON (defaultOptions { sumEncoding = ObjectWithSingleField }) parseJSON = genericParseJSON (defaultOptions { sumEncoding = GUA.defaultTaggedObject })
instance ToJSON ShareNodeParams where instance ToJSON ShareNodeParams where
toJSON = genericToJSON (defaultOptions { sumEncoding = ObjectWithSingleField }) toJSON = genericToJSON (defaultOptions { sumEncoding = GUA.defaultTaggedObject })
instance ToSchema ShareNodeParams instance ToSchema ShareNodeParams
instance Arbitrary ShareNodeParams where instance Arbitrary ShareNodeParams where
arbitrary = elements [ ShareTeamParams "user1" arbitrary = elements [ ShareTeamParams "user1"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment