Merge branch 'dev-dashoard-charts' of...

Merge branch 'dev-dashoard-charts' of ssh://gitlab.iscpif.fr:20022/gargantext/haskell-gargantext into dev-merge

src/Gargantext/Database/Types/Node.hs

@@ -301,6 +301,18 @@ instance Hyperdata HyperdataUser
 ------------------------------------------------------------------------
 ------------------------------------------------------------------------
 ------------------------------------------------------------------------
+
+data Chart =
+    CDocsHistogram
+  | CAuthorsPie
+  | CInstitutesTree
+  | CTermsMetrics
+  deriving (Generic, Show, Eq)
+instance ToJSON Chart
+instance FromJSON Chart
+instance ToSchema Chart
+
+
 data CodeType = JSON | Markdown | Haskell
   deriving (Generic)
 instance ToJSON CodeType
@@ -313,6 +325,7 @@ data CorpusField = MarkdownField { _cf_text :: !Text }
                               , _cf_desc  :: !Text
                               , _cf_query :: !Text
                               , _cf_authors :: !Text
+                              , _cf_charts :: ![Chart]
                               -- , _cf_resources :: ![Resource]
                               } 
                   | HaskellField { _cf_haskell :: !Text }
@@ -361,9 +374,10 @@ corpusExample :: ByteString
 corpusExample = "" -- TODO
 
 defaultCorpus :: HyperdataCorpus
-defaultCorpus = HyperdataCorpus [ HyperdataField JSON "Mandatory fields" (JsonField "Title" "Descr" "Bool query" "Authors")
-                                , HyperdataField Markdown "Optional Text" (MarkdownField "# title\n## subtitle")
-                                ]
+defaultCorpus = HyperdataCorpus [
+    HyperdataField JSON "Mandatory fields" (JsonField "Title" "Descr" "Bool query" "Authors" [])
+  , HyperdataField Markdown "Optional Text" (MarkdownField "# title\n## subtitle")
+  ]
 
 hyperdataCorpus :: HyperdataCorpus
 hyperdataCorpus = case decode corpusExample of

src/Gargantext/Database/Utils.hs

@@ -144,7 +144,7 @@ fromField' field mb = do
       where
           valueToHyperdata v = case fromJSON v of
              Success a  -> pure a
-             Error _err -> returnError ConversionFailed field "cannot parse hyperdata"
+             Error _err -> returnError ConversionFailed field $ DL.intercalate " " ["cannot parse hyperdata for JSON: ", show v]
 
 printSqlOpa :: Default Unpackspec a a => Query a -> IO ()
 printSqlOpa = putStrLn . maybe "Empty query" identity . showSqlForPostgres