Skip to content

Commit 0b1b079

Browse files
committed
fix: patch to name duplicate
1 parent b2c5211 commit 0b1b079

File tree

3 files changed

+35
-6
lines changed

3 files changed

+35
-6
lines changed

package-lock.json

+29
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/data/redux/thunkActions/download.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export const FetchSubmissionFilesException = () => ({
2424
* @return {string} - manifest text file content.
2525
*/
2626
export const genManifest = (files) => files.map(
27-
(file) => `Filename: ${file.name}\nDescription: ${file.description}\nSize: ${file.size}`,
27+
(file, i) => `Filename: ${i}-${file.name}\nDescription: ${file.description}\nSize: ${file.size}`,
2828
).join('\n\n');
2929

3030
/**
@@ -41,7 +41,7 @@ export const zipFiles = async (files, blobs, username) => {
4141
// promise or async function just to circumvent that.
4242
for (let i = 0; i < blobs.length; i++) {
4343
// eslint-disable-next-line no-await-in-loop
44-
await zipWriter.add(files[i].name, new zip.BlobReader(blobs[i]), {
44+
await zipWriter.add(`${i}-${files[i].name}`, new zip.BlobReader(blobs[i]), {
4545
bufferedWrite: true,
4646
});
4747
}

src/data/redux/thunkActions/download.test.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ describe('download thunkActions', () => {
6666
test('returns a list of strings with filename and description for each file', () => {
6767
expect(download.genManifest(files)).toEqual(
6868
[
69-
`Filename: ${files[0].name}\nDescription: ${files[0].description}\nSize: ${files[0].size}`,
70-
`Filename: ${files[1].name}\nDescription: ${files[1].description}\nSize: ${files[0].size}`,
69+
`Filename: 0-${files[0].name}\nDescription: ${files[0].description}\nSize: ${files[0].size}`,
70+
`Filename: 1-${files[1].name}\nDescription: ${files[1].description}\nSize: ${files[0].size}`,
7171
].join('\n\n'),
7272
);
7373
});
@@ -78,8 +78,8 @@ describe('download thunkActions', () => {
7878
return download.zipFiles(files, blobs, username).then(() => {
7979
expect(mockZipWriter.files).toEqual([
8080
['manifest.txt', mockTextReader],
81-
[files[0].name, mockBlobReader],
82-
[files[1].name, mockBlobReader],
81+
[`0-${files[0].name}`, mockBlobReader],
82+
[`1-${files[1].name}`, mockBlobReader],
8383
]);
8484
expect(mockZipAdd).toHaveBeenCalledTimes(mockZipWriter.files.length);
8585
expect(mockZipClose).toHaveBeenCalledTimes(1);

0 commit comments

Comments
 (0)