Merge remote-tracking branch 'origin/dev-phylo-csv-fix' into dev

src/Gargantext/Core/Viz/Phylo.hs

@@ -45,6 +45,8 @@ data CorpusParser =
       Wos  {_wos_limit  :: Int}
     | Tsv  {_tsv_limit  :: Int}
     | Tsv' {_tsv'_limit :: Int}
+    | Csv  {_csv_limit  :: Int}
+    | Csv' {_csv'_limit :: Int}
     deriving (Show,Generic,Eq, ToExpr)
 
 instance ToSchema CorpusParser where
@@ -727,6 +729,8 @@ instance Arbitrary CorpusParser where
   arbitrary = oneof [ Wos <$> arbitrary
                     , Tsv <$> arbitrary
                     , Tsv' <$> arbitrary
+                    , Csv <$> arbitrary
+                    , Csv' <$> arbitrary
                     ]
 
 instance Arbitrary ListParser where

test/Test/Offline/Phylo.hs

@@ -13,7 +13,7 @@ import Data.Text.Lazy as TL
 import Data.TreeDiff
 import Data.Vector qualified as V
 import Gargantext.Core.Text.List.Formats.TSV
-import Gargantext.Core.Types.Phylo
+import Gargantext.Core.Types.Phylo hiding (Phylo(..))
 import Gargantext.Core.Viz.Phylo hiding (EdgeType(..))
 import Gargantext.Core.Viz.Phylo.API.Tools (readPhylo, phylo2dot2json)
 import Gargantext.Core.Viz.Phylo.Example qualified as Cleopatre
@@ -69,6 +69,7 @@ tests = testGroup "Phylo" [
   , testGroup "relatedComponents" [
     testCase "finds simple connection" testRelComp_Connected
   ]
+  , testCase "parses csv phylo" testCsvPhylo
   ]
 
 testCleopatreWithoutLinkExpectedOutput :: Assertion
@@ -248,3 +249,11 @@ testToPhyloDeterminism = do
   let actual = setConfig phyloTestConfig $ toPhylo $ toPhyloWithoutLink corpus config
   expected    <- setConfig phyloTestConfig <$> (readPhylo =<< getDataFileName "test-data/phylo/187481.json")
   assertBool ("Phylo mismatch! " <> show (ansiWlEditExprCompact $ ediff expected actual)) (expected == actual)
+
+testCsvPhylo :: Assertion
+testCsvPhylo = do
+  pth <- getDataFileName "test-data/phylo/cleopatre.golden.csv.json"
+  phyloJson <- eitherDecodeFileStrict' @Phylo pth
+  case phyloJson of
+    Left err -> error err
+    Right _  -> pure ()