[node] some more refactoring of node action views

parent 317f5942
Pipeline #5481 failed with stage
in 0 seconds
...@@ -330,7 +330,6 @@ performAction = performAction' where ...@@ -330,7 +330,6 @@ performAction = performAction' where
performAction' (DoSearch task) p = doSearch task p performAction' (DoSearch task) p = doSearch task p
performAction' (UpdateNode params) p = updateNode params p performAction' (UpdateNode params) p = updateNode params p
performAction' (RenameNode name) p = renameNode name p performAction' (RenameNode name) p = renameNode name p
performAction' (ShareTeam username) p = shareTeam username p
performAction' (SharePublic { params }) p = sharePublic params p performAction' (SharePublic { params }) p = sharePublic params p
performAction' (AddContact params) p = addContact params p performAction' (AddContact params) p = addContact params p
performAction' (AddNode name nodeType) p = addNode' name nodeType p performAction' (AddNode name nodeType) p = addNode' name nodeType p
...@@ -385,10 +384,6 @@ performAction = performAction' where ...@@ -385,10 +384,6 @@ performAction = performAction' where
GAT.insert id task tasks GAT.insert id task tasks
here.log2 "[performAction] UpdateNode task:" task here.log2 "[performAction] UpdateNode task:" task
shareTeam username { boxes: { errors }, nodeId: id, session } = do
eTask <- Share.shareReq session id $ Share.ShareTeamParams { username }
handleRESTError here errors eTask $ \_task -> pure unit
sharePublic params p@{ boxes: { errors }, session } = traverse_ f params where sharePublic params p@{ boxes: { errors }, session } = traverse_ f params where
f (SubTreeOut { in: inId, out }) = do f (SubTreeOut { in: inId, out }) = do
eTask <- Share.shareReq session inId $ Share.SharePublicParams { node_id: out } eTask <- Share.shareReq session inId $ Share.SharePublicParams { node_id: out }
......
...@@ -325,10 +325,6 @@ renameNode name p@{ boxes: { errors }, session, tree: (NTree (LNode {id}) _) } = ...@@ -325,10 +325,6 @@ renameNode name p@{ boxes: { errors }, session, tree: (NTree (LNode {id}) _) } =
handleRESTError here errors eTask $ \_task -> pure unit handleRESTError here errors eTask $ \_task -> pure unit
refreshTree p refreshTree p
shareTeam username { boxes: { errors }, session, tree: (NTree (LNode {id}) _) } = do
eTask <- Share.shareReq session id $ Share.ShareTeamParams { username }
handleRESTError here errors eTask $ \_task -> pure unit
sharePublic params p@{ boxes: { errors, forestOpen }, session } = traverse_ f params where sharePublic params p@{ boxes: { errors, forestOpen }, session } = traverse_ f params where
f (SubTreeOut { in: inId, out }) = do f (SubTreeOut { in: inId, out }) = do
eTask <- Share.shareReq session inId $ Share.SharePublicParams { node_id: out } eTask <- Share.shareReq session inId $ Share.SharePublicParams { node_id: out }
...@@ -398,7 +394,6 @@ performAction (DeleteNode nt) p = deleteNode' nt p ...@@ -398,7 +394,6 @@ performAction (DeleteNode nt) p = deleteNode' nt p
performAction (DoSearch task) p = doSearch task p performAction (DoSearch task) p = doSearch task p
performAction (UpdateNode params) p = updateNode params p performAction (UpdateNode params) p = updateNode params p
performAction (RenameNode name) p = renameNode name p performAction (RenameNode name) p = renameNode name p
performAction (ShareTeam username) p = shareTeam username p
performAction (SharePublic { params }) p = sharePublic params p performAction (SharePublic { params }) p = sharePublic params p
performAction (AddContact params) p = addContact params p performAction (AddContact params) p = addContact params p
performAction (AddNode name nodeType) p = addNode' name nodeType p performAction (AddNode name nodeType) p = addNode' name nodeType p
...@@ -407,7 +402,6 @@ performAction (UploadFile nodeType fileType fileFormat lang mName contents selec ...@@ -407,7 +402,6 @@ performAction (UploadFile nodeType fileType fileFormat lang mName contents selec
uploadFile' nodeType fileType fileFormat lang mName contents p selection uploadFile' nodeType fileType fileFormat lang mName contents p selection
performAction (UploadArbitraryFile fileFormat mName blob selection) p = performAction (UploadArbitraryFile fileFormat mName blob selection) p =
uploadArbitraryFile' fileFormat mName blob p selection uploadArbitraryFile' fileFormat mName blob p selection
performAction DownloadNode _ = liftEffect $ here.log "[performAction] DownloadNode"
performAction (MoveNode {params}) p = moveNode params p performAction (MoveNode {params}) p = moveNode params p
performAction (MergeNode {params}) p = mergeNode params p performAction (MergeNode {params}) p = mergeNode params p
performAction (LinkNode { nodeType, params }) p = linkNode nodeType params p performAction (LinkNode { nodeType, params }) p = linkNode nodeType params p
...@@ -415,3 +409,5 @@ performAction RefreshTree p = refreshTree p ...@@ -415,3 +409,5 @@ performAction RefreshTree p = refreshTree p
performAction CloseBox p = closeBox p performAction CloseBox p = closeBox p
performAction (DocumentsFromWriteNodes params) p = documentsFromWriteNodes params p performAction (DocumentsFromWriteNodes params) p = documentsFromWriteNodes params p
performAction NoAction _ = liftEffect $ here.log "[performAction] NoAction" performAction NoAction _ = liftEffect $ here.log "[performAction] NoAction"
performAction DownloadNode _ = liftEffect $ here.log "[performAction] DownloadNode"
performAction (ShareTeam _) _ = liftEffect $ here.log "[performAction] ShareTeam not used as action, see Node/Action/Share instead"
...@@ -104,24 +104,24 @@ addNodeViewCpt = here.component "addNodeView" cpt where ...@@ -104,24 +104,24 @@ addNodeViewCpt = here.component "addNodeView" cpt where
) )
where where
defaultNt = (fromMaybe Error $ head nodeTypes) defaultNt = (fromMaybe Error $ head nodeTypes)
maybeEdit = [ if edit maybeEdit = if edit then
then inputWithEnterWithKey { [ inputWithEnterWithKey {
onBlur: \val -> T.write_ val nodeName onBlur: \val -> T.write_ val nodeName
, onEnter: \_ -> launchAff_ $ dispatch (AddNode nodeName' nt') , onEnter: \_ -> launchAff_ $ dispatch (AddNode nodeName' nt')
, onValueChanged: \val -> T.write_ val nodeName , onValueChanged: \val -> T.write_ val nodeName
, autoFocus: true , autoFocus: true
, className: "form-control" , className: "form-control"
, defaultValue: nodeName' -- (prettyNodeType nt') , defaultValue: nodeName' -- (prettyNodeType nt')
, placeholder: nodeName' -- (prettyNodeType nt') , placeholder: nodeName' -- (prettyNodeType nt')
, type: "text" , type: "text"
, key: show nodeType' , key: show nodeType'
, required: false , required: false
} } ]
else H.div {} [] else []
]
pure $ Tools.panelWithSubmitButton { action: AddNode nodeName' nt' pure $ Tools.panelWithSubmitButton { action: AddNode nodeName' nt'
, dispatch } (maybeChoose <> maybeEdit) , dispatch
, mError: Nothing } (maybeChoose <> maybeEdit)
-- END Create Node -- END Create Node
......
...@@ -3,20 +3,21 @@ module Gargantext.Components.Forest.Tree.Node.Action.Contact where ...@@ -3,20 +3,21 @@ module Gargantext.Components.Forest.Tree.Node.Action.Contact where
import Prelude import Prelude
import Data.Maybe (Maybe(..)) import Data.Maybe (Maybe(..))
import Effect.Aff (Aff, launchAff) import Effect.Aff (Aff, launchAff_)
import Formula as F import Formula as F
import Reactix as R
import Reactix.DOM.HTML as H
import Toestand as T
import Gargantext.Components.Forest.Tree.Node.Action.Types (Action(..))
import Gargantext.Components.Forest.Tree.Node.Action.Contact.Types (AddContactParams(..)) import Gargantext.Components.Forest.Tree.Node.Action.Contact.Types (AddContactParams(..))
import Gargantext.Components.Forest.Tree.Node.Action.Types (Action(..))
import Gargantext.Components.Forest.Tree.Node.Tools as Tools
import Gargantext.Components.InputWithEnter (inputWithEnter)
import Gargantext.Config.REST (AffRESTError) import Gargantext.Config.REST (AffRESTError)
import Gargantext.Routes as GR import Gargantext.Routes as GR
import Gargantext.Sessions (Session, post) import Gargantext.Sessions (Session, post)
import Gargantext.Types (ID) import Gargantext.Types (ID)
import Gargantext.Types as GT import Gargantext.Types as GT
import Gargantext.Utils.Reactix as R2 import Gargantext.Utils.Reactix as R2
import Reactix as R
import Reactix.DOM.HTML as H
import Toestand as T
here :: R2.Here here :: R2.Here
here = R2.here "Gargantext.Components.Forest.Tree.Node.Action.Contact" here = R2.here "Gargantext.Components.Forest.Tree.Node.Action.Contact"
...@@ -34,21 +35,19 @@ actionAddContact = R.createElement actionAddContactCpt ...@@ -34,21 +35,19 @@ actionAddContact = R.createElement actionAddContactCpt
actionAddContactCpt :: R.Component ActionAddContact actionAddContactCpt :: R.Component ActionAddContact
actionAddContactCpt = here.component "actionAddContact" cpt where actionAddContactCpt = here.component "actionAddContact" cpt where
cpt { dispatch, id } _ = do cpt { dispatch, id } _ = do
isOpen <- T.useBox true pure $
pure $ textInputBox Tools.panelNoFooter { mError: Nothing }
{ boxAction: \p -> AddContact p [ textInputBox
, boxName:"addContact" { boxAction: \p -> AddContact p
, dispatch , dispatch
, id , id
, isOpen , params: { firstname: "", lastname: "" } }
, params: {firstname:"First Name", lastname: "Last Name"} } ]
type TextInputBoxProps = type TextInputBoxProps =
( boxAction :: AddContactParams -> Action ( boxAction :: AddContactParams -> Action
, boxName :: String
, dispatch :: Action -> Aff Unit , dispatch :: Action -> Aff Unit
, id :: ID , id :: ID
, isOpen :: T.Box Boolean
, params :: Record AddContactProps ) , params :: Record AddContactProps )
type AddContactProps = ( firstname :: String, lastname :: String ) type AddContactProps = ( firstname :: String, lastname :: String )
...@@ -57,38 +56,50 @@ textInputBox :: R2.Leaf TextInputBoxProps ...@@ -57,38 +56,50 @@ textInputBox :: R2.Leaf TextInputBoxProps
textInputBox = R2.leaf textInputBoxCpt textInputBox = R2.leaf textInputBoxCpt
textInputBoxCpt :: R.Component TextInputBoxProps textInputBoxCpt :: R.Component TextInputBoxProps
textInputBoxCpt = here.component "textInputBox" cpt where textInputBoxCpt = here.component "textInputBox" cpt where
cpt { boxName, boxAction, dispatch, isOpen cpt { boxAction, dispatch
, params: { firstname, lastname } } _ = , params: { firstname, lastname } } _ = do
content <$> T.useLive T.unequal isOpen
<*> T.useBox firstname <*> T.useBox lastname firstName <- T.useBox firstname
lastName <- T.useBox lastname
let submitF unit = do
f <- T.read firstName
l <- T.read lastName
launchAff_ $
dispatch (boxAction $ AddContactParams { firstname: f, lastname: l })
pure $ H.div { className: "from-group" }
[ textInput "First name" firstName firstname submitF true
, textInput "Last name" lastName lastname submitF false
, R2.row [
submitBtn submitF
]
]
where where
content false _ _ = H.div {} [] textInput placeholder value defaultValue submitF autoFocus =
content true firstName lastName = R2.row
H.div { className: "from-group row" } [ R2.col 8
[ textInput firstName [ inputWithEnter { onBlur: \s -> T.write_ s value
, textInput lastName , onEnter: submitF
, submitBtn firstName lastName , onValueChanged: \s -> T.write_ s value
, cancelBtn , autoFocus
] where , className: "form-control"
textInput value = , defaultValue
H.div {className: "col-md-8"} , placeholder
[ F.bindInput , type: "value"
{ value, className: "form-control", type: "text" , required: true }
, placeholder: (boxName <> " Node") } ] ]
submitBtn first last = -- [ F.bindInput
H.a -- { value
{ className: "btn glyphitem fa fa-ok col-md-2 pull-left" -- , className: "form-control"
, type: "button", on: { click }, title:"Submit" -- , type: "text"
} [] where -- , placeholder: boxName <> " Node" }
click _ = do -- ]
f <- T.read first ]
l <- T.read last submitBtn submitF =
T.write_ false isOpen H.a { className: "btn glyphitem fa fa-send col-md-2 pull-left"
launchAff $ , type: "button"
dispatch (boxAction $ AddContactParams { firstname: f, lastname: l }) , on: { click: \_ -> submitF unit }
cancelBtn = , title:"Submit"
H.a } []
{ className: "btn text-danger glyphitem fa fa-remove col-md-2 pull-left"
, on: { click }, title: "Cancel", type: "button"
} [] where
click _ = T.write_ false isOpen
...@@ -54,7 +54,7 @@ actionDeleteUserCpt :: R.Component Delete ...@@ -54,7 +54,7 @@ actionDeleteUserCpt :: R.Component Delete
actionDeleteUserCpt = here.component "actionDeleteUser" cpt where actionDeleteUserCpt = here.component "actionDeleteUser" cpt where
cpt _ _ = do cpt _ _ = do
pure $ pure $
Tools.panelNoFooter {} Tools.panelNoFooter { mError: Nothing }
[ H.div { style: {margin: "10px"}} [ H.div { style: {margin: "10px"}}
[ H.text $ "Yes, we are RGPD compliant!" [ H.text $ "Yes, we are RGPD compliant!"
<> " But you can not delete User Node yet." <> " But you can not delete User Node yet."
...@@ -70,7 +70,8 @@ actionDeleteOtherCpt = here.component "actionDeleteOther" cpt where ...@@ -70,7 +70,8 @@ actionDeleteOtherCpt = here.component "actionDeleteOther" cpt where
cpt { dispatch, nodeType } _ = do cpt { dispatch, nodeType } _ = do
pure $ pure $
Tools.panelWithSubmitButton { action: DeleteNode nodeType Tools.panelWithSubmitButton { action: DeleteNode nodeType
, dispatch } , dispatch
, mError: Nothing }
(map (\t -> H.p {} [H.text t]) (map (\t -> H.p {} [H.text t])
[ "Are your sure you want to delete it ?" [ "Are your sure you want to delete it ?"
, "If yes, click again below." , "If yes, click again below."
......
module Gargantext.Components.Forest.Tree.Node.Action.Documentation where module Gargantext.Components.Forest.Tree.Node.Action.Documentation where
import Reactix as R import Data.Maybe (Maybe(..))
import Reactix.DOM.HTML as H
import Gargantext.Prelude (map, pure, show, ($), (<>))
import Gargantext.Components.Forest.Tree.Node.Tools as Tools import Gargantext.Components.Forest.Tree.Node.Tools as Tools
import Gargantext.Prelude (map, pure, show, ($), (<>))
import Gargantext.Types (NodeType) import Gargantext.Types (NodeType)
import Gargantext.Types as GT import Gargantext.Types as GT
import Gargantext.Utils.Reactix as R2 import Gargantext.Utils.Reactix as R2
import Reactix as R
import Reactix.DOM.HTML as H
here :: R2.Here here :: R2.Here
here = R2.here "Gargantext.Components.Forest.Tree.Node.Action.Documentation" here = R2.here "Gargantext.Components.Forest.Tree.Node.Action.Documentation"
...@@ -23,9 +22,9 @@ actionDocCpt :: R.Component ActionDoc ...@@ -23,9 +22,9 @@ actionDocCpt :: R.Component ActionDoc
actionDocCpt = here.component "actionDoc" cpt where actionDocCpt = here.component "actionDoc" cpt where
cpt { nodeType } _ = do cpt { nodeType } _ = do
pure $ pure $
Tools.panelNoFooter {} Tools.panelNoFooter { mError: Nothing }
([ infoTitle nodeType ] ([ infoTitle nodeType ]
<> (map (\info -> H.p {} [H.text info]) $ docOf nodeType)) <> (map (\info -> H.p {} [ H.text info ]) $ docOf nodeType))
where where
infoTitle :: NodeType -> R.Element infoTitle :: NodeType -> R.Element
infoTitle nt = H.div { style: {margin: "10px"}} infoTitle nt = H.div { style: {margin: "10px"}}
......
...@@ -5,7 +5,7 @@ import Data.Maybe (Maybe(..)) ...@@ -5,7 +5,7 @@ import Data.Maybe (Maybe(..))
import Data.Show.Generic (genericShow) import Data.Show.Generic (genericShow)
import Data.String.Common (toLower) import Data.String.Common (toLower)
import Gargantext.Components.Forest.Tree.Node.Action.Types (Action(DownloadNode)) import Gargantext.Components.Forest.Tree.Node.Action.Types (Action(DownloadNode))
import Gargantext.Components.Forest.Tree.Node.Tools (fragmentPT, panel, submitButtonHref) import Gargantext.Components.Forest.Tree.Node.Tools as Tools
import Gargantext.Ends (url) import Gargantext.Ends (url)
import Gargantext.Prelude import Gargantext.Prelude
import Gargantext.Routes as Routes import Gargantext.Routes as Routes
...@@ -41,10 +41,11 @@ actionDownloadCorpus = R.createElement actionDownloadCorpusCpt ...@@ -41,10 +41,11 @@ actionDownloadCorpus = R.createElement actionDownloadCorpusCpt
actionDownloadCorpusCpt :: R.Component ActionDownload actionDownloadCorpusCpt :: R.Component ActionDownload
actionDownloadCorpusCpt = here.component "actionDownloadCorpus" cpt where actionDownloadCorpusCpt = here.component "actionDownloadCorpus" cpt where
cpt { id, session } _ = do cpt { id, session } _ = do
pure $ panel {} [ H.div {} [H.text info] pure $
Tools.panelWithSubmitButtonHref { action: DownloadNode
-- footer , href
, submitButtonHref DownloadNode href ] , mError: Nothing }
[ H.div {} [H.text info] ]
where where
href = url session $ Routes.NodeAPI GT.Corpus (Just id) "export" href = url session $ Routes.NodeAPI GT.Corpus (Just id) "export"
info = "Download as JSON" info = "Download as JSON"
...@@ -54,10 +55,11 @@ actionDownloadGraph = R.createElement actionDownloadGraphCpt ...@@ -54,10 +55,11 @@ actionDownloadGraph = R.createElement actionDownloadGraphCpt
actionDownloadGraphCpt :: R.Component ActionDownload actionDownloadGraphCpt :: R.Component ActionDownload
actionDownloadGraphCpt = here.component "actionDownloadGraph" cpt where actionDownloadGraphCpt = here.component "actionDownloadGraph" cpt where
cpt { id, session } _ = do cpt { id, session } _ = do
pure $ panel {} [ H.div {} [H.text info] pure $
Tools.panelWithSubmitButtonHref { action: DownloadNode
-- footer , href
, submitButtonHref DownloadNode href ] , mError: Nothing }
[ H.div {} [H.text info] ]
where where
href = url session $ Routes.NodeAPI GT.Graph (Just id) "gexf" href = url session $ Routes.NodeAPI GT.Graph (Just id) "gexf"
info = "Info about the Graph as GEXF format" info = "Info about the Graph as GEXF format"
...@@ -83,16 +85,17 @@ actionDownloadNodeListCpt = here.component "actionDownloadNodeList" cpt where ...@@ -83,16 +85,17 @@ actionDownloadNodeListCpt = here.component "actionDownloadNodeList" cpt where
downloadFormat <- T.useBox NL_JSON downloadFormat <- T.useBox NL_JSON
downloadFormat' <- T.useLive T.unequal downloadFormat downloadFormat' <- T.useLive T.unequal downloadFormat
pure $ panel {} pure $
[ R2.select { className: "form-control" Tools.panelWithSubmitButtonHref { action: DownloadNode
, defaultValue: show downloadFormat' , href: href downloadFormat'
, on: { change: onChange downloadFormat } } , mError: Nothing }
[ opt NL_CSV downloadFormat [ R2.select { className: "form-control"
, opt NL_JSON downloadFormat ] , defaultValue: show downloadFormat'
, H.div {} [ H.text $ info downloadFormat' ] , on: { change: onChange downloadFormat } }
[ opt NL_CSV downloadFormat
-- footer , opt NL_JSON downloadFormat ]
, submitButtonHref DownloadNode $ href downloadFormat' ] , H.div {} [ H.text $ info downloadFormat' ]
]
where where
opt t downloadFormat = H.option { value: show t } [ H.text $ show t ] opt t downloadFormat = H.option { value: show t } [ H.text $ show t ]
where where
...@@ -127,16 +130,16 @@ actionDownloadNodeTextsCpt = here.component "actionDownloadNodeTexts" cpt where ...@@ -127,16 +130,16 @@ actionDownloadNodeTextsCpt = here.component "actionDownloadNodeTexts" cpt where
downloadFormat <- T.useBox NT_JSON downloadFormat <- T.useBox NT_JSON
downloadFormat' <- T.useLive T.unequal downloadFormat downloadFormat' <- T.useLive T.unequal downloadFormat
pure $ panel {} pure $ Tools.panelWithSubmitButtonHref { action: DownloadNode
, href: href downloadFormat'
, mError: Nothing }
[ R2.select { className: "form-control" [ R2.select { className: "form-control"
, defaultValue: show downloadFormat' , defaultValue: show downloadFormat'
, on: { change: onChange downloadFormat } } , on: { change: onChange downloadFormat } }
[ opt NT_CSV downloadFormat [ opt NT_CSV downloadFormat
, opt NT_JSON downloadFormat ] , opt NT_JSON downloadFormat ]
, H.div {} [ H.text $ info downloadFormat' ] , H.div {} [ H.text $ info downloadFormat' ]
]
-- footer
, submitButtonHref DownloadNode $ href downloadFormat' ]
where where
opt t downloadFormat = H.option { value: show t } [ H.text $ show t ] opt t downloadFormat = H.option { value: show t } [ H.text $ show t ]
where where
...@@ -160,4 +163,4 @@ actionDownloadOther = R.createElement actionDownloadOtherCpt ...@@ -160,4 +163,4 @@ actionDownloadOther = R.createElement actionDownloadOtherCpt
actionDownloadOtherCpt :: R.Component ActionDownload actionDownloadOtherCpt :: R.Component ActionDownload
actionDownloadOtherCpt = here.component "actionDownloadOther" cpt where actionDownloadOtherCpt = here.component "actionDownloadOther" cpt where
cpt _ _ = do cpt _ _ = do
pure $ fragmentPT $ "Soon, you will be able to download your file here " pure $ Tools.fragmentPT $ "Soon, you will be able to download your file here "
...@@ -69,15 +69,15 @@ linkNodeCpt' = here.component "__clone__" cpt ...@@ -69,15 +69,15 @@ linkNodeCpt' = here.component "__clone__" cpt
let let
button = case action' of button = case action' of
LinkNode { params } -> case params of LinkNode { params } ->
Just (SubTreeOut { in: inId }) -> R2.fromMaybe params $
Tools.submitButton { action: toParams nodeType inId \(SubTreeOut { in: inId }) ->
, dispatch } Tools.submitButton { action: toParams nodeType inId
Nothing -> mempty , dispatch }
_ -> mempty _ -> mempty
pure $ pure $
Tools.panel {} Tools.panel { mError: Nothing }
[ subTreeView { action [ subTreeView { action
, boxes , boxes
, dispatch , dispatch
......
...@@ -4,6 +4,7 @@ import Gargantext.Prelude ...@@ -4,6 +4,7 @@ import Gargantext.Prelude
import Data.Array (filter, null, (:)) import Data.Array (filter, null, (:))
import Data.Either (Either(..)) import Data.Either (Either(..))
import Data.Maybe (Maybe(..))
import Effect.Aff (runAff_) import Effect.Aff (runAff_)
import Effect.Class (liftEffect) import Effect.Class (liftEffect)
import Gargantext.Components.Forest.Tree.Node.Tools as Tools import Gargantext.Components.Forest.Tree.Node.Tools as Tools
...@@ -52,55 +53,53 @@ type TeamProps = ...@@ -52,55 +53,53 @@ type TeamProps =
teamLayoutWrapper :: R2.Component TeamProps teamLayoutWrapper :: R2.Component TeamProps
teamLayoutWrapper = R.createElement teamLayoutWrapperCpt teamLayoutWrapper = R.createElement teamLayoutWrapperCpt
teamLayoutWrapperCpt :: R.Component TeamProps teamLayoutWrapperCpt :: R.Component TeamProps
teamLayoutWrapperCpt = here.component "teamLayoutWrapper" cpt where teamLayoutWrapperCpt = here.component "teamLayoutWrapper" cpt where
cpt {nodeId, session, team: {team_owner_username, team_members}} _ = do cpt {nodeId, session, team: {team_owner_username, team_members}} _ = do
teamS <- T.useBox team_members team_members <- T.useBox team_members
team' <- T.useLive T.unequal teamS error <- T.useBox Nothing
error <- T.useBox ""
error' <- T.useLive T.unequal error
pure $ teamLayoutRows {nodeId, session, team: teamS, team', error, error', team_owner_username} pure $ teamLayoutRows {nodeId, session, team_members, error, team_owner_username}
type TeamRowProps = type TeamRowProps =
( nodeId :: ID ( nodeId :: ID
, session :: Session , session :: Session
, team :: T.Box (Array TeamMember) , team_members :: T.Box (Array TeamMember)
, error :: T.Box String , error :: T.Box (Maybe String)
, team' :: Array TeamMember
, error' :: String
, team_owner_username :: String , team_owner_username :: String
) )
teamLayoutRows :: R2.Leaf TeamRowProps teamLayoutRows :: R2.Leaf TeamRowProps
teamLayoutRows = R2.leaf teamLayoutRowsCpt teamLayoutRows = R2.leaf teamLayoutRowsCpt
teamLayoutRowsCpt :: R.Component TeamRowProps teamLayoutRowsCpt :: R.Component TeamRowProps
teamLayoutRowsCpt = here.component "teamLayoutRows" cpt where teamLayoutRowsCpt = here.component "teamLayoutRows" cpt where
cpt { team, nodeId, session, error, team', error', team_owner_username} _ = do cpt { team_members, nodeId, session, error, team_owner_username } _ = do
team_members' <- T.useLive T.unequal team_members
error' <- T.useLive T.unequal error
pure $ pure $
if null team' then if null team_members' then
H.div { style: {margin: "10px"}} H.div { style: {margin: "10px"}}
[ H.h4 {} [H.text "Your team is empty, you can send some invitations."]] [ H.h4 {} [H.text "Your team is empty, you can send some invitations."]]
else else
Tools.panel {} Tools.panelNoFooter { mError: error' }
((makeLeader team_owner_username : (map makeTeam team')) <> [ H.div {} [H.text error'] ]) (makeLeader team_owner_username : (map makeTeam team_members'))
where where
makeTeam :: TeamMember -> R.Element makeTeam :: TeamMember -> R.Element
makeTeam { username, shared_folder_id } = H.div {className: "from-group row"} [ H.div { className: "col-8" } [ H.text username ] makeTeam { username, shared_folder_id } =
, H.a { className: "text-danger col-2 fa fa-times" H.div {className: "from-group row"} [ H.div { className: "col-8" } [ H.text username ]
, title: "Remove user from team" , H.a { className: "text-danger col-2 fa fa-times"
, type: "button" , title: "Remove user from team"
, on: {click: submit shared_folder_id } , type: "button"
} [] , on: {click: submit shared_folder_id }
] } []
]
makeLeader username = H.div {className: "from-group row"} [ H.div { className: "col-8"} [ H.text username ]
, H.p { className: "col-2"} [ H.text "owner"] makeLeader username =
] H.div {className: "from-group row"} [ H.div { className: "col-8"} [ H.text username ]
, H.p { className: "col-2"} [ H.text "owner"]
]
submit sharedFolderId _ = do submit sharedFolderId _ = do
runAff_ callback $ saveDeleteTeam { session, nodeId, sharedFolderId } runAff_ callback $ saveDeleteTeam { session, nodeId, sharedFolderId }
...@@ -108,14 +107,15 @@ teamLayoutRowsCpt = here.component "teamLayoutRows" cpt where ...@@ -108,14 +107,15 @@ teamLayoutRowsCpt = here.component "teamLayoutRows" cpt where
callback res = callback res =
case res of case res of
Left _ -> do Left _ -> do
_ <- liftEffect $ T.write "Only the Team owner can remove users" error _ <- liftEffect $ T.write (Just "Only the Team owner can remove users") error
pure unit pure unit
Right val -> Right val ->
case val of case val of
Left _ -> do Left _ -> do
pure unit pure unit
Right r -> do Right r -> do
T.write_ (filter (\tm -> tm.shared_folder_id /= r) team') team T.modify_ (filter (\tm -> tm.shared_folder_id /= r)) team_members
T.write_ Nothing error
------------------------------------------------------------- -------------------------------------------------------------
......
...@@ -36,13 +36,13 @@ mergeNodeCpt = here.component "mergeNode" cpt ...@@ -36,13 +36,13 @@ mergeNodeCpt = here.component "mergeNode" cpt
options <- T.useBox (Set.singleton GT.MapTerm) options <- T.useBox (Set.singleton GT.MapTerm)
let button = case action' of let button = case action' of
MergeNode {params} -> case params of MergeNode { params } ->
Just val -> Tools.submitButton { action: MergeNode {params: Just val} R2.fromMaybe params $
, dispatch } \val -> Tools.submitButton { action: MergeNode {params: Just val }
Nothing -> H.div {} [] , dispatch }
_ -> H.div {} [] _ -> H.div {} []
pure $ Tools.panel {} pure $ Tools.panel { mError: Nothing }
[ subTreeView { action [ subTreeView { action
, boxes , boxes
, dispatch , dispatch
...@@ -52,12 +52,12 @@ mergeNodeCpt = here.component "mergeNode" cpt ...@@ -52,12 +52,12 @@ mergeNodeCpt = here.component "mergeNode" cpt
, subTreeParams , subTreeParams
} [] } []
, H.ul { className:"merge mx-auto list-group"} , H.ul { className:"merge mx-auto list-group"}
([ H.li { className: "list-group-item" } [ H.li { className: "list-group-item" }
[ H.h5 { className: "mb-1" } [ H.text "Merge which list?" ] [ H.h5 { className: "mb-1" } [ H.text "Merge which list?" ]
, Tools.checkboxesListGroup { groups: [ GT.MapTerm, GT.CandidateTerm, GT.StopTerm ] , Tools.checkboxesListGroup { groups: [ GT.MapTerm, GT.CandidateTerm, GT.StopTerm ]
, options } [] , options } []
] ]
]) ]
, H.ul { className:"merge mx-auto list-group"} , H.ul { className:"merge mx-auto list-group"}
[ H.li { className: "list-group-item" } [ H.li { className: "list-group-item" }
[ H.h5 { className: "mb-1" } [ H.text "Title" ] [ H.h5 { className: "mb-1" } [ H.text "Title" ]
......
...@@ -59,15 +59,15 @@ moveNodeCpt' = here.component "__clone__" cpt where ...@@ -59,15 +59,15 @@ moveNodeCpt' = here.component "__clone__" cpt where
action' <- T.useLive T.unequal action action' <- T.useLive T.unequal action
let button = case action' of let button = case action' of
MoveNode { params } -> case params of MoveNode { params } ->
Just val -> Tools.submitButton { action: MoveNode {params: Just val} R2.fromMaybe params $
, dispatch } \val -> Tools.submitButton { action: MoveNode {params: Just val}
Nothing -> H.div {} [] , dispatch }
_ -> H.div {} [] _ -> H.div {} []
pure $ pure $
Tools.panel {} Tools.panel { mError: Nothing }
[ subTreeView { action [ subTreeView { action
, boxes , boxes
, dispatch , dispatch
......
...@@ -43,9 +43,6 @@ getCompletionsReq :: { session :: Session } -> AffRESTError (Array String) ...@@ -43,9 +43,6 @@ getCompletionsReq :: { session :: Session } -> AffRESTError (Array String)
getCompletionsReq { session } = getCompletionsReq { session } =
get session GR.Members get session GR.Members
shareAction :: String -> Action
shareAction username = Action.ShareTeam (trim username)
------------------------------------------------------------------------ ------------------------------------------------------------------------
data ShareNodeParams = ShareTeamParams { username :: String } data ShareNodeParams = ShareTeamParams { username :: String }
...@@ -63,7 +60,6 @@ instance Show ShareNodeParams where show = genericShow ...@@ -63,7 +60,6 @@ instance Show ShareNodeParams where show = genericShow
------------------------------------------------------------------------ ------------------------------------------------------------------------
type ShareNode = type ShareNode =
( id :: ID ( id :: ID
, dispatch :: Action -> Aff Unit
, session :: Session ) , session :: Session )
shareNode :: R2.Component ShareNode shareNode :: R2.Component ShareNode
...@@ -71,7 +67,7 @@ shareNode = R.createElement shareNodeCpt ...@@ -71,7 +67,7 @@ shareNode = R.createElement shareNodeCpt
shareNodeCpt :: R.Component ShareNode shareNodeCpt :: R.Component ShareNode
shareNodeCpt = here.component "shareNode" cpt shareNodeCpt = here.component "shareNode" cpt
where where
cpt { dispatch, id, session } _ = do cpt { id, session } _ = do
useLoader { useLoader {
loader: getCompletionsReq loader: getCompletionsReq
, path: { session } , path: { session }
...@@ -83,8 +79,7 @@ shareNodeCpt = here.component "shareNode" cpt ...@@ -83,8 +79,7 @@ shareNodeCpt = here.component "shareNode" cpt
type ShareNodeInner = type ShareNodeInner =
( completions :: Array String ( completions :: Array String
, id :: ID | ShareNode
, session :: Session
) )
shareNodeInner :: R2.Component ShareNodeInner shareNodeInner :: R2.Component ShareNodeInner
...@@ -95,18 +90,19 @@ shareNodeInnerCpt = here.component "shareNodeInner" cpt ...@@ -95,18 +90,19 @@ shareNodeInnerCpt = here.component "shareNodeInner" cpt
cpt { completions, id, session } _ = do cpt { completions, id, session } _ = do
state' /\ state <- R2.useBox' "" state' /\ state <- R2.useBox' ""
text' /\ text <- R2.useBox' "" text' /\ text <- R2.useBox' ""
mError' /\ mError <- R2.useBox' Nothing
pure $ Tools.panel {} pure $ Tools.panel { mError: mError' }
[ inputWithAutocomplete { autoFocus: true [ inputWithAutocomplete { autoFocus: true
, autocompleteSearch , autocompleteSearch
, classes: "share-users-completions d-flex align-items-center" , classes: "share-users-completions d-flex align-items-center"
, onAutocompleteClick , onAutocompleteClick
, onEnterPress: onEnterPress text , onEnterPress: onEnterPress text mError
, placeholder: "username or email"
, pattern: "^\\S+$" -- pattern doesn't allow space characters , pattern: "^\\S+$" -- pattern doesn't allow space characters
, title , placeholder: "username or email"
, state } , state
[ B.iconButton { callback: \_ -> onEnterPress text state' , title }
[ B.iconButton { callback: \_ -> onEnterPress text mError state'
, elevation: Level1 , elevation: Level1
, name: "send" , name: "send"
, title: "Submit" } ] , title: "Submit" } ]
...@@ -116,13 +112,16 @@ shareNodeInnerCpt = here.component "shareNodeInner" cpt ...@@ -116,13 +112,16 @@ shareNodeInnerCpt = here.component "shareNodeInner" cpt
where where
autocompleteSearch input = pure $ nub $ filter (contains (Pattern input)) completions autocompleteSearch input = pure $ nub $ filter (contains (Pattern input)) completions
onAutocompleteClick _ = pure unit onAutocompleteClick _ = pure unit
onEnterPress text val = do onEnterPress text mError val = do
-- launchAff_ $ dispatch (shareAction val) T.write_ Nothing mError
launchAff_ do launchAff_ do
eRes <- shareReq session id $ ShareTeamParams { username: val } eRes <- shareReq session id $ ShareTeamParams { username: val }
liftEffect $ case eRes of liftEffect $ case eRes of
Left err -> T.write_ (show err) text Left err -> do
Right _ -> T.write_ ("Invited " <> val <> " to the team") text T.write_ (Just $ show err) mError
Right _ -> do
T.write_ ("Invited " <> val <> " to the team") text
T.write_ Nothing mError
title = "Enter a username or an email address (space characters are not allowed)" title = "Enter a username or an email address (space characters are not allowed)"
------------------------------------------------------------------------ ------------------------------------------------------------------------
publishNode :: R2.Component SubTreeParamsIn publishNode :: R2.Component SubTreeParamsIn
...@@ -135,13 +134,13 @@ publishNodeCpt = here.component "publishNode" cpt ...@@ -135,13 +134,13 @@ publishNodeCpt = here.component "publishNode" cpt
action' <- T.useLive T.unequal action action' <- T.useLive T.unequal action
let button = case action' of let button = case action' of
Action.SharePublic { params } -> case params of Action.SharePublic { params } ->
Just val -> Tools.submitButton { action: Action.SharePublic {params: Just val} R2.fromMaybe params $
, dispatch } \val -> Tools.submitButton { action: Action.SharePublic {params: Just val}
Nothing -> H.div {} [] , dispatch }
_ -> H.div {} [] _ -> H.div {} []
pure $ Tools.panel {} pure $ Tools.panel { mError: Nothing }
[ subTreeView { action [ subTreeView { action
, boxes , boxes
, dispatch , dispatch
......
...@@ -64,7 +64,8 @@ updateDashboardCpt = here.component "updateDashboard" cpt where ...@@ -64,7 +64,8 @@ updateDashboardCpt = here.component "updateDashboard" cpt where
pure $ pure $
Tools.panelWithSubmitButton { action: UpdateNode $ UpdateNodeParamsBoard { methodBoard: methodBoard' } Tools.panelWithSubmitButton { action: UpdateNode $ UpdateNodeParamsBoard { methodBoard: methodBoard' }
, dispatch } , dispatch
, mError: Nothing }
[ -- H.text "Update with" [ -- H.text "Update with"
Tools.formChoiceSafe { items: [All, Sources, Authors, Institutes, Ngrams] Tools.formChoiceSafe { items: [All, Sources, Authors, Institutes, Ngrams]
, default: methodBoard' , default: methodBoard'
...@@ -108,7 +109,9 @@ updateGraphCpt = here.component "updateGraph" cpt where ...@@ -108,7 +109,9 @@ updateGraphCpt = here.component "updateGraph" cpt where
} }
pure $ pure $
Tools.panelWithSubmitButton { action, dispatch: callback } Tools.panelWithSubmitButton { action
, dispatch: callback
, mError: Nothing }
[ H.text "Show subjects with Order1 or concepts with Order2 ?" [ H.text "Show subjects with Order1 or concepts with Order2 ?"
, Tools.formChoiceSafe { items: [Order1, Order2_A, Order2_B] , Tools.formChoiceSafe { items: [Order1, Order2_A, Order2_B]
, default: methodGraphMetric' , default: methodGraphMetric'
...@@ -218,7 +221,8 @@ updateNodeListCpt = here.component "updateNodeList" cpt where ...@@ -218,7 +221,8 @@ updateNodeListCpt = here.component "updateNodeList" cpt where
pure $ pure $
Tools.panelWithSubmitButton { action: UpdateNode $ UpdateNodeParamsList { methodList: methodList' } Tools.panelWithSubmitButton { action: UpdateNode $ UpdateNodeParamsList { methodList: methodList' }
, dispatch } , dispatch
, mError: Nothing }
[ -- H.text "Update with" [ -- H.text "Update with"
Tools.formChoiceSafe { items: [Basic, Advanced, WithModel] Tools.formChoiceSafe { items: [Basic, Advanced, WithModel]
, default: methodList' , default: methodList'
...@@ -236,7 +240,8 @@ updateTextsCpt = here.component "updateTexts" cpt where ...@@ -236,7 +240,8 @@ updateTextsCpt = here.component "updateTexts" cpt where
pure $ pure $
Tools.panelWithSubmitButton { action: UpdateNode $ UpdateNodeParamsTexts { methodTexts: Both } Tools.panelWithSubmitButton { action: UpdateNode $ UpdateNodeParamsTexts { methodTexts: Both }
, dispatch } , dispatch
, mError: Nothing }
[] -- H.text "Update with" [] -- H.text "Update with"
-- formChoiceSafe { items: [NewNgrams, NewTexts, Both] -- formChoiceSafe { items: [NewNgrams, NewTexts, Both]
-- , default: methodTexts' -- , default: methodTexts'
......
...@@ -23,7 +23,7 @@ import Gargantext.Components.Forest.Tree.Node.Action (Props) ...@@ -23,7 +23,7 @@ import Gargantext.Components.Forest.Tree.Node.Action (Props)
import Gargantext.Components.Forest.Tree.Node.Action.Types (Action(..)) import Gargantext.Components.Forest.Tree.Node.Action.Types (Action(..))
import Gargantext.Components.Forest.Tree.Node.Action.Upload.Types (FileFormat(..), FileType(..), UploadFileBlob(..), readUFBAsBase64, readUFBAsText) import Gargantext.Components.Forest.Tree.Node.Action.Upload.Types (FileFormat(..), FileType(..), UploadFileBlob(..), readUFBAsBase64, readUFBAsText)
import Gargantext.Components.Forest.Tree.Node.Action.Utils (loadLanguages) import Gargantext.Components.Forest.Tree.Node.Action.Utils (loadLanguages)
import Gargantext.Components.Forest.Tree.Node.Tools (fragmentPT, formChoiceSafe, panel) import Gargantext.Components.Forest.Tree.Node.Tools as Tools
import Gargantext.Components.Lang (Lang(..), langReader) import Gargantext.Components.Lang (Lang(..), langReader)
import Gargantext.Components.ListSelection as ListSelection import Gargantext.Components.ListSelection as ListSelection
import Gargantext.Components.ListSelection.Types (Selection(..)) import Gargantext.Components.ListSelection.Types (Selection(..))
...@@ -83,7 +83,7 @@ actionUploadOther = R.createElement actionUploadOtherCpt ...@@ -83,7 +83,7 @@ actionUploadOther = R.createElement actionUploadOtherCpt
actionUploadOtherCpt :: R.Component ActionUpload actionUploadOtherCpt :: R.Component ActionUpload
actionUploadOtherCpt = here.component "actionUploadOther" cpt where actionUploadOtherCpt = here.component "actionUploadOther" cpt where
cpt _ _ = do cpt _ _ = do
pure $ fragmentPT $ "Soon, upload for this NodeType." pure $ Tools.fragmentPT $ "Soon, upload for this NodeType."
-- file upload types -- file upload types
...@@ -153,30 +153,30 @@ uploadFileViewWithLangsCpt = here.component "uploadFileViewWithLangs" cpt ...@@ -153,30 +153,30 @@ uploadFileViewWithLangsCpt = here.component "uploadFileViewWithLangs" cpt
] ]
, R2.row , R2.row
[ H.div {className:"col-6 flex-space-around"} [ H.div {className:"col-6 flex-space-around"}
[ formChoiceSafe { items: [ CSV [ Tools.formChoiceSafe { items: [ CSV
, CSV_HAL , CSV_HAL
, Istex , Istex
, WOS , WOS
, JSON , JSON
-- , Iramuteq -- , Iramuteq
] ]
, default: CSV , default: CSV
, callback: setFileType' , callback: setFileType'
, print: show } [] , print: show } []
, formChoiceSafe { items: [ Plain , Tools.formChoiceSafe { items: [ Plain
, ZIP ] , ZIP ]
, default: Plain , default: Plain
, callback: setFileFormat' , callback: setFileFormat'
, print: show } [] , print: show } []
] ]
] ]
, R2.row , R2.row
[ H.div {className:"col-6 flex-space-around"} [ H.div {className:"col-6 flex-space-around"}
[ formChoiceSafe { items: langs <> [No_extraction] [ Tools.formChoiceSafe { items: langs <> [No_extraction]
, default: EN , default: EN
, callback: setLang' , callback: setLang'
, print: show , print: show
} [] } []
] ]
] ]
, R2.row , R2.row
...@@ -194,7 +194,7 @@ uploadFileViewWithLangsCpt = here.component "uploadFileViewWithLangs" cpt ...@@ -194,7 +194,7 @@ uploadFileViewWithLangsCpt = here.component "uploadFileViewWithLangs" cpt
, selection , selection
} [] } []
] ]
pure $ panel {} (bodies <> [ footer ]) pure $ Tools.panel { mError: Nothing } (bodies <> [ footer ])
onChangeContents :: forall e. T.Box (Maybe UploadFile) -> E.SyntheticEvent_ e -> Effect Unit onChangeContents :: forall e. T.Box (Maybe UploadFile) -> E.SyntheticEvent_ e -> Effect Unit
...@@ -318,7 +318,7 @@ uploadListViewCpt = here.component "uploadListView" cpt where ...@@ -318,7 +318,7 @@ uploadListViewCpt = here.component "uploadListView" cpt where
-- Render -- Render
pure $ pure $
panel {} Tools.panel { mError: Nothing }
-- Body -- Body
[ [
-- Upload -- Upload
...@@ -663,7 +663,7 @@ uploadTermListViewCpt = here.component "uploadTermListView" cpt ...@@ -663,7 +663,7 @@ uploadTermListViewCpt = here.component "uploadTermListView" cpt
} }
] ]
pure $ panel {} pure $ Tools.panel { mError: Nothing }
[ H.form {} [ H.form {}
[ R2.row [ R2.col 12 [ input ] ] [ R2.row [ R2.col 12 [ input ] ]
, R2.row [ R2.col 12 [ uploadTypeHtml ] ] , R2.row [ R2.col 12 [ uploadTypeHtml ] ]
...@@ -815,7 +815,7 @@ uploadFrameCalcViewWithLangsCpt = here.component "uploadFrameCalcViewWithLangs" ...@@ -815,7 +815,7 @@ uploadFrameCalcViewWithLangsCpt = here.component "uploadFrameCalcViewWithLangs"
[ H.text "Upload!" ] [ H.text "Upload!" ]
] ]
pure $ panel {} (bodies <> [ footer ]) pure $ Tools.panel { mError: Nothing } (bodies <> [ footer ])
where where
onClick lang' selection' _ = do onClick lang' selection' _ = do
......
...@@ -76,7 +76,8 @@ actionWriteNodesDocumentsWithLangsCpt = here.component "actionWriteNodesDocument ...@@ -76,7 +76,8 @@ actionWriteNodesDocumentsWithLangsCpt = here.component "actionWriteNodesDocument
, lang: lang' , lang: lang'
, selection: selection' , selection: selection'
, paragraphs: paragraphs' } , paragraphs: paragraphs' }
, dispatch } , dispatch
, mError: Nothing }
[ [
H.div H.div
{ className: "col-12 flex-space-around" } { className: "col-12 flex-space-around" }
......
...@@ -351,7 +351,7 @@ panelActionCpt = here.component "panelAction" cpt ...@@ -351,7 +351,7 @@ panelActionCpt = here.component "panelAction" cpt
pure $ moveNode { boxes, dispatch, id, nodeType, session, subTreeParams } [] pure $ moveNode { boxes, dispatch, id, nodeType, session, subTreeParams } []
cpt { action: Link {subTreeParams}, boxes, dispatch, id, nodeType, session } _ = cpt { action: Link {subTreeParams}, boxes, dispatch, id, nodeType, session } _ =
pure $ linkNode { boxes, dispatch, id, nodeType, session, subTreeParams } [] pure $ linkNode { boxes, dispatch, id, nodeType, session, subTreeParams } []
cpt { action : Share, dispatch, id, session } _ = pure $ Share.shareNode { dispatch, id, session } [] cpt { action : Share, id, session } _ = pure $ Share.shareNode { id, session } []
cpt { action : AddingContact, dispatch, id } _ = pure $ Contact.actionAddContact { dispatch, id } [] cpt { action : AddingContact, dispatch, id } _ = pure $ Contact.actionAddContact { dispatch, id } []
cpt { action : Publish {subTreeParams}, boxes, dispatch, id, nodeType, session } _ = cpt { action : Publish {subTreeParams}, boxes, dispatch, id, nodeType, session } _ =
pure $ Share.publishNode { boxes, dispatch, id, nodeType, session, subTreeParams } [] pure $ Share.publishNode { boxes, dispatch, id, nodeType, session, subTreeParams } []
......
...@@ -31,28 +31,45 @@ fragmentPT :: String -> R.Element ...@@ -31,28 +31,45 @@ fragmentPT :: String -> R.Element
fragmentPT text = H.div { style: { margin: "10px" }} [ H.text text ] fragmentPT text = H.div { style: { margin: "10px" }} [ H.text text ]
type PanelProps = () type PanelProps =
( mError :: Maybe String )
-- | Last element of panel's children goes to footer, all others go to body -- | Last element of panel's children goes to footer, all others go to body
panel :: R2.Component PanelProps panel :: R2.Component PanelProps
panel = R.createElement panelCpt panel = R.createElement panelCpt
panelCpt :: R.Component PanelProps panelCpt :: R.Component PanelProps
panelCpt = here.component "panel" cpt where panelCpt = here.component "panel" cpt where
cpt {} children = cpt { mError } children = do
let errorCpt =
R2.fromMaybe mError $
\err ->
R2.row
[ R2.col 12
[ H.div { className: "alert alert-danger" } [ H.text err ]
]
]
pure $ R.fragment pure $ R.fragment
[ H.div { className: "card-body" } [ H.div { className: "card-body" }
[ H.div { className: "row" } [ H.div { className: "card-text" }
-- TODO add type for text or form here [ H.form {className: "form-horizontal"} bodies ] [ R2.row
[ H.div { className: "col-12" } bodies ]] -- TODO add type for text or form here [ H.form {className: "form-horizontal"} bodies ]
[ R2.col 12 bodies ]
, errorCpt
]
]
, H.div {className: "card-footer"} , H.div {className: "card-footer"}
[ H.div { className: "row" } [ R2.row
[ H.div { className: "mx-auto"} [ footer ] ]]] [ H.div { className: "mx-auto"} [ footer ] ]
]
]
where where
bodies /\ footer = bodies /\ footer =
case A.unsnoc children of case A.unsnoc children of
Nothing -> [] /\ (H.div {} []) Nothing -> [] /\ (H.div {} [])
Just { init, last } -> init /\ last Just { init, last } -> init /\ last
-- | A panel without a footer
panelNoFooter :: R2.Component PanelProps panelNoFooter :: R2.Component PanelProps
panelNoFooter = R.createElement panelNoFooterCpt panelNoFooter = R.createElement panelNoFooterCpt
panelNoFooterCpt :: R.Component PanelProps panelNoFooterCpt :: R.Component PanelProps
...@@ -66,6 +83,7 @@ type PanelWithSubmitButtonProps = ...@@ -66,6 +83,7 @@ type PanelWithSubmitButtonProps =
, dispatch :: Action -> Aff Unit , dispatch :: Action -> Aff Unit
| PanelProps ) | PanelProps )
-- | A panel with 'submitButton { action, dispatch }'
panelWithSubmitButton :: R2.Component PanelWithSubmitButtonProps panelWithSubmitButton :: R2.Component PanelWithSubmitButtonProps
panelWithSubmitButton = R.createElement panelWithSubmitButtonCpt panelWithSubmitButton = R.createElement panelWithSubmitButtonCpt
panelWithSubmitButtonCpt :: R.Component PanelWithSubmitButtonProps panelWithSubmitButtonCpt :: R.Component PanelWithSubmitButtonProps
...@@ -76,6 +94,22 @@ panelWithSubmitButtonCpt = here.component "panelWithSubmitButton" cpt where ...@@ -76,6 +94,22 @@ panelWithSubmitButtonCpt = here.component "panelWithSubmitButton" cpt where
-- footer -- footer
<> [ submitButton { action, dispatch } ]) <> [ submitButton { action, dispatch } ])
type PanelWithSubmitButtonHrefProps =
( action :: Action
, href :: String
| PanelProps )
-- | A panel with 'submitButtonHref { action, href }'
panelWithSubmitButtonHref :: R2.Component PanelWithSubmitButtonHrefProps
panelWithSubmitButtonHref = R.createElement panelWithSubmitButtonHrefCpt
panelWithSubmitButtonHrefCpt :: R.Component PanelWithSubmitButtonHrefProps
panelWithSubmitButtonHrefCpt = here.component "panelWithSubmitButtonHref" cpt where
cpt props@{ action, href } children = do
let pProps = (RX.pick props :: Record PanelProps)
pure $ panel pProps (children
-- footer
<> [ submitButtonHref { action, href } ])
type TextInputBoxProps = type TextInputBoxProps =
( id :: GT.ID ( id :: GT.ID
...@@ -198,15 +232,15 @@ inviteInputBoxCpt = here.component "textInputBox" cpt where ...@@ -198,15 +232,15 @@ inviteInputBoxCpt = here.component "textInputBox" cpt where
T.write_ ("Invited " <> R.readRef ref <> " to the team") username T.write_ ("Invited " <> R.readRef ref <> " to the team") username
launchAff_ $ dispatch (boxAction $ R.readRef ref) launchAff_ $ dispatch (boxAction $ R.readRef ref)
type DefaultText = String -- type DefaultText = String
formEdit :: forall prev next -- formEdit :: forall prev next
. DefaultText -> ((prev -> String) -> Effect next) -> R.Element -- . DefaultText -> ((prev -> String) -> Effect next) -> R.Element
formEdit defaultValue setter = -- formEdit defaultValue setter =
H.div { className: "form-group" } -- H.div { className: "form-group" }
[ H.input { defaultValue, type: "text", on: { input } -- [ H.input { defaultValue, type: "text", on: { input }
, placeholder: defaultValue, className: "form-control" } -- , placeholder: defaultValue, className: "form-control" }
] where input = setter <<< const <<< R.unsafeEventValue -- ] where input = setter <<< const <<< R.unsafeEventValue
type FormChoiceSafeProps item m = type FormChoiceSafeProps item m =
( items :: Array item ( items :: Array item
...@@ -305,14 +339,23 @@ submitButtonCpt = here.component "submitButton" cpt where ...@@ -305,14 +339,23 @@ submitButtonCpt = here.component "submitButton" cpt where
} }
[ H.span {className: "font-family-theme mx-1"} [ H.text $ " " <> text action] ] [ H.span {className: "font-family-theme mx-1"} [ H.text $ " " <> text action] ]
type Href = String type Href = String
submitButtonHref :: Action -> Href -> R.Element type SubmitButtonHrefProps =
submitButtonHref action href = ( action :: Action
H.a { className, href, target: "_blank" } , href :: Href )
[ H.span {className: "font-family-theme mx-1"} [ H.text $ " " <> text action ] ]
where submitButtonHref :: R2.Leaf SubmitButtonHrefProps
className = "btn btn-primary fa fa-" <> icon action submitButtonHref = R2.leaf submitButtonHrefCpt
submitButtonHrefCpt :: R.Component SubmitButtonHrefProps
submitButtonHrefCpt = here.component "submitButtonHref" cpt where
cpt { action, href } _ = do
pure $
H.a { className, href, target: "_blank" }
[ H.span {className: "font-family-theme mx-1"} [ H.text $ " " <> text action ] ]
where
className = "btn btn-primary fa fa-" <> icon action
------------------------------------------------------------------------ ------------------------------------------------------------------------
-- | CheckBox tools -- | CheckBox tools
......
...@@ -78,15 +78,15 @@ treeSearchCpt = here.component "treeSearch" cpt where ...@@ -78,15 +78,15 @@ treeSearchCpt = here.component "treeSearch" cpt where
{ className: "input-group p-1" } { className: "input-group p-1" }
[ [
inputWithEnter { className: "form-control" inputWithEnter { className: "form-control"
, autoFocus: true , autoFocus: true
, onEnter: submit inputRef query , onEnter: submit inputRef query
, onValueChanged: R.setRef inputRef , onValueChanged: R.setRef inputRef
, onBlur: R.setRef inputRef , onBlur: R.setRef inputRef
, type: "value" , type: "value"
, defaultValue: "" , defaultValue: ""
, required: true , required: true
, placeholder: "Search keys..." , placeholder: "Search keys..."
} }
, ,
H.div { className: "input-group-append"} H.div { className: "input-group-append"}
[ [
......
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