Merge branch 'dev-merge' into dev

src/Gargantext/API/Public.hs

@@ -23,23 +23,25 @@ import Data.List (replicate, null)
 import Data.Aeson
 import Data.Swagger
 import GHC.Generics (Generic)
+import Servant
+import Test.QuickCheck (elements)
+import Test.QuickCheck.Arbitrary
+
+import qualified Data.List as List
+import qualified Data.Map as Map
+import qualified Data.Set as Set
+
 import Gargantext.API.Prelude
 import Gargantext.API.Node.File
 import Gargantext.Database.Query.Table.Node.Error (HasNodeError(..))
 import Gargantext.Database.Prelude
+import Gargantext.Database.Admin.Types.Hyperdata
+import Gargantext.Database.Admin.Types.Hyperdata.CorpusField
 import Gargantext.Database.Admin.Types.Node
 import Gargantext.Database.Query.Table.NodeNode (selectPublicNodes)
 import Gargantext.Core.Utils.DateUtils (utc2year)
-import Gargantext.Database.Admin.Types.Hyperdata
 import Gargantext.Database.Schema.Node -- (NodePoly(..))
 import Gargantext.Prelude
-import Servant
-import Test.QuickCheck (elements)
-import Test.QuickCheck.Arbitrary
-
-import qualified Data.List as List
-import qualified Data.Map as Map
-import qualified Data.Set as Set
 
 ------------------------------------------------------------------------
 type API =  API_Home

src/Gargantext/Database/Admin/Types/Hyperdata/Corpus.hs

@@ -22,69 +22,9 @@ module Gargantext.Database.Admin.Types.Hyperdata.Corpus
   where
 
 import Gargantext.Prelude
+import Gargantext.Database.Admin.Types.Hyperdata.CorpusField
 import Gargantext.Database.Admin.Types.Hyperdata.Prelude
 
-
-data CodeType = JSON | Markdown | Haskell | Python
-  deriving (Generic, Eq)
-instance ToJSON CodeType
-instance FromJSON CodeType
-instance ToSchema CodeType
-
-------------------------------------------------------------------------
-data CorpusField = MarkdownField { _cf_text    :: !Text }
-                 | HaskellField { _cf_haskell :: !Text }
-                 | PythonField  { _cf_python  :: !Text }
-                 | JsonField    { _cf_title   :: !Text
-                                 , _cf_desc    :: !Text
-                                 , _cf_query   :: !Text
-                                 , _cf_authors :: !Text
-                                 -- , _cf_resources :: ![Resource]
-                                 }
-                  deriving (Generic)
-
-defaultCorpusField :: CorpusField
-defaultCorpusField = MarkdownField "# Title"
-
-------------------------------------------------------------------------
--- Instances
-------------------------------------------------------------------------
-$(makeLenses ''CorpusField)
-$(deriveJSON (unPrefix "_cf_") ''CorpusField)
-
-instance ToSchema CorpusField where
-  declareNamedSchema proxy =
-    genericDeclareNamedSchema (unPrefixSwagger "_cf_") proxy
-    & mapped.schema.description ?~ "CorpusField"
-    & mapped.schema.example ?~ toJSON defaultCorpusField
-
-------------------------------------------------------------------------
-data HyperdataField a =
-  HyperdataField { _hf_type :: !CodeType
-                 , _hf_name :: !Text
-                 , _hf_data :: !a
-                 } deriving (Generic)
-defaultHyperdataField :: HyperdataField CorpusField
-defaultHyperdataField = HyperdataField Markdown "name" defaultCorpusField
-
-------------------------------------------------------------------------
--- Instances
-------------------------------------------------------------------------
-$(makeLenses ''HyperdataField)
-$(deriveJSON (unPrefix "_hf_") ''HyperdataField)
-
-instance (Typeable a, ToSchema a) => ToSchema (HyperdataField a) where
-  declareNamedSchema proxy =
-    genericDeclareNamedSchema (unPrefixSwagger "_hf_") proxy
-    & mapped.schema.description ?~ "Hyperdata Field"
-    & mapped.schema.example ?~ toJSON defaultCorpusField
-{-
-  declareNamedSchema =
-    wellNamedSchema "_hf_"
-    -- & mapped.schema.description ?~ "HyperdataField"
-    -- & mapped.schema.example ?~ toJSON defaultHyperdataField
--}
-
 ------------------------------------------------------------------------
 data HyperdataCorpus =
   HyperdataCorpus { _hc_fields :: ![HyperdataField CorpusField] }

src/Gargantext/Database/Admin/Types/Hyperdata/CorpusField.hs

+{-|
+Module      : Gargantext.Database.Admin.Types.Hyperdata.CorpusField
+Description :
+Copyright   : (c) CNRS, 2017-Present
+License     : AGPL + CECILL v3
+Maintainer  : team@gargantext.org
+Stability   : experimental
+Portability : POSIX
+
+-}
+
+{-# LANGUAGE NoImplicitPrelude          #-}
+{-# LANGUAGE OverloadedStrings          #-}
+{-# LANGUAGE TemplateHaskell            #-}
+
+module Gargantext.Database.Admin.Types.Hyperdata.CorpusField
+where
+
+import Gargantext.Prelude
+import Gargantext.Database.Admin.Types.Hyperdata.Prelude
+
+
+data CodeType = JSON | Markdown | Haskell | Python
+  deriving (Generic, Show, Eq)
+instance ToJSON CodeType
+instance FromJSON CodeType
+instance ToSchema CodeType
+
+
+------------------------------------------------------------------------
+data CorpusField = MarkdownField { _cf_text    :: !Text }
+                 | HaskellField { _cf_haskell :: !Text }
+                 | PythonField  { _cf_python  :: !Text }
+                 | JsonField    { _cf_title   :: !Text
+                                 , _cf_desc    :: !Text
+                                 , _cf_query   :: !Text
+                                 , _cf_authors :: !Text
+                                 -- , _cf_resources :: ![Resource]
+                                 }
+                  deriving (Show, Generic)
+
+defaultCorpusField :: CorpusField
+defaultCorpusField = MarkdownField "# Title"
+
+------------------------------------------------------------------------
+-- Instances
+------------------------------------------------------------------------
+$(makeLenses ''CorpusField)
+$(deriveJSON (unPrefix "_cf_") ''CorpusField)
+
+instance ToSchema CorpusField where
+  declareNamedSchema proxy =
+    genericDeclareNamedSchema (unPrefixSwagger "_cf_") proxy
+    & mapped.schema.description ?~ "CorpusField"
+    & mapped.schema.example ?~ toJSON defaultCorpusField
+
+------------------------------------------------------------------------
+data HyperdataField a =
+  HyperdataField { _hf_type :: !CodeType
+                 , _hf_name :: !Text
+                 , _hf_data :: !a
+                 } deriving (Generic, Show)
+defaultHyperdataField :: HyperdataField CorpusField
+defaultHyperdataField = HyperdataField Markdown "name" defaultCorpusField
+
+------------------------------------------------------------------------
+-- Instances
+------------------------------------------------------------------------
+$(makeLenses ''HyperdataField)
+$(deriveJSON (unPrefix "_hf_") ''HyperdataField)
+
+instance (Typeable a, ToSchema a) => ToSchema (HyperdataField a) where
+  declareNamedSchema proxy =
+    genericDeclareNamedSchema (unPrefixSwagger "_hf_") proxy
+    & mapped.schema.description ?~ "Hyperdata Field"
+    & mapped.schema.example ?~ toJSON defaultCorpusField
+{-
+  declareNamedSchema =
+    wellNamedSchema "_hf_"
+    -- & mapped.schema.description ?~ "HyperdataField"
+    -- & mapped.schema.example ?~ toJSON defaultHyperdataField
+-}

src/Gargantext/Database/Admin/Types/Hyperdata/Dashboard.hs

@@ -23,18 +23,31 @@ module Gargantext.Database.Admin.Types.Hyperdata.Dashboard
 
 import Gargantext.Prelude
 import Gargantext.Database.Admin.Types.Hyperdata.Prelude
+import Gargantext.Database.Admin.Types.Hyperdata.CorpusField
 
 ------------------------------------------------------------------------
 
 data HyperdataDashboard =
   HyperdataDashboard { _hd_preferences :: !(Maybe Text)
                      , _hd_charts      :: ![Chart]
+                     , _hd_fields      :: ![HyperdataField CorpusField]
                      }
   deriving (Show, Generic)
 
 
 defaultHyperdataDashboard :: HyperdataDashboard
-defaultHyperdataDashboard = HyperdataDashboard Nothing []
+defaultHyperdataDashboard = HyperdataDashboard Nothing [] defaultHyperdataDashboardFields
+
+defaultHyperdataDashboardFields :: [HyperdataField CorpusField]
+defaultHyperdataDashboardFields =
+  [ HyperdataField Markdown
+                   "Corpus analysis"
+                   (MarkdownField "# title\n## subtitle")
+
+  , HyperdataField JSON
+                  "Metadata (Experts only)"
+                  (JsonField "Title" "Descr" "Bool query" "Authors")
+  ]
 
 ------------------------------------------------------------------------
 -- Instances