Merge branch 'dev' into dev-scroll-fix

src/Gargantext/Components/App.purs

@@ -62,6 +62,7 @@ appCpt = R.hooksComponent "G.C.App.app" cpt where
           FolderPrivate sid nodeId -> withSession sid $ \session -> forested $ corpusLayout { key: show nodeId, nodeId, session }
           FolderPublic sid nodeId -> withSession sid $ \session -> forested $ corpusLayout { key: show nodeId, nodeId, session }
           FolderShared sid nodeId -> withSession sid $ \session -> forested $ corpusLayout { key: show nodeId, nodeId, session }
+          Team sid nodeId -> withSession sid $ \session -> forested $ corpusLayout { key: show nodeId, nodeId, session }
           Corpus sid nodeId -> withSession sid $ \session -> forested $ corpusLayout { key: show nodeId, nodeId, session }
           Texts sid nodeId  -> withSession sid $ \session -> forested $ textsLayout { nodeId, session, frontends }
           Lists sid nodeId  -> withSession sid $ \session -> forested $ listsLayout { nodeId, session }

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

@@ -125,10 +125,10 @@ settingsBox FolderPublic = SettingsBox {
     show: true
   , edit : false
   , doc  : Documentation FolderPublic
-  , buttons : [{-, SearchBox
-                                                    , Add [ Corpus
-                                                          , Folder
-                                                          ]-}
+  , buttons : [ SearchBox
+              , Add [ Corpus
+                    , Folder
+                    ]
     ]
   }
 

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

@@ -142,11 +142,11 @@ uploadButtonCpt = R.hooksComponent "G.C.F.T.N.A.U.uploadButton" cpt
 
 -- START File Type View
 type FileTypeProps =
-  ( action :: Action -> Aff Unit
+  ( action      :: Action -> Aff Unit
   , droppedFile :: R.State (Maybe DroppedFile)
-  , id :: ID
-  , isDragOver :: R.State Boolean
-  , nodeType :: GT.NodeType
+  , id          :: ID
+  , isDragOver  :: R.State Boolean
+  , nodeType    :: GT.NodeType
   )
 
 fileTypeView :: Record FileTypeProps -> R.Element
@@ -246,9 +246,9 @@ uploadFile session nodeType id fileType {mName, contents: UploadFileContents con
     --p = NodeAPI GT.Corpus (Just id) $ "add/file/async/nobody" <> Q.print (toQuery q)
     p = GR.NodeAPI nodeType (Just id) $ GT.asyncTaskTypePath GT.Form
     bodyParams = [
-        Tuple "_wf_data" (Just contents)
+        Tuple "_wf_data"     (Just contents)
       , Tuple "_wf_filetype" (Just $ show fileType)
-      , Tuple "_wf_name" mName
+      , Tuple "_wf_name"      mName
       ]
 
 uploadTermListView :: Record Props -> R.Element
@@ -273,7 +273,7 @@ uploadTermListViewCpt = R.hooksComponent "G.C.F.T.N.A.U.UploadTermListView" cpt
     onChangeContents :: forall e. R.State (Maybe UploadFile) -> E.SyntheticEvent_ e -> Effect Unit
     onChangeContents (mFile /\ setMFile) e = do
       let mF = R2.inputFileNameWithBlob 0 e
-      E.preventDefault e
+      E.preventDefault  e
       E.stopPropagation e
       case mF of
         Nothing -> pure unit
@@ -286,8 +286,8 @@ uploadTermListViewCpt = R.hooksComponent "G.C.F.T.N.A.U.UploadTermListView" cpt
 type UploadTermButtonProps =
   (
     dispatch :: Action -> Aff Unit
-  , id :: Int
-  , mFile :: R.State (Maybe UploadFile)
+  , id       :: Int
+  , mFile    :: R.State (Maybe UploadFile)
   , nodeType :: GT.NodeType
   )
 

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

@@ -412,11 +412,13 @@ panelActionCpt = R.hooksComponent "G.C.F.T.N.B.panelAction" cpt
     cpt {action: Upload, dispatch, id, nodeType, session} _ = do
       pure $ uploadFileView {dispatch, id, nodeType, session}
     cpt {action: Download, id, nodeType: NodeList, session} _ = do
-      let href = url session $ Routes.NodeAPI GT.Node (Just id) ""
+      let href = url session $ Routes.NodeAPI GT.NodeList (Just id) ""
       pure $ R.fragment [
-        H.span { className: "row" } [
-           H.a { className: "col-md-12", href, target: "_blank" } [ H.text "Download file" ]
-        ]
+        H.span { className: "row" }
+               [ H.a { className: "col-md-12"
+                     , href
+                     , target: "_blank" } [ H.text "Download file" ]
+               ]
       ]
     cpt {action: Download} _ = do
       pure $ fragmentPT "Soon, you will be able to dowload your file here"

src/Gargantext/Router.purs

@@ -14,6 +14,7 @@ router = oneOf
   , FolderPrivate    <$> (route "folderPrivate"     *> sid) <*> int
   , FolderPublic     <$> (route "folderPublic"     *> sid) <*> int
   , FolderShared     <$> (route "folderShared"     *> sid) <*> int
+  , Team             <$> (route "team"     *> sid) <*> int
   , CorpusDocument   <$> (route "corpus"     *> sid) <*> int
                         <*> (lit "list" *> int)
                         <*> (lit "document" *> int)

src/Gargantext/Routes.purs

@@ -11,7 +11,8 @@ data AppRoute
   | FolderPrivate SessionId Int
   | FolderPublic SessionId Int
   | FolderShared SessionId Int
-  | Corpus SessionId  Int
+    | Team SessionId Int
+  | Corpus SessionId Int
     | Document       SessionId Int Int
     | CorpusDocument SessionId Int Int Int
     | PGraphExplorer SessionId Int
@@ -46,6 +47,7 @@ instance showAppRoute :: Show AppRoute where
   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 <> ")"
@@ -60,10 +62,11 @@ instance showAppRoute :: Show AppRoute where
 appPath :: AppRoute -> String
 appPath Home                 = ""
 appPath Login                = "login"
-appPath (Folder s i)         = "folder/"     <> show s <> "/" <> show i
-appPath (FolderPrivate s i)  = "folderPrivate/"     <> show s <> "/" <> show i
-appPath (FolderPublic s i)   = "folderPublic/"     <> show s <> "/" <> show i
-appPath (FolderShared s i)   = "folderShared/"     <> show s <> "/" <> show i
+appPath (Folder s i)         = "folder/"        <> show s <> "/" <> show i
+appPath (FolderPrivate s i)  = "folderPrivate/" <> show s <> "/" <> show i
+appPath (FolderPublic s i)   = "folderPublic/"  <> show s <> "/" <> show i
+appPath (FolderShared s i)   = "folderShared/"  <> show s <> "/" <> show i
+appPath (Team s i)           = "team/"          <> show s <> "/" <> show i
 appPath (CorpusDocument s c l i) = "corpus/" <> show s <> "/" <> show c <> "/list/" <> show l <> "/document/" <> show i
 appPath (Corpus s i)         = "corpus/"     <> show s <> "/" <> show i
 appPath (Document s l i)     = "list/"       <> show s <> "/" <> show l <> "/document/" <> show i

src/Gargantext/Types.purs

@@ -153,7 +153,7 @@ instance showNodeType :: Show NodeType where
 
   show Folder        = "NodeFolder"
   show FolderPrivate = "NodeFolderPrivate"  -- Node Private Worktop
-  show FolderShared    = "NodeFolderShared" -- Node Share Worktop
+  show FolderShared  = "NodeFolderShared"   -- Node Share Worktop
   show FolderPublic  = "NodeFolderPublic"   -- Node Public Worktop
 
   show Annuaire      = "NodeAnnuaire"
@@ -453,7 +453,7 @@ data AsyncTaskType = Form | Query
 derive instance genericAsyncTaskType :: Generic AsyncTaskType _
 
 asyncTaskTypePath :: AsyncTaskType -> String
-asyncTaskTypePath Form = "add/form/async/"
+asyncTaskTypePath Form  = "add/form/async/"
 asyncTaskTypePath Query = "add/query/async/"
 
 type AsyncTaskID = String