diff --git a/website/src/components/SequenceDetailsPage/getTableData.ts b/website/src/components/SequenceDetailsPage/getTableData.ts index 39f4c78376..8f493a2b30 100644 --- a/website/src/components/SequenceDetailsPage/getTableData.ts +++ b/website/src/components/SequenceDetailsPage/getTableData.ts @@ -81,7 +81,7 @@ function validateDetailsAreNotEmpty(acces title: 'Not Found', status: 0, detail: 'No data found for accession version ' + accessionVersion, - instance: '/sequences/' + accessionVersion, + instance: '/seq/' + accessionVersion, }); } } diff --git a/website/src/pages/[organism]/sequences/[accessionVersion]/getSequenceDetailsTableData.ts b/website/src/pages/[organism]/seq/[accessionVersion]/getSequenceDetailsTableData.ts similarity index 100% rename from website/src/pages/[organism]/sequences/[accessionVersion]/getSequenceDetailsTableData.ts rename to website/src/pages/[organism]/seq/[accessionVersion]/getSequenceDetailsTableData.ts diff --git a/website/src/pages/[organism]/sequences/[accessionVersion]/index.astro b/website/src/pages/[organism]/seq/[accessionVersion]/index.astro similarity index 100% rename from website/src/pages/[organism]/sequences/[accessionVersion]/index.astro rename to website/src/pages/[organism]/seq/[accessionVersion]/index.astro diff --git a/website/src/pages/[organism]/sequences/[accessionVersion]/versions.astro b/website/src/pages/[organism]/seq/[accessionVersion]/versions.astro similarity index 100% rename from website/src/pages/[organism]/sequences/[accessionVersion]/versions.astro rename to website/src/pages/[organism]/seq/[accessionVersion]/versions.astro diff --git a/website/src/pages/[organism]/user/sequences.astro b/website/src/pages/[organism]/user/seq.astro similarity index 100% rename from website/src/pages/[organism]/user/sequences.astro rename to website/src/pages/[organism]/user/seq.astro diff --git a/website/src/routes.ts b/website/src/routes.ts index 0396aa0c41..84d10826ef 100644 --- a/website/src/routes.ts +++ b/website/src/routes.ts @@ -11,9 +11,9 @@ export const routes = { searchPage: (organism: string, searchFilter: Filter[] = [], page: number = 1) => withOrganism(organism, `/search?${buildSearchParams(searchFilter, page).toString()}`), sequencesDetailsPage: (organism: string, accessionVersion: AccessionVersion | string) => - `/${organism}/sequences/${getAccessionVersionString(accessionVersion)}`, + `/${organism}/seq/${getAccessionVersionString(accessionVersion)}`, sequencesVersionsPage: (organism: string, accessionVersion: AccessionVersion | string) => - `/${organism}/sequences/${getAccessionVersionString(accessionVersion)}/versions`, + `/${organism}/seq/${getAccessionVersionString(accessionVersion)}/versions`, submitPage: (organism: string) => withOrganism(organism, '/submit'), revisePage: (organism: string) => withOrganism(organism, '/revise'), editPage: (organism: string, accessionVersion: AccessionVersion) => @@ -26,8 +26,8 @@ export const routes = { const groupPagePath = `/group/${groupName}` as const; return groupPagePath; }, - userSequencesPage: (organism: string) => withOrganism(organism, `/user/sequences`), - versionPage: (organism: string, accession: string) => withOrganism(organism, `/sequences/${accession}/versions`), + userSequencesPage: (organism: string) => withOrganism(organism, `/user/seq`), + versionPage: (organism: string, accession: string) => withOrganism(organism, `/seq/${accession}/versions`), unknownOrganismPage: (organism: string) => `/404?unknownOrganism=${organism}`, logout: () => '/logout', }; diff --git a/website/src/utils/shouldMiddlewareEnforceLogin.spec.ts b/website/src/utils/shouldMiddlewareEnforceLogin.spec.ts index 9578f04abe..337077ecde 100644 --- a/website/src/utils/shouldMiddlewareEnforceLogin.spec.ts +++ b/website/src/utils/shouldMiddlewareEnforceLogin.spec.ts @@ -2,6 +2,7 @@ import { describe, expect, test } from 'vitest'; import { shouldMiddlewareEnforceLogin } from './shouldMiddlewareEnforceLogin'; import { testOrganism } from '../../vitest.setup.ts'; +import { routes } from '../routes.ts'; const otherOrganism = 'otherOrganism'; const configuredOrganisms = [testOrganism, otherOrganism]; @@ -26,7 +27,7 @@ describe('shouldMiddlewareEnforceLogin', () => { expectNoLogin(`/${testOrganism}/search`); expectNoLogin(`/`); expectNoLogin(`/${testOrganism}`); - expectNoLogin(`/${testOrganism}/sequences/id_002156`); + expectNoLogin(routes.sequencesDetailsPage(testOrganism, 'id_002156')); }); function expectForceLogin(path: string) {