website 404: Remove unknown organism message (#808)

* Remove unknown organism message * address comment from code review * restore message * Update website/src/routes.ts Co-authored-by: Fabian Engelniederhammer <92720311+fengelniederhammer@users.noreply.github.com> * Update website/src/middleware/organismValidatorMiddleware.ts Co-authored-by: Fabian Engelniederhammer <92720311+fengelniederhammer@users.noreply.github.com> --------- Co-authored-by: Fabian Engelniederhammer <92720311+fengelniederhammer@users.noreply.github.com>
loculus-project · Jan 23, 2024 · 58aaf8a · 58aaf8a
1 parent c7b4e6c
commit 58aaf8a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/website/src/middleware/organismValidatorMiddleware.ts b/website/src/middleware/organismValidatorMiddleware.ts
@@ -11,7 +11,7 @@ export const organismValidatorMiddleware = defineMiddleware(async (context, next
 
     const { organism: validatedOrganism } = cleanOrganism(organism);
     if (validatedOrganism === undefined) {
-        return context.redirect(routes.unknownOrganismPage(organism));
+        return context.redirect(routes.notFoundPage());
     }
 
     return next();

diff --git a/website/src/pages/404.astro b/website/src/pages/404.astro
@@ -1,19 +1,12 @@
 ---
 import BaseLayout from '../layouts/BaseLayout.astro';
-
-const unknownOrganism = Astro.url.searchParams.get('unknownOrganism');
-
-const errorMessage =
-    typeof unknownOrganism === 'string'
-        ? `The organism "${unknownOrganism}" does not exist on this instance. `
-        : 'The page you are looking for does not exist. ';
 ---
 
 <BaseLayout title='Not Found'>
     <div class='bc'>
         <h1 class='title'>Page not found</h1>
         <p>
-            {errorMessage}
+            The page you are looking for does not exist.
             <a href='/'>Go to start page.</a>
         </p>
     </div>

diff --git a/website/src/routes.ts b/website/src/routes.ts
@@ -38,7 +38,7 @@ export const routes = {
     },
     userSequencesPage: (organism: string) => withOrganism(organism, `/user/seq`),
     versionPage: (organism: string, accession: string) => withOrganism(organism, `/seq/${accession}/versions`),
-    unknownOrganismPage: (organism: string) => `/404?unknownOrganism=${organism}`,
+    notFoundPage: () => `/404`,
     logout: () => '/logout',
 };