Commit 5f23a9dc authored by Alexandre Delanoë's avatar Alexandre Delanoë

[GRAPH] SidePanel Tabs States use (WIP)

parent c81b315a
...@@ -141,10 +141,10 @@ explorerCpt = R.hooksComponent "G.C.GraphExplorer.explorer" cpt ...@@ -141,10 +141,10 @@ explorerCpt = R.hooksComponent "G.C.GraphExplorer.explorer" cpt
, graph , graph
, graphId , graphId
, graphVersion , graphVersion
, removedNodeIds: controls.removedNodeIds , removedNodeIds : controls.removedNodeIds
, session , session
, selectedNodeIds: controls.selectedNodeIds , selectedNodeIds: controls.selectedNodeIds
, showSidePanel: fst controls.showSidePanel , showSidePanel : controls.showSidePanel
, treeReload , treeReload
} }
] ]
...@@ -191,7 +191,7 @@ type MSidebarProps = ...@@ -191,7 +191,7 @@ type MSidebarProps =
, graphId :: GraphId , graphId :: GraphId
, graphVersion :: R.State Int , graphVersion :: R.State Int
, removedNodeIds :: R.State SigmaxT.NodeIds , removedNodeIds :: R.State SigmaxT.NodeIds
, showSidePanel :: GET.SidePanelState , showSidePanel :: R.State GET.SidePanelState
, selectedNodeIds :: R.State SigmaxT.NodeIds , selectedNodeIds :: R.State SigmaxT.NodeIds
, session :: Session , session :: Session
, treeReload :: R.State Int , treeReload :: R.State Int
......
...@@ -94,7 +94,7 @@ controlsCpt = R.hooksComponent "GraphControls" cpt ...@@ -94,7 +94,7 @@ controlsCpt = R.hooksComponent "GraphControls" cpt
-- Automatic opening of sidebar when a node is selected (but only first time). -- Automatic opening of sidebar when a node is selected (but only first time).
R.useEffect' $ do R.useEffect' $ do
if fst props.showSidePanel == GET.InitialClosed && (not Set.isEmpty $ fst props.selectedNodeIds) then if fst props.showSidePanel == GET.InitialClosed && (not Set.isEmpty $ fst props.selectedNodeIds) then
snd props.showSidePanel $ \_ -> GET.Opened snd props.showSidePanel $ \_ -> GET.Opened GET.SideTab2
else else
pure unit pure unit
......
...@@ -39,7 +39,7 @@ type Props = ...@@ -39,7 +39,7 @@ type Props =
, removedNodeIds :: R.State SigmaxT.NodeIds , removedNodeIds :: R.State SigmaxT.NodeIds
, selectedNodeIds :: R.State SigmaxT.NodeIds , selectedNodeIds :: R.State SigmaxT.NodeIds
, session :: Session , session :: Session
, showSidePanel :: GET.SidePanelState , showSidePanel :: R.State GET.SidePanelState
, treeReload :: R.State Int , treeReload :: R.State Int
) )
...@@ -49,25 +49,29 @@ sidebar props = R.createElement sidebarCpt props [] ...@@ -49,25 +49,29 @@ sidebar props = R.createElement sidebarCpt props []
sidebarCpt :: R.Component Props sidebarCpt :: R.Component Props
sidebarCpt = R.hooksComponent "Sidebar" cpt sidebarCpt = R.hooksComponent "Sidebar" cpt
where where
cpt {showSidePanel: GET.Closed} _children = do cpt {showSidePanel: (GET.Closed /\ _)} _children = do
pure $ RH.div {} [] pure $ RH.div {} []
cpt {showSidePanel: GET.InitialClosed} _children = do cpt {showSidePanel: (GET.InitialClosed /\ _)} _children = do
pure $ RH.div {} [] pure $ RH.div {} []
cpt props@{metaData} _children = do cpt props@{metaData, showSidePanel} _children = do
let (sidePanel /\ setSidePanel) = showSidePanel
let nodesMap = SigmaxT.nodesGraphMap props.graph let nodesMap = SigmaxT.nodesGraphMap props.graph
pure $ pure $
RH.div { id: "sp-container" } RH.div { id: "sp-container" }
[ RH.div {} [ RH.div {}
[ R2.row [ R2.row
[ R2.col12 [ R2.col 12
[ RH.ul { id: "myTab", className: "nav nav-tabs", role: "tablist"} [ RH.ul { id: "myTab", className: "nav nav-tabs", role: "tablist"}
[ RH.div { className: "tab-content" } [ RH.div { className: "tab-content" }
[ RH.div { className: "", role: "tabpanel" } [ RH.div { className: "", role: "tabpanel" }
(Seq.toUnfoldable $ (Seq.map (badge props.selectedNodeIds) (badges props.graph props.selectedNodeIds))) ( Seq.toUnfoldable
$ ( Seq.map (badge props.selectedNodeIds)
(badges props.graph props.selectedNodeIds)
)
)
] ]
, RH.div { className: "tab-content" } , RH.div { className: "tab-content" }
[ [ removeButton "Remove candidate" CandidateTerm props nodesMap
removeButton "Remove candidate" CandidateTerm props nodesMap
, removeButton "Remove stop" StopTerm props nodesMap , removeButton "Remove stop" StopTerm props nodesMap
] ]
...@@ -85,7 +89,7 @@ sidebarCpt = R.hooksComponent "Sidebar" cpt ...@@ -85,7 +89,7 @@ sidebarCpt = R.hooksComponent "Sidebar" cpt
] ]
, RH.li { className: "nav-item" } , RH.li { className: "nav-item" }
[ RH.a { id: "home-tab" [ RH.a { id: "home-tab"
, className: "nav-link active" , className: "nav-link"
, data: {toggle: "tab"} , data: {toggle: "tab"}
, href: "#nodes" , href: "#nodes"
, role: "tab" , role: "tab"
...@@ -131,7 +135,8 @@ sidebarCpt = R.hooksComponent "Sidebar" cpt ...@@ -131,7 +135,8 @@ sidebarCpt = R.hooksComponent "Sidebar" cpt
[ RH.text text ] [ RH.text text ]
onClickRemove rType props nodesMap e = do onClickRemove rType props nodesMap e = do
let nodes = mapMaybe (\id -> Map.lookup id nodesMap) $ Set.toUnfoldable $ fst props.selectedNodeIds let nodes = mapMaybe (\id -> Map.lookup id nodesMap)
$ Set.toUnfoldable $ fst props.selectedNodeIds
deleteNodes { graphId: props.graphId deleteNodes { graphId: props.graphId
, metaData: props.metaData , metaData: props.metaData
, nodes , nodes
......
...@@ -144,12 +144,12 @@ sidebarToggleButton (state /\ setState) = R.createElement el {} [] ...@@ -144,12 +144,12 @@ sidebarToggleButton (state /\ setState) = R.createElement el {} []
] ]
onMessage = "Hide Sidebar" onMessage = "Hide Sidebar"
offMessage = "Show Sidebar" offMessage = "Show Sidebar"
text on _off GET.Opened = on text on _off (GET.Opened _) = on
text _on off GET.InitialClosed = off text _on off GET.InitialClosed = off
text _on off GET.Closed = off text _on off GET.Closed = off
onClick = \_ -> do onClick = \_ -> do
setState $ \s -> case s of setState $ \s -> case s of
GET.InitialClosed -> GET.Opened GET.InitialClosed -> GET.Opened GET.SideTab1
GET.Closed -> GET.Opened GET.Closed -> GET.Opened GET.SideTab1
GET.Opened -> GET.Closed (GET.Opened _) -> GET.Closed
...@@ -189,6 +189,10 @@ intColor :: Int -> String ...@@ -189,6 +189,10 @@ intColor :: Int -> String
intColor i = unsafePartial $ fromJust $ defaultPalette !! (i `mod` length defaultPalette) intColor i = unsafePartial $ fromJust $ defaultPalette !! (i `mod` length defaultPalette)
data SidePanelState = InitialClosed | Opened | Closed data SidePanelState = InitialClosed | Opened SideTab | Closed
data SideTab = SideTab1 | SideTab2 | SideTab3
derive instance eqSideTab :: Eq SideTab
derive instance eqSidePanelState :: Eq SidePanelState derive instance eqSidePanelState :: Eq SidePanelState
...@@ -252,8 +252,8 @@ blur el = el ... "blur" $ [] ...@@ -252,8 +252,8 @@ blur el = el ... "blur" $ []
row :: Array R.Element -> R.Element row :: Array R.Element -> R.Element
row children = H.div { className: "row" } children row children = H.div { className: "row" } children
col12 :: Array R.Element -> R.Element col :: Int -> Array R.Element -> R.Element
col12 children = H.div { className: "col-md-12" } children col n children = H.div { className : "col-md" <> show n } children
innerText :: DOM.Element -> String innerText :: DOM.Element -> String
innerText e = e .. "innerText" innerText e = e .. "innerText"
......
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