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

Merge branch 'dev-merge' into dev

parents feedaa3c e7b8cfc4
...@@ -80,12 +80,11 @@ ...@@ -80,12 +80,11 @@
} }
.input-with-autocomplete .completions { .input-with-autocomplete .completions {
position: absolute; position: fixed;
max-height: 300px; max-height: 300px;
overflow-y: scroll; overflow-y: scroll;
width: 300px; width: 300px;
top: 50px; top: 100px;
z-index: 5;
} }
/*# sourceMappingURL=Graph.css.map */ /*# sourceMappingURL=Graph.css.map */
...@@ -79,9 +79,8 @@ ...@@ -79,9 +79,8 @@
.input-with-autocomplete .input-with-autocomplete
.completions .completions
position: absolute position: fixed
max-height: 300px max-height: 300px
overflow-y: scroll overflow-y: scroll
width: 300px width: 300px
top: 50px top: 100px
z-index: 5
...@@ -758,18 +758,22 @@ type RootParent = { root :: NgramsTerm, parent :: NgramsTerm } ...@@ -758,18 +758,22 @@ type RootParent = { root :: NgramsTerm, parent :: NgramsTerm }
type ReParent a = forall m. MonadState NgramsTable m => a -> m Unit type ReParent a = forall m. MonadState NgramsTable m => a -> m Unit
reRootChildren :: NgramsTerm -> ReParent NgramsTerm reRootMaxDepth :: Int
reRootChildren root ngram = do 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) nre <- use (at ngram)
traverseOf_ (_Just <<< _NgramsRepoElement <<< _children <<< folded) (\child -> do traverseOf_ (_Just <<< _NgramsRepoElement <<< _children <<< folded) (\child -> do
at child <<< _Just <<< _NgramsRepoElement <<< _root ?= root at child <<< _Just <<< _NgramsRepoElement <<< _root ?= root
reRootChildren root child) nre reRootChildren (max_depth - 1) root child) nre
reParent :: Maybe RootParent -> ReParent NgramsTerm reParent :: Maybe RootParent -> ReParent NgramsTerm
reParent mrp child = do reParent mrp child = do
at child <<< _Just <<< _NgramsRepoElement %= ((_parent .~ (view _parent <$> mrp)) <<< at child <<< _Just <<< _NgramsRepoElement %= ((_parent .~ (view _parent <$> mrp)) <<<
(_root .~ (view _root <$> mrp))) (_root .~ (view _root <$> mrp)))
reRootChildren (fromMaybe child (mrp ^? _Just <<< _root)) child reRootChildren reRootMaxDepth (fromMaybe child (mrp ^? _Just <<< _root)) child
-- reParentNgramsPatch :: NgramsTerm -> ReParent NgramsPatch -- reParentNgramsPatch :: NgramsTerm -> ReParent NgramsPatch
-- ^ GHC would have accepted this type. Here reParentNgramsPatch checks but -- ^ GHC would have accepted this type. Here reParentNgramsPatch checks but
......
...@@ -103,7 +103,7 @@ loaded :: Record MetricsProps -> HistoMetrics -> R.Element ...@@ -103,7 +103,7 @@ loaded :: Record MetricsProps -> HistoMetrics -> R.Element
loaded { path, reload, session } loaded = loaded { path, reload, session } loaded =
H.div {} [ H.div {} [
U.reloadButton reload U.reloadButton reload
-- , U.chartUpdateButton { chartType: Histo, path, reload, session } , U.chartUpdateButton { chartType: Histo, path, reload, session }
, chart $ chartOptions loaded , chart $ chartOptions loaded
] ]
-- TODO: parametrize ngramsType above -- TODO: parametrize ngramsType above
...@@ -137,6 +137,6 @@ loaded :: Record MetricsProps -> Loaded -> R.Element ...@@ -137,6 +137,6 @@ loaded :: Record MetricsProps -> Loaded -> R.Element
loaded { path, reload, session } loaded = loaded { path, reload, session } loaded =
H.div {} [ H.div {} [
U.reloadButton reload U.reloadButton reload
-- , U.chartUpdateButton { chartType: Scatter, path, reload, session } , U.chartUpdateButton { chartType: Scatter, path, reload, session }
, chart $ scatterOptions loaded , chart $ scatterOptions loaded
] ]
...@@ -123,7 +123,7 @@ loadedPie :: Record MetricsProps -> HistoMetrics -> R.Element ...@@ -123,7 +123,7 @@ loadedPie :: Record MetricsProps -> HistoMetrics -> R.Element
loadedPie { path, reload, session } loaded = loadedPie { path, reload, session } loaded =
H.div {} [ H.div {} [
U.reloadButton reload U.reloadButton reload
-- , U.chartUpdateButton { chartType: ChartPie, path, reload, session } , U.chartUpdateButton { chartType: ChartPie, path, reload, session }
, chart $ chartOptionsPie loaded , chart $ chartOptionsPie loaded
] ]
...@@ -151,6 +151,6 @@ loadedBar :: Record MetricsProps -> Loaded -> R.Element ...@@ -151,6 +151,6 @@ loadedBar :: Record MetricsProps -> Loaded -> R.Element
loadedBar { path, reload, session } loaded = loadedBar { path, reload, session } loaded =
H.div {} [ H.div {} [
U.reloadButton reload U.reloadButton reload
-- , U.chartUpdateButton { chartType: ChartBar, path, reload, session } , U.chartUpdateButton { chartType: ChartBar, path, reload, session }
, chart $ chartOptionsBar loaded , chart $ chartOptionsBar loaded
] ]
...@@ -95,6 +95,6 @@ loaded :: Record MetricsProps -> Loaded -> R.Element ...@@ -95,6 +95,6 @@ loaded :: Record MetricsProps -> Loaded -> R.Element
loaded { path, reload, session } loaded = loaded { path, reload, session } loaded =
H.div {} [ H.div {} [
U.reloadButton reload U.reloadButton reload
-- , U.chartUpdateButton { chartType: ChartTree, path, reload, session } , U.chartUpdateButton { chartType: ChartTree, path, reload, session }
, chart (scatterOptions loaded) , chart (scatterOptions loaded)
] ]
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