Merge remote-tracking branch 'origin/600-dev-wip-graphql-error-format' into dev-merge

src/Gargantext/API/GraphQL.hs

@@ -65,9 +65,9 @@ data Query m
     , context_ngrams      :: GQLCTX.ContextNgramsArgs -> m [Text]
     , contexts            :: GQLCTX.NodeContextArgs -> m [GQLCTX.NodeContextGQL]
     , contexts_for_ngrams :: GQLCTX.ContextsForNgramsArgs -> m [GQLCTX.ContextGQL]
-    , imt_schools         :: GQLIMT.SchoolsArgs -> m [GQLIMT.School]
+    , imt_schools         :: m [GQLIMT.School]
     , job_logs            :: GQLAT.JobLogArgs -> m (Map Int JobLog)
-    , languages           :: GQLNLP.LanguagesArgs -> m GQLNLP.LanguagesMap
+    , languages           :: m [GQLNLP.LanguageTuple]
     , nodes               :: GQLNode.NodeArgs -> m [GQLNode.Node]
     , nodes_corpus        :: GQLNode.CorpusArgs -> m [GQLNode.Corpus]
     , node_parent         :: GQLNode.NodeParentArgs -> m [GQLNode.Node]

src/Gargantext/API/GraphQL/IMT.hs

@@ -19,5 +19,5 @@ newtype SchoolsArgs
     deriving anyclass (GQLType)
 
 resolveSchools
-  :: SchoolsArgs -> GqlM e env [School]
-resolveSchools (SchoolsArgs ()) = pure $ schools
+  :: GqlM e env [School]
+resolveSchools = pure $ schools

src/Gargantext/API/GraphQL/NLP.hs

@@ -5,6 +5,7 @@ module Gargantext.API.GraphQL.NLP
   ( Lang(..)
   , LanguagesArgs(..)
   , LanguagesMap
+  , LanguageTuple
   , resolveLanguages
   )
   where
@@ -24,6 +25,11 @@ newtype LanguagesArgs
     deriving anyclass (GQLType)
 
 type LanguagesMap = Map.Map Lang NLPServer
+data LanguageTuple =
+  LanguageTuple { lt_lang   :: Lang
+                , lt_server :: NLPServer }
+    deriving stock (Generic)
+    deriving anyclass (GQLType)
 
 data NLPServer = NLPServer
   {
@@ -33,11 +39,11 @@ data NLPServer = NLPServer
   deriving (Show, Eq, Generic, GQLType)
 
 resolveLanguages
-  :: HasNLPServer env => LanguagesArgs -> GqlM e env LanguagesMap
-resolveLanguages ( LanguagesArgs () ) = do
-  -- pure $ allLangs
+  :: HasNLPServer env => GqlM e env [LanguageTuple]
+resolveLanguages = do
   lift $ do
     ns <- view nlpServer
     printDebug "[resolveLanguages] nlpServer" ns
-    pure $ Map.map (\(NLPServerConfig { .. }) -> NLPServer { server
-                                                           , url = Protolude.show url }) ns
+    pure $ [LanguageTuple { lt_lang = lang
+                          , lt_server = NLPServer { server, url = Protolude.show url } }
+           | (lang, NLPServerConfig { .. }) <- Map.toList ns]