Commit a535f984 authored by Alexandre Delanoë's avatar Alexandre Delanoë

Merge remote-tracking branch 'origin/618-trim-deblank-missing-in-invitations-modal-box' into dev

parents 2ba047b3 63a5ef70
...@@ -6,7 +6,7 @@ import Data.Array (filter, nub) ...@@ -6,7 +6,7 @@ import Data.Array (filter, nub)
import Data.Generic.Rep (class Generic) import Data.Generic.Rep (class Generic)
import Data.Maybe (Maybe(..)) import Data.Maybe (Maybe(..))
import Data.Show.Generic (genericShow) import Data.Show.Generic (genericShow)
import Data.String (Pattern(..), contains) import Data.String (Pattern(..), contains, trim)
import Data.Tuple.Nested ((/\)) import Data.Tuple.Nested ((/\))
import Effect.Aff (Aff) import Effect.Aff (Aff)
import Gargantext.Components.Forest.Tree.Node.Action.Types (Action) import Gargantext.Components.Forest.Tree.Node.Action.Types (Action)
...@@ -40,7 +40,7 @@ getCompletionsReq { session } = ...@@ -40,7 +40,7 @@ getCompletionsReq { session } =
get session GR.Members get session GR.Members
shareAction :: String -> Action shareAction :: String -> Action
shareAction username = Action.ShareTeam username shareAction username = Action.ShareTeam (trim username)
------------------------------------------------------------------------ ------------------------------------------------------------------------
...@@ -99,6 +99,8 @@ shareNodeInnerCpt = here.component "shareNodeInner" cpt ...@@ -99,6 +99,8 @@ shareNodeInnerCpt = here.component "shareNodeInner" cpt
, autocompleteSearch , autocompleteSearch
, onAutocompleteClick , onAutocompleteClick
, text , text
, pattern: "^\\S+$" -- pattern doesn't allow space characters
, title: "Enter a username or an email address (space characters are not allowed)"
, placeholder: "username or email"} , placeholder: "username or email"}
] (H.div {} [H.text text']) ] (H.div {} [H.text text'])
where where
......
...@@ -66,6 +66,8 @@ nodeSearchControlCpt = here.component "nodeSearchControl" cpt ...@@ -66,6 +66,8 @@ nodeSearchControlCpt = here.component "nodeSearchControl" cpt
, onEnterPress: doSearch , onEnterPress: doSearch
, classes: "filter-results-completions rounded-circle-2 text-small py-0" , classes: "filter-results-completions rounded-circle-2 text-small py-0"
, state: search , state: search
, pattern: ".*"
, title: ""
, placeholder: "find and select a term here..." , placeholder: "find and select a term here..."
} }
, ,
......
...@@ -7,6 +7,7 @@ import DOM.Simple as DOM ...@@ -7,6 +7,7 @@ import DOM.Simple as DOM
import DOM.Simple.Event as DE import DOM.Simple.Event as DE
import Data.Maybe (Maybe(..), maybe) import Data.Maybe (Maybe(..), maybe)
import Data.Nullable (Nullable, null, toMaybe) import Data.Nullable (Nullable, null, toMaybe)
import Data.String as S
import Effect (Effect) import Effect (Effect)
import Effect.Aff (Aff, launchAff_) import Effect.Aff (Aff, launchAff_)
import FFI.Simple ((..)) import FFI.Simple ((..))
...@@ -31,6 +32,8 @@ type Props = ...@@ -31,6 +32,8 @@ type Props =
, onAutocompleteClick :: String -> Effect Unit , onAutocompleteClick :: String -> Effect Unit
, onEnterPress :: String -> Effect Unit , onEnterPress :: String -> Effect Unit
, placeholder :: String , placeholder :: String
, pattern :: String
, title :: String
, state :: T.Box String , state :: T.Box String
) )
...@@ -44,6 +47,8 @@ inputWithAutocompleteCpt = here.component "inputWithAutocomplete" cpt ...@@ -44,6 +47,8 @@ inputWithAutocompleteCpt = here.component "inputWithAutocomplete" cpt
, onAutocompleteClick , onAutocompleteClick
, onEnterPress , onEnterPress
, placeholder , placeholder
, pattern
, title
, state } _ = do , state } _ = do
-- States -- States
state' <- T.useLive T.unequal state state' <- T.useLive T.unequal state
...@@ -68,6 +73,8 @@ inputWithAutocompleteCpt = here.component "inputWithAutocomplete" cpt ...@@ -68,6 +73,8 @@ inputWithAutocompleteCpt = here.component "inputWithAutocomplete" cpt
, ref: inputRef , ref: inputRef
, className: "form-control" , className: "form-control"
, value: state' , value: state'
, pattern: pattern
, title: title
, placeholder , placeholder
, on: { focus: onFocus completions state' , on: { focus: onFocus completions state'
, input: onInput completions , input: onInput completions
...@@ -114,7 +121,7 @@ inputWithAutocompleteCpt = here.component "inputWithAutocomplete" cpt ...@@ -114,7 +121,7 @@ inputWithAutocompleteCpt = here.component "inputWithAutocomplete" cpt
onInput :: forall event. T.Box Completions -> event -> Effect Unit onInput :: forall event. T.Box Completions -> event -> Effect Unit
onInput completions e = do onInput completions e = do
let val = R.unsafeEventValue e let val = S.trim $ R.unsafeEventValue e
T.write_ val state T.write_ val state
cs <- autocompleteSearch val cs <- autocompleteSearch val
T.write_ cs completions T.write_ cs completions
...@@ -145,6 +152,8 @@ type Props' = ...@@ -145,6 +152,8 @@ type Props' =
, boxAction :: String -> Action , boxAction :: String -> Action
, state :: T.Box String , state :: T.Box String
, text :: T.Box String , text :: T.Box String
, pattern :: String
, title :: String
, placeholder :: String , placeholder :: String
) )
...@@ -160,6 +169,8 @@ inputWithAutocompleteCpt' = here.component "inputWithAutocomplete" cpt ...@@ -160,6 +169,8 @@ inputWithAutocompleteCpt' = here.component "inputWithAutocomplete" cpt
, boxAction , boxAction
, state , state
, text , text
, pattern
, title
, placeholder } _ = do , placeholder } _ = do
-- States -- States
state' <- T.useLive T.unequal state state' <- T.useLive T.unequal state
...@@ -184,6 +195,8 @@ inputWithAutocompleteCpt' = here.component "inputWithAutocomplete" cpt ...@@ -184,6 +195,8 @@ inputWithAutocompleteCpt' = here.component "inputWithAutocomplete" cpt
, ref: inputRef , ref: inputRef
, className: "form-control" , className: "form-control"
, value: state' , value: state'
, pattern: pattern
, title: title
, placeholder , placeholder
, on: { focus: onFocus completions state' , on: { focus: onFocus completions state'
, input: onInput completions , input: onInput completions
...@@ -246,7 +259,7 @@ inputWithAutocompleteCpt' = here.component "inputWithAutocomplete" cpt ...@@ -246,7 +259,7 @@ inputWithAutocompleteCpt' = here.component "inputWithAutocomplete" cpt
if DE.key e == "Enter" then do if DE.key e == "Enter" then do
R2.preventDefault e R2.preventDefault e
R2.stopPropagation e R2.stopPropagation e
let val = R.unsafeEventValue e let val = S.trim $ R.unsafeEventValue e
let mInput = toMaybe $ R.readRef inputRef let mInput = toMaybe $ R.readRef inputRef
T.write_ val state T.write_ val state
launchAff_ $ dispatch (boxAction val) launchAff_ $ dispatch (boxAction val)
...@@ -260,7 +273,7 @@ inputWithAutocompleteCpt' = here.component "inputWithAutocomplete" cpt ...@@ -260,7 +273,7 @@ inputWithAutocompleteCpt' = here.component "inputWithAutocomplete" cpt
pure $ false pure $ false
submit val _ = do submit val _ = do
T.write_ ("Invited " <> val <> " to the team") text T.write_ ("Invited " <> S.trim val <> " to the team") text
launchAff_ $ dispatch (boxAction val) launchAff_ $ dispatch (boxAction val)
--------------------------------------------------------- ---------------------------------------------------------
......
...@@ -147,6 +147,8 @@ component = here.component "main" cpt where ...@@ -147,6 +147,8 @@ component = here.component "main" cpt where
Nothing -> pure unit Nothing -> pure unit
Just h -> autocompleteClickCallback h Just h -> autocompleteClickCallback h
, classes: "filter-results-completions rounded-circle-2 text-small py-0" , classes: "filter-results-completions rounded-circle-2 text-small py-0"
, pattern: ".*"
, title: ""
, placeholder: "find and select a term here..." , placeholder: "find and select a term here..."
, state: searchState , state: searchState
} }
......
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