Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
purescript-gargantext
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
142
Issues
142
List
Board
Labels
Milestones
Merge Requests
7
Merge Requests
7
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gargantext
purescript-gargantext
Commits
5a8eced7
Commit
5a8eced7
authored
Sep 10, 2020
by
Przemyslaw Kaminski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[charts] fixes to bar chart
parent
d51a608e
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
34 additions
and
28 deletions
+34
-28
Tree.css
dist/styles/Tree.css
+4
-0
Tree.sass
dist/styles/Tree.sass
+4
-0
SubTree.purs
...Gargantext/Components/Forest/Tree/Node/Tools/SubTree.purs
+7
-9
NgramsTable.purs
src/Gargantext/Components/NgramsTable.purs
+0
-4
Annuaire.purs
src/Gargantext/Components/Nodes/Annuaire.purs
+1
-0
Pie.purs
src/Gargantext/Components/Nodes/Corpus/Chart/Pie.purs
+16
-14
Tabs.purs
src/Gargantext/Components/Nodes/Lists/Tabs.purs
+2
-1
No files found.
dist/styles/Tree.css
View file @
5a8eced7
...
...
@@ -16,6 +16,10 @@
.tree
.node
{
margin-top
:
1px
;
}
.tree
.node.node-type-valid
.text
{
color
:
blue
;
text-decoration
:
underline
;
}
.tree
.lefthanded
ul
{
margin-right
:
19px
;
}
...
...
dist/styles/Tree.sass
View file @
5a8eced7
...
...
@@ -11,6 +11,10 @@
cursor
:
wait
.node
margin-top
:
1px
&
.node-type-valid
.text
color
:
blue
text-decoration
:
underline
.lefthanded
ul
margin-right
:
19px
...
...
src/Gargantext/Components/Forest/Tree/Node/Tools/SubTree.purs
View file @
5a8eced7
...
...
@@ -121,14 +121,8 @@ subTreeTreeViewCpt = R2.hooksComponent thisModule "subTreeTreeViewCpt" cpt
GT.RightHanded -> identity
pure $ H.div {} $ ordering [
H.div { className: "node " <> GT.fldr nodeType true} [
H.span { style : if validNodeType then
{ color : "blue"
, "text-decoration": "underline"
}
else { color : ""
, "text-decoration": "none"
}
H.div { className: nodeClass validNodeType } [
H.span { className: "text"
, on: { click: onClick }
} [
nodeText { isSelected: isSelected targetId valAction
...
...
@@ -141,6 +135,10 @@ subTreeTreeViewCpt = R2.hooksComponent thisModule "subTreeTreeViewCpt" cpt
]
where
nodeClass vnt = "node " <> GT.fldr nodeType true <> " " <> validNodeTypeClass
where
validNodeTypeClass = if vnt then "node-type-valid" else ""
SubTreeParams { valitypes } = subTreeParams
sortedAry = A.sortWith (\(NTree (LNode {id:id'}) _) -> id')
...
...
@@ -152,7 +150,7 @@ subTreeTreeViewCpt = R2.hooksComponent thisModule "subTreeTreeViewCpt" cpt
clickable = if validNodeType then "clickable" else ""
(
valAction /\ setAction) = action
(valAction /\ setAction) = action
isSelected n action' = case (subTreeOut action') of
Nothing -> false
...
...
src/Gargantext/Components/NgramsTable.purs
View file @
5a8eced7
...
...
@@ -559,10 +559,6 @@ mainNgramsTablePaintCpt :: R.Component MainNgramsTablePaintProps
mainNgramsTablePaintCpt = R2.hooksComponent thisModule "mainNgramsTablePaint" cpt
where
cpt {path, tabNgramType, versioned, withAutoUpdate} _ = do
R.useEffect' $ do
let (Versioned v) = versioned
log2 "[mainNgramsTablePaint] versioned values" $ show v.data
pathS <- R.useState' path
state <- R.useState' $ initialState versioned
...
...
src/Gargantext/Components/Nodes/Annuaire.purs
View file @
5a8eced7
...
...
@@ -69,6 +69,7 @@ annuaireLayoutWithKeyCpt = R2.hooksComponent thisModule "annuaireLayoutWithKey"
where
cpt { frontends, nodeId, session } _ = do
path <- R.useState' nodeId
useLoader (fst path) (getAnnuaireInfo session) $
\info -> annuaire { frontends, info, path, session }
...
...
src/Gargantext/Components/Nodes/Corpus/Chart/Pie.purs
View file @
5a8eced7
...
...
@@ -108,6 +108,7 @@ pieCpt = R2.hooksComponent thisModule "pie" cpt
where
cpt { path, session } _ = do
reload <- R.useState' 0
pure $ metricsWithCacheLoadView {
getMetricsHash
, handleResponse
...
...
@@ -120,10 +121,11 @@ pieCpt = R2.hooksComponent thisModule "pie" cpt
loadedPie :: Record MetricsProps -> HistoMetrics -> R.Element
loadedPie { path, reload, session } loaded =
H.div {} [ U.reloadButton reload
, U.chartUpdateButton { chartType: ChartPie, path, reload, session }
, chart $ chartOptionsPie loaded
]
H.div {} [
U.reloadButton reload
, U.chartUpdateButton { chartType: ChartPie, path, reload, session }
, chart $ chartOptionsPie loaded
]
bar :: Record Props -> R.Element
...
...
@@ -134,16 +136,16 @@ barCpt = R2.hooksComponent thisModule "bar" cpt
where
cpt {path, session} _ = do
reload <- R.useState' 0
--pure $ metricsLoadView {getMetrics, loaded: loadedBar, path, reload, session}
pure $ metricsWithCacheLoadView
{
getMetricsHash
, handleResponse
, loaded: loadedPie
, mkRequest: mkRequest session
, path
, reload
, session
}
pure $ metricsWithCacheLoadView
{
getMetricsHash
, handleResponse
, loaded: loadedBar
, mkRequest: mkRequest session
, path
, reload
, session
}
loadedBar :: Record MetricsProps -> Loaded -> R.Element
loadedBar { path, reload, session } loaded =
...
...
src/Gargantext/Components/Nodes/Lists/Tabs.purs
View file @
5a8eced7
...
...
@@ -103,7 +103,8 @@ ngramsViewCpt = R2.hooksComponent thisModule "ngramsView" cpt
, getChartFunction chartType $ { session, path }
]
charts _ _ = [ chart mode ]
chart Authors = pie { session, path }
chart Sources = bar { session, path }
chart Institutes = tree { session, path }
chart Sources = bar { session, path }
chart Terms = metrics { session, path }
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment