Merge branch 'dev' into dev-markdown

src/Gargantext/Components/Nodes/Corpus.purs

@@ -333,8 +333,9 @@ loadCorpus :: Record LoadProps -> Aff CorpusData
 loadCorpus {nodeId, session} = do
   -- fetch corpus via lists parentId
   (NodePoly {parentId: corpusId} :: NodePoly {}) <- get session nodePolyRoute
-  corpusNode     <- get session $ corpusNodeRoute     corpusId ""
-  defaultListIds <- (get session $ defaultListIdsRoute corpusId) :: forall a. DecodeJson a => AffTableResult (NodePoly a)
+  corpusNode     <-  get session $ corpusNodeRoute     corpusId ""
+  defaultListIds <- (get session $ defaultListIdsRoute corpusId)
+                    :: forall a. DecodeJson a => AffTableResult (NodePoly a)
   case (A.head defaultListIds.docs :: Maybe (NodePoly HyperdataList)) of
     Just (NodePoly { id: defaultListId }) ->
       pure {corpusId, corpusNode, defaultListId}
@@ -344,3 +345,22 @@ loadCorpus {nodeId, session} = do
     nodePolyRoute       = NodeAPI Corpus (Just nodeId) ""
     corpusNodeRoute     = NodeAPI Corpus <<< Just
     defaultListIdsRoute = Children NodeList 0 1 Nothing <<< Just
+
+
+loadCorpusWithChild :: Record LoadProps -> Aff CorpusData
+loadCorpusWithChild {nodeId:childId, session} = do
+  -- fetch corpus via lists parentId
+  (NodePoly {parentId: corpusId} :: NodePoly {}) <- get session $ listNodeRoute childId ""
+  corpusNode     <-  get session $ corpusNodeRoute     corpusId ""
+  defaultListIds <- (get session $ defaultListIdsRoute corpusId)
+                    :: forall a. DecodeJson a => AffTableResult (NodePoly a)
+  case (A.head defaultListIds.docs :: Maybe (NodePoly HyperdataList)) of
+    Just (NodePoly { id: defaultListId }) ->
+      pure {corpusId, corpusNode, defaultListId}
+    Nothing ->
+      throwError $ error "Missing default list"
+  where
+    corpusNodeRoute     = NodeAPI Corpus <<< Just
+    listNodeRoute       = NodeAPI Node <<< Just
+    defaultListIdsRoute = Children NodeList 0 1 Nothing <<< Just
+

src/Gargantext/Components/Nodes/Corpus/Types.purs

 module Gargantext.Components.Nodes.Corpus.Types where
 
+import Data.Maybe (Maybe(..))
+import Data.Array (head)
 import Data.Argonaut (class DecodeJson, class EncodeJson, decodeJson, (.:), (.:?), (:=), (~>), jsonEmptyObject)
 import Data.Either (Either(..))
 import Data.Generic.Rep (class Generic)
@@ -63,6 +65,29 @@ data FieldType =
     tag              :: Tag
   , text             :: MarkdownText
   }
+
+isJSON :: FieldType -> Boolean
+isJSON (JSON _) = true
+isJSON _        = false
+
+getCorpusInfo :: Array (Field FieldType) -> CorpusInfo
+getCorpusInfo as = case head as of
+  Just (Field {typ: JSON {authors, desc,query,title}}) -> CorpusInfo { title
+                                                                     , desc
+                                                                     , query
+                                                                     , authors
+                                                                     , chart:Nothing
+                                                                     , totalRecords:0
+                                                                     }
+  _                                -> CorpusInfo { title:"Empty"
+                                                 , desc:""
+                                                 , query:""
+                                                 , authors:""
+                                                 , chart:Nothing
+                                                 , totalRecords:0
+                                                 }
+
+
 derive instance genericFieldType :: Generic FieldType _
 instance eqFieldType :: Eq FieldType where
   eq = genericEq
@@ -99,8 +124,8 @@ instance encodeFTField :: EncodeJson (Field FieldType) where
     ~> "type"   := typ' typ
     ~> jsonEmptyObject
     where
-      typ' (Haskell _) = "Haskell"
-      typ' (JSON _) = "JSON"
+      typ' (Haskell _)  = "Haskell"
+      typ' (JSON _)     = "JSON"
       typ' (Markdown _) = "Markdown"
 instance encodeFieldType :: EncodeJson FieldType where
   encodeJson (Haskell {haskell}) =
@@ -170,5 +195,5 @@ instance decodeCorpusInfo :: DecodeJson CorpusInfo where
     pure $ CorpusInfo {title, desc, query, authors, chart, totalRecords}
 
 type CorpusData = { corpusId :: Int
-                  , corpusNode :: NodePoly CorpusInfo
+                  , corpusNode :: NodePoly Hyperdata -- CorpusInfo
                   , defaultListId :: Int}

src/Gargantext/Components/Nodes/Lists.purs

 module Gargantext.Components.Nodes.Lists where
 
 import Reactix as R
---------------------------------------------------------
-import Gargantext.Prelude
-import Gargantext.Components.Nodes.Corpus (loadCorpus)
-import Gargantext.Components.Nodes.Corpus.Types (CorpusInfo(..))
+------------------------------------------------------------------------
 import Gargantext.Components.Node (NodePoly(..))
+import Gargantext.Components.Nodes.Corpus (loadCorpusWithChild)
+import Gargantext.Components.Nodes.Corpus.Types (getCorpusInfo, CorpusInfo(..), Hyperdata(..))
+import Gargantext.Components.Nodes.Lists.Tabs as Tabs
 import Gargantext.Components.Table as Table
 import Gargantext.Hooks.Loader (useLoader)
-import Gargantext.Components.Nodes.Lists.Tabs as Tabs
+import Gargantext.Prelude
 import Gargantext.Sessions (Session)
-
+------------------------------------------------------------------------
 ------------------------------------------------------------------------
 
 type Props = ( session :: Session, nodeId :: Int )
@@ -22,12 +22,13 @@ listsLayoutCpt :: R.Component Props
 listsLayoutCpt = R.hooksComponent "G.P.Lists.listsLayout" cpt
   where
     cpt path@{session} _ =
-      useLoader path loadCorpus $
+      useLoader path loadCorpusWithChild $
         \corpusData@{corpusId, defaultListId, corpusNode: NodePoly poly} ->
-          let { name, date, hyperdata: CorpusInfo corpus } = poly
-              { desc, query, authors: user } = corpus in
+              let { name, date, hyperdata : Hyperdata h} = poly
+                  CorpusInfo {desc,query,authors} = getCorpusInfo h.fields
+           in
           R.fragment
           [ Table.tableHeaderLayout
-            { title: "Corpus " <> name, desc, query, user, date }
+            { title: "Corpus " <> name, desc, query, user:authors, date }
          , Tabs.tabs {session, corpusId, corpusData}]
 ------------------------------------------------------------------------

src/Gargantext/Components/Nodes/Texts.purs

@@ -7,19 +7,19 @@ import Data.Maybe (Maybe(..))
 import Data.Tuple.Nested ((/\))
 import Reactix as R
 import Reactix.DOM.HTML as H
-
 --------------------------------------------------------
 import Gargantext.Components.DocsTable as DT
 import Gargantext.Components.Loader (loader)
 import Gargantext.Components.Node (NodePoly(..))
-import Gargantext.Components.Nodes.Corpus (loadCorpus)
-import Gargantext.Components.Nodes.Corpus.Types (CorpusData, CorpusInfo(..))
+import Gargantext.Components.Nodes.Corpus (loadCorpusWithChild)
 import Gargantext.Components.Nodes.Corpus.Chart.Histo (histo)
+import Gargantext.Components.Nodes.Corpus.Types (CorpusData, Hyperdata(..), getCorpusInfo, CorpusInfo(..))
 import Gargantext.Components.Tab as Tab
 import Gargantext.Components.Table as Table
 import Gargantext.Ends (Frontends)
 import Gargantext.Sessions (Session)
 import Gargantext.Types (CTabNgramType(..), TabSubType(..), TabType(..))
+--------------------------------------------------------
 
 type Props = ( frontends :: Frontends, session :: Session, nodeId :: Int )
 
@@ -30,16 +30,16 @@ textsLayout props = R.createElement textsLayoutCpt props []
 textsLayoutCpt :: R.Component Props
 textsLayoutCpt = R.hooksComponent "G.C.Nodes.Texts.textsLayout" cpt where
   cpt {session,nodeId,frontends} _ = do
-    pure $ loader {session, nodeId} loadCorpus paint
+    pure $ loader {session, nodeId} loadCorpusWithChild paint
     where
       paint corpusData@{corpusId, corpusNode, defaultListId} =
         R.fragment [ Table.tableHeaderLayout headerProps, tabs' ]
         where
-          NodePoly { name, date, hyperdata: CorpusInfo corpus } = corpusNode
-          {desc, query, authors: user} = corpus
+          NodePoly { name, date, hyperdata: Hyperdata h } = corpusNode
+          CorpusInfo {desc,query,authors} = getCorpusInfo h.fields
           tabs' = tabs {session, corpusId, corpusData, frontends}
           title = "Corpus " <> name
-          headerProps = { title, desc, query, date, user }
+          headerProps = { title, desc, query, date, user:authors }
 
 data Mode = MoreLikeFav | MoreLikeTrash