[API Query] search connection ok

src/Gargantext/Components/App.purs

@@ -13,7 +13,7 @@ import Effect.Class (liftEffect)
 import Reactix as R
 import Reactix.DOM.HTML as H
 
-import Gargantext.Components.Data.Lang (LandingLang(..))
+import Gargantext.Components.Lang (LandingLang(..))
 import Gargantext.Components.Forest (forest)
 import Gargantext.Components.GraphExplorer (explorerLayout)
 import Gargantext.Components.Login (login)

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

@@ -9,7 +9,7 @@ import Data.Newtype (class Newtype)
 import Effect.Aff (Aff)
 import Prelude hiding (div)
 
-import Gargantext.Components.Data.Lang (Lang)
+import Gargantext.Components.Lang (Lang)
 import Gargantext.Routes (SessionRoute(..))
 import Gargantext.Sessions (Session, get, put, post, delete)
 import Gargantext.Types as GT

src/Gargantext/Components/Forest/Tree/Node/Action/Upload.purs

@@ -18,7 +18,7 @@ import Web.File.FileReader.Aff (readAsText)
 
 import Gargantext.Prelude (class Show, Unit, bind, const, discard, map, pure, show, unit, void, ($), (&&), (/=), (<>))
 
-import Gargantext.Components.Data.Lang (readLang, Lang(..))
+import Gargantext.Components.Lang (readLang, Lang(..))
 import Gargantext.Components.Forest.Tree.Node.Action (Action(..), DroppedFile(..), FTree, FileType(..), ID, LNode(..), NTree(..), UploadFile, UploadFileContents(..), readFileType)
 import Gargantext.Hooks.Loader (useLoader)
 import Gargantext.Routes as GR

src/Gargantext/Components/Forest/Tree/Node/Box.purs

@@ -18,7 +18,7 @@ import URI.Extra.QueryPairs as NQP
 import URI.Query as Query
 import Web.File.FileReader.Aff (readAsText)
 
-import Gargantext.Components.Data.Lang (allLangs, Lang(EN))
+import Gargantext.Components.Lang (allLangs, Lang(EN))
 import Gargantext.Components.Forest.Tree.Node (NodeAction(..), SettingsBox(..), glyphiconNodeAction, settingsBox)
 import Gargantext.Components.Forest.Tree.Node.Action (Action(..), DroppedFile(..), FileType(..), ID, Name, UploadFileContents(..))
 import Gargantext.Components.Forest.Tree.Node.Action.Add (NodePopup(..), createNodeView)

src/Gargantext/Components/Lang/Data/Lang.purs → src/Gargantext/Components/Lang.purs

-module Gargantext.Components.Data.Lang where
+module Gargantext.Components.Lang where
 
 import Data.Argonaut (class EncodeJson, encodeJson)
 import Data.Maybe (Maybe(..))

src/Gargantext/Components/Nodes/Home.purs

@@ -10,7 +10,7 @@ import Gargantext.Components.Lang.Landing.EnUS as En
 import Gargantext.Components.Lang.Landing.FrFR as Fr
 import Gargantext.Components.Data.Landing
   (BlockText(..), BlockTexts(..), Button(..), LandingData(..))
-import Gargantext.Components.Data.Lang (LandingLang(..))
+import Gargantext.Components.Lang (LandingLang(..))
 
 type Props = ()
 

src/Gargantext/Components/Search/SearchBar.purs

@@ -4,16 +4,14 @@ module Gargantext.Components.Search.SearchBar
 
 import Data.Tuple.Nested ((/\))
 import Effect (Effect)
-import Reactix as R
-import Reactix.DOM.HTML as H
-
-import Gargantext.Prelude (Unit, pure, ($))
-
-import Gargantext.Components.Data.Lang (Lang)
-import Gargantext.Components.Search.Types (allDatabases) -- (Database, SearchQuery(..), defaultSearchQuery, performSearch, Lang(..))
+import Gargantext.Components.Lang (Lang)
 import Gargantext.Components.Search.SearchField (Search, searchField)
+import Gargantext.Components.Search.Types (allDatabases) -- (Database, SearchQuery(..), defaultSearchQuery, performSearch, Lang(..))
+import Gargantext.Prelude (Unit, pure, ($))
 import Gargantext.Sessions (Session)
 import Gargantext.Types as GT
+import Reactix as R
+import Reactix.DOM.HTML as H
 
 type Props = ( langs     :: Array Lang
              , onSearch  :: GT.AsyncTaskWithType -> Effect Unit

src/Gargantext/Components/Search/Types.purs

@@ -14,7 +14,7 @@ import URI.Query as Q
 
 import Gargantext.Prelude (class Eq, class Ord, class Show, bind, map, pure, show, ($), (<>))
 
-import Gargantext.Components.Data.Lang
+import Gargantext.Components.Lang
 import Gargantext.Ends (class ToUrl, backendUrl)
 import Gargantext.Routes as GR
 import Gargantext.Sessions (Session(..), post)
@@ -42,7 +42,7 @@ data DataField = Gargantext
 
 instance showDataField :: Show DataField where
   show Gargantext   = "Gargantext"
-  show (External x) = "External" -- <> show x
+  show (External _) = "Others" -- <> show x
   show Web          = "Web"
   show Files        = "Files"
 
@@ -55,6 +55,11 @@ instance docDataField :: Doc DataField where
 
 derive instance eqDataField :: Eq DataField
 
+instance encodeJsonDataField :: EncodeJson DataField where
+  encodeJson Gargantext   = encodeJson "Internal PubMed" -- later Internal Maybe Database
+  encodeJson (External (Just db)) = encodeJson $ "External " <> show db
+  encodeJson a                    = encodeJson (show a)
+
 {-
 instance eqDataField :: Eq DataField where
   eq Gargantext Gargantext = true
@@ -66,7 +71,8 @@ instance eqDataField :: Eq DataField where
 -- | Database search specifications
 
 allDatabases :: Array Database
-allDatabases = [ PubMed
+allDatabases = [ Empty
+               , PubMed
                , HAL Nothing
                , IsTex
                , Isidore
@@ -76,6 +82,7 @@ allDatabases = [ PubMed
                ]
 
 data Database = All_Databases
+              | Empty
               | PubMed
               | HAL (Maybe Org)
               | IsTex
@@ -89,6 +96,7 @@ instance showDatabase :: Show Database where
   show (HAL _)= "HAL"
   show IsTex  = "IsTex"
   show Isidore= "Isidore"
+  show Empty  = "Empty"
 --  show News   = "News"
 --  show SocialNetworks = "Social Networks"
 
@@ -98,6 +106,7 @@ instance docDatabase :: Doc Database where
   doc (HAL _)     = "All open science (archives ouvertes)"
   doc IsTex       = "All Elsevier enriched by CNRS/INIST"
   doc Isidore     = "All (French) Social Sciences"
+  doc Empty       = "Empty"
 --  doc News        = "Web filtered by News"
 --  doc SocialNetworks = "Web filtered by MicroBlogs"
 
@@ -116,6 +125,7 @@ derive instance eqDatabase :: Eq Database
 
 instance encodeJsonDatabase :: EncodeJson Database where
   encodeJson a = encodeJson (show a)
+
 ------------------------------------------------------------------------
 -- | Organization specifications
 
@@ -279,7 +289,7 @@ instance showSearchOrder :: Show SearchOrder where
 
 newtype SearchQuery = SearchQuery
   { query     :: String
-  , databases :: Array Database
+  , databases :: Array DataField
   , datafield :: Maybe DataField
   , files_id  :: Array String
   , lang      :: Maybe Lang
@@ -298,10 +308,10 @@ defaultSearchQuery = SearchQuery
   , datafield: Nothing
   , files_id : []
   , lang     : Nothing
-  , limit: Nothing
+  , limit    : Nothing
   , node_id  : Nothing
-  , offset: Nothing
-  , order: Nothing
+  , offset   : Nothing
+  , order    : Nothing
   }
 
 instance toUrlSessionSearchQuery :: ToUrl Session SearchQuery where

src/Gargantext/Types.purs

@@ -468,7 +468,7 @@ derive instance genericAsyncTaskType :: Generic AsyncTaskType _
 asyncTaskTypePath :: AsyncTaskType -> String
 asyncTaskTypePath Form   = "add/form/async/"
 asyncTaskTypePath GraphT = "async/nobody/"
-asyncTaskTypePath Query  = "add/query/async/"
+asyncTaskTypePath Query  = "add/query/async/nobody/"
 
 type AsyncTaskID = String