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
138
Issues
138
List
Board
Labels
Milestones
Merge Requests
3
Merge Requests
3
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
b156eb60
Commit
b156eb60
authored
Oct 01, 2020
by
Alexandre Delanoë
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev-merge' into dev
parents
feedaa3c
e7b8cfc4
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
17 additions
and
15 deletions
+17
-15
Graph.css
dist/styles/Graph.css
+2
-3
Graph.sass
dist/styles/Graph.sass
+2
-3
Core.purs
src/Gargantext/Components/NgramsTable/Core.purs
+8
-4
Histo.purs
src/Gargantext/Components/Nodes/Corpus/Chart/Histo.purs
+1
-1
Metrics.purs
src/Gargantext/Components/Nodes/Corpus/Chart/Metrics.purs
+1
-1
Pie.purs
src/Gargantext/Components/Nodes/Corpus/Chart/Pie.purs
+2
-2
Tree.purs
src/Gargantext/Components/Nodes/Corpus/Chart/Tree.purs
+1
-1
No files found.
dist/styles/Graph.css
View file @
b156eb60
...
...
@@ -80,12 +80,11 @@
}
.input-with-autocomplete
.completions
{
position
:
absolute
;
position
:
fixed
;
max-height
:
300px
;
overflow-y
:
scroll
;
width
:
300px
;
top
:
50px
;
z-index
:
5
;
top
:
100px
;
}
/*# sourceMappingURL=Graph.css.map */
dist/styles/Graph.sass
View file @
b156eb60
...
...
@@ -79,9 +79,8 @@
.input-with-autocomplete
.completions
position
:
absolute
position
:
fixed
max-height
:
300px
overflow-y
:
scroll
width
:
300px
top
:
50px
z-index
:
5
top
:
100px
src/Gargantext/Components/NgramsTable/Core.purs
View file @
b156eb60
...
...
@@ -758,18 +758,22 @@ type RootParent = { root :: NgramsTerm, parent :: NgramsTerm }
type ReParent a = forall m. MonadState NgramsTable m => a -> m Unit
reRootChildren :: NgramsTerm -> ReParent NgramsTerm
reRootChildren root ngram = do
reRootMaxDepth :: Int
reRootMaxDepth = 100 -- TODO: this is a hack
reRootChildren :: Int -> NgramsTerm -> ReParent NgramsTerm
reRootChildren 0 _ _ = pure unit -- TODO: this is a hack
reRootChildren max_depth root ngram = do
nre <- use (at ngram)
traverseOf_ (_Just <<< _NgramsRepoElement <<< _children <<< folded) (\child -> do
at child <<< _Just <<< _NgramsRepoElement <<< _root ?= root
reRootChildren root child) nre
reRootChildren
(max_depth - 1)
root child) nre
reParent :: Maybe RootParent -> ReParent NgramsTerm
reParent mrp child = do
at child <<< _Just <<< _NgramsRepoElement %= ((_parent .~ (view _parent <$> mrp)) <<<
(_root .~ (view _root <$> mrp)))
reRootChildren (fromMaybe child (mrp ^? _Just <<< _root)) child
reRootChildren
reRootMaxDepth
(fromMaybe child (mrp ^? _Just <<< _root)) child
-- reParentNgramsPatch :: NgramsTerm -> ReParent NgramsPatch
-- ^ GHC would have accepted this type. Here reParentNgramsPatch checks but
...
...
src/Gargantext/Components/Nodes/Corpus/Chart/Histo.purs
View file @
b156eb60
...
...
@@ -103,7 +103,7 @@ loaded :: Record MetricsProps -> HistoMetrics -> R.Element
loaded { path, reload, session } loaded =
H.div {} [
U.reloadButton reload
--
, U.chartUpdateButton { chartType: Histo, path, reload, session }
, U.chartUpdateButton { chartType: Histo, path, reload, session }
, chart $ chartOptions loaded
]
-- TODO: parametrize ngramsType above
src/Gargantext/Components/Nodes/Corpus/Chart/Metrics.purs
View file @
b156eb60
...
...
@@ -137,6 +137,6 @@ loaded :: Record MetricsProps -> Loaded -> R.Element
loaded { path, reload, session } loaded =
H.div {} [
U.reloadButton reload
--
, U.chartUpdateButton { chartType: Scatter, path, reload, session }
, U.chartUpdateButton { chartType: Scatter, path, reload, session }
, chart $ scatterOptions loaded
]
src/Gargantext/Components/Nodes/Corpus/Chart/Pie.purs
View file @
b156eb60
...
...
@@ -123,7 +123,7 @@ loadedPie :: Record MetricsProps -> HistoMetrics -> R.Element
loadedPie { path, reload, session } loaded =
H.div {} [
U.reloadButton reload
--
, U.chartUpdateButton { chartType: ChartPie, path, reload, session }
, U.chartUpdateButton { chartType: ChartPie, path, reload, session }
, chart $ chartOptionsPie loaded
]
...
...
@@ -151,6 +151,6 @@ loadedBar :: Record MetricsProps -> Loaded -> R.Element
loadedBar { path, reload, session } loaded =
H.div {} [
U.reloadButton reload
--
, U.chartUpdateButton { chartType: ChartBar, path, reload, session }
, U.chartUpdateButton { chartType: ChartBar, path, reload, session }
, chart $ chartOptionsBar loaded
]
src/Gargantext/Components/Nodes/Corpus/Chart/Tree.purs
View file @
b156eb60
...
...
@@ -95,6 +95,6 @@ loaded :: Record MetricsProps -> Loaded -> R.Element
loaded { path, reload, session } loaded =
H.div {} [
U.reloadButton reload
--
, U.chartUpdateButton { chartType: ChartTree, path, reload, session }
, U.chartUpdateButton { chartType: ChartTree, path, reload, session }
, chart (scatterOptions loaded)
]
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