diff --git a/website/src/components/SearchPage/DownloadDialog/DownloadDialog.spec.tsx b/website/src/components/SearchPage/DownloadDialog/DownloadDialog.spec.tsx index bc1a4c48a..12bc6309b 100644 --- a/website/src/components/SearchPage/DownloadDialog/DownloadDialog.spec.tsx +++ b/website/src/components/SearchPage/DownloadDialog/DownloadDialog.spec.tsx @@ -79,11 +79,16 @@ describe('DownloadDialog', () => { await checkAgreement(); expect(getDownloadHref()).toBe( - `${defaultLapisUrl}/sample/details?downloadAsFile=true&versionStatus=LATEST_VERSION&isRevocation=false&dataFormat=tsv&field1=value1`, + `${defaultLapisUrl}/sample/details?downloadAsFile=true&versionStatus=LATEST_VERSION&isRevocation=false&dataUseTerms=OPEN&dataFormat=tsv&field1=value1`, ); await userEvent.click(screen.getByLabelText(/Yes, include older versions/)); await userEvent.click(screen.getByLabelText(/Raw nucleotide sequences/)); + expect(getDownloadHref()).toBe( + `${defaultLapisUrl}/sample/unalignedNucleotideSequences?downloadAsFile=true&dataUseTerms=OPEN&field1=value1`, + ); + + await userEvent.click(screen.getByLabelText(/include restricted data/)); expect(getDownloadHref()).toBe( `${defaultLapisUrl}/sample/unalignedNucleotideSequences?downloadAsFile=true&field1=value1`, ); diff --git a/website/src/components/SearchPage/DownloadDialog/generateDownloadUrl.ts b/website/src/components/SearchPage/DownloadDialog/generateDownloadUrl.ts index f49a7a072..d66cb91d0 100644 --- a/website/src/components/SearchPage/DownloadDialog/generateDownloadUrl.ts +++ b/website/src/components/SearchPage/DownloadDialog/generateDownloadUrl.ts @@ -28,7 +28,7 @@ export const generateDownloadUrl = ( params.set(IS_REVOCATION_FIELD, 'false'); } if (!option.includeRestricted) { - // TODO(#852) Filter for sequences with an open Data Use Term. + params.set('dataUseTerms', 'OPEN'); } if (option.dataType.type === 'metadata') { params.set('dataFormat', metadataDefaultDownloadDataFormat); diff --git a/website/src/pages/[organism]/search/index.astro b/website/src/pages/[organism]/search/index.astro index a24649124..5ee93483f 100644 --- a/website/src/pages/[organism]/search/index.astro +++ b/website/src/pages/[organism]/search/index.astro @@ -14,6 +14,7 @@ const { data, page, metadataFilter, + metadataFilterWithoutHiddenFilters, mutationFilter, lapisUrl, referenceGenomesSequenceNames, @@ -42,7 +43,7 @@ const { (data) => (