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

Merge branch '305-dev-sidebar-fixes' of...

Merge branch '305-dev-sidebar-fixes' of ssh://gitlab.iscpif.fr:20022/gargantext/purescript-gargantext into dev-merge
parents 8ad7dc34 22d92f10
Pipeline #1586 failed with stage
...@@ -209,12 +209,12 @@ selectedNodesCpt = here.component "selectedNodes" cpt ...@@ -209,12 +209,12 @@ selectedNodesCpt = here.component "selectedNodes" cpt
] ]
] ]
, RH.div { className: "tab-content flex-space-between" } , RH.div { className: "tab-content flex-space-between" }
[ removeButton (Record.merge { buttonType: "primary" [ updateTermButton (Record.merge { buttonType: "primary"
, rType: CandidateTerm , rType: CandidateTerm
, nodesMap , nodesMap
, text: "Move as candidate" } commonProps) [] , text: "Move as candidate" } commonProps) []
, H.br {} , H.br {}
, removeButton (Record.merge { buttonType: "danger" , updateTermButton (Record.merge { buttonType: "danger"
, nodesMap , nodesMap
, rType: StopTerm , rType: StopTerm
, text: "Move as stop" } commonProps) [] , text: "Move as stop" } commonProps) []
...@@ -246,7 +246,7 @@ neighborhoodCpt = here.component "neighborhood" cpt ...@@ -246,7 +246,7 @@ neighborhoodCpt = here.component "neighborhood" cpt
] ]
type RemoveButtonProps = ( type UpdateTermButtonProps = (
buttonType :: String buttonType :: String
, nodesMap :: SigmaxT.NodesMap , nodesMap :: SigmaxT.NodesMap
, rType :: TermList , rType :: TermList
...@@ -254,11 +254,10 @@ type RemoveButtonProps = ( ...@@ -254,11 +254,10 @@ type RemoveButtonProps = (
| Common | Common
) )
removeButton :: R2.Component RemoveButtonProps updateTermButton :: R2.Component UpdateTermButtonProps
removeButton = R.createElement removeButtonCpt updateTermButton = R.createElement updateTermButtonCpt
updateTermButtonCpt :: R.Component UpdateTermButtonProps
removeButtonCpt :: R.Component RemoveButtonProps updateTermButtonCpt = here.component "updateTermButton" cpt
removeButtonCpt = here.component "removeButton" cpt
where where
cpt { buttonType cpt { buttonType
, graphId , graphId
...@@ -282,7 +281,7 @@ removeButtonCpt = here.component "removeButton" cpt ...@@ -282,7 +281,7 @@ removeButtonCpt = here.component "removeButton" cpt
onClickRemove selectedNodeIds' e = do onClickRemove selectedNodeIds' e = do
let nodes = mapMaybe (\id -> Map.lookup id nodesMap) let nodes = mapMaybe (\id -> Map.lookup id nodesMap)
$ Set.toUnfoldable selectedNodeIds' $ Set.toUnfoldable selectedNodeIds'
deleteNodes { graphId: graphId sendPatches { graphId: graphId
, metaData: metaData , metaData: metaData
, nodes , nodes
, session: session , session: session
...@@ -309,7 +308,7 @@ neighbourBadges :: SigmaxT.SGraph -> SigmaxT.NodeIds -> Seq.Seq (Record SigmaxT. ...@@ -309,7 +308,7 @@ neighbourBadges :: SigmaxT.SGraph -> SigmaxT.NodeIds -> Seq.Seq (Record SigmaxT.
neighbourBadges graph selectedNodeIds = SigmaxT.neighbours graph selectedNodes' where neighbourBadges graph selectedNodeIds = SigmaxT.neighbours graph selectedNodes' where
selectedNodes' = SigmaxT.graphNodes $ SigmaxT.nodesById graph selectedNodeIds selectedNodes' = SigmaxT.graphNodes $ SigmaxT.nodesById graph selectedNodeIds
type DeleteNodes = type SendPatches =
( graphId :: NodeID ( graphId :: NodeID
, metaData :: GET.MetaData , metaData :: GET.MetaData
, nodes :: Array (Record SigmaxT.Node) , nodes :: Array (Record SigmaxT.Node)
...@@ -318,10 +317,10 @@ type DeleteNodes = ...@@ -318,10 +317,10 @@ type DeleteNodes =
, termList :: TermList , termList :: TermList
) )
deleteNodes :: Record DeleteNodes -> Effect Unit sendPatches :: Record SendPatches -> Effect Unit
deleteNodes { graphId, metaData, nodes, session, termList, reloadForest } = do sendPatches { graphId, metaData, nodes, session, termList, reloadForest } = do
launchAff_ do launchAff_ do
patches <- (parTraverse (deleteNode termList session metaData) nodes) :: Aff (Array NTC.VersionedNgramsPatches) patches <- (parTraverse (sendPatch termList session metaData) nodes) :: Aff (Array NTC.VersionedNgramsPatches)
let mPatch = last patches let mPatch = last patches
case mPatch of case mPatch of
Nothing -> pure unit Nothing -> pure unit
...@@ -329,12 +328,12 @@ deleteNodes { graphId, metaData, nodes, session, termList, reloadForest } = do ...@@ -329,12 +328,12 @@ deleteNodes { graphId, metaData, nodes, session, termList, reloadForest } = do
liftEffect $ T2.reload reloadForest liftEffect $ T2.reload reloadForest
-- Why is this called delete node? -- Why is this called delete node?
deleteNode :: TermList sendPatch :: TermList
-> Session -> Session
-> GET.MetaData -> GET.MetaData
-> Record SigmaxT.Node -> Record SigmaxT.Node
-> Aff NTC.VersionedNgramsPatches -> Aff NTC.VersionedNgramsPatches
deleteNode termList session (GET.MetaData metaData) node = do sendPatch termList session (GET.MetaData metaData) node = do
ret <- NTC.putNgramsPatches coreParams versioned ret <- NTC.putNgramsPatches coreParams versioned
task <- NTC.postNgramsChartsAsync coreParams -- TODO add task task <- NTC.postNgramsChartsAsync coreParams -- TODO add task
pure ret pure ret
......
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