feat(backend): pluralize Sequences, remove accessionVersion, adapt …

…download format
loculus-project · Feb 1, 2024 · de60dd9 · de60dd9
1 parent 99bdf55
commit de60dd9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/website/src/components/Edit/EditPage.tsx b/website/src/components/Edit/EditPage.tsx
@@ -76,8 +76,11 @@ const InnerEditPage: FC<EditPageProps> = ({ organism, dataToEdit, clientConfig,
                 <button
                     className='btn normal-case'
                     onClick={() => generateAndDownloadFastaFile(editedSequences, dataToEdit)}
+                    title={`Download the original, unaligned sequence${
+                        editedSequences.length > 1 ? 's' : ''
+                    } as provided by the submitter`}
                 >
-                    Download Sequences as fasta file
+                    Download Sequence{editedSequences.length > 1 ? 's' : ''}
                 </button>
             </div>
 
@@ -157,16 +160,17 @@ function useSubmitEditedSequence(
 
 function generateAndDownloadFastaFile(editedSequences: Row[], editedData: SequenceEntryToEdit) {
     const accessionVersion = getAccessionVersionString(editedData);
-    const fileContent = editedSequences
-        .map((sequence) => `>${accessionVersion}.${sequence.key}\n${sequence.value}\n\n`)
-        .join();
+    const fileContent =
+        editedSequences.length === 1
+            ? `>${accessionVersion}\n${editedSequences[0].value}`
+            : editedSequences.map((sequence) => `>${accessionVersion}_${sequence.key}\n${sequence.value}\n\n`).join();
 
     const blob = new Blob([fileContent], { type: 'text/plain' });
     const url = URL.createObjectURL(blob);
 
     const a = document.createElement('a');
     a.href = url;
-    a.download = `accessionVersion${accessionVersion}.fasta`;
+    a.download = `${accessionVersion}.fasta`;
     a.click();
 
     URL.revokeObjectURL(url);

diff --git a/website/tests/pages/edit/edit.page.ts b/website/tests/pages/edit/edit.page.ts
@@ -2,7 +2,7 @@ import type { Page } from '@playwright/test';
 
 import { routes } from '../../../src/routes.ts';
 import type { AccessionVersion } from '../../../src/types/backend.ts';
-import { getAccessionVersionString } from '../../../src/utils/extractAccessionVersion.ts';
+import { extractAccessionVersion, getAccessionVersionString } from '../../../src/utils/extractAccessionVersion.ts';
 import { baseUrl, dummyOrganism, expect } from '../../e2e.fixture';
 
 export class EditPage {
@@ -33,7 +33,7 @@ export class EditPage {
         await this.downloadButton.click();
         const download = await downloadPromise;
 
-        expect(download.suggestedFilename()).toContain('accessionVersion');
+        expect(download.suggestedFilename()).toContain(getAccessionVersionString(accessionVersion));
         const downloadStream = await download.createReadStream();
         expect(downloadStream).toBeDefined();
 
@@ -46,7 +46,7 @@ export class EditPage {
             downloadStream.on('end', resolve);
         });
 
-        expect(downloadData.toString()).toContain(`>${getAccessionVersionString(accessionVersion)}.main
+        expect(downloadData.toString()).toContain(`>${getAccessionVersionString(accessionVersion)}
 ACTG`);
     }
 }