[SEARCH FORM][WIP] Before Fun with Types.

src/Gargantext/Components/Search/SearchField.purs

 module Gargantext.Components.Search.SearchField
   ( Search, Props, searchField, searchFieldComponent )where
 
-import Prelude (bind, const, identity, pure, show, ($), (/=), (<$>), (||), (==), map, (<>), (&&), (*>), (>>=), (>=>))
+import Prelude (bind, const, identity, pure, show, ($), (/=), (<$>), (||), (==), map, (<>), (&&), (*>), (>>=), (>=>), (<))
 import Data.Maybe (Maybe(..), maybe, isJust)
+import Data.String (length)
 import Data.Set as Set
 import Data.Tuple (fst)
 import Data.Tuple.Nested ((/\))
@@ -65,14 +66,18 @@ searchFieldComponent = R.memo (R.hooksComponent "SearchField" cpt) hasChanged
       pure $
           div { className: "search-field-group" }
               [ searchInput term
-              , if curTerm == ""
-                   then div {}[]
-                   else div {} [ langNav lang props.langs
+              , if length curTerm < 3
+                  then
+                    div {}[]
+                  else
+                    div {} [ langNav lang props.langs
                            , if curLg == Nothing
-                                    then div {}[]
-                                    else div {} [ dataFieldNav  df dataFields
+                               then
+                                 div {}[]
+                               else
+                                 div {} [ dataFieldNav  df dataFields
                                          , if curDf == Just (External Nothing)
-                                                     then databaseInput db filters org props.databases
+                                             then databaseInput df db filters org props.databases
                                              else div {} []
 
                                          , if isHAL curDb
@@ -87,9 +92,9 @@ searchFieldComponent = R.memo (R.hooksComponent "SearchField" cpt) hasChanged
                                                      [ ul {} $ map ( \org' -> li {}
                                                                    [ input { type: "checkbox"
                                                                            , checked: isInFilters org' curFilters
-                                                                                  , on: {change: \_ -> setFilters
+                                                                           , on: {change: \_ -> (setFilters
                                                                                              $ const
-                                                                                                    $ updateFilter org' curFilters
+                                                                                             $ updateFilter org' curFilters)
                                                                                  }
                                                                            }
                                                                    , if org' == All_IMT
@@ -107,9 +112,9 @@ searchFieldComponent = R.memo (R.hooksComponent "SearchField" cpt) hasChanged
                                                         div {} []
                                              else
                                                div {} []
-                                                 , submitButton node_id db term lang org filters props.search
                                          ]
                           ]
+              , submitButton node_id db term lang org filters props.search
               ]
     hasChanged p p' = (fst p.search /= fst p'.search)
                    || (p.databases  /= p'.databases )
@@ -183,6 +188,7 @@ dataFieldNav :: R.State (Maybe DataField) -> Array DataField -> R.Element
 dataFieldNav (df /\ setDf) datafields =
   R.fragment [ div {className: "text-primary center"} [text "with DataField"]
              , div { className: "nav nav-tabs"} (liItem <$> dataFields)
+             , div {className:"center"} [ text $ maybe "" doc df ]
              ]
     where
       liItem :: DataField -> R.Element
@@ -193,12 +199,13 @@ dataFieldNav (df /\ setDf) datafields =
 
 
 ------------------------------------------------------------------------
-databaseInput :: R.State (Maybe Database)
+databaseInput :: R.State (Maybe DataField)
+              -> R.State (Maybe Database)
               -> R.State (Maybe HAL_Filters)
               -> R.State (Maybe Org)
               -> Array Database
               -> R.Element
-databaseInput (db /\ setDB) (_ /\ setFilters) (_ /\ setOrg) dbs =
+databaseInput (df /\ setDf) (db /\ setDB) (_ /\ setFilters) (_ /\ setOrg) dbs =
    div { className: "form-group" }
                    [ div {className: "text-primary center"} [text "in database"]
                    , R2.select { className: "form-control"
@@ -208,6 +215,7 @@ databaseInput (db /\ setDB) (_ /\ setFilters) (_ /\ setOrg) dbs =
                                          $ e .. "target" .. "value")
                                          *> (setOrg     $ const Nothing)
                                          *> (setFilters $ const Nothing)
+                                         *> (setDf $ const $ Just $ External db)
                                    }
                                } (liItem <$> dbs)
                    , div {className:"center"} [ text $ maybe "" doc db ]

src/Gargantext/Components/Search/Types.purs

@@ -60,28 +60,33 @@ instance encodeJsonLang :: EncodeJson Lang where
 
 dataFields :: Array DataField
 dataFields = [ Gargantext
-             , External Nothing
              , Web
+             , External Nothing
+             , Files
              ]
 
 data DataField = Gargantext
                | External (Maybe Database)
                | Web
+               | Files
 
 instance showDataField :: Show DataField where
   show Gargantext   = "In Gargantext"
   show (External _) = "Ext.Database"
   show Web          = "Web"
+  show Files        = "Files"
 
 instance docDataField :: Doc DataField where
   doc Gargantext   = "All Gargantext Database"
   doc (External _) = "External (scientific) databases"
   doc Web          = "All the web crawled with meta-search-engine SearX"
+  doc Files        = "Zip files with formats.."
 
 instance eqDataField :: Eq DataField where
   eq Gargantext Gargantext = true
   eq (External _) (External _) = true
   eq Web Web = true
+  eq Files Files = true
   eq _ _     = false
 
 ------------------------------------------------------------------------