wip: redirect from organism base page (#728)

* redirect * no longer needed * fix * try to fix title issue * fix * import order fix * try this * fix * format * fix * fix * remove second test of title
loculus-project · Jan 8, 2024 · 484b192 · 484b192
1 parent 483f046
commit 484b192
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 15 deletions.
diff --git a/website/src/pages/[organism]/index.astro b/website/src/pages/[organism]/index.astro
@@ -1,14 +1,6 @@
 ---
-import { BackButton } from '../../components/Navigation/BackButton';
 import { cleanOrganism } from '../../components/Navigation/cleanOrganism';
-import BaseLayout from '../../layouts/BaseLayout.astro';
 
 const { organism } = cleanOrganism(Astro.params.organism);
+return Astro.redirect(`/${organism.key}/search`);
 ---
-
-<BaseLayout title={organism!.displayName}>
-    <div class='flex items-center'>
-        <BackButton marginRight={2} client:load />
-        <h1 class='title'>Organism {organism?.displayName}</h1>
-    </div>
-</BaseLayout>
diff --git a/website/src/pages/[organism]/search/index.astro b/website/src/pages/[organism]/search/index.astro
@@ -1,5 +1,6 @@
 ---
 import { getData, getSearchFormFilters } from './search';
+import { cleanOrganism } from '../../../components/Navigation/cleanOrganism';
 import { Pagination } from '../../../components/SearchPage/Pagination';
 import { SearchForm } from '../../../components/SearchPage/SearchForm';
 import { Table } from '../../../components/SearchPage/Table';
@@ -9,7 +10,7 @@ import BaseLayout from '../../../layouts/BaseLayout.astro';
 import { pageSize } from '../../../settings';
 
 const organism = Astro.params.organism!;
-
+const { organism: cleanedOrganism } = cleanOrganism(organism);
 const schema = getSchema(organism);
 const clientConfig = getRuntimeConfig().public;
 const getSearchParams = (field: string): string => {
@@ -25,7 +26,7 @@ const offset = (page - 1) * pageSize;
 const data = await getData(organism, searchFormFilter, offset, pageSize);
 ---
 
-<BaseLayout title='Search'>
+<BaseLayout title={`${cleanedOrganism!.displayName} - Browse`}>
     <h1 class='title'>Search</h1>
     <div class='flex flex-col md:flex-row gap-8 md:gap-4'>
         <div class='md:w-72'>

diff --git a/website/tests/pages/navigation.spec.ts b/website/tests/pages/navigation.spec.ts
@@ -9,7 +9,7 @@ const organismIndependentNavigationItems = [
 ];
 
 const organismNavigationItems = [
-    { link: 'Search', title: 'Search' },
+    { link: 'Search', title: '[Organism] - Browse' },
     { link: 'Submit', title: 'Submit' },
     { link: 'Revise', title: 'Revise' },
     { link: 'User', title: 'Login' },
@@ -29,11 +29,11 @@ test.describe('Clicking the navigation links', () => {
 
         await navigationFixture.openOrganismNavigation();
         await navigationFixture.clickLink(dummyOrganism.displayName);
-        await navigationFixture.expectTitle(dummyOrganism.displayName);
+        await navigationFixture.expectTitle(`${dummyOrganism.displayName} - Browse`);
 
         for (const { link, title } of organismNavigationItems) {
             await navigationFixture.clickLink(link);
-            await navigationFixture.expectTitle(title);
+            await navigationFixture.expectTitle(title.replace('[Organism]', dummyOrganism.displayName));
         }
     });
 });
diff --git a/website/tests/pages/search/index.spec.ts b/website/tests/pages/search/index.spec.ts
@@ -6,7 +6,6 @@ import { baseUrl, dummyOrganism, expect, test, testSequenceEntry } from '../../e
 test.describe('The search page', () => {
     test('should show the search form with button and a table', async ({ searchPage }) => {
         await searchPage.goto();
-        await expect(searchPage.page).toHaveTitle('Search');
         await expect(searchPage.searchButton).toBeVisible();
         await expect(searchPage.table).toBeVisible();
     });