Merge branch '736-dev-fix-upload-sending-nothing-as-lang' into 'dev'

Resolve "Upload file sends 'Nothing' as language which results in 400 error from backend"

See merge request !509

flake.lock

@@ -36,16 +36,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1717179513,
-        "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=",
+        "lastModified": 1731603435,
+        "narHash": "sha256-CqCX4JG7UiHvkrBTpYC3wcEurvbtTADLbo3Ns2CEoL8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0",
+        "rev": "8b27c1239e5c421a2bbc2c65d52e4a6fbf2ff296",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "24.05",
+        "ref": "24.11",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -3,7 +3,7 @@
 
   inputs.flake-utils.url = "github:numtide/flake-utils";
 
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs?ref=24.05";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs?ref=24.11";
 
   inputs.purescript-overlay = {
     url = "github:thomashoneyman/purescript-overlay";

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

@@ -386,9 +386,6 @@ onChangeContents
       T.write_ (Just $ { blob: UploadFileBlob blob, name }) mFile
       checkFileUpdateParams props
 
-uploadButton :: R2.Component UploadFileProps
-uploadButton = R.createElement uploadButtonCpt
-
 -- | String pattern used to parse extensions in file paths
 fileExtensionPattern :: String
 fileExtensionPattern = "(.*)\\.(.*)"
@@ -509,6 +506,9 @@ checkFileUpdateParams
       T.write_ "The file extension is invalid." message
       T.write_ "alert-danger" alertType
 
+uploadButton :: R2.Component UploadFileProps
+uploadButton = R.createElement uploadButtonCpt
+
 uploadButtonCpt :: R.Component UploadFileProps
 uploadButtonCpt = here.component "uploadButton" cpt
   where
@@ -861,14 +861,14 @@ uploadFile { contents, fileFormat, lang, fileType, id, nodeType, mName, selectio
   postWwwUrlencoded session p body
   --postMultipartFormData session p fileContents
   where
+  langParam key = if lang == No_extraction then [] else [ Tuple key (Just $ show lang) ]
   bodyParams =
     [ Tuple "_wf_data" (Just contents)
     , Tuple "_wf_filetype" (Just $ show fileType)
     , Tuple "_wf_fileformat" (Just $ show fileFormat)
-    , Tuple "_wf_lang" (Just $ show lang)
     , Tuple "_wf_name" mName
     , Tuple "_wf_selection" (Just $ show selection)
-    ]
+    ] <> (langParam "_wf_lang")
   jsonBodyParams =
     [ Tuple "_wjf_data" (Just contents)
     , Tuple "_wjf_filetype" (Just $ show fileType)
@@ -878,10 +878,9 @@ uploadFile { contents, fileFormat, lang, fileType, id, nodeType, mName, selectio
     [ Tuple "_wtf_data" (Just contents)
     , Tuple "_wtf_filetype" (Just $ show fileType)
     , Tuple "_wtf_fileformat" (Just $ show fileFormat)
-    , Tuple "_wf_lang" (Just $ show lang)
     , Tuple "_wtf_name" mName
     , Tuple "_wtf_selection" (Just $ show selection)
-    ]
+    ] <> (langParam "_wtf_lang")
 
   (typ /\ p /\ body) = case nodeType of
     Corpus -> GT.CorpusFormUpload /\ (GR.NodeAPI nodeType (Just id) $ GT.asyncTaskTypePath GT.CorpusFormUpload) /\ bodyParams

src/Gargantext/Components/Lang.purs

@@ -53,7 +53,7 @@ derive instance Generic Lang _
 derive instance Ord Lang
 
 instance Show Lang where
-  show No_extraction = "Nothing"
+  show No_extraction = "No language extraction"
   show s = genericShow s
 
 langReader :: String -> Maybe Lang
@@ -72,6 +72,7 @@ instance JSON.ReadForeign Lang where
       Just l -> pure l
 
 instance JSON.WriteForeign Lang where
+  writeImpl No_extraction = JSON.writeImpl (Nothing :: Maybe String)
   writeImpl l = JSON.writeImpl $ show l
 
 data ServerType = CoreNLP | Spacy | JohnSnow