Merge branch 'dev-forest' of...

Merge branch 'dev-forest' of ssh://gitlab.iscpif.fr:20022/gargantext/purescript-gargantext into dev-forest

src/Gargantext/Components/Annotation/AnnotatedField.purs

@@ -24,7 +24,7 @@ import Reactix.SyntheticEvent as E
 
 import Gargantext.Types (CTabNgramType(..), TermList)
 import Gargantext.Components.Annotation.Utils ( termBootstrapClass )
-import Gargantext.Components.NgramsTable.Core (NgramsTable, NgramsTerm, findNgramTermList, highlightNgrams)
+import Gargantext.Components.NgramsTable.Core (NgramsTable, NgramsTerm, findNgramTermList, highlightNgrams, normNgram)
 import Gargantext.Components.Annotation.Menu ( AnnotationMenu, annotationMenu, MenuType(..) )
 import Gargantext.Utils.Reactix as R2
 import Gargantext.Utils.Selection as Sel
@@ -56,7 +56,7 @@ annotatedFieldComponent = R.hooksComponent "AnnotatedField" cpt
             let x = E.clientX event
                 y = E.clientY event
                 setList t = do
-                  setTermList text' (Just list) t
+                  setTermList (normNgram CTabTerms text') (Just list) t
                   setMenu (const Nothing)
             setMenu (const $ Just {x, y, list: Just list, menuType: SetTermListItem, setList} )
 
@@ -78,9 +78,10 @@ maybeShowMenu setMenu setTermList ngrams event = do
         sel' -> do
           let x = E.clientX event
               y = E.clientY event
-              list = findNgramTermList CTabTerms ngrams sel'
+              n = normNgram CTabTerms sel'
+              list = findNgramTermList ngrams n
               setList t = do
-                setTermList sel' list t
+                setTermList n list t
                 setMenu (const Nothing)
           E.preventDefault event
           setMenu (const $ Just { x, y, list, menuType: NewNgram, setList })

src/Gargantext/Components/DocsTable.purs

@@ -391,7 +391,7 @@ pageCpt = R.memo' $ R.hooksComponent "G.C.DocsTable.pageCpt" cpt where
     pure $ T.table
       { rows: rows localCategories
       , container: T.defaultContainer { title: "Documents" }
-      , params, colNames, totalRecords }
+      , params, colNames, totalRecords, wrapColElts }
       where
         sid = sessionId session
         gi Favorite  = "glyphicon glyphicon-star"
@@ -402,6 +402,7 @@ pageCpt = R.memo' $ R.hooksComponent "G.C.DocsTable.pageCpt" cpt where
           | Just cid <- corpusId = Routes.CorpusDocument sid cid listId
           | otherwise = Routes.Document sid listId
         colNames = T.ColumnName <$> [ "Tag", "Date", "Title", "Source"]
+        wrapColElts = const identity
         getCategory (localCategories /\ _) {_id, category} = maybe category identity (localCategories ^. at _id)
         rows localCategories = row <$> documents
           where

src/Gargantext/Components/FacetsTable.purs

@@ -277,11 +277,12 @@ pageCpt :: R.Component PageProps
 pageCpt = R.staticComponent "G.C.FacetsTable.Page" cpt
   where
     cpt {totalRecords, container, deletions, documents, session, path: path@({nodeId, listId, query} /\ setPath)} _ = do
-      T.table { rows, container, colNames, totalRecords, params }
+      T.table { rows, container, colNames, totalRecords, params, wrapColElts }
       where
         setParams f = setPath $ \p@{params: ps} -> p {params = f ps}
         params = (fst path).params /\ setParams
         colNames = T.ColumnName <$> [ "", "Date", "Title", "Source", "Authors", "Delete" ]
+        wrapColElts = const identity
         -- TODO: how to interprete other scores?
         gi Favorite = "glyphicon glyphicon-star-empty"
         gi _ = "glyphicon glyphicon-star"

src/Gargantext/Components/Nodes/Annuaire.purs

 module Gargantext.Components.Nodes.Annuaire where
 
-import Prelude (bind, identity, pure, ($), (<$>), (<>))
+import Prelude (bind, identity, pure, const, ($), (<$>), (<>))
 import Data.Argonaut (class DecodeJson, decodeJson, (.:), (.:?))
 import Data.Array (head)
 import Data.Maybe (Maybe(..), maybe)
@@ -101,12 +101,13 @@ pageCpt = R.staticComponent "LoadedAnnuairePage" cpt
   where
     cpt { session, annuairePath, pagePath
         , table: (AnnuaireTable {annuaireTable}) } _ = do
-      T.table { rows, params, container, colNames, totalRecords }
+      T.table { rows, params, container, colNames, totalRecords, wrapColElts }
       where
         totalRecords = 4361 -- TODO
         rows = (\c -> {row: contactCells session c, delete: false}) <$> annuaireTable
         container = T.defaultContainer { title: "Annuaire" } -- TODO
         colNames = T.ColumnName <$> [ "", "Name", "Company", "Service", "Role"]
+        wrapColElts = const identity
         setParams f = snd pagePath $ \{nodeId, params: ps} ->
           {params: f ps, nodeId: fst annuairePath}
         params = T.initialParams /\ setParams

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

@@ -22,7 +22,7 @@ import Gargantext.Components.Annotation.AnnotatedField as AnnotatedField
 import Gargantext.Hooks.Loader (useLoader)
 import Gargantext.Routes (SessionRoute(..))
 import Gargantext.Sessions (Session, get)
-import Gargantext.Types (CTabNgramType(..), NodeType(..), TabSubType(..), TabType(..), TermList)
+import Gargantext.Types (CTabNgramType(..), NodeType(..), TabSubType(..), TabType(..), TermList, ScoreType(..))
 import Gargantext.Utils.Reactix as R2
 
 type DocPath =
@@ -295,11 +295,11 @@ docViewSpec = simpleSpec performAction render
         commitPatch path (Versioned {version: ngramsVersion, data: pt})
       where
         pe = NgramsPatch { patch_list: pl, patch_children: mempty }
-        pt = singletonNgramsTablePatch CTabTerms n pe
+        pt = singletonNgramsTablePatch n pe
     performAction (AddNewNgram ngram termList) {path} {ngramsVersion} =
         commitPatch path (Versioned {version: ngramsVersion, data: pt})
       where
-        pt = addNewNgram CTabTerms ngram termList
+        pt = addNewNgram ngram termList
 
     render :: Render State Props Action
     render dispatch { loaded: { ngramsTable: Versioned { data: initTable }, document } }
@@ -380,8 +380,9 @@ loadData {session, nodeId, listIds, tabType} = do
     , listIds
     , params: { offset : 0, limit : 100, orderBy: Nothing}
     , tabType
-    , searchQuery : ""
-    , termListFilter : Nothing
-    , termSizeFilter : Nothing
+    , searchQuery: ""
+    , termListFilter: Nothing
+    , termSizeFilter: Nothing
+    , scoreType: Occurrences
     }
   pure {document, ngramsTable}

src/Gargantext/Components/Table.purs

@@ -12,6 +12,7 @@ import Effect (Effect)
 import Reactix as R
 import Reactix.DOM.HTML as H
 import Gargantext.Utils.Reactix as R2
+import Gargantext.Utils.Reactix (effectLink)
 
 type TableContainerProps =
   ( pageSizeControl     :: R.Element
@@ -51,6 +52,8 @@ derive instance eqOrderByDirection :: Eq a => Eq (OrderByDirection a)
 
 type Props =
   ( colNames     :: Array ColumnName
+  , wrapColElts  :: ColumnName -> Array R.Element -> Array R.Element
+                 -- ^ Use `const identity` as a default behavior.
   , totalRecords :: Int
   , params       :: R.State Params
   , rows         :: Rows
@@ -126,32 +129,33 @@ table props = R.createElement tableCpt props []
 tableCpt :: R.Component Props
 tableCpt = R.hooksComponent "G.C.Table.table" cpt
   where
-    cpt {container, colNames, totalRecords, rows, params} _ = do
+    cpt {container, colNames, wrapColElts, totalRecords, rows, params} _ = do
       pageSize@(pageSize' /\ setPageSize) <- R.useState' PS10
       (page /\ setPage) <- R.useState' 1
       (orderBy /\ setOrderBy) <- R.useState' Nothing
-      let state = {pageSize: pageSize', orderBy, page}
-      let ps = pageSizes2Int pageSize'
-      let totalPages = (totalRecords / ps) + min 1 (totalRecords `mod` ps)
+      let
+        state = {pageSize: pageSize', orderBy, page}
+        ps = pageSizes2Int pageSize'
+        totalPages = (totalRecords / ps) + min 1 (totalRecords `mod` ps)
+        colHeader :: ColumnName -> R.Element
+        colHeader c = H.th {scope: "col"} [ H.b {} cs ]
+          where
+            lnk mc = effectLink (setOrderBy (const mc))
+            cs :: Array R.Element
+            cs =
+              wrapColElts c $
+              case orderBy of
+                Just (ASC d)  | c == d -> [lnk (Just (DESC c)) "DESC ", lnk Nothing (columnName c)]
+                Just (DESC d) | c == d -> [lnk (Just (ASC  c)) "ASC ",  lnk Nothing (columnName c)]
+                _ -> [lnk (Just (ASC c)) (columnName c)]
       R.useEffect1' state $ when (fst params /= stateParams state) $ (snd params) (const $ stateParams state)
       pure $ container
         { pageSizeControl: sizeDD pageSize
         , pageSizeDescription: textDescription page pageSize' totalRecords
         , paginationLinks: pagination setPage totalPages page
-        , tableHead: H.tr {} (colHeader setOrderBy orderBy <$> colNames)
+        , tableHead: H.tr {} (colHeader <$> colNames)
         , tableBody: map (H.tr {} <<< map (\c -> H.td {} [c]) <<< _.row) rows
         }
-        where
-          colHeader :: (R2.Setter OrderBy) -> OrderBy -> ColumnName -> R.Element
-          colHeader setOrderBy orderBy c = H.th {scope: "col"} [ H.b {} cs ]
-            where
-              lnk mc = effectLink (setOrderBy (const mc))
-              cs :: Array R.Element
-              cs =
-                case orderBy of
-                  Just (ASC d)  | c == d -> [lnk (Just (DESC c)) "DESC ",  lnk Nothing (columnName c)]
-                  Just (DESC d) | c == d -> [lnk (Just (ASC  c)) "ASC ", lnk Nothing (columnName c)]
-                  _ -> [lnk (Just (ASC c)) (columnName c)]
 
 defaultContainer :: {title :: String} -> Record TableContainerProps -> R.Element
 defaultContainer {title} props = R.fragment
@@ -198,9 +202,6 @@ textDescription currPage pageSize totalRecords =
     end  = if end' > totalRecords then totalRecords else end'
     msg = "Showing " <> show start <> " to " <> show end <> " of " <> show totalRecords
 
-effectLink :: Effect Unit -> String -> R.Element
-effectLink eff msg = H.a {on: {click: const eff}} [H.text msg]
-
 pagination :: (R2.Setter Int) -> Int -> Int -> R.Element
 pagination changePage tp cp =
   H.span {} $

src/Gargantext/Ends.purs

@@ -127,6 +127,7 @@ sessionPath (R.GetNgrams opts i)    =
     <> foldMap (\x -> "&list=" <> show x) opts.listIds
     <> foldMap (\x -> "&listType=" <> show x) opts.termListFilter
     <> foldMap termSizeFilter opts.termSizeFilter
+    <> "&scoreType=" <> show opts.scoreType
     <> search opts.searchQuery
   where
     base (TabCorpus _) = sessionPath <<< R.NodeAPI Node i

src/Gargantext/Types.purs

@@ -267,6 +267,13 @@ nodeTypePath Team      = "team"
 
 type ListId = Int
 
+data ScoreType = Occurrences
+
+derive instance genericScoreType :: Generic ScoreType _
+
+instance showScoreType :: Show ScoreType where
+  show = genericShow
+
 type NgramsGetOpts =
   { tabType        :: TabType
   , offset         :: Offset
@@ -275,6 +282,7 @@ type NgramsGetOpts =
   , listIds        :: Array ListId
   , termListFilter :: Maybe TermList
   , termSizeFilter :: Maybe TermSize
+  , scoreType      :: ScoreType
   , searchQuery    :: String
   }
 

src/Gargantext/Utils/Reactix.purs

@@ -20,6 +20,7 @@ import FFI.Simple ((...), defineProperty, delay, args2, args3)
 import React (class ReactPropFields, Children, ReactClass, ReactElement)
 import React as React
 import Reactix as R
+import Reactix.DOM.HTML as H
 import Reactix.DOM.HTML (ElemFactory, createDOM, text)
 import Reactix.React (react)
 import Reactix.SyntheticEvent as RE
@@ -187,3 +188,6 @@ appendChildToParentId ps c = delay unit $ \_ -> do
   case parentEl of
     Nothing -> pure unit
     Just el -> appendChild el c
+
+effectLink :: Effect Unit -> String -> R.Element
+effectLink eff msg = H.a {on: {click: const eff}} [H.text msg]