Merge branch 'dev-multi-term-selection' of...

Merge branch 'dev-multi-term-selection' of ssh://gitlab.iscpif.fr:20022/gargantext/purescript-gargantext into dev-merge

dist/styles/Tree.css

@@ -36,6 +36,7 @@ li .leaf:hover a.settings {
 .tree ul li::before {
   bottom: -12px;
   content: " ";
+  height: 7px;
   position: absolute;
   top: 5px;
 }
@@ -50,6 +51,15 @@ li .leaf:hover a.settings {
   width: 1px;
   top: 5px;
 }
+.tree ul li.with-children::after {
+  background-color: #000;
+}
+.tree ul li.with-children::before {
+  background-color: #000;
+}
+.tree .lefthanded .leaf {
+  justify-content: flex-end;
+}
 .tree .lefthanded ul {
   margin-right: 5px;
 }
@@ -58,17 +68,15 @@ li .leaf:hover a.settings {
   padding-right: 5px;
 }
 .tree .lefthanded ul li.with-children::after {
-  background-color: #000;
   right: -10px;
   width: 5px;
 }
 .tree .lefthanded ul li.with-children::before {
-  background-color: #000;
   right: -10px;
   width: 1px;
 }
-.tree .lefthanded ul li .leaf {
-  justify-content: flex-end;
+.tree .righthanded .leaf {
+  justify-content: flex-start;
 }
 .tree .righthanded ul {
   margin-left: 5px;
@@ -78,12 +86,10 @@ li .leaf:hover a.settings {
   padding-left: 5px;
 }
 .tree .righthanded ul li.with-children::after {
-  background-color: #000;
   left: -10px;
   width: 5px;
 }
 .tree .righthanded ul li.with-children::before {
-  background-color: #000;
   left: -10px;
   width: 1px;
 }
@@ -91,9 +97,6 @@ li .leaf:hover a.settings {
   background-color: #000;
   right: 10px;
 }
-.tree .righthanded ul li .leaf {
-  justify-content: flex-start;
-}
 .tree .file-dropped {
   background-color: #d8dfe5;
 }

dist/styles/Tree.sass

@@ -31,6 +31,7 @@ li
       &::before
         bottom: -12px
         content: " "
+        height: 7px
         position: absolute
         top: 5px
       &:not(:first-child):last-child::before
@@ -43,8 +44,15 @@ li
         position: absolute
         width: 1px
         top: 5px
+      &.with-children
+        &::after
+          background-color: #000
+        &::before
+          background-color: #000
 
   .lefthanded
+    .leaf
+      justify-content : flex-end
     ul
       margin-right : 5px
       li
@@ -52,18 +60,16 @@ li
         padding-right: 5px
         &.with-children
           &::after
-            background-color: #000
             right: -10px
             width: 5px
           &::before
-            background-color: #000
             right: -10px
             width: 1px
           &:only-child::before
             //right: 1px
-        .leaf
-          justify-content : flex-end
   .righthanded
+    .leaf
+      justify-content : flex-start
     ul
       margin-left : 5px
       li
@@ -71,18 +77,14 @@ li
         padding-left: 5px
         &.with-children
           &::after
-            background-color: #000
             left: -10px
             width: 5px
           &::before
-            background-color: #000
             left: -10px
             width: 1px
           &:only::before
             background-color: #000
             right: 10px
-        .leaf
-          justify-content : flex-start
 
   .file-dropped
     background-color: #d8dfe5

src/Gargantext/Components/Login.purs

@@ -3,7 +3,6 @@
   -- Select a backend and log into it
 module Gargantext.Components.Login where
 
-import DOM.Simple.Console (log)
 import Data.Array (head)
 import Data.Either (Either(..))
 import Data.Maybe (Maybe(..), fromMaybe)
@@ -11,17 +10,21 @@ import Data.Sequence as DS
 import Data.String as DST
 import Data.Tuple (fst, snd)
 import Data.Tuple.Nested ((/\))
+import DOM.Simple.Console (log)
 import Effect (Effect)
 import Effect.Aff (launchAff_)
 import Effect.Class (liftEffect)
-import Prelude (Unit, bind, const, discard, map, pure, show, ($), (&&), (*>), (/=), (<$>), (<>), (==), (>))
 import Reactix as R
 import Reactix.DOM.HTML as H
 
+import Gargantext.Prelude
+
 import Gargantext.Components.Forest.Tree.Node.Tools (checkbox)
 import Gargantext.Components.Forms (clearfix, cardBlock, cardGroup, center, formGroup)
 import Gargantext.Components.Login.Types (AuthRequest(..))
+import Gargantext.Components.NgramsTable.Loader as NTL
 import Gargantext.Ends (Backend(..))
+import Gargantext.Hooks.Loader as GHL
 import Gargantext.Sessions (Session, Sessions(..), postAuthRequest, unSessions)
 import Gargantext.Sessions as Sessions
 import Gargantext.Utils (csrfMiddlewareToken)
@@ -129,14 +132,27 @@ renderSessions :: R2.Reductor Sessions Sessions.Action -> R.Element
 renderSessions sessions = R.fragment (renderSession sessions <$> unSessions (fst sessions))
   where
     renderSession :: R2.Reductor Sessions Sessions.Action -> Session -> R.Element
-    renderSession sessions' session = H.li {} $ [ H.text $ show session ]
-                                            <> [ H.a { on : {click}
-                                                     , className: "glyphitem glyphicon glyphicon-log-out"
+    renderSession sessions' session = H.li {} [
+      H.text $ show session
+    , H.a { className: "glyphitem fa fa-sign-out"
           , id : "log-out"
+          , on : { click: logOutClick }
           , title: "Log out"
-                                                     } [] ]
+          } []
+    , H.a { className: "glyphitem fa fa-eraser"
+          , id : "log-out"
+          , on : { click: clearCacheClick }
+          , title: "Clear cache"
+          } []
+    ]
       where
-                                                  click _ = (snd sessions') (Sessions.Logout session)
+        clearCacheClick :: forall a. a -> Effect Unit
+        clearCacheClick _ = do
+          launchAff_ $ do
+            GHL.clearCache unit
+            NTL.clearCache unit
+            liftEffect $ log "[renderSessions] cache cleared"
+        logOutClick _ = (snd sessions') (Sessions.Logout session)
 
 renderBackend :: R.State (Maybe Backend) -> Backend -> R.Element
 renderBackend state backend@(Backend {name}) =

src/Gargantext/Components/NgramsTable/Loader.purs

@@ -17,6 +17,7 @@ import Gargantext.Components.NgramsTable.Core (Version(..), Versioned(..))
 import Gargantext.Utils.CacheAPI as GUC
 
 
+cacheName :: String
 cacheName = "ngrams-cache-api-loader"
 
 

src/Gargantext/Hooks/Loader.purs

@@ -23,6 +23,12 @@ import Gargantext.Utils as GU
 import Gargantext.Utils.CacheAPI as GUC
 import Gargantext.Utils.Reactix as R2
 
+cacheName :: String
+cacheName = "cache-api-loader"
+
+clearCache :: Unit -> Aff Unit
+clearCache _ = GUC.delete $ GUC.CacheName cacheName
+
 
 useLoader :: forall path st. Eq path
           => path
@@ -119,7 +125,6 @@ useCachedAPILoaderEffect { cacheEndpoint
     else do
       R.setRef oPath path
 
-      let cacheName = "cache-api-loader"
       let req = mkRequest path
       -- log2 "[useCachedLoader] mState" mState
       launchAff_ $ do