Merge branch 'dev' into dev-graph-screenshot

package.json

 {
     "name": "Gargantext",
-    "version": "0.0.1.7.4",
+    "version": "0.0.1.7.6",
     "scripts": {
         "rebase-set": "spago package-set-upgrade && spago psc-package-insdhall",
         "rebuild-set": "spago psc-package-insdhall",

src/Gargantext/Components/App.purs

@@ -169,14 +169,16 @@ topBarCpt = R.hooksComponent "G.C.A.topBar" cpt
                    , className: "navbar navbar-inverse navbar-fixed-top" }
         [ H.div { className: "container-fluid" }
             [ H.div { className: "navbar-inner" }
-            [ logo
-            , H.div { className: "collapse navbar-collapse" }
-                    [ H.ul { className: "nav navbar-nav" } [divDropdownLeft]
+              [ logo (fst handed)
+              , H.div { className: "collapse navbar-collapse"  <> navHanded}
+                      $ sortHanded
+                      [ H.ul { className: "nav navbar-nav" <> navHanded} [divDropdownLeft]
                       , H.ul { title: "If you are Left Handed you can change "
                                     <> "the interface by clicking on me. Click "
                                     <> "again to come back to previous state."
-                           , className: "nav navbar-nav"
+                             , className: "nav navbar-nav" <> navHanded
                              } [handedChooser { handed }]
+                      , H.ul { className: "nav navbar-nav" <> navHanded} []
                       {-, H.ul { title: "Dark Mode soon here"
                              , className : "nav navbar-nav"
                              } [ H.li {} [ H.a {} [ H.span {className : "fa fa-moon"}[]
@@ -188,6 +190,9 @@ topBarCpt = R.hooksComponent "G.C.A.topBar" cpt
               ]
             ]
         ]
+          where
+            navHanded  = if fst handed == GT.LeftHanded then " navbar-right" else ""
+            sortHanded = if fst handed == GT.LeftHanded then reverse else reverse -- identity
             -- SB.searchBar {session, databases: allDatabases}
 
 type HandedChooserProps = (
@@ -215,15 +220,16 @@ handedChooserCpt = R.hooksComponent "G.C.A.handedChooser" cpt
       GT.LeftHanded  -> GT.RightHanded
       GT.RightHanded -> GT.LeftHanded
 
-logo :: R.Element
-logo =
+logo :: GT.Handed -> R.Element
+logo handed =
   H.a { className, href: "#/" }
   [ H.img { src, title, width: "30", height: "28" }
   ]
   where
-    className = "navbar-brand logoSmall"
+    className = "navbar-brand logoSmall" <> navHanded
     src       = "images/logoSmall.png"
     title     = "Back to home."
+    navHanded = if handed == GT.LeftHanded then " navbar-right" else ""
 
 divDropdownLeft :: R.Element
 divDropdownLeft =

src/Gargantext/Components/Forest.purs

@@ -48,7 +48,6 @@ forestCpt = R.hooksComponent "G.C.Forest.forest" cpt where
       )
       (cpt' openNodes asyncTasks reload showLogin)
   cpt' openNodes asyncTasks reload showLogin (frontends /\ route /\ sessions /\ _ /\ _ /\ _ /\ _ /\ handed) = do
-    --pure $ R.fragment $ A.cons (plus showLogin) trees
     pure $ R2.row $ [plus handed showLogin] <> trees
     where
       trees = tree <$> unSessions sessions

src/Gargantext/Components/Forest/Tree/Node.purs

@@ -140,7 +140,10 @@ nodeMainSpan p@{ dispatch, folderOpen, frontends, handed, session } = R.createEl
         H.i {className: GT.fldr nodeType open} []
         ]
 
-    popOverIcon = H.a { className: "settings fa fa-cog" } []
+    popOverIcon = H.a { className: "settings fa fa-cog" 
+                      , title : "Each node of the Tree can perform some actions.\n"
+                             <> "Click here to execute one of them."
+                      } []
 
     mNodePopupView props@{id, nodeType} onPopoverClose =
       nodePopupView { id

src/Gargantext/Components/Forest/Tree/Node/Settings.purs

@@ -95,8 +95,11 @@ settingsBox NodeUser =
   SettingsBox { show : true
               , edit : false
               , doc  : Documentation NodeUser
-              , buttons : [ Delete
-                          -- , Add [FolderPublic]
+              , buttons : [ Add [ FolderPrivate
+                                , FolderShared
+                                , FolderPublic
+                                ]
+                          , Delete
                           ]
               }
 
@@ -110,6 +113,7 @@ settingsBox FolderPrivate =
                                 , NodeFrameWrite
                                 , NodeFrameCalc
                                 ]
+                          , Delete
                           ]
               }
 
@@ -132,8 +136,8 @@ settingsBox FolderShared =
   SettingsBox { show : true
               , edit : true
               , doc  : Documentation FolderShared
-              , buttons : [ Add [Team, Folder]
-               --           , Delete
+              , buttons : [ Add [Team, FolderShared]
+                          , Delete
                           ]
               }
 
@@ -142,7 +146,7 @@ settingsBox FolderPublic =
               , edit : true
               , doc  : Documentation FolderPublic
               , buttons : [ Add [ FolderPublic ]
-                         -- , Delete
+                          , Delete
                           ]
               }
 

src/Gargantext/Components/Nodes/Annuaire/User/Contacts.purs

@@ -24,7 +24,6 @@ import Gargantext.Prelude (Unit, bind, const, discard, pure, show, unit, ($), (+
 import Gargantext.Routes as Routes
 import Gargantext.Sessions (Session, get, put, sessionId)
 import Gargantext.Types (NodeType(..))
-import Gargantext.Utils.Reactix as R2
 
 display :: String -> Array R.Element -> R.Element
 display title elems =

src/Gargantext/Components/Nodes/Corpus/Chart/Pie.purs

@@ -116,8 +116,7 @@ pieCpt = R.hooksComponent "G.C.N.C.C.P.pie" cpt
 
 loadedPie :: Record MetricsProps -> HistoMetrics -> R.Element
 loadedPie { path, reload, session } loaded =
-  H.div {} [
-    U.reloadButton reload
+  H.div {} [ U.reloadButton reload
            , U.chartUpdateButton { chartType: ChartPie, path, reload, session }
            , chart $ chartOptionsPie loaded
            ]
@@ -132,8 +131,8 @@ barCpt = R.hooksComponent "LoadedMetricsBar" cpt
     cpt {path, session} _ = do
       reload <- R.useState' 0
       --pure $ metricsLoadView {getMetrics, loaded: loadedBar, path, reload, session}
-      pure $ metricsWithCacheLoadView {
-          getMetricsHash
+      pure $ metricsWithCacheLoadView
+           { getMetricsHash
            , handleResponse
            , loaded: loadedPie
            , mkRequest: mkRequest session

src/Gargantext/Components/Nodes/Corpus/Chart/Predefined.purs

@@ -19,8 +19,10 @@ import Gargantext.Types (NodeID, Mode(..), TabSubType(..), TabType(..), modeTabT
 data PredefinedChart =
     CDocsHistogram
   | CAuthorsPie
+  | CSourcesBar
   | CInstitutesTree
   | CTermsMetrics
+
 derive instance genericPredefinedChart :: Generic PredefinedChart _
 
 instance showPredefinedChart :: Show PredefinedChart where
@@ -42,30 +44,30 @@ instance encodePredefinedChart :: EncodeJson PredefinedChart where
 instance readPredefinedChart :: Read PredefinedChart where
   read "CDocsHistogram"  = Just CDocsHistogram
   read "CAuthorsPie"     = Just CAuthorsPie
+  read "CSourcesBar"     = Just CSourcesBar
   read "CInstitutesTree" = Just CInstitutesTree
   read "CTermsMetrics"   = Just CTermsMetrics
   read _                 = Nothing
 
 
 allPredefinedCharts :: Array PredefinedChart
-allPredefinedCharts = [
-    CDocsHistogram
+allPredefinedCharts =
+  [ CDocsHistogram
   , CAuthorsPie
   , CTermsMetrics
   , CInstitutesTree
+  , CSourcesBar
   ]
 
 
 type Params =
-  (
-    corpusId :: NodeID
+  ( corpusId :: NodeID
   , session  :: Session
   -- optinal params
   , limit    :: Maybe Int
   , listId   :: Maybe Int
   )
 
-
 render :: PredefinedChart -> Record Params -> R.Element
 render CDocsHistogram { corpusId, listId, session } = histo { path, session }
   where
@@ -93,5 +95,16 @@ render CTermsMetrics { corpusId, limit, listId, session } = metrics { path, sess
     path = { corpusId
            , limit
            , listId: fromMaybe 0 listId
-           , tabType: TabCorpus (TabNgramType $ modeTabType Authors)
+           , tabType: TabCorpus (TabNgramType $ modeTabType Terms)
            }
+render CSourcesBar { corpusId, limit, listId, session } = metrics { path, session }
+  where
+    path = { corpusId
+           , limit
+           , listId: fromMaybe 0 listId
+           , tabType: TabCorpus (TabNgramType $ modeTabType Sources)
+           }
+
+
+
+

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

@@ -5,7 +5,6 @@ import Data.Argonaut (class DecodeJson, decodeJson, (.:), (.:?))
 import Data.Generic.Rep (class Generic)
 import Data.Generic.Rep.Show (genericShow)
 import Data.Maybe (Maybe(..), fromMaybe)
-import Data.Tuple (fst)
 import Data.Tuple.Nested ((/\))
 import Effect (Effect)
 import Effect.Aff (Aff)

src/Gargantext/Components/Nodes/Lists/Tabs.purs

@@ -18,10 +18,10 @@ import Gargantext.Sessions (Session)
 import Gargantext.Types (ChartType(..), CTabNgramType(..), Mode(..), TabSubType(..), TabType(..), chartTypeFromString, modeTabType)
 import Gargantext.Utils.Reactix as R2
 
-type Props =
-  ( session :: Session
+type Props = ( session    :: Session
              , corpusId   :: Int
-  , corpusData :: CorpusData )
+             , corpusData :: CorpusData 
+             )
 
 tabs :: Record Props -> R.Element
 tabs props = R.createElement tabsCpt props []
@@ -55,27 +55,40 @@ ngramsViewCpt = R.hooksComponent "G.C.N.L.T.ngramsView" cpt
 
       pure $ R.fragment
         ( charts tabNgramType chartType
-        <> [
-          NT.mainNgramsTable
-            {session, defaultListId, nodeId: corpusId, tabType, tabNgramType, withAutoUpdate: false}
+        <> [ NT.mainNgramsTable { session
+                                , defaultListId
+                                , nodeId: corpusId
+                                , tabType
+                                , tabNgramType
+                                , withAutoUpdate: false
+                                }
            ]
         )
       where
         tabNgramType = modeTabType mode
         tabType      = TabCorpus (TabNgramType tabNgramType)
         listId       = defaultListId
-        path = {corpusId, listId, tabType, limit: (Just 1000)}
+        path         = { corpusId
+                       , listId
+                       , tabType
+                       , limit: Just 1000
+                       }
 
         charts CTabTerms (chartType /\ setChartType) = [
           H.div { className: "row chart-type-selector" } [
             H.div { className: "col-md-3" } [
-
               R2.select { className: "form-control"
-                        ,  on: { change: \e -> setChartType $ const $ fromMaybe Histo $ chartTypeFromString $ R2.unsafeEventValue e }
+                        ,  on: { change: \e -> setChartType
+                                             $ const
+                                             $ fromMaybe Histo
+                                             $ chartTypeFromString
+                                             $ R2.unsafeEventValue e
+                               }
                         , defaultValue: show chartType } [
                 H.option { value: show Histo     } [ H.text $ show Histo     ]
               , H.option { value: show Scatter   } [ H.text $ show Scatter   ]
               , H.option { value: show ChartBar  } [ H.text $ show ChartBar  ]
+              , H.option { value: show ChartPie  } [ H.text $ show ChartPie  ]
               , H.option { value: show ChartTree } [ H.text $ show ChartTree ]
               ]
             ]
@@ -83,7 +96,6 @@ ngramsViewCpt = R.hooksComponent "G.C.N.L.T.ngramsView" cpt
         , getChartFunction chartType $ { session, path }
         ]
         charts _ _       = [ chart mode ]
-
         chart Authors    = pie     { session, path }
         chart Sources    = bar     { session, path }
         chart Institutes = tree    { session, path }

src/Gargantext/Components/Nodes/Texts.purs

@@ -46,6 +46,7 @@ type KeyProps = (
 textsLayoutWithKey :: Record KeyProps -> R.Element
 textsLayoutWithKey props = R.createElement textsLayoutWithKeyCpt props []
 
+textsLayoutWithKeyCpt :: R.Component KeyProps
 textsLayoutWithKeyCpt = R.hooksComponent "G.C.N.T.textsLayoutWithKey" cpt
   where
     cpt { frontends, nodeId, session } _ = do

src/Gargantext/Components/Tab.purs

@@ -21,7 +21,9 @@ tabsCpt = R.hooksComponent "G.C.Tab.tabs" cpt
       pure $
         H.div {}
         [ H.nav {}
-          [ H.div { className: "nav nav-tabs" }
+          [ H.div { className: "nav nav-tabs"
+                  , title    : "Tab for ngrams"
+                  }
             (mapWithIndex (button setActiveTab activeTab) props.tabs) ]
         , H.div { className: "tab-content" } $ mapWithIndex (item activeTab) props.tabs ]
     button setActiveTab selected index (name /\ _) =

src/Gargantext/Ends.purs

@@ -119,7 +119,7 @@ sessionPath (R.Tab t i)             = sessionPath (R.NodeAPI Node i (showTabType
 sessionPath (R.Children n o l s i)  = sessionPath (R.NodeAPI Node i ("children?type=" <> show n <> offsetUrl o <> limitUrl l <> orderUrl s))
 sessionPath (R.NodeAPI Phylo pId p) = "phyloscape?nodeId=" <> (show $ fromMaybe 0 pId) <> p
 sessionPath (R.RecomputeNgrams nt nId lId)      = "node/" <> (show nId) <> "/ngrams/recompute?" <> (defaultList lId) <> "&ngramsType=" <> (show nt)
-sessionPath (R.RecomputeListChart ChartBar nt nId lId)   = "node/" <> (show nId) <> "/pie?" <> (defaultList lId) <> "&ngramsType=" <> (show nt)
+sessionPath (R.RecomputeListChart ChartBar nt nId lId)   = "node/" <> (show nId) <> "/chart?" <> (defaultList lId) <> "&ngramsType=" <> (show nt)
 sessionPath (R.RecomputeListChart ChartPie nt nId lId)   = "node/" <> (show nId) <> "/pie?" <> (defaultList lId) <> "&ngramsType=" <> (show nt)
 sessionPath (R.RecomputeListChart ChartTree nt nId lId)  = "node/" <> (show nId) <> "/tree?" <> (defaultList lId) <> "&ngramsType=" <> (show nt) <> "&listType=" <> show MapTerm
 sessionPath (R.RecomputeListChart Histo nt nId lId)      = "node/" <> (show nId) <> "/chart?" <> (defaultList lId) <> "&ngramsType=" <> (show nt)

src/Gargantext/Types.purs

@@ -16,8 +16,6 @@ import Prelude
 import Prim.Row (class Union)
 import URI.Query (Query)
 
-
-
 data Handed = LeftHanded | RightHanded
 
 derive instance genericHanded :: Generic Handed _