Merge remote-tracking branch 'origin/582-dev-phylo-default-behavior' into dev

src/Gargantext/API/Viz/Types.hs

@@ -36,8 +36,8 @@ instance ToSchema Value where declareNamedSchema _ = declareNamedSchema (Proxy :
 -- 'purescript-gargantext' package.
 data PhyloData = PhyloData { pd_corpusId :: NodeId
                            , pd_listId   :: NodeId
-                           , pd_data     :: GraphData
-                           , pd_config   :: PhyloConfig
+                           , pd_data     :: Maybe GraphData
+                           , pd_config   :: Maybe PhyloConfig
                            }
   deriving (Generic, Show, Eq)
 

src/Gargantext/Core/Viz/Phylo/API.hs

@@ -28,7 +28,6 @@ import Gargantext.Core.Types.Phylo (GraphData(..))
 import Gargantext.Core.Viz.LegacyPhylo hiding (Phylo(..))
 import Gargantext.Core.Viz.Phylo (PhyloConfig(..), defaultConfig, _phylo_param, _phyloParam_config)
 import Gargantext.Core.Viz.Phylo.API.Tools
-import Gargantext.Core.Viz.Phylo.Example (phyloCleopatre)
 import Gargantext.Database.Admin.Types.Hyperdata
 import Gargantext.Database.Admin.Types.Node -- (PhyloId, ListId, CorpusId, UserId, NodeId(..))
 import Gargantext.Database.Query.Table.Node (getClosestParentIdByType, defaultList)
@@ -58,21 +57,27 @@ getPhylo phyloId = Named.GetPhylo $ \lId _level _minSizeBranch -> do
   listId   <- case lId of
                 Nothing -> defaultList corpusId
                 Just ld -> pure ld
-  (gd, phyloConfig) <- getPhyloDataJson phyloId
+  pd <- getPhyloDataJson phyloId
   -- printDebug "getPhylo" theData
-  pure $ PhyloData corpusId listId gd phyloConfig
+  case pd of
+    Nothing -> pure $ PhyloData corpusId listId Nothing Nothing
+    Just (gd, phyloConfig) ->
+      pure $ PhyloData corpusId listId (Just gd) (Just phyloConfig)
 
 
 
-getPhyloDataJson :: PhyloId -> GargNoServer (GraphData, PhyloConfig)
+getPhyloDataJson :: PhyloId -> GargNoServer (Maybe (GraphData, PhyloConfig))
 getPhyloDataJson phyloId = do
-  maybePhyloData <- getPhyloData phyloId
-  let phyloData = fromMaybe phyloCleopatre maybePhyloData
-  let phyloConfig = _phyloParam_config $ _phylo_param phyloData
-  phyloJson <- liftBase $ phylo2dot2json phyloData
-  case parseEither parseJSON phyloJson of
-    Left err -> panicTrace $ T.pack $ "[Gargantext.Core.Viz.Phylo.API] getPhyloDataJson: " <> err
-    Right gd -> pure (gd, phyloConfig)
+  phyloData <- getPhyloData phyloId
+  phyloJson <- liftBase $ maybePhylo2dot2json phyloData
+  case phyloJson of
+    Nothing -> pure Nothing
+    Just pj  ->
+      case parseEither parseJSON pj of
+        Left err -> panicTrace $ T.pack $ "[Gargantext.Core.Viz.Phylo.API] getPhyloDataJson: " <> err
+        Right gd -> pure  $ Just (gd, phyloConfig phyloData)
+  where
+    phyloConfig phyloData = _phyloParam_config . _phylo_param $ fromMaybe (panicTrace "[Gargantext.Core.Viz.Phylo.API] getPhyloDataJson: no phylo data") phyloData
 
 
 -- getPhyloDataSVG phId _lId l msb  = do

src/Gargantext/Core/Viz/Phylo/API/Tools.hs

@@ -69,6 +69,10 @@ savePhylo :: PhyloId -> DBCmd err ()
 savePhylo = undefined
 
 --------------------------------------------------------------------
+maybePhylo2dot2json :: Maybe Phylo -> IO (Maybe Value)
+maybePhylo2dot2json Nothing = pure Nothing
+maybePhylo2dot2json (Just phylo) = Just <$> phylo2dot2json phylo
+
 phylo2dot2json :: Phylo -> IO Value
 phylo2dot2json phylo = do
   withTempDirectory "/tmp" "phylo" $ \dirPath -> do