-
-
-
- {isError ? (
-
There was an error fetching the mutations to display.
- ) : isPending ? (
-
- ) : (
-
- {displayMutations?.length === 0 ? (
-
- ) : (
-
- )}
-
+
+
-
+ {isError ? (
+
There was an error fetching the mutations to display.
+ ) : isPending ? (
+
+ ) : (
+
+ {displayMutations?.length === 0 ? (
+
+ ) : (
+
+ )}
+
+
+ )}
+
+
+
);
};
diff --git a/website/src/lapis/getLastUpdatedDate.spec.ts b/website/src/lapis/getLastUpdatedDate.spec.ts
index 410ee68a8..4dea079e4 100644
--- a/website/src/lapis/getLastUpdatedDate.spec.ts
+++ b/website/src/lapis/getLastUpdatedDate.spec.ts
@@ -28,7 +28,7 @@ describe('getLastUpdatedDate', () => {
const result = await getLastUpdatedDate(DUMMY_LAPIS_URL);
- expect(result).toBeUndefined();
+ expect(result).toBeNull();
});
test('should handle non-numeric data versions gracefully', async () => {
@@ -36,6 +36,6 @@ describe('getLastUpdatedDate', () => {
const result = await getLastUpdatedDate(DUMMY_LAPIS_URL);
- expect(result).toBeUndefined();
+ expect(result).toBeNull();
});
});
diff --git a/website/src/lapis/getLastUpdatedDate.ts b/website/src/lapis/getLastUpdatedDate.ts
index 4fcdac581..013724881 100644
--- a/website/src/lapis/getLastUpdatedDate.ts
+++ b/website/src/lapis/getLastUpdatedDate.ts
@@ -2,14 +2,14 @@ import axios from 'axios';
import dayjs from 'dayjs';
import { z } from 'zod';
-import { getInstanceLogger } from '../logger.ts';
+import { getClientLogger } from '../clientLogger.ts';
const lapisInfoSchema = z.object({
dataVersion: z.string(),
});
export type LapisInfo = z.infer
;
-const logger = getInstanceLogger('getLastUpdatedDate');
+const logger = getClientLogger('getLastUpdatedDate');
export async function getLastUpdatedDate(lapisUrl: string) {
try {
@@ -20,7 +20,7 @@ export async function getLastUpdatedDate(lapisUrl: string) {
const timestamp = Number(parsedLapisInfo.data.dataVersion);
if (isNaN(timestamp)) {
logger.error(`Got invalid timestamp from lapis info: '${parsedLapisInfo.data.dataVersion}'`);
- return undefined;
+ return null;
}
return dayjs.unix(timestamp).locale('de').calendar(null, { sameElse: '[on] YYYY-MM-DD' });
}
@@ -28,9 +28,9 @@ export async function getLastUpdatedDate(lapisUrl: string) {
logger.error(
`Failed to parse lapis info: ${JSON.stringify(parsedLapisInfo)} (was ${JSON.stringify(response.data)})`,
);
- return undefined;
+ return null;
} catch (error) {
logger.error(`Failed to fetch lapis info: ${JSON.stringify(error)}`);
- return undefined;
+ return null;
}
}
diff --git a/website/src/layouts/OrganismPage/AccessionsDownloadButton.astro b/website/src/layouts/OrganismPage/AccessionsDownloadButton.astro
deleted file mode 100644
index 3457d3132..000000000
--- a/website/src/layouts/OrganismPage/AccessionsDownloadButton.astro
+++ /dev/null
@@ -1,53 +0,0 @@
----
-import type { LapisFilter } from '@genspectrum/dashboard-components/util';
-
-import { assembleDownloadUrl } from './assembleDownloadUrl';
-import { Modal } from '../../styles/containers/Modal';
-import { ModalContent } from '../../styles/containers/ModalContent';
-import { ModalHeader } from '../../styles/containers/ModalHeader';
-
-type DownloadLink = {
- label: string;
- filter: LapisFilter;
- downloadFileBasename: string;
-};
-
-interface Props {
- accessionDownloadFields: string[];
- downloadLinks: DownloadLink[];
- lapisUrl: string;
-}
-
-const { accessionDownloadFields, downloadLinks, lapisUrl } = Astro.props;
-
-const modalId = 'accessionDownloadModal';
----
-
-
-
-
-
- You can download a list of accessions that are used for the visualizations on this page:
-
- {
- downloadLinks
- .map(({ label, filter, downloadFileBasename }) => ({
- label,
- url: assembleDownloadUrl(accessionDownloadFields, filter, downloadFileBasename, lapisUrl),
- }))
- .map(({ label, url }) => (
-
-
- {label}
-
- ))
- }
-
You can download a list of accessions that are used for the visualizations on this page:
+
+ {downloadLinks
+ .map(({ label, filter, downloadFileBasename }) => ({
+ label,
+ url: assembleDownloadUrl(
+ accessionDownloadFields,
+ filter,
+ downloadFileBasename,
+ lapisUrl,
+ ),
+ }))
+ .map(({ label, url }) => (
+
+
+ {label}
+
+ ))}
+
-
-
-
-
-
-
-
-
-
- {
- downloadLinks.length > 0 && (
-
- )
- }
-
-
-
-
+
+
+
+
+ {children}
+
+
+ {downloadLinks.length > 0 && (
+
+ )}
+
+
+
+
+
{filters}
+ {dataDisplay}
+
-
- Enabled by data from:
- {
- dataOrigins.map((dataOrigin, index) => (
-
- {index > 0 && (index === dataOrigins.length - 1 ? ' and ' : ', ')}
-
- {dataOriginConfig[dataOrigin].name}
-
-
- ))
- }
-
-
+
+ Enabled by data from:
+ {dataOrigins.map((dataOrigin, index) => (
+
+ {index > 0 && (index === dataOrigins.length - 1 ? ' and ' : ', ')}
+
+ {dataOriginConfig[dataOrigin].name}
+
+
+ ))}
+
+
-
-
-
-
-
- Collections
-
-
-
-
-
-
+
+
+
diff --git a/website/src/pages/index.astro b/website/src/pages/index.astro
index be85c87ee..1f93fad8f 100644
--- a/website/src/pages/index.astro
+++ b/website/src/pages/index.astro
@@ -2,7 +2,7 @@
import Link from '../components/Link.astro';
import MainMenu from '../components/MainMenu.astro';
import BaseLayout from '../layouts/base/BaseLayout.astro';
-import DataInfo from '../layouts/base/footer/DataInfo.astro';
+import { DataInfo } from '../layouts/base/footer/DataInfo.tsx';
import { BrandName } from '../layouts/base/header/Brand';
import { getPathogenMegaMenuSections } from '../layouts/base/header/getPathogenMegaMenuSections';
import { dataOrigins } from '../types/dataOrigins';
diff --git a/website/src/pages/swiss-wastewater/flu.astro b/website/src/pages/swiss-wastewater/flu.astro
index 9395dd487..119324242 100644
--- a/website/src/pages/swiss-wastewater/flu.astro
+++ b/website/src/pages/swiss-wastewater/flu.astro
@@ -4,7 +4,8 @@ import type { SequenceType } from '@genspectrum/dashboard-components/util';
import InfluenzaWastewaterInfo from '../../components/InfluenzaWastewaterInfo.astro';
import GsWastewaterMutationsOverTime from '../../components/genspectrum/GsWastewaterMutationsOverTime.astro';
import { defaultBreadcrumbs } from '../../layouts/Breadcrumbs';
-import DataPageLayout from '../../layouts/OrganismPage/DataPageLayout.astro';
+import { DataPageLayout } from '../../layouts/OrganismPage/DataPageLayout.tsx';
+import BaseLayout from '../../layouts/base/BaseLayout.astro';
import { dataOrigins } from '../../types/dataOrigins';
import {
getMutationAnnotation,
@@ -16,48 +17,49 @@ import {
const lapisUrl = `${wastewaterConfig.lapisBaseUrl}/influenza`;
---
-
+
{
- name: 'Influenza',
- href: wastewaterConfig.pages.influenza.path,
- },
- ]}
- dataOrigins={[dataOrigins.wise]}
- lapisUrl={lapisUrl}
->
- {
- InfluenzaTypes.map((reference) => {
- const mutationAnnotations = getMutationAnnotation(reference);
- return (
-
-
-
{reference}
- {(['nucleotide', 'amino acid'] satisfies SequenceType[]).map((sequenceType) => (
-
- {
+ const mutationAnnotations = getMutationAnnotation(reference);
+ return (
+
+
+
{reference}
+ {(['nucleotide', 'amino acid'] satisfies SequenceType[]).map((sequenceType) => (
+
-
- ))}
-
-
- );
- })
- }
-
+ collapsible={sequenceType === 'nucleotide'}
+ linkSuffix={reference}
+ >
+
+
+ ))}
+
+
+ (
- <>
-
-
{reference}
- {(['nucleotide', 'amino acid'] satisfies SequenceType[]).map((sequenceType) => (
-
-
+
+
+ {
+ RSVTypes.map((reference) => (
+ <>
+
+
{reference}
+ {(['nucleotide', 'amino acid'] satisfies SequenceType[]).map((sequenceType) => (
+
-
- ))}
-
-
- ))
- }
-
+ ))}
+