Verified Commit a66c60ed authored by Przemyslaw Kaminski's avatar Przemyslaw Kaminski

Merge branch 'dev' into 341-dev-websockets

parents c5274cff 144dce2d
Pipeline #6180 failed with stages
in 76 minutes and 39 seconds
...@@ -19,6 +19,9 @@ TAGS ...@@ -19,6 +19,9 @@ TAGS
*.swp *.swp
.dir-locals.el .dir-locals.el
# VSCode
.vscode
# UI # UI
gui gui
purescript-gargantext purescript-gargantext
...@@ -45,3 +48,7 @@ devops/docker/js-cache ...@@ -45,3 +48,7 @@ devops/docker/js-cache
cabal.project.local cabal.project.local
gargantext_profile_out.dot gargantext_profile_out.dot
dev.jwk
.psc-ide-port
logs/
\ No newline at end of file
## Version 0.0.7.1.5.4
* [BACK][FIX][[Docs TSV export/import] Check and maintain consistency between export and import formats (#345)](https://gitlab.iscpif.fr/gargantext/haskell-gargantext/issues/345)
## Version 0.0.7.1.5.3
* [FRONT][FIX][[Tree focus] Temporary HOTFIX: comment the forced focus (forest open nodes) for performances reason (#669)](https://gitlab.iscpif.fr/gargantext/purescript-gargantext/issues/669)
* [FRONT][FIX][[Tree perfs] When the tree is opening: reduce API calls or replace with lighter calls (#670)](https://gitlab.iscpif.fr/gargantext/purescript-gargantext/issues/670)
* [BACK][FIX][update .gitignore file (#347)](https://gitlab.iscpif.fr/gargantext/haskell-gargantext/issues/347)
## Version 0.0.7.1.5.2 ## Version 0.0.7.1.5.2
* [BACK][FIX] Order 2 small corpus * [BACK][FIX] Order 2 small corpus
......
...@@ -5,7 +5,7 @@ cabal-version: 3.4 ...@@ -5,7 +5,7 @@ cabal-version: 3.4
-- see: https://github.com/sol/hpack -- see: https://github.com/sol/hpack
name: gargantext name: gargantext
version: 0.0.7.1.5.2 version: 0.0.7.1.5.4
synopsis: Search, map, share synopsis: Search, map, share
description: Please see README.md description: Please see README.md
category: Data category: Data
......
...@@ -13,7 +13,7 @@ module Gargantext.API.Node.Document.Export ...@@ -13,7 +13,7 @@ module Gargantext.API.Node.Document.Export
import Control.Lens (view) import Control.Lens (view)
import Data.ByteString.Lazy.Char8 qualified as BSC import Data.ByteString.Lazy.Char8 qualified as BSC
import Data.Csv (encodeDefaultOrderedByName) import Data.Csv (encodeDefaultOrderedByNameWith, defaultEncodeOptions, encDelimiter, encQuoting, Quoting(..))
import Data.Text qualified as T import Data.Text qualified as T
import Data.Text.Encoding qualified as TE import Data.Text.Encoding qualified as TE
import Data.Time.Clock.System (getSystemTime, systemSeconds) import Data.Time.Clock.System (getSystemTime, systemSeconds)
...@@ -100,7 +100,7 @@ getDocumentsCSV :: NodeId ...@@ -100,7 +100,7 @@ getDocumentsCSV :: NodeId
getDocumentsCSV userNodeId pId = do getDocumentsCSV userNodeId pId = do
dJSON <- getDocumentsJSON userNodeId pId dJSON <- getDocumentsJSON userNodeId pId
let DocumentExport { _de_documents } = getResponse dJSON let DocumentExport { _de_documents } = getResponse dJSON
let ret = TE.decodeUtf8 $ BSC.toStrict $ encodeDefaultOrderedByName _de_documents let ret = TE.decodeUtf8 $ BSC.toStrict $ encodeDefaultOrderedByNameWith (defaultEncodeOptions {encDelimiter = fromIntegral $ ord '\t', encQuoting = QuoteAll }) _de_documents
pure $ addHeader (T.concat [ "attachment; filename=GarganText_DocsList-" pure $ addHeader (T.concat [ "attachment; filename=GarganText_DocsList-"
, T.pack $ show pId , T.pack $ show pId
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment