[REFACT] split upload types

src/Gargantext/Components/Forest/Tree.purs

@@ -11,7 +11,7 @@ import Effect.Class (liftEffect)
 import Gargantext.AsyncTasks as GAT
 import Gargantext.Components.Forest.Tree.Node.Action (Action(..))
 import Gargantext.Components.Forest.Tree.Node.Action.Add (AddNodeValue(..), addNode)
-import Gargantext.Components.Forest.Tree.Node.Action.CopyFrom (loadNode)
+import Gargantext.Components.Forest.Tree.Node.Action.CopyFrom (getNodeTree)
 import Gargantext.Components.Forest.Tree.Node.Action.Delete (deleteNode)
 import Gargantext.Components.Forest.Tree.Node.Action.Rename (RenameValue(..), rename)
 import Gargantext.Components.Forest.Tree.Node.Action.Share (ShareValue(..), share)
@@ -82,7 +82,7 @@ treeLoadView p = R.createElement treeLoadViewCpt p []
             , openNodes
             , reload
             } _children = do
-          let fetch _ = loadNode session root
+          let fetch _ = getNodeTree session root
           let paint loaded = loadedTreeView { asyncTasks
                                             , frontends
                                             , mCurrentRoute

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

@@ -9,8 +9,7 @@ import Gargantext.Prelude (class Eq, class Show, class Read, Unit)
 import Gargantext.Sessions (Session)
 import Gargantext.Types  as GT
 import Gargantext.Components.Forest.Tree.Node (NodeAction(..), glyphiconNodeAction)
-
-import Data.Maybe (Maybe(..))
+import Gargantext.Components.Forest.Tree.Node.Action.Upload.Types (FileType, UploadFileContents)
 
 type Props =
   ( dispatch :: Action -> Aff Unit
@@ -21,65 +20,43 @@ type Props =
 
 data Action = AddNode     String GT.NodeType
             | DeleteNode
-            | UpdateNode  GT.AsyncTaskWithType
             | RenameNode  String
+            | UpdateNode  GT.AsyncTaskWithType
+            | ShareNode   String
             | DoSearch    GT.AsyncTaskWithType
             | UploadFile  GT.NodeType FileType (Maybe String) UploadFileContents
             | RefreshTree
-            | ShareNode   String
 
 
 instance showShow :: Show Action where
+  show (AddNode     _ _    )= "AddNode"
   show  DeleteNode          = "DeleteNode"
-  show  RefreshTree         = "RefreshTree"
-  show (ShareNode   _      )= "ShareNode"
-  show (UpdateNode  _      )= "UpdateNode"
   show (RenameNode  _      )= "RenameNode"
+  show (UpdateNode  _      )= "UpdateNode"
+  show (ShareNode   _      )= "ShareNode"
   show (DoSearch    _      )= "SearchQuery"
-  show (AddNode     _ _    )= "AddNode"
   show (UploadFile  _ _ _ _)= "UploadFile"
+  show  RefreshTree         = "RefreshTree"
 
 -----------------------------------------------------------------------
 icon :: Action -> String
 icon (AddNode _ _)        = glyphiconNodeAction (Add [])
-icon DeleteNode           = glyphiconNodeAction Delete
-icon (UpdateNode _)       = glyphiconNodeAction Refresh
+icon  DeleteNode          = glyphiconNodeAction Delete
 icon (RenameNode _)       = glyphiconNodeAction Config
+icon (UpdateNode _)       = glyphiconNodeAction Refresh
+icon (ShareNode _)        = glyphiconNodeAction Share
 icon (DoSearch   _)       = glyphiconNodeAction SearchBox
 icon (UploadFile _ _ _ _) = glyphiconNodeAction Upload
-icon RefreshTree          = glyphiconNodeAction Refresh
-icon (ShareNode _)        = glyphiconNodeAction Share
+icon  RefreshTree         = glyphiconNodeAction Refresh
 -- icon _             = "hand-o-right"
 
 text :: Action -> String
-text  DeleteNode          = "Delete !"
-text  RefreshTree         = "Refresh Tree !"
 text (AddNode     _ _    )= "Add !"
-text (UpdateNode  _      )= "Update !"
+text  DeleteNode          = "Delete !"
 text (RenameNode  _      )= "Rename !"
-text (DoSearch    _      )= "Launch search !"
+text (UpdateNode  _      )= "Update !"
 text (ShareNode   _      )= "Share !"
+text (DoSearch    _      )= "Launch search !"
 text (UploadFile  _ _ _ _)= "Upload File !"
+text  RefreshTree         = "Refresh Tree !"
 -----------------------------------------------------------------------
-
--- TODO move code below elsewhere
-data FileType = CSV | CSV_HAL | WOS | PresseRIS
-
-derive instance genericFileType :: Generic FileType _
-
-instance eqFileType :: Eq FileType where
-  eq = genericEq
-
-instance showFileType :: Show FileType where
-  show = genericShow
-
-instance readFileType :: Read FileType where
-  read :: String -> Maybe FileType
-  read "CSV"       = Just CSV
-  read "CSV_HAL"   = Just CSV_HAL
-  read "PresseRIS" = Just PresseRIS
-  read "WOS"       = Just WOS
-  read _           = Nothing
-
-
-newtype UploadFileContents = UploadFileContents String

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

@@ -15,8 +15,9 @@ import Reactix as R
 import Reactix.DOM.HTML as H
 
 
-loadNode :: Session -> GT.ID -> Aff FTree
-loadNode session nodeId = get session $ GR.NodeAPI GT.Tree (Just nodeId) ""
+------------------------------------------------------------------------
+getNodeTree :: Session -> GT.ID -> Aff FTree
+getNodeTree session nodeId = get session $ GR.NodeAPI GT.Tree (Just nodeId) ""
 
 copyFromCorpusView :: Record Props -> R.Element
 copyFromCorpusView props = R.createElement copyFromCorpusViewCpt props []
@@ -24,10 +25,22 @@ copyFromCorpusView props = R.createElement copyFromCorpusViewCpt props []
 copyFromCorpusViewCpt :: R.Component Props
 copyFromCorpusViewCpt = R.hooksComponent "G.C.F.T.N.A.U.copyFromCorpusView" cpt
   where
-    cpt {dispatch, id, nodeType, session} _ = do
-      useLoader session loadCorporaTree $
-        \tree ->
-          copyFromCorpusViewLoaded {dispatch, id, nodeType, session, tree}
+    cpt { dispatch
+        , id
+        , nodeType
+        , session
+        } _ =
+      do
+        useLoader session loadCorporaTree $
+          \tree ->
+            copyFromCorpusViewLoaded { dispatch
+                                     , id
+                                     , nodeType
+                                     , session
+                                     , tree
+                                     }
+
+------------------------------------------------------------------------
 
 type CorpusTreeProps =
   ( tree :: FTree
@@ -41,9 +54,10 @@ copyFromCorpusViewLoadedCpt :: R.Component CorpusTreeProps
 copyFromCorpusViewLoadedCpt = R.hooksComponent "G.C.F.T.N.A.U.copyFromCorpusViewLoadedCpt" cpt
   where
     cpt p@{dispatch, id, nodeType, session, tree} _ = do
-      pure $ H.div { className: "copy-from-corpus" } [
-        H.div { className: "tree" } [copyFromCorpusTreeView p]
-      ]
+      pure $ H.div { className: "copy-from-corpus" }
+                   [ H.div { className: "tree" }
+                           [copyFromCorpusTreeView p]
+                   ]
 
 copyFromCorpusTreeView :: Record CorpusTreeProps -> R.Element
 copyFromCorpusTreeView props = R.createElement copyFromCorpusTreeViewCpt props []
@@ -53,11 +67,13 @@ copyFromCorpusTreeViewCpt = R.hooksComponent "G.C.F.T.N.A.U.copyFromCorpusTreeVi
   where
     cpt p@{id, tree: NTree (LNode { id: sourceId, name, nodeType }) ary} _ = do
       pure $ {- H.div {} [ H.h5 { className: GT.fldr nodeType true} []
-      , -} H.div { className: "node" } ([ H.span { className: "name " <> clickable
-                                                              , on: { click: onClick }
-                                                              } [ H.text name ]
+      , -} H.div { className: "node" } 
+                 ( [ H.span { className: "name " <> clickable
+                            , on: { click: onClick }
+                            } [ H.text name ]
 
-                                                     ] <> children)
+                   ] <> children
+                 )
                       -- ]
       where
         children = map (\c -> copyFromCorpusTreeView (p { tree = c })) ary
@@ -77,10 +93,12 @@ loadCorporaTree session = getCorporaTree session treeId
 getCorporaTree :: Session -> Int -> Aff FTree
 getCorporaTree session treeId = get session $ GR.NodeAPI GT.Tree (Just treeId) nodeTypes
   where
-    nodeTypes = A.foldl (\a b -> a <> "type=" <> show b <> "&") "?" [ GT.FolderPrivate
-                                                             , GT.FolderShared
-                                                             , GT.Team
-                                                             , GT.FolderPublic
-                                                             , GT.Folder
-                                                             , GT.Corpus
-                                                             , GT.NodeList]
+    nodeTypes     = A.foldl (\a b -> a <> "type=" <> show b <> "&") "?" typesList
+    typesList = [ GT.FolderPrivate
+                , GT.FolderShared
+                , GT.Team
+                , GT.FolderPublic
+                , GT.Folder
+                , GT.Corpus
+                , GT.NodeList
+                ]

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

@@ -23,7 +23,7 @@ actionSearch :: Session
             -> Maybe NodePopup
             -> R.Hooks R.Element
 actionSearch session id dispatch nodePopup = do
-  search        <- R.useState' $ defaultSearch { node_id = id }
+  search <- R.useState' $ defaultSearch { node_id = id }
   pure $ R.fragment [ H.p {"style": {"margin" :"10px"}}
                           [ H.text $ "Search and create a private "
                                   <> "corpus with the search query as corpus name." ]

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

@@ -7,7 +7,8 @@ import Data.Tuple.Nested ((/\))
 import Effect (Effect)
 import Effect.Aff (Aff, launchAff)
 import Effect.Class (liftEffect)
-import Gargantext.Components.Forest.Tree.Node.Action (Action(..), Props, FileType(..), UploadFileContents(..))
+import Gargantext.Components.Forest.Tree.Node.Action (Action(..), Props)
+import Gargantext.Components.Forest.Tree.Node.Action.Upload.Types (FileType(..), UploadFileContents(..))
 import Gargantext.Components.Forest.Tree.Node.Tools (fragmentPT)
 import Gargantext.Components.Lang (Lang(..))
 import Gargantext.Prelude (class Show, Unit, discard, bind, const, id, map, pure, show, unit, void, ($), read)

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

+module Gargantext.Components.Forest.Tree.Node.Action.Upload.Types where
+
+import Gargantext.Prelude (class Read, class Show, class Eq)
+import Data.Generic.Rep (class Generic)
+import Data.Generic.Rep.Eq (genericEq)
+import Data.Generic.Rep.Show (genericShow)
+import Data.Maybe (Maybe(..), fromMaybe, maybe)
+
+
+data FileType = CSV | CSV_HAL | WOS | PresseRIS
+
+derive instance genericFileType :: Generic FileType _
+
+instance eqFileType :: Eq FileType where
+  eq = genericEq
+
+instance showFileType :: Show FileType where
+  show = genericShow
+
+instance readFileType :: Read FileType where
+  read :: String -> Maybe FileType
+  read "CSV"       = Just CSV
+  read "CSV_HAL"   = Just CSV_HAL
+  read "PresseRIS" = Just PresseRIS
+  read "WOS"       = Just WOS
+  read _           = Nothing
+
+
+newtype UploadFileContents = UploadFileContents String
+
+

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

@@ -8,7 +8,8 @@ import Effect.Aff (Aff, launchAff)
 import Effect.Class (liftEffect)
 import Effect.Uncurried (mkEffectFn1)
 import Gargantext.Components.Forest.Tree.Node (NodeAction(..), SettingsBox(..), glyphiconNodeAction, settingsBox)
-import Gargantext.Components.Forest.Tree.Node.Action (Action(..), FileType(..), UploadFileContents(..))
+import Gargantext.Components.Forest.Tree.Node.Action (Action(..))
+import Gargantext.Components.Forest.Tree.Node.Action.Upload.Types (FileType(..), UploadFileContents(..))
 import Gargantext.Components.Forest.Tree.Node.Action.Add (NodePopup(..), addNodeView)
 import Gargantext.Components.Forest.Tree.Node.Action.CopyFrom (copyFromCorpusView)
 import Gargantext.Components.Forest.Tree.Node.Action.Documentation (actionDoc)