[MERGE] fix with dev

src/Gargantext/Components/Forest/Tree.purs

@@ -189,10 +189,13 @@ performAction p@{ reload: (_ /\ setReload)
   performAction p RefreshTree
 
 performAction p@{ openNodes: (_ /\ setOpenNodes)
-                , reload: (_ /\ setReload)
+                , reload:    (_ /\ setReload)
+                , tasks:     (_ /\ setAsyncTasks)
                 , session
                 , tree: (NTree (LNode {id}) _) } (CreateSubmit name nodeType) = do
-  void $ createNode session id $ CreateValue {name, nodeType}
+  -- task <- createNodeAsync session id $ CreateValue {name, nodeType}
+  task <- createNode session id $ CreateValue {name, nodeType}
+  -- liftEffect $ setAsyncTasks $ A.cons task
   liftEffect do
     setOpenNodes (Set.insert (mkNodeId session id))
   performAction p RefreshTree

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

@@ -16,9 +16,12 @@ filterWithRights (show action if user can only)
 -}
 ------------------------------------------------------------------------
 ------------------------------------------------------------------------
+
+data Status a = IsBeta a | IsProd a
+
 data NodeAction = Documentation NodeType
                 | SearchBox
-                | Download | Upload | Refresh
+                | Download | Upload | Refresh | Config
                 | Move     | Clone  | Delete
                 | Share    | Link NodeType
                 | Add (Array NodeType)
@@ -36,8 +39,9 @@ instance eqNodeAction :: Eq NodeAction where
   eq Delete Delete     = true
   eq Share Share       = true
   eq (Link x) (Link y) = true && (x == y)
-  eq (Add x) (Add y)   = true && (x == y)
+  eq (Add  x) (Add  y) = true && (x == y)
   eq CopyFromCorpus CopyFromCorpus = true
+  eq Config Config     = true
   eq _ _               = false
 
 instance showNodeAction :: Show NodeAction where
@@ -50,6 +54,7 @@ instance showNodeAction :: Show NodeAction where
   show Clone             = "Clone"
   show Delete            = "Delete"
   show Share             = "Share"
+  show Config            = "Config"
   show (Link x)          = "Link to " <> show x
   show (Add xs)          = foldl (\a b -> a <> show b) "Add " xs
   show CopyFromCorpus    = "Copy from corpus"
@@ -64,10 +69,11 @@ glyphiconNodeAction Upload            = "upload"
 glyphiconNodeAction (Link _)          = "transfer"
 glyphiconNodeAction Download          = "download"
 glyphiconNodeAction CopyFromCorpus    = "random"
+glyphiconNodeAction Refresh           = "refresh"
+glyphiconNodeAction Config            = "wrench"
 glyphiconNodeAction _                 = ""
 
 
-------------------------------------------------------------------------
 ------------------------------------------------------------------------
 data SettingsBox =
   SettingsBox { show    :: Boolean
@@ -79,14 +85,14 @@ data SettingsBox =
 
 settingsBox :: NodeType -> SettingsBox
 settingsBox NodeUser = SettingsBox {
-    show: true
+    show : true
   , edit : false
   , doc  : Documentation NodeUser
   , buttons : [ Delete ]
   }
 
 settingsBox FolderPrivate = SettingsBox {
-    show: true
+    show : true
   , edit : false
   , doc  : Documentation FolderPrivate
   , buttons : [ Add [ Corpus
@@ -97,7 +103,7 @@ settingsBox FolderPrivate = SettingsBox {
   }
 
 settingsBox Team = SettingsBox {
-    show: true
+    show : true
   , edit : true
   , doc  : Documentation Team
   , buttons : [ Add [ Corpus
@@ -108,7 +114,7 @@ settingsBox Team = SettingsBox {
   }
 
 settingsBox FolderShared = SettingsBox {
-    show: true
+    show : true
   , edit : true
   , doc  : Documentation FolderShared
   , buttons : [ Add [Team, FolderShared]
@@ -117,7 +123,7 @@ settingsBox FolderShared = SettingsBox {
   }
 
 settingsBox FolderPublic = SettingsBox {
-    show: true
+    show : true
   , edit : false
   , doc  : Documentation FolderPublic
   , buttons : [ Add [ Corpus
@@ -126,86 +132,91 @@ settingsBox FolderPublic = SettingsBox {
     ]
   }
 
-settingsBox Folder = SettingsBox {
-    show: true
-  , edit : true
-  , doc  : Documentation Folder
-  , buttons : [ Add [ Corpus
-                    , Folder
-                    , Annuaire
-                    ]
-              , Delete
-              ]
-  }
+settingsBox Folder =
+  SettingsBox { show : true
+              , edit : true
+              , doc  : Documentation Folder
+              , buttons : [ Add [ Corpus
+                                , Folder
+                                , Annuaire
+                                ]
+                          , Delete
+                          ]
+              }
 
-settingsBox Corpus = SettingsBox {
-    show: true
-  , edit : true
-  , doc  : Documentation Corpus
-  , buttons : [ SearchBox
-              , Add [ NodeList
-                    , Graph
-                    , Dashboard
-                    ]
-              , Upload
-              , Download
-                --, Share
-                --, Move
-                --, Clone
-              , Link Annuaire
-              , Delete
-              ]
-  }
+settingsBox Corpus =
+  SettingsBox { show : true
+              , edit : true
+              , doc  : Documentation Corpus
+              , buttons : [ SearchBox
+                          , Add [ NodeList
+                                , Graph
+                                , Dashboard
+                                ]
+                          , Upload
+                          , Download
+                            --, Share
+                            --, Move
+                            --, Clone
+                          , Link Annuaire
+                          , Delete
+                          ]
+              }
 
-settingsBox Texts = SettingsBox {
-    show: true
-  , edit : false
-  , doc  : Documentation Texts
-  , buttons : [ Upload
-              , Download
-              -- , Delete
-              ]
-  }
+settingsBox Texts =
+  SettingsBox { show : true
+              , edit : false
+              , doc  : Documentation Texts
+              , buttons : [ Refresh
+                          , Upload
+                          , Download
+                          -- , Delete
+                          ]
+              }
 
-settingsBox Graph = SettingsBox {
-    show: true
-  , edit : false
-  , doc  : Documentation Graph
-  , buttons : [ Download -- TODO as GEXF or JSON
-              , Delete
-              ]
-  }
+settingsBox Graph =
+  SettingsBox { show : true
+              , edit : false
+              , doc  : Documentation Graph
+              , buttons : [ Refresh
+                          , Config
+                          , Download -- TODO as GEXF or JSON
+                          , Delete
+                          ]
+              }
 
-settingsBox NodeList = SettingsBox {
-    show: true
-  , edit : false
-  , doc  : Documentation NodeList
-  , buttons : [ Upload
-              , CopyFromCorpus
-              , Download
-              -- , Delete
-              ]
-  }
+settingsBox NodeList =
+  SettingsBox { show : true
+              , edit : false
+              , doc  : Documentation NodeList
+              , buttons : [ Refresh
+                          , Config
+                          , Download
+                          , Upload
+                          , CopyFromCorpus
+                          , Delete
+                          ]
+              }
 
-settingsBox Dashboard = SettingsBox {
-    show: true
-  , edit : false
-  , doc  : Documentation Dashboard
-  , buttons : []
-  }
+settingsBox Dashboard =
+  SettingsBox { show : true
+              , edit : false
+              , doc  : Documentation Dashboard
+              , buttons : []
+              }
 
-settingsBox Annuaire = SettingsBox {
-    show: true
-  , edit : false
-  , doc  : Documentation Annuaire
-  , buttons : [ Upload
-              , Delete 
-              ]
-  }
+settingsBox Annuaire =
+  SettingsBox { show : true
+              , edit : false
+              , doc  : Documentation Annuaire
+              , buttons : [ Upload
+                          , Delete
+                          ]
+              }
 
-settingsBox _ = SettingsBox {
-    show: false
-  , edit : false
-  , doc  : Documentation NodeUser
-  , buttons : []
-  }
+settingsBox _ =
+  SettingsBox { show : false
+              , edit : false
+              , doc  : Documentation NodeUser
+              , buttons : []
+              }

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

@@ -12,7 +12,8 @@ import Prelude hiding (div)
 import Gargantext.Components.Lang (Lang)
 import Gargantext.Routes (SessionRoute(..))
 import Gargantext.Sessions (Session, get, put, post, delete)
-import Gargantext.Types as GT
+import Gargantext.Routes as GR
+import Gargantext.Types  as GT
 
 data Action = CreateSubmit String GT.NodeType
             | DeleteNode
@@ -61,6 +62,16 @@ type UploadFile = {
 createNode :: Session -> ID -> CreateValue -> Aff (Array ID)
 createNode session parentId = post session $ NodeAPI GT.Node (Just parentId) ""
 
+createNodeAsync :: Session
+                -> ID
+                -> CreateValue
+                -> Aff GT.AsyncTaskWithType
+createNodeAsync session parentId q = do
+  task <- post session p q
+  pure $ GT.AsyncTaskWithType {task, typ: GT.CreateNode}
+  where
+    p = GR.NodeAPI GT.Node (Just parentId) (GT.asyncTaskTypePath GT.CreateNode)
+
 renameNode :: Session -> ID -> RenameValue -> Aff (Array ID)
 renameNode session renameNodeId = put session $ NodeAPI GT.Node (Just renameNodeId) "rename"
 

src/Gargantext/Components/GraphExplorer/Sidebar.purs

@@ -69,11 +69,6 @@ sidebarCpt = R.hooksComponent "Sidebar" cpt
                   [ RH.div { className: "", role: "tabpanel" }
                     (Seq.toUnfoldable $ (Seq.map (badge props.selectedNodeIds) (badges props.graph props.selectedNodeIds)))
                   ]
-                , RH.div { className: "gexf" } [
-                   RH.a { className: "btn btn-default"
-                        , href: gexfHref props.session props.graphId
-                        , target: "_blank" } [ RH.text "Download GEXF" ]
-                  ]
                 , RH.div { className: "tab-content" }
                   [
                     removeButton "Remove candidate" CandidateTerm props nodesMap
@@ -138,9 +133,6 @@ sidebarCpt = R.hooksComponent "Sidebar" cpt
       snd props.removedNodeIds $ const $ fst props.selectedNodeIds
       snd props.selectedNodeIds $ const SigmaxT.emptyNodeIds
 
-    gexfHref :: Session -> Int -> String
-    gexfHref session graphId = url session $ Routes.NodeAPI GT.Graph (Just graphId) "gexf"
-
 
 badge :: R.State SigmaxT.NodeIds -> Record SigmaxT.Node -> R.Element
 badge (_ /\ setNodeIds) {id, label} =

src/Gargantext/Components/Login.purs

@@ -167,19 +167,25 @@ formCpt = R.hooksComponent "G.C.Login.form" cpt where
       [ cardGroup
         [ cardBlock
           [ center
-            [ H.div {className: "text-muted"}
+          [ H.div {}{-className: "text-muted"-}
               [ H.text $ "Login to garg://" <> show backend]
-              , requestAccessLink {} 
+              , requestAccessLink {}
               ]
           , H.div {}
             [ csrfTokenInput {}
             , formGroup [ H.p {} [ H.text (fst error) ], usernameInput username ]
             , formGroup [ passwordInput password, clearfix {} ]
             , center
-              [ H.label {}
-                [ H.div {className: "checkbox"}
-                  [ termsCheckbox setBox , H.text "I accept the terms of use ", termsLink {} ] ]
-              ] 
+               [ H.label {}
+                 [ H.div {className: "checkbox"}
+                    [ termsCheckbox setBox
+                    , H.text "I hereby accept "
+                    , H.a { target: "_blank"
+                          , href: "http://gitlab.iscpif.fr/humanities/tofu/tree/master"
+                          } [ H.text "the terms of use" ]
+                    ]
+                  ]
+                ]
             ]
           , if checkBox == true
                && fst username /= ""
@@ -216,7 +222,7 @@ termsCheckbox setCheckBox =
 
 termsLink :: {} -> R.Element
 termsLink _ =
-  H.a { target: "_blank", href: termsUrl } [ H.text " [Read the terms of use]" ]
+  H.a { target: "_blank", href: termsUrl } [ H.text "the terms of use" ]
   where termsUrl = "http://gitlab.iscpif.fr/humanities/tofu/tree/master"
 
 requestAccessLink :: {} -> R.Element

src/Gargantext/Routes.purs

@@ -47,21 +47,21 @@ data SessionRoute
 instance showAppRoute :: Show AppRoute where
   show Home                     = "Home"
   show Login                    = "Login"
-  show (Folder s i)             = "Folder"   <> show i <> " (" <> show s <> ")"
-  show (FolderPrivate s i)      = "FolderPrivate"   <> show i <> " (" <> show s <> ")"
-  show (FolderPublic s i)       = "FolderPublic"   <> show i <> " (" <> show s <> ")"
-  show (FolderShared s i)       = "FolderShared"   <> show i <> " (" <> show s <> ")"
-  show (Team s i)               = "Team"   <> show i <> " (" <> show s <> ")"
-  show (Corpus s i)             = "Corpus"   <> show i <> " (" <> show s <> ")"
-  show (Document _ s i)         = "Document" <> show i <> " (" <> show s <> ")"
+  show (Folder        s i)      = "Folder"         <> show i <> " (" <> show s <> ")"
+  show (FolderPrivate s i)      = "FolderPrivate"  <> show i <> " (" <> show s <> ")"
+  show (FolderPublic  s i)      = "FolderPublic"   <> show i <> " (" <> show s <> ")"
+  show (FolderShared  s i)      = "FolderShared"   <> show i <> " (" <> show s <> ")"
+  show (Team          s i)      = "Team"           <> show i <> " (" <> show s <> ")"
+  show (Corpus        s i)      = "Corpus"         <> show i <> " (" <> show s <> ")"
+  show (Document    _ s i)      = "Document"       <> show i <> " (" <> show s <> ")"
   show (CorpusDocument s _ _ i) = "CorpusDocument" <> show i <> " (" <> show s <> ")"
   show (PGraphExplorer s i)     = "graphExplorer"  <> show i <> " (" <> show s <> ")"
   show (Dashboard      s i)     = "Dashboard"      <> show i <> " (" <> show s <> ")"
-  show (Texts s i)              = "texts"    <> show i <> " (" <> show s <> ")"
-  show (Lists s i)              = "lists"    <> show i <> " (" <> show s <> ")"
-  show (Annuaire s i)           = "Annuaire" <> show i <> " (" <> show s <> ")"
-  show (UserPage s i)           = "User"     <> show i <> " (" <> show s <> ")"
-  show (ContactPage s a i)      = "Contact"  <> show a <> "::" <> show i <> " (" <> show s <> ")"
+  show (Texts          s i)     = "texts"          <> show i <> " (" <> show s <> ")"
+  show (Lists          s i)     = "lists"          <> show i <> " (" <> show s <> ")"
+  show (Annuaire       s i)     = "Annuaire"       <> show i <> " (" <> show s <> ")"
+  show (UserPage       s i)     = "User"           <> show i <> " (" <> show s <> ")"
+  show (ContactPage  s a i)     = "Contact"        <> show a <> "::" <> show i <> " (" <> show s <> ")"
 
 appPath :: AppRoute -> String
 appPath Home                 = ""

src/Gargantext/Types.purs

@@ -464,13 +464,14 @@ modeFromString _ = Nothing
 -- Async tasks
 
 -- corresponds to /add/form/async or /add/query/async
-data AsyncTaskType = Form | GraphT | Query
+data AsyncTaskType = Form | GraphT | Query | CreateNode
 derive instance genericAsyncTaskType :: Generic AsyncTaskType _
 
 asyncTaskTypePath :: AsyncTaskType -> String
 asyncTaskTypePath Form   = "add/form/async/"
 asyncTaskTypePath Query  = "query/"
 asyncTaskTypePath GraphT = "async/"
+asyncTaskTypePath CreateNode = "async/nobody/"
 
 type AsyncTaskID = String
 

src/Gargantext/BootstrapNative.purs → src/Gargantext/Utils/BootstrapNative.purs

-module Gargantext.BootstrapNative where
+module Gargantext.Utils.BootstrapNative where
 
 import Effect (Effect)