Merge branch '311-tree-node-list-upload-file-as-json' of...

Merge branch '311-tree-node-list-upload-file-as-json' of ssh://gitlab.iscpif.fr:20022/gargantext/purescript-gargantext into dev-merge

src/Gargantext/Components/FolderView.purs

@@ -270,7 +270,7 @@ performAction = performAction' where
   performAction' (SharePublic { params }) p = sharePublic params p
   performAction' (AddContact params) p = addContact params p
   performAction' (AddNode name nodeType) p = addNode' name nodeType p
-  performAction' (UploadFile nodeType fileType mName blob) p = uploadFile' nodeType fileType mName blob p
+  performAction' (UploadFile nodeType fileType mName contents) p = uploadFile' nodeType fileType mName contents p
   performAction' (UploadArbitraryFile mName blob) p = uploadArbitraryFile' mName blob p
   performAction' DownloadNode _ = liftEffect $ log "[performAction] DownloadNode"
   performAction' (MoveNode {params}) p = moveNode params p
@@ -316,8 +316,8 @@ performAction = performAction' where
   addContact params p@{ nodeId: id } =
     void $ Contact.contactReq p.session id params
 
-  uploadFile' nodeType fileType mName blob p@{ tasks, nodeId: id } = do
-    task <- uploadFile p.session nodeType id fileType {mName, blob}
+  uploadFile' nodeType fileType mName contents p@{ tasks, nodeId: id } = do
+    task <- uploadFile p.session nodeType id fileType {mName, contents}
     liftEffect $ do
       GAT.insert id task tasks
       log2 "[performAction] UploadFile, uploaded, task:" task

src/Gargantext/Components/Forest/Tree.purs

@@ -237,8 +237,8 @@ addNode' name nodeType p@{ forestOpen, tree: (NTree (LNode { id }) _) } = do
   liftEffect $ T.modify_ (openNodesInsert (mkNodeId p.session id)) forestOpen
   refreshTree p
 
-uploadFile' nodeType fileType mName blob p@{ tasks, tree: (NTree (LNode { id }) _) } = do
-  task <- uploadFile p.session nodeType id fileType {mName, blob}
+uploadFile' nodeType fileType mName contents p@{ tasks, tree: (NTree (LNode { id }) _) } = do
+  task <- uploadFile p.session nodeType id fileType {mName, contents}
   liftEffect $ do
     GAT.insert id task tasks
     log2 "[performAction] UploadFile, uploaded, task:" task
@@ -276,7 +276,7 @@ performAction (ShareTeam username) p = shareTeam username p
 performAction (SharePublic { params }) p = sharePublic params p
 performAction (AddContact params) p = addContact params p
 performAction (AddNode name nodeType) p = addNode' name nodeType p
-performAction (UploadFile nodeType fileType mName blob) p = uploadFile' nodeType fileType mName blob p
+performAction (UploadFile nodeType fileType mName contents) p = uploadFile' nodeType fileType mName contents p
 performAction (UploadArbitraryFile mName blob) p = uploadArbitraryFile' mName blob p
 performAction DownloadNode _ = liftEffect $ log "[performAction] DownloadNode"
 performAction (MoveNode {params}) p = moveNode params p

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

@@ -28,7 +28,7 @@ data Action = AddNode     String GT.NodeType
             | RenameNode  String
             | UpdateNode  UpdateNodeParams
             | DoSearch    GT.AsyncTaskWithType
-            | UploadFile  GT.NodeType FileType (Maybe String) UploadFileBlob
+            | UploadFile  GT.NodeType FileType (Maybe String) String
             | UploadArbitraryFile  (Maybe String) UploadFileBlob
             | DownloadNode
             | RefreshTree

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

@@ -20,16 +20,16 @@ import Reactix.DOM.HTML         as H
 import Toestand as T
 import URI.Extra.QueryPairs     as QP
 -- import Web.File.Blob (Blob)
-import Web.File.FileReader.Aff (readAsDataURL, readAsText)
+import Web.File.FileReader.Aff (readAsDataURL)
 
 import Gargantext.Prelude
 
 import Gargantext.Components.Forest.Tree.Node.Action (Action(..), Props)
-import Gargantext.Components.Forest.Tree.Node.Action.Upload.Types (FileType(..), UploadFileBlob(..))
+import Gargantext.Components.Forest.Tree.Node.Action.Upload.Types (FileType(..), UploadFileBlob(..), readUFBAsText)
 import Gargantext.Components.Forest.Tree.Node.Tools (fragmentPT, formChoiceSafe, panel)
 import Gargantext.Components.Lang (Lang(..))
 import Gargantext.Routes       as GR
-import Gargantext.Sessions (Session, postWwwUrlencoded)
+import Gargantext.Sessions (Session, postWwwUrlencoded, post)
 import Gargantext.Types (NodeType(..), ID)
 import Gargantext.Types         as GT
 import Gargantext.Utils.Reactix as R2
@@ -79,12 +79,11 @@ instance Eq DroppedFile where
 
 type FileHash = String
 
-
 type UploadFile =
-  { blob     :: UploadFileBlob
-  , name     :: String
+  { blob :: UploadFileBlob
+  , name :: String
   }
-
+  
 
 uploadFileView :: Record Props -> R.Element
 uploadFileView props = R.createElement uploadFileViewCpt props []
@@ -202,8 +201,9 @@ uploadButtonCpt = here.component "uploadButton" cpt
             case fileType' of
               Arbitrary ->
                 dispatch $ UploadArbitraryFile (Just name) blob
-              _ ->
-                dispatch $ UploadFile nodeType fileType' (Just name) blob
+              _ -> do
+                contents <- readUFBAsText blob
+                dispatch $ UploadFile nodeType fileType' (Just name) contents
             liftEffect $ do
               T.write_ Nothing mFile
               T.write_ CSV fileType
@@ -288,7 +288,9 @@ fileTypeViewCpt = here.component "fileTypeView" cpt
                          , type: "button"
                          , on: {click: \_ -> do
                                    T.write_ Nothing droppedFile
-                                   launchAff $ dispatch $ UploadFile nodeType ft Nothing blob
+                                   launchAff $ do
+                                     contents <- readUFBAsText blob
+                                     dispatch $ UploadFile nodeType ft Nothing contents
                                }
                          } [H.text "Upload"]
               Nothing ->
@@ -313,11 +315,19 @@ uploadFile :: Session
            -> GT.NodeType
            -> ID
            -> FileType
-           -> {blob :: UploadFileBlob, mName :: Maybe String}
+           -> {contents :: String, mName :: Maybe String}
            -> Aff GT.AsyncTaskWithType
-uploadFile session nodeType id fileType {mName, blob: UploadFileBlob blob} = do
-  contents <- readAsText blob
-  task <- postWwwUrlencoded session p (bodyParams contents)
+uploadFile session NodeList id fileType { mName, contents } = do
+  let url = GR.NodeAPI NodeList (Just id) $ GT.asyncTaskTypePath GT.ListUpload
+    -- { input: { data: ..., filetype: "JSON", name: "..." } }
+  let body = { input: { data: contents
+                      , filetype: "JSON"
+                      , name: fromMaybe "" mName } }
+  task <- post session url body
+  pure $ GT.AsyncTaskWithType { task, typ: GT.Form }
+uploadFile session nodeType id fileType { mName, contents } = do
+  -- contents <- readAsText blob
+  task <- postWwwUrlencoded session p bodyParams
   pure $ GT.AsyncTaskWithType {task, typ: GT.Form}
     --postMultipartFormData session p fileContents
   where
@@ -326,10 +336,10 @@ uploadFile session nodeType id fileType {mName, blob: UploadFileBlob blob} = do
       Annuaire -> GR.NodeAPI nodeType (Just id) "annuaire"
       _        -> GR.NodeAPI nodeType (Just id) ""
 
-    bodyParams c = [ Tuple "_wf_data"     (Just c)
-                   , Tuple "_wf_filetype" (Just $ show fileType)
-                   , Tuple "_wf_name"      mName
-                   ]
+    bodyParams = [ Tuple "_wf_data"     (Just contents)
+                 , Tuple "_wf_filetype" (Just $ show fileType)
+                 , Tuple "_wf_name"      mName
+                 ]
 
 
 uploadArbitraryFile :: Session
@@ -366,20 +376,34 @@ uploadTermListViewCpt = here.component "uploadTermListView" cpt
   where
     cpt {dispatch, id, nodeType} _ = do
       mFile <- T.useBox (Nothing :: Maybe UploadFile)
+      uploadType <- T.useBox CSV
 
-      let body = H.input { type: "file"
-                            , placeholder: "Choose file"
-                            , on: {change: onChangeContents mFile}
-                            }
+      let input = H.input { type: "file"
+                          , placeholder: "Choose file"
+                          , on: {change: onChangeContents mFile}
+                          , className: "form-control"
+                          }
+
+      let opt fileType = H.option { value: show fileType } [ H.text $ show fileType ]
+      
+      let uploadTypeHtml = R2.select { className: "form-control"
+                                     , defaultValue: show JSON
+                                     , on: { change: onUploadTypeChange uploadType } } (opt <$> [ CSV, JSON ])
 
       let footer = H.div {} [ uploadTermButton { dispatch
                                                , id
                                                , mFile
                                                , nodeType
+                                               , uploadType
                                                }
                             ]
 
-      pure $ panel [body] footer
+      pure $ panel
+        [ H.form {}
+          [ R2.row [ R2.col 12 [ input ] ]
+          , R2.row [ R2.col 12 [ uploadTypeHtml ] ]
+        ]
+      ] footer
 
     onChangeContents :: forall e. T.Box (Maybe UploadFile)
                      -> E.SyntheticEvent_ e
@@ -396,12 +420,18 @@ uploadTermListViewCpt = here.component "uploadTermListView" cpt
             T.write_ (Just $ { blob: UploadFileBlob blob
                              , name }) mFile
 
+    onUploadTypeChange uploadType e = do
+      case read (R.unsafeEventValue e) of
+        Nothing -> pure unit
+        Just fileType -> T.write_ fileType uploadType
+
 
 type UploadTermButtonProps =
   ( dispatch :: Action -> Aff Unit
   , id       :: Int
   , mFile    :: T.Box (Maybe UploadFile)
   , nodeType :: GT.NodeType
+  , uploadType :: T.Box FileType
   )
 
 uploadTermButton :: R2.Leaf UploadTermButtonProps
@@ -412,21 +442,24 @@ uploadTermButtonCpt = here.component "uploadTermButton" cpt
     cpt { dispatch
         , id
         , mFile
-        , nodeType } _ = do
+        , nodeType
+        , uploadType } _ = do
       mFile' <- T.useLive T.unequal mFile
+      uploadType' <- T.useLive T.unequal uploadType
 
-      let  disabled = case mFile' of
-             Nothing -> "1"
-             Just _  -> ""
+      let disabled = case mFile' of
+            Nothing -> "1"
+            Just _  -> ""
 
       pure $ H.button { className: "btn btn-primary"
                       , disabled
-                      , on: {click: onClick mFile'}
+                      , on: { click: onClick mFile' uploadType' }
                       } [ H.text "Upload" ]
       where
-        onClick mFile' e = do
+        onClick mFile' uploadType' e = do
           let {name, blob} = unsafePartial $ fromJust mFile'
           void $ launchAff do
-            _ <- dispatch $ UploadFile nodeType CSV (Just name) blob
+            contents <- readUFBAsText blob
+            _ <- dispatch $ UploadFile nodeType uploadType' (Just name) contents
             liftEffect $ do
               T.write_ Nothing mFile

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

@@ -4,12 +4,14 @@ import Data.Generic.Rep (class Generic)
 import Data.Eq.Generic (genericEq)
 import Data.Show.Generic (genericShow)
 import Data.Maybe (Maybe(..))
+import Effect.Aff (Aff)
 import Web.File.Blob (Blob, size)
+import Web.File.FileReader.Aff (readAsText)
 
 import Gargantext.Prelude
 
 
-data FileType = CSV | CSV_HAL | WOS | PresseRIS | Arbitrary
+data FileType = CSV | CSV_HAL | WOS | PresseRIS | Arbitrary | JSON
 
 derive instance Generic FileType _
 instance Eq FileType where
@@ -23,6 +25,7 @@ instance Read FileType where
   read "CSV_HAL"   = Just CSV_HAL
   read "PresseRIS" = Just PresseRIS
   read "WOS"       = Just WOS
+  read "JSON"      = Just JSON
   read _           = Nothing
 
 
@@ -30,3 +33,6 @@ newtype UploadFileBlob = UploadFileBlob Blob
 derive instance Generic UploadFileBlob _
 instance Eq UploadFileBlob where
   eq (UploadFileBlob b1) (UploadFileBlob b2) = eq (size b1) (size b2)
+
+readUFBAsText :: UploadFileBlob -> Aff String
+readUFBAsText (UploadFileBlob b) = readAsText b

src/Gargantext/Types.purs

@@ -652,6 +652,7 @@ modeFromString _            = Nothing
 data AsyncTaskType = AddNode
                    | Form  -- this is file upload too
                    | GraphRecompute
+                   | ListUpload
                    | Query
                    | UpdateNgramsCharts
                    | UpdateNode
@@ -669,6 +670,7 @@ asyncTaskTypePath :: AsyncTaskType -> String
 asyncTaskTypePath AddNode            = "async/nobody/"
 asyncTaskTypePath Form               = "add/form/async/"
 asyncTaskTypePath GraphRecompute     = "async/recompute/"
+asyncTaskTypePath ListUpload         = "add/form/async/"
 asyncTaskTypePath Query              = "query/"
 asyncTaskTypePath UpdateNgramsCharts = "ngrams/async/charts/update/"
 asyncTaskTypePath UpdateNode         = "update/"