Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
purescript-gargantext
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Grégoire Locqueville
purescript-gargantext
Commits
a1d04f92
Commit
a1d04f92
authored
Apr 17, 2020
by
Alexandre Delanoë
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[API] connection to backend ok
parent
f5a32191
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
37 additions
and
21 deletions
+37
-21
package.json
package.json
+1
-1
SearchField.purs
src/Gargantext/Components/Search/SearchField.purs
+7
-7
Types.purs
src/Gargantext/Components/Search/Types.purs
+27
-11
Types.purs
src/Gargantext/Types.purs
+2
-2
No files found.
package.json
View file @
a1d04f92
{
"name"
:
"Gargantext"
,
"version"
:
"0.0.
0.4
"
,
"version"
:
"0.0.
1.3.2
"
,
"scripts"
:
{
"rebase-set"
:
"spago package-set-upgrade && spago psc-package-insdhall"
,
"rebuild-set"
:
"spago psc-package-insdhall"
,
...
...
src/Gargantext/Components/Search/SearchField.purs
View file @
a1d04f92
module Gargantext.Components.Search.SearchField
( Search, Props, defaultSearch, searchField, searchFieldComponent, isIsTex) where
import Data.Maybe (Maybe(..), maybe)
import Data.Maybe (Maybe(..), maybe
, fromMaybe
)
import Data.Newtype (over)
import Data.String (length)
import Data.Set as Set
...
...
@@ -18,7 +18,7 @@ import Gargantext.Prelude (Unit, bind, const, discard, map, pure, show, ($), (&&
import Gargantext.Data.Array (catMaybes)
import Gargantext.Components.Lang (Lang)
import Gargantext.Components.Search.Types (Data
Field(..), 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.Components.Search.Types (Data
OriginApi(..), DataField(..), Database(..), IMT_org(..), Org(..), SearchQuery(..), allIMTorgs, allOrgs, dataFields, defaultSearchQuery, doc, performSearch, readDatabase, readOrg, datafield2database
)
import Gargantext.Sessions (Session)
import Gargantext.Types as GT
import Gargantext.Utils.Reactix as R2
...
...
@@ -30,7 +30,7 @@ select :: forall props.
-> R.Element
select = R.createElement "select"
type Search = { databases ::
Array DataField
type Search = { databases ::
Database
, datafield :: Maybe DataField
, lang :: Maybe Lang
, node_id :: Maybe Int
...
...
@@ -45,7 +45,7 @@ eqSearch s s' = (s.databases == s'.databases)
&& (s.term == s'.term)
defaultSearch :: Search
defaultSearch = { databases:
[]
defaultSearch = { databases:
Empty
, datafield: Nothing
, node_id : Nothing
, lang : Nothing
...
...
@@ -261,7 +261,7 @@ dataFieldNav ({datafield} /\ setSearch) datafields =
then " active"
else ""
, on: { click: \_ -> setSearch $ _ { datafield = Just df'
, databases = [df']
, databases = datafield2database df'
}
}
-- just one database query for now
...
...
@@ -312,8 +312,8 @@ databaseInput (search /\ setSearch) dbs =
onChange e = do
let value = readDatabase $ R2.unsafeEventValue e
setSearch $ _ { datafield =
Just $ External value
, databases =
[External value] -- should append this
setSearch $ _ { datafield = Just $ External value
, databases =
fromMaybe Empty value
}
...
...
src/Gargantext/Components/Search/Types.purs
View file @
a1d04f92
...
...
@@ -40,6 +40,7 @@ data DataField = Gargantext
| Web
| Files
instance showDataField :: Show DataField where
show Gargantext = "Gargantext"
show (External _) = "Others" -- <> show x
...
...
@@ -52,24 +53,39 @@ instance docDataField :: Doc DataField where
doc Web = "All the web crawled with meta-search-engine SearX"
doc Files = "Zip files with formats.."
derive instance eqDataField :: Eq DataField
instance encodeJsonDataField :: EncodeJson DataField where
encodeJson Gargantext = encodeJson "Internal PubMed" -- later Internal Maybe Database
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
eq (External _) (External _) = true
eq Web Web = true
eq _ _ = false
-}
----------------------------------------
instance showDataOriginApi :: Show DataOriginApi where
show (InternalOrigin io) = "InternalOrigin " <> show io.api
show (ExternalOrigin io) = "ExternalOrigin " <> show io.api
derive instance eqDataOriginApi :: Eq DataOriginApi
data DataOriginApi = InternalOrigin { api :: Database }
| ExternalOrigin { api :: Database }
instance encodeJsonDataOriginApi :: EncodeJson DataOriginApi where
encodeJson (InternalOrigin dta) = "api" := dta.api ~> jsonEmptyObject
encodeJson (ExternalOrigin dta) = "api" := dta.api ~> jsonEmptyObject
datafield2dataOriginApi :: DataField -> DataOriginApi
datafield2dataOriginApi (External (Just a)) = ExternalOrigin { api : a }
datafield2dataOriginApi _ = InternalOrigin { api : IsTex } -- TOD fixme
------------------------------------------------------------------------
-- | Database search specifications
datafield2database :: DataField -> Database
datafield2database (External (Just x)) = x
datafield2database _ = Empty
allDatabases :: Array Database
allDatabases = [ Empty
, PubMed
...
...
@@ -289,7 +305,7 @@ instance showSearchOrder :: Show SearchOrder where
newtype SearchQuery = SearchQuery
{ query :: String
, databases ::
Array DataField
, databases ::
Database
, datafield :: Maybe DataField
, files_id :: Array String
, lang :: Maybe Lang
...
...
@@ -304,7 +320,7 @@ derive instance newtypeSearchQuery :: Newtype SearchQuery _
defaultSearchQuery :: SearchQuery
defaultSearchQuery = SearchQuery
{ query: ""
, databases:
[]
, databases:
Empty
, datafield: Nothing
, files_id : []
, lang : Nothing
...
...
src/Gargantext/Types.purs
View file @
a1d04f92
...
...
@@ -467,8 +467,8 @@ derive instance genericAsyncTaskType :: Generic AsyncTaskType _
asyncTaskTypePath :: AsyncTaskType -> String
asyncTaskTypePath Form = "add/form/async/"
asyncTaskTypePath
GraphT = "async/nobod
y/"
asyncTaskTypePath
Query = "add/query/async/nobody
/"
asyncTaskTypePath
Query = "quer
y/"
asyncTaskTypePath
GraphT = "async
/"
type AsyncTaskID = String
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment