[API Query] search connection ok

f5a32191 · Alexandre Delanoë · a5b594f6 · f5a32191 · f5a32191 · f5a32191
Commit f5a32191 authored Apr 16, 2020 by Alexandre Delanoë
11 changed files
--- a/src/Gargantext/Components/App.purs
+++ b/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)

--- a/src/Gargantext/Components/Forest/Tree/Node/Action.purs
+++ b/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

--- a/src/Gargantext/Components/Forest/Tree/Node/Action/Upload.purs
+++ b/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

--- a/src/Gargantext/Components/Forest/Tree/Node/Box.purs
+++ b/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)

--- a/src/Gargantext/Components/Lang/Data/Lang.purs
+++ b/src/Gargantext/Components/Lang/Data/Lang.purs
-module Gargantext.Components.Data.Lang where
+module Gargantext.Components.Lang where

 import Data.Argonaut (class EncodeJson, encodeJson)
 import Data.Maybe (Maybe(..))

--- a/src/Gargantext/Components/Lang/Data/Landing.purs
+++ b/src/Gargantext/Components/Lang/Data/Landing.purs
--- a/src/Gargantext/Components/Nodes/Home.purs
+++ b/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 = ()


--- a/src/Gargantext/Components/Search/SearchBar.purs
+++ b/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

--- a/src/Gargantext/Components/Search/SearchField.purs
+++ b/src/Gargantext/Components/Search/SearchField.purs
@@ -16,7 +16,8 @@ import Reactix.DOM.HTML as H

 import Gargantext.Prelude (Unit, bind, const, discard, map, pure, show, ($), (&&), (<), (<$>), (<<<), (<>), (==))

-import Gargantext.Components.Data.Lang (Lang)
+import Gargantext.Data.Array (catMaybes)
+import Gargantext.Components.Lang (Lang)
 import Gargantext.Components.Search.Types (DataField(..), Database(..), IMT_org(..), Org(..), SearchQuery(..), allIMTorgs, allOrgs, dataFields, defaultSearchQuery, doc, performSearch, readDatabase, readOrg) -- (Database(..), readDatabase, Lang(..), readLang, Org(..), readOrg, allOrgs, allIMTorgs, HAL_Filters(..), IMT_org(..))
 import Gargantext.Sessions (Session)
 import Gargantext.Types as GT
@@ -29,7 +30,7 @@ select :: forall props.
          -> R.Element
 select = R.createElement "select"

-type Search = { databases :: Array Database
+type Search = { databases :: Array DataField
              , datafield :: Maybe DataField
              , lang      :: Maybe Lang
              , node_id   :: Maybe Int
@@ -39,16 +40,16 @@ type Search = { databases :: Array Database
 eqSearch :: Search -> Search -> Boolean
 eqSearch s s' =    (s.databases == s'.databases)
                && (s.datafield == s'.datafield)
-                && (s.term == s'.term)
                && (s.lang      == s'.lang)
                && (s.node_id   == s'.node_id)
+                && (s.term      == s'.term)

 defaultSearch :: Search
 defaultSearch = { databases: []
                , datafield: Nothing
-                , node_id: Nothing
-                , lang: Nothing
-                , term: ""
+                , node_id  : Nothing
+                , lang     : Nothing
+                , term     : ""
                }

 type Props =
@@ -77,7 +78,7 @@ searchFieldComponent = R.hooksComponent "G.C.S.SearchField" cpt
              [
                H.div { className: "col-md-12" }
                [ searchInput {search}
-                , if length s.term < 3
+                , if length s.term < 3  -- search with love : <3
                  then
                    H.div {}[]
                  else
@@ -101,9 +102,12 @@ searchFieldComponent = R.hooksComponent "G.C.S.SearchField" cpt
                ]
              ]
          , H.div { className : "panel-footer" }
-                [ if needsLang s.datafield then langNav search props.langs else H.div {} []
+                [ if needsLang s.datafield
+                    then langNav search props.langs
+                    else H.div {} []
                , H.div {} []
-                , H.div {className: "flex-center"} [submitButton {onSearch, search, session: props.session}]
+                , H.div {className: "flex-center"}
+                        [submitButton {onSearch, search, session: props.session}]
                ]
          ]
    eqProps :: Record Props -> Record Props -> Boolean
@@ -121,8 +125,7 @@ searchFieldComponent = R.hooksComponent "G.C.S.SearchField" cpt
          H.li {}
          [ H.input { type: "checkbox"
                    , checked: isIn org search.datafield
-                  , on: {
-                    change: \_ -> (setSearch $ _ { datafield = updateFilter org search.datafield })
+                    , on: { change: \_ -> ( setSearch $ _ { datafield = updateFilter org search.datafield })
                          }
                    }
          , if org == All_IMT
@@ -141,30 +144,73 @@ isExternal (Just (External _)) = true
 isExternal _ = false

 isHAL :: Maybe DataField -> Boolean
-isHAL (Just (External (Just (HAL _)))) = true
+isHAL (Just
+        ( External 
+          ( Just (HAL _ )
+          )
+        )
+      ) = true
 isHAL _ = false

 isIsTex :: Maybe DataField -> Boolean
-isIsTex (Just (External (Just (IsTex)))) = true
+isIsTex ( Just
+          ( External
+            ( Just ( IsTex)
+            )
+          )
+        ) = true
 isIsTex _ = false

 isIMT :: Maybe DataField -> Boolean
-isIMT (Just ( External ( Just ( HAL ( Just ( IMT _)))))) = true
+isIMT ( Just 
+        ( External
+          ( Just 
+            ( HAL 
+              ( Just ( IMT _)
+              )
+            )
+          )
+        )
+      ) = true
 isIMT _ = false

 isCNRS :: Maybe DataField -> Boolean
-isCNRS (Just ( External ( Just ( HAL ( Just ( CNRS _)))))) = true
+isCNRS ( Just
+         ( External
+          ( Just
+            ( HAL
+              ( Just ( CNRS _)
+              )
+            )
+          )
+        )
+      ) = true
 isCNRS _ = false

 needsLang :: Maybe DataField -> Boolean
 needsLang (Just Gargantext) = true
 needsLang (Just Web)        = true
-needsLang (Just ( External ( Just (HAL _)))) = true
+needsLang ( Just
+            ( External
+              ( Just (HAL _)
+              )
+            )
+          ) = true
 needsLang _                 = false


 isIn :: IMT_org -> Maybe DataField -> Boolean
-isIn org (Just (External (Just (HAL (Just (IMT imtOrgs)))))) = Set.member org imtOrgs
+isIn org ( Just
+           ( External
+             ( Just
+               ( HAL
+                 ( Just
+                   ( IMT imtOrgs )
+                 )
+               )
+             )
+           )
+         ) = Set.member org imtOrgs
 isIn _ _ = false

 updateFilter :: IMT_org -> Maybe DataField -> Maybe DataField
@@ -191,7 +237,7 @@ updateFilter org _ = (Just (External (Just (HAL (Just (IMT imtOrgs'))))))
 langNav :: R.State Search -> Array Lang -> R.Element
 langNav ({lang} /\ setSearch) langs =
  R.fragment [ H.div {className: "text-primary center"} [H.text "with lang"]
-             , H.div { className: "nav nav-tabs"} (liItem <$> langs)
+             , H.div {className: "nav nav-tabs"} (liItem <$> langs)
             ]
    where
      liItem :: Lang -> R.Element
@@ -201,23 +247,29 @@ langNav ({lang} /\ setSearch) langs =
              } [ H.text (show lang') ]

 ------------------------------------------------------------------------
-
 dataFieldNav :: R.State Search -> Array DataField -> R.Element
 dataFieldNav ({datafield} /\ setSearch) datafields =
  R.fragment [ H.div {className: "text-primary center"} [H.text "with DataField"]
-             , H.div { className: "nav nav-tabs"} (liItem <$> dataFields)
-             , H.div {className:"center"} [ H.text $ maybe "" doc datafield ]
+  , H.div {className: "nav nav-tabs"} (liItem <$> dataFields)
+             , H.div {className: "center"} [ H.text $ maybe "" doc datafield ]
             ]
    where
      liItem :: DataField -> R.Element
      liItem  df' =
-        H.div { className : "nav-item nav-link" <> if (Just df') == datafield then " active" else ""
-            , on: { click: \_ -> setSearch $ _ { datafield = Just df'} }
+        H.div { className : "nav-item nav-link"
+                          <> if (Just df') == datafield
+                               then " active"
+                               else ""
+            , on: { click: \_ -> setSearch $ _ { datafield = Just df'
+                                               , databases = [df']
+                                               }
+                    }
+            -- just one database query for now
+            -- a list a selected database needs more ergonomy
            } [ H.text (show df') ]

-
 ------------------------------------------------------------------------
-
+{-
 databaseNav  :: R.State Search
              -> Array Database
              -> R.Element
@@ -237,13 +289,12 @@ databaseNav ({datafield} /\ setSearch) dbs =
        H.div { className : "nav-item nav-link" <> if (Just $ External $ Just df') == datafield then " active" else ""
            , on: { click: \_ -> setSearch $ _ { datafield = Just $ External $ Just df' } }
            } [ H.text (show df') ]
-
-
+            -}

 databaseInput :: R.State Search
              -> Array Database
              -> R.Element
-databaseInput ({datafield} /\ setSearch) dbs =
+databaseInput (search /\ setSearch) dbs =
   H.div { className: "form-group" }
   [ H.div {className: "text-primary center"} [H.text "in database"]
   , R2.select { className: "form-control"
@@ -252,7 +303,7 @@ databaseInput ({datafield} /\ setSearch) dbs =
   , H.div {className:"center"} [ H.text $ maybe "" doc db ]
   ]
    where
-      db = case datafield of
+      db = case search.datafield of
        (Just (External (Just x))) -> Just x
        _                          -> Nothing

@@ -260,8 +311,10 @@ databaseInput ({datafield} /\ setSearch) dbs =
      liItem  db' = H.option {className : "text-primary center"} [ H.text (show db') ]

      onChange e = do
-        let value = R2.unsafeEventValue e
-        setSearch $ _ {datafield =  Just $ External $ readDatabase value }
+        let value = readDatabase $ R2.unsafeEventValue e
+        setSearch $ _ { datafield =  Just $ External value
+                      , databases = [External value] -- should append this
+                      }


 orgInput :: R.State Search -> Array Org -> R.Element
@@ -279,9 +332,11 @@ orgInput ({datafield} /\ setSearch) orgs =
        let value = R2.unsafeEventValue e
        setSearch $ _ { datafield = Just $ External $ Just $ HAL $ readOrg value }

+{-
 filterInput :: R.State String -> R.Element
 filterInput (term /\ setTerm) =
-  H.div {className: "form-group"} [ H.input { defaultValue: term
+  H.div { className: "form-group" }
+        [ H.input { defaultValue: term
                  , className: "form-control"
                  , type: "text"
                  , on: { change: setTerm <<< const <<< R2.unsafeEventValue }
@@ -292,7 +347,7 @@ filterInput (term /\ setTerm) =
                  , placeholder : "Filter with struct_Ids as integer" 
                  }
         ]
-
+-}

 type SearchInputProps =
  (
@@ -312,15 +367,15 @@ searchInputComponent = R.hooksComponent "G.C.S.SearchInput" cpt
                  , className: "form-control"
                  , type: "text"
                  , on: { change : onChange setSearch }
-                  , placeholder: "Your Query here" }
+                  , placeholder: "Your Query here"
+                  }
        ]
    onChange setSearch e = do
      let value = R2.unsafeEventValue e
      setSearch $ _ { term = value }

 type SubmitButtonProps =
-  (
-    onSearch :: GT.AsyncTaskWithType -> Effect Unit
+  ( onSearch :: GT.AsyncTaskWithType -> Effect Unit
  , search :: R.State Search
  , session :: Session
  )
@@ -331,12 +386,12 @@ submitButton p = R.createElement submitButtonComponent p []
 submitButtonComponent :: R.Component SubmitButtonProps
 submitButtonComponent = R.hooksComponent "G.C.S.SubmitButton" cpt
  where
-    cpt {onSearch, search: (search /\ _), session} _ =
+    cpt {onSearch, search: (mySearch /\ _), session} _ =
      pure $
        H.button { className: "btn btn-primary"
-                 , type: "button"
-                 , on: {click: doSearch onSearch session search}
-                 , style: { width: "100%" }
+                 , "type"   : "button"
+                 , on       : {click: doSearch onSearch session mySearch}
+                 , style    : { width: "100%" }
                 } [ H.text "Launch Search" ]

    doSearch os s q = \_ -> do
@@ -346,14 +401,18 @@ submitButtonComponent = R.hooksComponent "G.C.S.SubmitButton" cpt
      --  "" -> setSearch $ const defaultSearch
      --  _  -> setSearch $ const q

-triggerSearch :: (GT.AsyncTaskWithType -> Effect Unit) -> Session -> Search -> Effect Unit
+triggerSearch :: (GT.AsyncTaskWithType -> Effect Unit)
+              -> Session
+              -> Search
+              -> Effect Unit
 triggerSearch os s q =
  launchAff_ $ do
-
    liftEffect $ do
-      -- log2 "Searching datafield: " $ show q.database
-      log2 "[triggerSearch] Searching term: " q.term
-      log2 "[triggerSearch] Searching lang: " q.lang
+      let here = "[triggerSearch] Searching "
+      log2 (here <> "databases: ") (show q.databases)
+      log2 (here <> "datafield: ") (show q.datafield)
+      log2 (here <> "term: ")            q.term
+      log2 (here <> "lang: ")      (show q.lang)

    case q.node_id of
      Nothing -> liftEffect $ log "[triggerSearch] node_id is Nothing, don't know what to do"
@@ -371,9 +430,9 @@ searchQuery :: Search -> SearchQuery
 searchQuery {datafield: Nothing, term} =
  over SearchQuery (_ {query=term}) defaultSearchQuery
 searchQuery {databases, datafield, lang, term, node_id} =
-  over SearchQuery (_ { databases=databases
-                      , datafield=datafield
-                      , lang=lang
-                      , query=term
-                      , node_id=node_id
+  over SearchQuery (_ { databases= databases
+                      , datafield= datafield
+                      , lang     = lang
+                      , query    = term
+                      , node_id  = node_id
                      }) defaultSearchQuery
--- a/src/Gargantext/Components/Search/Types.purs
+++ b/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

--- a/src/Gargantext/Types.purs
+++ b/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