Commit 25507fe9 authored by Przemyslaw Kaminski's avatar Przemyslaw Kaminski

[bootstrap v4] fix node tools search iframe styling

parent 111e9651
...@@ -14,8 +14,8 @@ import Gargantext.Components.Lang (Lang) ...@@ -14,8 +14,8 @@ import Gargantext.Components.Lang (Lang)
import Gargantext.Prelude (Unit, pure, ($)) import Gargantext.Prelude (Unit, pure, ($))
import Gargantext.Sessions (Session) import Gargantext.Sessions (Session)
import Gargantext.Types as GT import Gargantext.Types as GT
import Gargantext.Utils.Reactix as R2
thisModule :: String
thisModule = "Gargantext.Components.Forest.Tree.Node.Action.Search.SearchBar" thisModule = "Gargantext.Components.Forest.Tree.Node.Action.Search.SearchBar"
type Props = ( langs :: Array Lang type Props = ( langs :: Array Lang
......
...@@ -5,7 +5,6 @@ import Data.Maybe (Maybe(..), maybe, fromMaybe) ...@@ -5,7 +5,6 @@ import Data.Maybe (Maybe(..), maybe, fromMaybe)
import Data.Nullable (null) import Data.Nullable (null)
import Data.Newtype (over) import Data.Newtype (over)
import Data.Set as Set import Data.Set as Set
import Data.String (length)
import Data.Tuple.Nested ((/\)) import Data.Tuple.Nested ((/\))
import Effect (Effect) import Effect (Effect)
import Effect.Aff (launchAff_) import Effect.Aff (launchAff_)
...@@ -24,6 +23,7 @@ import Gargantext.Components.Forest.Tree.Node.Action.Search.Frame (searchIframes ...@@ -24,6 +23,7 @@ import Gargantext.Components.Forest.Tree.Node.Action.Search.Frame (searchIframes
import Gargantext.Types as GT import Gargantext.Types as GT
import Gargantext.Utils.Reactix as R2 import Gargantext.Utils.Reactix as R2
thisModule :: String
thisModule = "Gargantext.Components.Forest.Tree.Node.Action.Search.SearchField" thisModule = "Gargantext.Components.Forest.Tree.Node.Action.Search.SearchField"
defaultSearch :: Search defaultSearch :: Search
...@@ -78,18 +78,24 @@ searchField p = R.createElement searchFieldComponent p [] ...@@ -78,18 +78,24 @@ searchField p = R.createElement searchFieldComponent p []
, if isCNRS s.datafield , if isCNRS s.datafield
then componentCNRS search then componentCNRS search
else H.div {} [] else H.div {} []
, H.div {} [ searchIframes { iframeRef, search } ]
, if needsLang s.datafield , if needsLang s.datafield
then langNav search props.langs then langNav search props.langs
else H.div {} [] else H.div {} []
, H.div {} [ searchIframes { iframeRef, search } ]
] ]
] ]
let button = submitButton {onSearch, search, session: props.session} let button = submitButton {onSearch, search, session: props.session}
pure $ panel params button pure $ H.div { className: "search-field" }
[ H.div { className: "row" }
[ H.div { className: "col-12" } params ]
, H.div { className: "row" }
[ H.div { className: "col-12" } [ button ] ]
]
--pure $ panel params button
componentIMT (search /\ setSearch) = componentIMT (search /\ setSearch) =
...@@ -252,27 +258,6 @@ dataFieldNav ({datafield} /\ setSearch) datafields = ...@@ -252,27 +258,6 @@ dataFieldNav ({datafield} /\ setSearch) datafields =
isActive = show (Just df') == show datafield isActive = show (Just df') == show datafield
------------------------------------------------------------------------ ------------------------------------------------------------------------
{-
databaseNav :: R.State Search
-> Array Database
-> R.Element
databaseNav ({datafield} /\ setSearch) dbs =
R.fragment [ H.div {className: "text-primary center"} [H.text "with DataField"]
, H.div { className: "nav nav-tabs"} (liItem <$> dbs)
, H.div {className:"center"} [ H.text $ maybe "" doc db ]
]
where
db = case datafield of
(Just (External (Just x))) -> Just x
_ -> Nothing
liItem :: Database -> R.Element
liItem df' =
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') ]
-}
type DatabaseInputProps = ( type DatabaseInputProps = (
databases :: Array Database databases :: Array Database
...@@ -352,10 +337,10 @@ type SearchInputProps = ...@@ -352,10 +337,10 @@ type SearchInputProps =
) )
searchInput :: Record SearchInputProps -> R.Element searchInput :: Record SearchInputProps -> R.Element
searchInput p = R.createElement searchInputComponent p [] searchInput p = R.createElement searchInputCpt p []
where where
searchInputComponent :: R.Component SearchInputProps searchInputCpt :: R.Component SearchInputProps
searchInputComponent = R.hooksComponentWithModule thisModule "searchInput" cpt searchInputCpt = R.hooksComponentWithModule thisModule "searchInput" cpt
cpt {search: (search@{ term } /\ setSearch)} _ = do cpt {search: (search@{ term } /\ setSearch)} _ = do
valueRef <- R.useRef term valueRef <- R.useRef term
......
...@@ -35,20 +35,20 @@ type Footer = R.Element ...@@ -35,20 +35,20 @@ type Footer = R.Element
panel :: Body -> Footer -> R.Element panel :: Body -> Footer -> R.Element
panel bodies submit = panel bodies submit =
R.fragment [ panelBody bodies, footer submit ] R.fragment [ panelBody, footer ]
where where
panelBody bs = panelBody =
H.div { className: "card-body" } H.div { className: "card-body" }
[ H.div { className: "row" } [ H.div { className: "row" }
[ H.div { className: "col-12" } bs [ H.div { className: "col-12" } bodies
-- TODO add type for text or form here -- TODO add type for text or form here
-- [ H.form {className: "form-horizontal"} bs ] -- [ H.form {className: "form-horizontal"} bodies ]
] ]
] ]
footer sb = footer =
H.div {className: "card-footer"} H.div {className: "card-footer"}
[ H.div { className: "row" } [ H.div { className: "row" }
[ H.div { className: "mx-auto"} [ sb ] [ H.div { className: "mx-auto"} [ submit ]
] ]
] ]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment