From c81b315a83703fb1ef313596dcee83fbadf742db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20Delano=C3=AB?= <devel+git@delanoe.org>
Date: Fri, 17 Jul 2020 16:19:21 +0200
Subject: [PATCH] [GRAPH] Adding legend box (WIP)
---
.../Components/GraphExplorer/Legend.purs | 7 ++-
.../Components/GraphExplorer/Sidebar.purs | 55 +++++++++++--------
.../Components/GraphExplorer/Types.purs | 12 ++--
3 files changed, 44 insertions(+), 30 deletions(-)
diff --git a/src/Gargantext/Components/GraphExplorer/Legend.purs b/src/Gargantext/Components/GraphExplorer/Legend.purs
index 3b353255..654a32b8 100644
--- a/src/Gargantext/Components/GraphExplorer/Legend.purs
+++ b/src/Gargantext/Components/GraphExplorer/Legend.purs
@@ -23,6 +23,11 @@ legendCpt = R.hooksComponent "Legend" cpt
entry :: Legend -> R.Element
entry (Legend {id_, label}) =
RH.p {}
- [ RH.span { style: { width: 10, height: 10, backgroundColor: intColor id_, display: "inline-block" } } []
+ [ RH.span { style: { width : 10
+ , height: 10
+ , backgroundColor: intColor id_
+ , display: "inline-block"
+ }
+ } []
, RH.text $ " " <> label
]
diff --git a/src/Gargantext/Components/GraphExplorer/Sidebar.purs b/src/Gargantext/Components/GraphExplorer/Sidebar.purs
index e4643c88..3ce88387 100644
--- a/src/Gargantext/Components/GraphExplorer/Sidebar.purs
+++ b/src/Gargantext/Components/GraphExplorer/Sidebar.purs
@@ -14,7 +14,8 @@ import Data.Tuple.Nested ((/\))
import Effect (Effect)
import Effect.Aff (Aff, launchAff_)
import Effect.Class (liftEffect)
-import Gargantext.Components.GraphExplorer.Types as GET
+import Gargantext.Components.GraphExplorer.Types as GET
+import Gargantext.Components.GraphExplorer.Legend as Legend
import Gargantext.Components.NgramsTable.Core as NTC
import Gargantext.Components.Nodes.Corpus.Graph.Tabs (tabs) as CGT
import Gargantext.Components.RandomText (words)
@@ -30,16 +31,16 @@ import Reactix as R
import Reactix.DOM.HTML as RH
type Props =
- ( frontends :: Frontends
- , graph :: SigmaxT.SGraph
- , graphId :: Int
- , graphVersion :: R.State Int
- , metaData :: GET.MetaData
- , removedNodeIds :: R.State SigmaxT.NodeIds
+ ( frontends :: Frontends
+ , graph :: SigmaxT.SGraph
+ , graphId :: Int
+ , graphVersion :: R.State Int
+ , metaData :: GET.MetaData
+ , removedNodeIds :: R.State SigmaxT.NodeIds
, selectedNodeIds :: R.State SigmaxT.NodeIds
- , session :: Session
- , showSidePanel :: GET.SidePanelState
- , treeReload :: R.State Int
+ , session :: Session
+ , showSidePanel :: GET.SidePanelState
+ , treeReload :: R.State Int
)
sidebar :: Record Props -> R.Element
@@ -52,9 +53,8 @@ sidebarCpt = R.hooksComponent "Sidebar" cpt
pure $ RH.div {} []
cpt {showSidePanel: GET.InitialClosed} _children = do
pure $ RH.div {} []
- cpt props _children = do
+ cpt props@{metaData} _children = do
let nodesMap = SigmaxT.nodesGraphMap props.graph
-
pure $
RH.div { id: "sp-container" }
[ RH.div {}
@@ -70,15 +70,31 @@ sidebarCpt = R.hooksComponent "Sidebar" cpt
removeButton "Remove candidate" CandidateTerm props nodesMap
, removeButton "Remove stop" StopTerm props nodesMap
]
+
+ , RH.li { className: "nav-item" }
+ [ RH.a { id: "home-tab"
+ , className: "nav-link active"
+ , data: {toggle: "tab"}
+ , href: "#legend"
+ , role: "tab"
+ , aria: {controls: "legend", selected: "true"}
+ }
+ [ RH.text "Legend" ]
+ , let (GET.MetaData {legend}) = metaData
+ in Legend.legend { items: Seq.fromFoldable legend}
+ ]
, RH.li { className: "nav-item" }
[ RH.a { id: "home-tab"
, className: "nav-link active"
, data: {toggle: "tab"}
- , href: "#home"
+ , href: "#nodes"
, role: "tab"
- , aria: {controls: "home", selected: "true"}
+ , aria: {controls: "nodes", selected: "false"}
}
- [ RH.text "Neighbours" ]
+ [ RH.text "Nodes" ]
+
+ , RH.div { className: "col-md-12", id: "query" }
+ [ query props.frontends props.metaData props.session nodesMap props.selectedNodeIds]
]
]
, RH.div { className: "tab-content", id: "myTabContent" }
@@ -95,10 +111,6 @@ sidebarCpt = R.hooksComponent "Sidebar" cpt
]
]
-}
- , RH.div { className: "col-md-12", id: "query" }
- [
- query props.frontends props.metaData props.session nodesMap props.selectedNodeIds
- ]
]
]
]
@@ -126,7 +138,7 @@ sidebarCpt = R.hooksComponent "Sidebar" cpt
, session: props.session
, termList: rType
, treeReload: props.treeReload }
- snd props.removedNodeIds $ const $ fst props.selectedNodeIds
+ snd props.removedNodeIds $ const $ fst props.selectedNodeIds
snd props.selectedNodeIds $ const SigmaxT.emptyNodeIds
@@ -148,8 +160,7 @@ neighbourBadges graph (selectedNodeIds /\ _) = SigmaxT.neighbours graph selected
selectedNodes = SigmaxT.graphNodes $ SigmaxT.nodesById graph selectedNodeIds
type DeleteNodes =
- (
- graphId :: Int
+ ( graphId :: Int
, metaData :: GET.MetaData
, nodes :: Array (Record SigmaxT.Node)
, session :: Session
diff --git a/src/Gargantext/Components/GraphExplorer/Types.purs b/src/Gargantext/Components/GraphExplorer/Types.purs
index 9446689c..36022ec1 100644
--- a/src/Gargantext/Components/GraphExplorer/Types.purs
+++ b/src/Gargantext/Components/GraphExplorer/Types.purs
@@ -58,14 +58,12 @@ derive instance newtypeGraphData :: Newtype GraphData _
newtype MetaData = MetaData
- {
- title :: String
- , legend :: Array Legend
+ { title :: String
+ , legend :: Array Legend
, corpusId :: Array Int
- , list :: {
- listId :: ListId
- , version :: Version
- }
+ , list :: { listId :: ListId
+ , version :: Version
+ }
}
getLegend :: GraphData -> Maybe (Array Legend)
--
2.21.0