Skip to content

haskell-gargantext
haskell-gargantext
Commit fed00f24 authored by Alexandre Delanoë's avatar Alexandre Delanoë
Browse files
Options

[FIX] #205 GraphExplorer recomputing (needs refactoring TODO)

parent b40b708a
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 7 deletions
src/Gargantext/Core/Viz/Graph/API.hs
View file @ fed00f24
...@@ -84,7 +84,7 @@ graphAPI u n = getGraph u n ...@@ -84,7 +84,7 @@ graphAPI u n = getGraph u n
getGraph :: UserId -> NodeId -> GargNoServer HyperdataGraphAPI getGraph :: UserId -> NodeId -> GargNoServer HyperdataGraphAPI
getGraph _uId nId = do getGraph _uId nId = do
nodeGraph <- getNodeWith nId (Proxy :: Proxy HyperdataGraph) nodeGraph <- getNodeWith nId (Proxy :: Proxy HyperdataGraph)
let graph = nodeGraph ^. node_hyperdata . hyperdataGraph let graph = nodeGraph ^. node_hyperdata . hyperdataGraph
let camera = nodeGraph ^. node_hyperdata . hyperdataCamera let camera = nodeGraph ^. node_hyperdata . hyperdataCamera
repo <- getRepo repo <- getRepo
...@@ -100,7 +100,8 @@ getGraph _uId nId = do ...@@ -100,7 +100,8 @@ getGraph _uId nId = do
mt <- defaultGraphMetadata cId "Title" repo mt <- defaultGraphMetadata cId "Title" repo
let graph'' = set graph_metadata (Just mt) graph' let graph'' = set graph_metadata (Just mt) graph'
let hg = HyperdataGraphAPI graph'' camera let hg = HyperdataGraphAPI graph'' camera
_ <- updateHyperdata nId hg -- _ <- updateHyperdata nId hg
_ <- updateHyperdata nId (HyperdataGraph (Just graph'') camera)
pure $ trace "[G.V.G.API] Graph empty, computing" hg pure $ trace "[G.V.G.API] Graph empty, computing" hg
Just graph' -> pure $ trace "[G.V.G.API] Graph exists, returning" $ Just graph' -> pure $ trace "[G.V.G.API] Graph exists, returning" $
...@@ -110,10 +111,10 @@ getGraph _uId nId = do ...@@ -110,10 +111,10 @@ getGraph _uId nId = do
recomputeGraph :: UserId -> NodeId -> Distance -> GargNoServer Graph recomputeGraph :: UserId -> NodeId -> Distance -> GargNoServer Graph
recomputeGraph _uId nId d = do recomputeGraph _uId nId d = do
nodeGraph <- getNodeWith nId (Proxy :: Proxy HyperdataGraph) nodeGraph <- getNodeWith nId (Proxy :: Proxy HyperdataGraph)
let graph = nodeGraph ^. node_hyperdata . hyperdataGraph let graph = nodeGraph ^. node_hyperdata . hyperdataGraph
let camera = nodeGraph ^. node_hyperdata . hyperdataCamera let camera = nodeGraph ^. node_hyperdata . hyperdataCamera
let graphMetadata = graph ^? _Just . graph_metadata . _Just let graphMetadata = graph ^? _Just . graph_metadata . _Just
let listVersion = graph ^? _Just . graph_metadata . _Just . gm_list . lfg_version let listVersion = graph ^? _Just . graph_metadata . _Just . gm_list . lfg_version
repo <- getRepo repo <- getRepo
let v = repo ^. r_version let v = repo ^. r_version
...@@ -223,11 +224,11 @@ type GraphVersionsAPI = Summary "Graph versions" ...@@ -223,11 +224,11 @@ type GraphVersionsAPI = Summary "Graph versions"
graphVersionsAPI :: UserId -> NodeId -> GargServer GraphVersionsAPI graphVersionsAPI :: UserId -> NodeId -> GargServer GraphVersionsAPI
graphVersionsAPI u n = graphVersionsAPI u n =
graphVersions u n graphVersions n
:<|> recomputeVersions u n :<|> recomputeVersions u n
graphVersions :: UserId -> NodeId -> GargNoServer GraphVersions graphVersions :: NodeId -> GargNoServer GraphVersions
graphVersions _uId nId = do graphVersions nId = do
nodeGraph <- getNodeWith nId (Proxy :: Proxy HyperdataGraph) nodeGraph <- getNodeWith nId (Proxy :: Proxy HyperdataGraph)
let graph = nodeGraph ^. node_hyperdata . hyperdataGraph let graph = nodeGraph ^. node_hyperdata . hyperdataGraph
let listVersion = graph ^? _Just let listVersion = graph ^? _Just
......
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