Merge branch 'dev' into dev-hackathon-fixes

CHANGELOG.md

+## Version 0.0.6.9.0
+
+* [FRONT][FIX] Node Selection Indicator
+* [FRONT][FIX] Just a little warning specifying a bug on <ReactTooltip>
+* [FRONT][FEAT] Graph Explorer fixes (labels, Sigma JS parameters)
+* [FRONT][layout] Close CTA button on graph/phylo sidebar
+* [BACK][NodeWrite] Corpus easier to make with NodeWrite Frames
+
+
 ## Version 0.0.6.8.6
 
 * [BACK][FIX][New Corpus, Ngrams Table Repo (#163)](https://gitlab.iscpif.fr/gargantext/haskell-gargantext/issues/163)

README.md

@@ -94,7 +94,26 @@ curl -sSL https://gitlab.iscpif.fr/gargantext/haskell-gargantext/raw/dev/devops/
 ``` sh
 ./devops/install-corenlp
 ```
+### Launch Gargantext (It should have been initialized first)
+Run
+haskell-gargantext/devops/docker$ docker-compose up
 
+Then 
+``` sh
+stack --nix install
+~/.local/bin/gargantext-init "gargantext.ini"
+```
+Or for Docker env, first create the appropriate image:
+
+``` sh
+cd devops/docker
+docker build -t cgenie/stack-build:lts-18.12-garg .
+```
+
+then run:
+
+``` sh
+stack --docker exec gargantext-init -- gargantext.ini
 
 ### Initialization
 
@@ -116,7 +135,7 @@ Initialization schema should be loaded automatically (from `devops/postgres/sche
 Change the passwords in gargantext.ini_toModify then move it:
 
 ``` sh
-mv gargantext.ini_toModify gargantext.ini
+cp gargantext.ini_toModify gargantext.ini
 ```
 (`.gitignore` avoids adding this file to the repository by mistake)
 
@@ -126,7 +145,7 @@ mv gargantext.ini_toModify gargantext.ini
 Users have to be created first (`user1` is created as instance):
 
 ``` sh
-stack install
+stack --nix install
 ~/.local/bin/gargantext-init "gargantext.ini"
 ```
 

gargantext.cabal

 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.0.
+-- This file has been generated from package.yaml by hpack version 0.35.1.
 --
 -- see: https://github.com/sol/hpack
 
 name:           gargantext
-version:        0.0.6.8.6
+version:        0.0.6.9.0
 synopsis:       Search, map, share
 description:    Please see README.md
 category:       Data

package.yaml

@@ -6,7 +6,7 @@ name: gargantext
 #         | | | +-----  Layers * : New versions with API additions
 #         | | | | +---  Layers * : New versions without API breaking changes
 #         | | | | |
-version: '0.0.6.8.6'
+version: '0.0.6.9.0'
 synopsis: Search, map, share
 description: Please see README.md
 category: Data

src/Gargantext/API/Node/DocumentsFromWriteNodes.hs

@@ -38,6 +38,7 @@ import Gargantext.Database.Admin.Types.Hyperdata.Frame
 import Gargantext.Database.Admin.Types.Node
 import Gargantext.Database.Query.Table.Node (getChildrenByType, getClosestParentIdByType', getNodeWith)
 import Gargantext.Database.Schema.Node (node_hyperdata)
+import qualified Data.List as List
 import qualified Gargantext.Defaults as Defaults
 import Gargantext.Prelude
 import Gargantext.Utils.Jobs (serveJobsAPI)
@@ -97,18 +98,19 @@ documentsFromWriteNodes uId nId _p logStatus = do
              pure (node, contents)
          ) frameWrites
 
-  let parsedE = (\(node, contents) -> hyperdataDocumentFromFrameWrite (node ^. node_hyperdata, contents)) <$> frameWritesWithContents
-  let parsed = rights parsedE
+  let parsedE = (\(node, contents) -> hyperdataDocumentFromFrameWrite 7 (node ^. node_hyperdata, contents)) <$> frameWritesWithContents
+                                              -- TODO hard coded param should be take
+  let parsed = List.concat $ rights parsedE
 
   _ <- flowDataText (RootId (NodeId uId)) (DataNew (Just $ fromIntegral $ length parsed, yieldMany parsed)) (Multi EN) cId Nothing logStatus
 
   pure $ jobLogSuccess jobLog
 ------------------------------------------------------------------------
-hyperdataDocumentFromFrameWrite :: (HyperdataFrame, T.Text) -> Either T.Text HyperdataDocument
-hyperdataDocumentFromFrameWrite (HyperdataFrame { _hf_base, _hf_frame_id }, contents) =
+hyperdataDocumentFromFrameWrite :: Int -> (HyperdataFrame, T.Text) -> Either T.Text [HyperdataDocument]
+hyperdataDocumentFromFrameWrite paragraphSize (HyperdataFrame { _hf_base, _hf_frame_id }, contents) =
   case parseLines contents of
     Left _ -> Left "Error parsing node"
-    Right (Parsed { authors, contents = c, date, source, title = t }) ->
+    Right (Parsed { authors, contents = ctxts, date, source, title = t }) ->
       let authorJoinSingle (Author { firstName, lastName }) = T.concat [ lastName, ", ", firstName ]
           authors' = T.concat $ authorJoinSingle <$> authors 
           date' = (\(Date { year, month, day }) -> T.concat [ T.pack $ show year, "-"
@@ -117,7 +119,7 @@ hyperdataDocumentFromFrameWrite (HyperdataFrame { _hf_base, _hf_frame_id }, cont
           year' = fromIntegral $ maybe Defaults.year (\(Date { year }) -> year) date
           month' = maybe Defaults.month (\(Date { month }) -> fromIntegral month) date
           day' = maybe Defaults.day (\(Date { day }) -> fromIntegral day) date in
-      Right HyperdataDocument { _hd_bdd = Just "FrameWrite"
+      Right (List.map (\ctxt ->  HyperdataDocument { _hd_bdd = Just "FrameWrite"
                               , _hd_doi = Nothing
                               , _hd_url = Nothing
                               , _hd_uniqId = Nothing
@@ -127,7 +129,7 @@ hyperdataDocumentFromFrameWrite (HyperdataFrame { _hf_base, _hf_frame_id }, cont
                               , _hd_authors = Just authors'
                               , _hd_institutes = Nothing
                               , _hd_source = source
-                              , _hd_abstract = Just c
+                              , _hd_abstract = Just ctxt
                               , _hd_publication_date = date'
                               , _hd_publication_year = Just year'
                               , _hd_publication_month = Just month'
@@ -136,3 +138,5 @@ hyperdataDocumentFromFrameWrite (HyperdataFrame { _hf_base, _hf_frame_id }, cont
                               , _hd_publication_minute = Nothing
                               , _hd_publication_second = Nothing
                               , _hd_language_iso2 = Just $ T.pack $ show EN }
+                      ) (text2paragraphs paragraphSize ctxts)
+                  )

src/Gargantext/API/Node/FrameCalcUpload.hs

@@ -24,7 +24,7 @@ import Gargantext.API.Node.Corpus.New.Types (FileFormat(..), FileType(..))
 import Gargantext.API.Node.Types (NewWithForm(..))
 import Gargantext.API.Prelude
 import Gargantext.Core.Types.Individu (User(..))
-import Gargantext.Core.Text.List.Social (FlowSocialListWith(..), FlowSocialListPriority(..))
+import Gargantext.Core.Text.List.Social (FlowSocialListWith(..))
 import Gargantext.Database.Action.Flow.Types
 import Gargantext.Database.Admin.Types.Hyperdata.Frame
 import Gargantext.Database.Admin.Types.Node
@@ -33,8 +33,12 @@ import Gargantext.Database.Query.Table.Node (getClosestParentIdByType, getNodeWi
 import Gargantext.Database.Schema.Node (node_hyperdata)
 import Gargantext.Prelude
 import Gargantext.Utils.Jobs (serveJobsAPI)
+import Gargantext.Core (Lang)
 
-data FrameCalcUpload = FrameCalcUpload ()
+data FrameCalcUpload = FrameCalcUpload {
+  _wf_lang      :: !(Maybe Lang)
+, _wf_selection :: !FlowSocialListWith
+}
   deriving (Generic)
 
 instance FromForm FrameCalcUpload
@@ -62,7 +66,7 @@ frameCalcUploadAsync :: (HasConfig env, FlowCmdM env err m)
                      -> (JobLog -> m ())
                      -> JobLog
                      -> m JobLog
-frameCalcUploadAsync uId nId _f logStatus jobLog = do
+frameCalcUploadAsync uId nId (FrameCalcUpload _wf_lang _wf_selection) logStatus jobLog = do
   logStatus jobLog
 
   -- printDebug "[frameCalcUploadAsync] uId" uId
@@ -88,6 +92,6 @@ frameCalcUploadAsync uId nId _f logStatus jobLog = do
   jobLog2 <- case mCId of
     Nothing -> pure $ jobLogFail jobLog
     Just cId ->
-      addToCorpusWithForm (RootId (NodeId uId)) cId (NewWithForm CSV Plain body Nothing "calc-upload.csv" (FlowSocialListWithPriority MySelfFirst)) logStatus jobLog
+      addToCorpusWithForm (RootId (NodeId uId)) cId (NewWithForm CSV Plain body _wf_lang "calc-upload.csv" _wf_selection) logStatus jobLog
 
   pure $ jobLogSuccess jobLog2

src/Gargantext/Core/Text/Corpus/Parsers/FrameWrite.hs

-module Gargantext.Core.Text.Corpus.Parsers.FrameWrite where
+{-|
+Module      : Gargantext.Core.Text.Corpus.Parsers.FrameWrite
+Description : 
+Copyright   : (c) CNRS, 2017-Present
+License     : AGPL + CECILL v3
+Maintainer  : team@gargantext.org
+Stability   : experimental
+Portability : POSIX
+
+-}
+
+module Gargantext.Core.Text.Corpus.Parsers.FrameWrite
+  where
 
 import Control.Applicative ((*>))
 import Control.Monad (void)
 import Data.Either
 import Data.Maybe
 import Data.Text hiding (foldl)
+import Gargantext.Core.Text (sentences)
 import Gargantext.Prelude
 import Prelude ((++), read)
 import Text.Parsec hiding (Line)
 import Text.Parsec.String
+import qualified Data.Text as DT
+import qualified Data.List as List
 
 
 -- https://gitlab.iscpif.fr/gargantext/purescript-gargantext/issues/331
@@ -26,11 +41,11 @@ sample :: Text
 sample =
   unlines
     [ "title1"
-    , "title2"
-    , "=="
-    , "^@@authors: FirstName1, LastName1; FirstName2, LastName2"
-    , "^@@date: 2021-09-10"
-    , "^@@source: someSource"
+--    , "title2"
+--    , "=="
+--     , "^@@authors: FirstName1, LastName1; FirstName2, LastName2"
+    , "date: 2021-09-10"
+    , "source: someSource"
     , "document contents 1"
     , "document contents 2"
     ]
@@ -42,9 +57,9 @@ sampleUnordered =
     , "title2"
     , "=="
     , "document contents 1"
-    , "^@@date: 2021-09-10"
-    , "^@@authors: FirstName1, LastName1; FirstName2, LastName2"
-    , "^@@source: someSource"
+    , "date: 2021-09-10"
+    , "authors: FirstName1, LastName1; FirstName2, LastName2"
+    , "source: someSource"
     , "document contents 2"
     ]
 
@@ -150,14 +165,14 @@ contentsLineP = do
 titleDelimiterP :: Parser ()
 titleDelimiterP = do
   _ <- newline
-  _ <- string "=="
-  tokenEnd
+  -- _ <- try (string "==")
+  pure ()
 titleP :: Parser [Char]
 titleP = manyTill anyChar (try titleDelimiterP)
 
 authorsPrefixP :: Parser [Char]
 authorsPrefixP = do
-  _ <- string "^@@authors:"
+  _ <- string "authors:"
   many (char ' ')
 authorsP :: Parser [Author]
 authorsP = try authorsPrefixP *> sepBy authorP (char ';')
@@ -173,7 +188,7 @@ authorP = do
 
 datePrefixP :: Parser [Char]
 datePrefixP = do
-  _ <- string "^@@date:"
+  _ <- string "date:"
   many (char ' ')
 dateP :: Parser Date
 dateP = try datePrefixP
@@ -195,7 +210,7 @@ dateISOP = do
 
 sourcePrefixP :: Parser [Char]
 sourcePrefixP = do
-  _ <- string "^@@source:"
+  _ <- string "source:"
   many (char ' ')
 sourceP :: Parser [Char]
 sourceP = try sourcePrefixP
@@ -206,3 +221,15 @@ sourceP = try sourcePrefixP
 
 tokenEnd :: Parser ()
 tokenEnd = void (char '\n') <|> eof
+
+--- MISC Tools
+
+text2paragraphs :: Int -> Text -> [Text]
+text2paragraphs n = List.map DT.concat
+                  . splitEvery n . List.map clean
+                  . sentences . DT.concat . DT.lines
+
+clean :: Text -> Text
+clean = DT.unwords . List.filter (\w -> DT.length w < 25) . DT.words
+
+