fraport/fradrive-old
Archived
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(csv-export): mime confusion

Browse Source
This commit is contained in:
Gregor Kleen 2021-03-17 21:38:18 +01:00
parent 5c513946c1
commit 8bdaae0881
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Handler/Utils/Csv.hs
View File

@ -318,7 +318,9 @@ respondCsv :: ( ToNamedRecord csv
-> Header -> Header
-> ConduitT () csv Handler () -> ConduitT () csv Handler ()
-> Handler TypedContent -> Handler TypedContent
respondCsv sheetName hdr src = respondSource typeCsv' $ src .| void (encodeCsv sheetName hdr) .| awaitForever sendChunk respondCsv sheetName hdr src = do
cType <- expectedCsvContentType
respondSource cType $ src .| void (encodeCsv sheetName hdr) .| awaitForever sendChunk
respondDefaultOrderedCsv :: forall csv msg. respondDefaultOrderedCsv :: forall csv msg.
( ToNamedRecord csv ( ToNamedRecord csv
@ -337,7 +339,9 @@ respondCsvDB :: ( ToNamedRecord csv
-> Header -> Header
-> ConduitT () csv DB () -> ConduitT () csv DB ()
-> Handler TypedContent -> Handler TypedContent
respondCsvDB sheetName hdr src = respondSourceDB typeCsv' $ src .| void (encodeCsv sheetName hdr) .| awaitForever sendChunk respondCsvDB sheetName hdr src = do
cType <- expectedCsvContentType
respondSourceDB cType $ src .| void (encodeCsv sheetName hdr) .| awaitForever sendChunk
respondDefaultOrderedCsvDB :: forall csv msg. respondDefaultOrderedCsvDB :: forall csv msg.
( ToNamedRecord csv ( ToNamedRecord csv

4
src/Handler/Utils/Table/Pagination.hs
View File

@ -701,7 +701,9 @@ withCsvExtraRep sheetName exportData mEncode = maybe id (flip snoc) (csvExtraRep
DBTCsvEncode{ dbtCsvNoExportData = (_ :: Maybe (AnIso' exportData' ())), .. } <- mEncode DBTCsvEncode{ dbtCsvNoExportData = (_ :: Maybe (AnIso' exportData' ())), .. } <- mEncode
Refl <- eqT @exportData @exportData' Refl <- eqT @exportData @exportData'
return DBTExtraRepFor return DBTExtraRepFor
{ dbtERepContentType = typeCsv' { dbtERepContentType = case fmt of
FormatCsv -> typeCsv'
FormatXlsx -> typeXlsx
, dbtERepDoEncode = do , dbtERepDoEncode = do
csvRendered <- toCsvRendered <$> lift (dbtCsvHeader $ Just exportData) <*> (dbtCsvDoEncode exportData .| C.foldMap (pure @[])) csvRendered <- toCsvRendered <$> lift (dbtCsvHeader $ Just exportData) <*> (dbtCsvDoEncode exportData .| C.foldMap (pure @[]))
encOpts <- csvOptionsForFormat fmt encOpts <- csvOptionsForFormat fmt