[graph] screenshot and file endpoint fixes

src/Gargantext/Components/Forest/Tree.purs

@@ -350,12 +350,12 @@ performAction (UploadFile nodeType fileType mName blob) { session
     liftEffect $ onTaskAdd task
     liftEffect $ log2 "Uploaded, task:" task
 
-performAction (UploadArbitraryFile nodeType mName blob) { session
-                                                        , tasks: { onTaskAdd }
-                                                        , tree: (NTree (LNode {id}) _)
-                                                        } =
+performAction (UploadArbitraryFile mName blob) { session
+                                               , tasks: { onTaskAdd }
+                                               , tree: (NTree (LNode {id}) _)
+                                               } =
   do
-    task <- uploadArbitraryFile session nodeType id { blob, mName }
+    task <- uploadArbitraryFile session id { blob, mName }
     liftEffect $ onTaskAdd task
     liftEffect $ log2 "Uploaded, task:" task
 

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

@@ -25,7 +25,7 @@ data Action = AddNode     String GT.NodeType
             | UpdateNode  UpdateNodeParams
             | DoSearch    GT.AsyncTaskWithType
             | UploadFile  GT.NodeType FileType (Maybe String) UploadFileBlob
-            | UploadArbitraryFile  GT.NodeType (Maybe String) UploadFileBlob
+            | UploadArbitraryFile  (Maybe String) UploadFileBlob
             | DownloadNode
             | RefreshTree
 
@@ -64,7 +64,7 @@ instance showShow :: Show Action where
   show (SharePublic _      )        = "SharePublic"
   show (DoSearch    _      )        = "SearchQuery"
   show (UploadFile  _ _ _ _)        = "UploadFile"
-  show (UploadArbitraryFile  _ _ _) = "UploadArbitraryFile"
+  show (UploadArbitraryFile  _ _) = "UploadArbitraryFile"
   show  RefreshTree                 = "RefreshTree"
   show  DownloadNode                = "Download"
   show (MoveNode  _ )               = "MoveNode"
@@ -83,7 +83,7 @@ icon (AddContact  _)              = glyphiconNodeAction Share
 icon (SharePublic _ )             = glyphiconNodeAction (Publish { subTreeParams : SubTreeParams {showtypes:[], valitypes:[] }})
 icon (DoSearch   _)               = glyphiconNodeAction SearchBox
 icon (UploadFile _ _ _ _)         = glyphiconNodeAction Upload
-icon (UploadArbitraryFile _ _ _ ) = glyphiconNodeAction Upload
+icon (UploadArbitraryFile _ _ ) = glyphiconNodeAction Upload
 icon  RefreshTree                 = glyphiconNodeAction Refresh
 icon  DownloadNode                = glyphiconNodeAction Download
 icon (MoveNode _ )                = glyphiconNodeAction (Move  { subTreeParams : SubTreeParams {showtypes:[], valitypes:[] }})
@@ -104,7 +104,7 @@ text (AddContact  _      )        = "Add contact !"
 text (SharePublic _      )        = "Publish !"
 text (DoSearch    _      )        = "Launch search !"
 text (UploadFile  _ _ _ _)        = "Upload File !"
-text (UploadArbitraryFile  _ _ _) = "Upload arbitrary file !"
+text (UploadArbitraryFile  _ _) = "Upload arbitrary file !"
 text  RefreshTree                 = "Refresh Tree !"
 text DownloadNode                 = "Download !"
 text (MoveNode  _ )               = "Move !"

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

@@ -166,7 +166,7 @@ uploadButtonCpt = R.hooksComponent "G.C.F.T.N.A.U.uploadButton" cpt
           void $ launchAff do
             case fileType of
               Arbitrary ->
-                dispatch $ UploadArbitraryFile nodeType (Just name) blob
+                dispatch $ UploadArbitraryFile (Just name) blob
               _ ->
                 dispatch $ UploadFile nodeType fileType (Just name) blob
             liftEffect $ do
@@ -296,32 +296,25 @@ uploadFile session nodeType id fileType {mName, blob: UploadFileBlob blob} = do
 
 
 uploadArbitraryFile :: Session
-                    -> GT.NodeType
                     -> ID
                     -> {blob :: UploadFileBlob, mName :: Maybe String}
                     -> Aff GT.AsyncTaskWithType
-uploadArbitraryFile session nodeType id {mName, blob: UploadFileBlob blob} = do
-    if nodeType == Corpus then
-      pure unit
-    else
-      throwError $ error $ "[uploadArbitraryFile] NodeType " <> (show nodeType) <> " not supported"
-
+uploadArbitraryFile session id {mName, blob: UploadFileBlob blob} = do
     contents <- readAsDataURL blob
-    uploadArbitraryDataURL session nodeType id mName contents
+    uploadArbitraryDataURL session id mName contents
 
 uploadArbitraryDataURL :: Session
-                       -> GT.NodeType
                        -> ID
                        -> Maybe String
                        -> String
                        -> Aff GT.AsyncTaskWithType
-uploadArbitraryDataURL session nodeType id mName contents' = do
+uploadArbitraryDataURL session id mName contents' = do
     let re = unsafePartial $ fromRight $ DSR.regex "data:.*;base64," DSRF.noFlags
         contents = DSR.replace re "" contents'
     task <- postWwwUrlencoded session p (bodyParams contents)
     pure $ GT.AsyncTaskWithType { task, typ: GT.Form }
   where
-    p = GR.NodeAPI nodeType (Just id) $ GT.asyncTaskTypePath GT.UploadFile
+    p = GR.NodeAPI GT.Node (Just id) $ GT.asyncTaskTypePath GT.UploadFile
 
     bodyParams c = [ Tuple "_wfi_b64_data"  (Just c)
                    , Tuple "_wfi_name"      mName

src/Gargantext/Components/GraphExplorer/Button.purs

@@ -18,7 +18,6 @@ import Gargantext.Components.Forest.Tree.Node.Action.Upload (uploadArbitraryData
 import Gargantext.Hooks.Sigmax as Sigmax
 import Gargantext.Hooks.Sigmax.Sigma as Sigma
 import Gargantext.Sessions (Session)
-import Gargantext.Types as GT
 
 type Props = (
     onClick :: forall e. e -> Effect Unit
@@ -58,6 +57,6 @@ cameraButton session id sigmaRef = simpleButton {
         screen <- Sigma.takeScreenshot s
         log2 "[cameraButton] screenshot" screen
         launchAff_ $ do
-          uploadArbitraryDataURL session GT.Graph id (Just "screenshot.png") screen
+          uploadArbitraryDataURL session id (Just "screenshot.png") screen
   , text: "Screenshot"
   }

src/Gargantext/Types.purs

@@ -608,7 +608,7 @@ instance decodeJsonAsyncTaskType :: DecodeJson AsyncTaskType where
 
 asyncTaskTypePath :: AsyncTaskType -> String
 asyncTaskTypePath Form       = "add/form/async/"
-asyncTaskTypePath UploadFile = "add/file/async/"
+asyncTaskTypePath UploadFile = "async/file/add/"
 asyncTaskTypePath Query      = "query/"
 asyncTaskTypePath GraphT     = "async/"
 asyncTaskTypePath AddNode    = "async/nobody/"