@genspectrum/dashboard-components 0.13.5 → 0.13.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/util.d.ts CHANGED
@@ -918,7 +918,7 @@ declare global {
918
918
 
919
919
  declare global {
920
920
  interface HTMLElementTagNameMap {
921
- 'gs-number-sequences-over-time': NumberSequencesOverTimeComponent;
921
+ 'gs-mutations-over-time': MutationsOverTimeComponent;
922
922
  }
923
923
  }
924
924
 
@@ -926,7 +926,7 @@ declare global {
926
926
  declare global {
927
927
  namespace JSX {
928
928
  interface IntrinsicElements {
929
- 'gs-number-sequences-over-time': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
929
+ 'gs-mutations-over-time': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
930
930
  }
931
931
  }
932
932
  }
@@ -934,7 +934,7 @@ declare global {
934
934
 
935
935
  declare global {
936
936
  interface HTMLElementTagNameMap {
937
- 'gs-mutations-over-time': MutationsOverTimeComponent;
937
+ 'gs-sequences-by-location': SequencesByLocationComponent;
938
938
  }
939
939
  }
940
940
 
@@ -942,7 +942,7 @@ declare global {
942
942
  declare global {
943
943
  namespace JSX {
944
944
  interface IntrinsicElements {
945
- 'gs-mutations-over-time': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
945
+ 'gs-sequences-by-location': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
946
946
  }
947
947
  }
948
948
  }
@@ -950,7 +950,7 @@ declare global {
950
950
 
951
951
  declare global {
952
952
  interface HTMLElementTagNameMap {
953
- 'gs-sequences-by-location': SequencesByLocationComponent;
953
+ 'gs-number-sequences-over-time': NumberSequencesOverTimeComponent;
954
954
  }
955
955
  }
956
956
 
@@ -958,7 +958,7 @@ declare global {
958
958
  declare global {
959
959
  namespace JSX {
960
960
  interface IntrinsicElements {
961
- 'gs-sequences-by-location': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
961
+ 'gs-number-sequences-over-time': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
962
962
  }
963
963
  }
964
964
  }
@@ -1018,10 +1018,10 @@ declare global {
1018
1018
 
1019
1019
  declare global {
1020
1020
  interface HTMLElementTagNameMap {
1021
- 'gs-text-input': TextInputComponent;
1021
+ 'gs-location-filter': LocationFilterComponent;
1022
1022
  }
1023
1023
  interface HTMLElementEventMap {
1024
- 'gs-text-input-changed': TextInputChangedEvent;
1024
+ 'gs-location-changed': LocationChangedEvent;
1025
1025
  }
1026
1026
  }
1027
1027
 
@@ -1029,7 +1029,7 @@ declare global {
1029
1029
  declare global {
1030
1030
  namespace JSX {
1031
1031
  interface IntrinsicElements {
1032
- 'gs-text-input': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
1032
+ 'gs-location-filter': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
1033
1033
  }
1034
1034
  }
1035
1035
  }
@@ -1037,10 +1037,10 @@ declare global {
1037
1037
 
1038
1038
  declare global {
1039
1039
  interface HTMLElementTagNameMap {
1040
- 'gs-location-filter': LocationFilterComponent;
1040
+ 'gs-text-input': TextInputComponent;
1041
1041
  }
1042
1042
  interface HTMLElementEventMap {
1043
- 'gs-location-changed': LocationChangedEvent;
1043
+ 'gs-text-input-changed': TextInputChangedEvent;
1044
1044
  }
1045
1045
  }
1046
1046
 
@@ -1048,7 +1048,7 @@ declare global {
1048
1048
  declare global {
1049
1049
  namespace JSX {
1050
1050
  interface IntrinsicElements {
1051
- 'gs-location-filter': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
1051
+ 'gs-text-input': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
1052
1052
  }
1053
1053
  }
1054
1054
  }
@@ -1056,10 +1056,10 @@ declare global {
1056
1056
 
1057
1057
  declare global {
1058
1058
  interface HTMLElementTagNameMap {
1059
- 'gs-mutation-filter': MutationFilterComponent;
1059
+ 'gs-lineage-filter': LineageFilterComponent;
1060
1060
  }
1061
1061
  interface HTMLElementEventMap {
1062
- 'gs-mutation-filter-changed': CustomEvent<MutationsFilter>;
1062
+ 'gs-lineage-filter-changed': LineageFilterChangedEvent;
1063
1063
  }
1064
1064
  }
1065
1065
 
@@ -1067,7 +1067,7 @@ declare global {
1067
1067
  declare global {
1068
1068
  namespace JSX {
1069
1069
  interface IntrinsicElements {
1070
- 'gs-mutation-filter': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
1070
+ 'gs-lineage-filter': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
1071
1071
  }
1072
1072
  }
1073
1073
  }
@@ -1075,10 +1075,10 @@ declare global {
1075
1075
 
1076
1076
  declare global {
1077
1077
  interface HTMLElementTagNameMap {
1078
- 'gs-lineage-filter': LineageFilterComponent;
1078
+ 'gs-mutation-filter': MutationFilterComponent;
1079
1079
  }
1080
1080
  interface HTMLElementEventMap {
1081
- 'gs-lineage-filter-changed': LineageFilterChangedEvent;
1081
+ 'gs-mutation-filter-changed': CustomEvent<MutationsFilter>;
1082
1082
  }
1083
1083
  }
1084
1084
 
@@ -1086,7 +1086,7 @@ declare global {
1086
1086
  declare global {
1087
1087
  namespace JSX {
1088
1088
  interface IntrinsicElements {
1089
- 'gs-lineage-filter': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
1089
+ 'gs-mutation-filter': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
1090
1090
  }
1091
1091
  }
1092
1092
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@genspectrum/dashboard-components",
3
- "version": "0.13.5",
3
+ "version": "0.13.6",
4
4
  "description": "GenSpectrum web components for building dashboards",
5
5
  "type": "module",
6
6
  "license": "AGPL-3.0-only",
@@ -127,7 +127,7 @@ export function DownshiftCombobox<Item>({
127
127
  {items.length > 0 ? (
128
128
  items.map((item, index) => (
129
129
  <li
130
- className={`${highlightedIndex === index ? 'bg-blue-300' : ''} ${selectedItem !== null && itemToString(selectedItem) === itemToString(item) ? 'font-bold' : ''} py-2 px-3 shadow-sm flex flex-col`}
130
+ className={`${highlightedIndex === index ? 'bg-blue-300' : ''} ${selectedItem !== null && itemToString(selectedItem) === itemToString(item) ? 'font-bold' : ''} py-2 px-3 shadow-sm`}
131
131
  key={itemToString(item)}
132
132
  {...getItemProps({ item, index })}
133
133
  >
@@ -135,7 +135,7 @@ export function DownshiftCombobox<Item>({
135
135
  </li>
136
136
  ))
137
137
  ) : (
138
- <li className='py-2 px-3 shadow-sm flex flex-col'>No elements to select.</li>
138
+ <li className='py-2 px-3 shadow-sm'>No elements to select.</li>
139
139
  )}
140
140
  </ul>
141
141
  </div>
@@ -0,0 +1,36 @@
1
+ import { InfoHeadline2, InfoLink, InfoParagraph } from './info';
2
+
3
+ export const SubstitutionsLink = () => (
4
+ <InfoLink href='https://www.genome.gov/genetics-glossary/Substitution'>substitutions</InfoLink>
5
+ );
6
+
7
+ export const InsertionsLink = () => (
8
+ <InfoLink href='https://www.genome.gov/genetics-glossary/Insertion'>insertions</InfoLink>
9
+ );
10
+
11
+ export const DeletionsLink = () => (
12
+ <InfoLink href='https://www.genome.gov/genetics-glossary/Deletion'>deletions</InfoLink>
13
+ );
14
+
15
+ export const ProportionExplanation = () => (
16
+ <>
17
+ <InfoHeadline2>Proportion calculation</InfoHeadline2>
18
+ <InfoParagraph>
19
+ The proportion of a mutation is calculated by dividing the number of sequences with the mutation by the
20
+ total number of sequences with a non-ambiguous symbol at the position.
21
+ </InfoParagraph>
22
+ <InfoParagraph>
23
+ <b>Example:</b> Assume we look at nucleotide mutations at position 5 where the reference has a T and assume
24
+ there are 10 sequences in total:
25
+ <ul className='list-disc list-inside ml-2'>
26
+ <li>3 sequences have a C,</li>
27
+ <li>2 sequences have a T,</li>
28
+ <li>1 sequence has a G,</li>
29
+ <li>3 sequences have an N,</li>
30
+ <li>1 sequence has a Y (which means T or C),</li>
31
+ </ul>
32
+ then the proportion of the T5C mutation is 50%. The 4 sequences that have an N or Y are excluded from the
33
+ calculation.
34
+ </InfoParagraph>
35
+ </>
36
+ );
@@ -11,11 +11,11 @@ describe('fetchAutocompletionList', () => {
11
11
  { fields, country: 'Germany' },
12
12
  {
13
13
  data: [
14
- { count: 0, region: 'region1', country: 'country1_1', division: 'division1_1_1' },
15
- { count: 0, region: 'region1', country: 'country1_1', division: 'division1_1_2' },
16
- { count: 0, region: 'region1', country: 'country1_1', division: null },
17
- { count: 0, region: 'region1', country: 'country1_2', division: 'division1_2_1' },
18
- { count: 0, region: 'region2', country: 'country2_1', division: null },
14
+ { count: 1, region: 'region1', country: 'country1_1', division: 'division1_1_1' },
15
+ { count: 2, region: 'region1', country: 'country1_1', division: 'division1_1_2' },
16
+ { count: 3, region: 'region1', country: 'country1_1', division: null },
17
+ { count: 4, region: 'region1', country: 'country1_2', division: 'division1_2_1' },
18
+ { count: 5, region: 'region2', country: 'country2_1', division: null },
19
19
  ],
20
20
  },
21
21
  );
@@ -27,14 +27,14 @@ describe('fetchAutocompletionList', () => {
27
27
  });
28
28
 
29
29
  expect(result).to.deep.equal([
30
- { region: 'region1', country: undefined, division: undefined },
31
- { region: 'region1', country: 'country1_1', division: undefined },
32
- { region: 'region1', country: 'country1_1', division: 'division1_1_1' },
33
- { region: 'region1', country: 'country1_1', division: 'division1_1_2' },
34
- { region: 'region1', country: 'country1_2', division: undefined },
35
- { region: 'region1', country: 'country1_2', division: 'division1_2_1' },
36
- { region: 'region2', country: undefined, division: undefined },
37
- { region: 'region2', country: 'country2_1', division: undefined },
30
+ { value: { region: 'region1', country: undefined, division: undefined }, count: 10 },
31
+ { value: { region: 'region1', country: 'country1_1', division: undefined }, count: 6 },
32
+ { value: { region: 'region1', country: 'country1_1', division: 'division1_1_1' }, count: 1 },
33
+ { value: { region: 'region1', country: 'country1_1', division: 'division1_1_2' }, count: 2 },
34
+ { value: { region: 'region1', country: 'country1_2', division: undefined }, count: 4 },
35
+ { value: { region: 'region1', country: 'country1_2', division: 'division1_2_1' }, count: 4 },
36
+ { value: { region: 'region2', country: undefined, division: undefined }, count: 5 },
37
+ { value: { region: 'region2', country: 'country2_1', division: undefined }, count: 5 },
38
38
  ]);
39
39
  });
40
40
  });
@@ -1,5 +1,10 @@
1
1
  import { FetchAggregatedOperator } from '../../operator/FetchAggregatedOperator';
2
- import type { LapisFilter } from '../../types';
2
+ import type { LapisFilter, LapisLocationFilter } from '../../types';
3
+
4
+ export type LocationEntry = {
5
+ value: LapisLocationFilter;
6
+ count: number;
7
+ };
3
8
 
4
9
  export async function fetchAutocompletionList({
5
10
  fields,
@@ -11,11 +16,10 @@ export async function fetchAutocompletionList({
11
16
  lapis: string;
12
17
  lapisFilter?: LapisFilter;
13
18
  signal?: AbortSignal;
14
- }): Promise<Record<string, string | undefined>[]> {
15
- const toAncestorInHierarchyOverwriteValues = Array(fields.length - 1)
16
- .fill(0)
17
- .map((_, i) => i + 1)
18
- .map((i) => fields.slice(i).reduce((acc, field) => ({ ...acc, [field]: null }), {}));
19
+ }): Promise<LocationEntry[]> {
20
+ const helpersThatOverwriteAValueToItsAncestor = fields.map((_, i) =>
21
+ fields.slice(i + 1).reduce((acc, field) => ({ ...acc, [field]: null }), {}),
22
+ );
19
23
 
20
24
  const fetchAggregatedOperator = new FetchAggregatedOperator<Record<string, string | null>>(
21
25
  lapisFilter ?? {},
@@ -25,26 +29,58 @@ export async function fetchAutocompletionList({
25
29
  const data = (await fetchAggregatedOperator.evaluate(lapis, signal)).content;
26
30
 
27
31
  const locationValues = data
28
- .map((entry) => fields.reduce((acc, field) => ({ ...acc, [field]: entry[field] }), {}))
29
- .reduce<Set<string>>((setOfAllHierarchies, entry) => {
30
- setOfAllHierarchies.add(JSON.stringify(entry));
31
- toAncestorInHierarchyOverwriteValues.forEach((overwriteValues) => {
32
- setOfAllHierarchies.add(JSON.stringify({ ...entry, ...overwriteValues }));
33
- });
34
- return setOfAllHierarchies;
35
- }, new Set());
32
+ .map((entry) => ({
33
+ value: fields.reduce((acc, field) => ({ ...acc, [field]: entry[field] }), {}),
34
+ count: entry.count,
35
+ }))
36
+ .reduce((mapOfAllHierarchiesAndCounts, entry) => {
37
+ return addValueAndAllAncestorsToMap(
38
+ entry,
39
+ helpersThatOverwriteAValueToItsAncestor,
40
+ mapOfAllHierarchiesAndCounts,
41
+ );
42
+ }, new Map<string, number>());
36
43
 
37
44
  return [...locationValues]
38
- .map((json) => JSON.parse(json))
45
+ .map<EntryWithNullValues>(([json, count]) => ({
46
+ value: JSON.parse(json),
47
+ count,
48
+ }))
39
49
  .sort(compareLocationEntries(fields))
40
- .map((entry) => fields.reduce((acc, field) => ({ ...acc, [field]: entry[field] ?? undefined }), {}));
50
+ .map(({ value, count }) => ({
51
+ value: fields.reduce((acc, field) => ({ ...acc, [field]: value[field] ?? undefined }), {}),
52
+ count,
53
+ }));
54
+ }
55
+
56
+ function addValueAndAllAncestorsToMap(
57
+ { value, count }: LocationEntry,
58
+ helpersThatOverwriteAValueToItsAncestor: Record<string, null>[],
59
+ mapOfAllHierarchiesAndCounts: Map<string, number>,
60
+ ) {
61
+ const keysOfAllHierarchyLevels = new Set(
62
+ helpersThatOverwriteAValueToItsAncestor
63
+ .map((overwriteValues) => ({ ...value, ...overwriteValues }))
64
+ .map((value) => JSON.stringify(value)),
65
+ );
66
+
67
+ for (const key of keysOfAllHierarchyLevels) {
68
+ mapOfAllHierarchiesAndCounts.set(key, (mapOfAllHierarchiesAndCounts.get(key) ?? 0) + count);
69
+ }
70
+
71
+ return mapOfAllHierarchiesAndCounts;
41
72
  }
42
73
 
74
+ type EntryWithNullValues = {
75
+ value: Record<string, string | null>;
76
+ count: number;
77
+ };
78
+
43
79
  function compareLocationEntries(fields: string[]) {
44
- return (a: Record<string, string | null>, b: Record<string, string | null>) => {
80
+ return (a: EntryWithNullValues, b: EntryWithNullValues) => {
45
81
  for (const field of fields) {
46
- const valueA = a[field];
47
- const valueB = b[field];
82
+ const valueA = a.value[field];
83
+ const valueB = b.value[field];
48
84
  if (valueA === valueB) {
49
85
  continue;
50
86
  }
@@ -88,7 +88,7 @@ export const Primary: StoryObj<LocationFilterProps> = {
88
88
  const input = await inputField(canvas);
89
89
  await userEvent.clear(input);
90
90
  await userEvent.type(input, 'Germany');
91
- await userEvent.click(canvas.getByRole('option', { name: 'Germany Europe / Germany' }));
91
+ await userEvent.click(canvas.getByRole('option', { name: 'Germany(42) Europe / Germany' }));
92
92
 
93
93
  await waitFor(() => {
94
94
  return expect(locationChangedListenerMock.mock.calls.at(-1)![0].detail).toStrictEqual({
@@ -2,7 +2,7 @@ import { type FunctionComponent } from 'preact';
2
2
  import { useContext, useMemo } from 'preact/hooks';
3
3
  import z from 'zod';
4
4
 
5
- import { fetchAutocompletionList } from './fetchAutocompletionList';
5
+ import { fetchAutocompletionList, type LocationEntry } from './fetchAutocompletionList';
6
6
  import { LapisUrlContext } from '../LapisUrlContext';
7
7
  import { LocationChangedEvent } from './LocationChangedEvent';
8
8
  import { lapisFilterSchema, type LapisLocationFilter, lapisLocationFilterSchema } from '../../types';
@@ -61,6 +61,7 @@ type SelectItem = {
61
61
  lapisFilter: LapisLocationFilter;
62
62
  label: string | null | undefined;
63
63
  description: string;
64
+ count: number;
64
65
  };
65
66
 
66
67
  const LocationSelector = ({
@@ -69,7 +70,7 @@ const LocationSelector = ({
69
70
  placeholderText,
70
71
  locationData,
71
72
  }: LocationSelectorProps & {
72
- locationData: LapisLocationFilter[];
73
+ locationData: LocationEntry[];
73
74
  }) => {
74
75
  const allItems = useMemo(() => {
75
76
  return locationData
@@ -78,8 +79,10 @@ const LocationSelector = ({
78
79
  }, [fields, locationData]);
79
80
 
80
81
  const selectedItem = useMemo(() => {
81
- return value !== undefined ? toSelectItem(value, fields) : undefined;
82
- }, [fields, value]);
82
+ return value !== undefined
83
+ ? allItems.find((item) => item.description == concatenateLocation(value, fields))
84
+ : undefined;
85
+ }, [fields, value, allItems]);
83
86
 
84
87
  return (
85
88
  <DownshiftCombobox
@@ -91,14 +94,15 @@ const LocationSelector = ({
91
94
  }
92
95
  itemToString={(item: SelectItem | undefined | null) => item?.label ?? ''}
93
96
  placeholderText={placeholderText}
94
- formatItemInList={(item: SelectItem) => {
95
- return (
96
- <>
97
+ formatItemInList={(item: SelectItem) => (
98
+ <>
99
+ <p>
97
100
  <span>{item.label}</span>
98
- <span className='text-sm text-gray-500'>{item.description}</span>
99
- </>
100
- );
101
- }}
101
+ <span className='ml-2 text-gray-500'>({item.count})</span>
102
+ </p>
103
+ <span className='text-sm text-gray-500'>{item.description}</span>
104
+ </>
105
+ )}
102
106
  />
103
107
  );
104
108
  };
@@ -113,7 +117,8 @@ function filterByInputValue(item: SelectItem, inputValue: string | undefined | n
113
117
  );
114
118
  }
115
119
 
116
- function toSelectItem(locationFilter: LapisLocationFilter, fields: string[]): SelectItem | undefined {
120
+ function toSelectItem(locationEntry: LocationEntry, fields: string[]): SelectItem | undefined {
121
+ const locationFilter = locationEntry.value;
117
122
  const concatenatedLocation = concatenateLocation(locationFilter, fields);
118
123
 
119
124
  const lastNonUndefinedField = [...fields]
@@ -128,6 +133,7 @@ function toSelectItem(locationFilter: LapisLocationFilter, fields: string[]): Se
128
133
  lapisFilter: locationFilter,
129
134
  label: locationFilter[lastNonUndefinedField],
130
135
  description: concatenatedLocation,
136
+ count: locationEntry.count,
131
137
  };
132
138
  }
133
139
 
@@ -11,8 +11,9 @@ import { LapisUrlContext } from '../LapisUrlContext';
11
11
  import { CsvDownloadButton } from '../components/csv-download-button';
12
12
  import { ErrorBoundary } from '../components/error-boundary';
13
13
  import { Fullscreen } from '../components/fullscreen';
14
- import Info, { InfoComponentCode, InfoHeadline1, InfoParagraph } from '../components/info';
14
+ import Info, { InfoComponentCode, InfoHeadline1, InfoHeadline2, InfoParagraph } from '../components/info';
15
15
  import { LoadingDisplay } from '../components/loading-display';
16
+ import { DeletionsLink, ProportionExplanation, SubstitutionsLink } from '../components/mutation-info';
16
17
  import { type DisplayedMutationType, MutationTypeSelector } from '../components/mutation-type-selector';
17
18
  import { NoDataDisplay } from '../components/no-data-display';
18
19
  import { type ProportionInterval } from '../components/proportion-selector';
@@ -190,7 +191,30 @@ const MutationComparisonInfo: FunctionComponent<MutationComparisonInfoProps> = (
190
191
  return (
191
192
  <Info>
192
193
  <InfoHeadline1>Info for mutation comparison</InfoHeadline1>
193
- <InfoParagraph>TODO: https://github.com/GenSpectrum/dashboard-components/issues/465</InfoParagraph>
194
+ <InfoParagraph>
195
+ This displays <SubstitutionsLink /> and <DeletionsLink /> of several variants. It shows mutations where
196
+ the proportion for any given variant falls within the range you can select in the component's toolbar.
197
+ </InfoParagraph>
198
+ <ProportionExplanation />
199
+ {originalComponentProps.views.includes(views.table) && (
200
+ <>
201
+ <InfoHeadline2>Table View</InfoHeadline2>
202
+ <InfoParagraph>
203
+ The table view displays the proportion of mutations that appear in any of the variants.
204
+ </InfoParagraph>
205
+ </>
206
+ )}
207
+ {originalComponentProps.views.includes(views.venn) && (
208
+ <>
209
+ <InfoHeadline2>Venn Diagram View</InfoHeadline2>
210
+ <InfoParagraph>
211
+ The Venn diagram view illustrates which mutations overlap between the variants and which are
212
+ exclusive to specific variants. Mutations overlap if their proportion falls within the selected
213
+ range for two variants. If the proportion of a mutation is within the selected range for one
214
+ variant but not for the other, the mutation is considered exclusive to that variant.
215
+ </InfoParagraph>
216
+ </>
217
+ )}
194
218
  <InfoComponentCode componentName='mutation-comparison' params={originalComponentProps} lapisUrl={lapis} />
195
219
  </Info>
196
220
  );
@@ -19,8 +19,9 @@ import { LapisUrlContext } from '../LapisUrlContext';
19
19
  import { CsvDownloadButton } from '../components/csv-download-button';
20
20
  import { ErrorBoundary } from '../components/error-boundary';
21
21
  import { Fullscreen } from '../components/fullscreen';
22
- import Info, { InfoComponentCode, InfoHeadline1, InfoHeadline2, InfoLink, InfoParagraph } from '../components/info';
22
+ import Info, { InfoComponentCode, InfoHeadline1, InfoParagraph } from '../components/info';
23
23
  import { LoadingDisplay } from '../components/loading-display';
24
+ import { DeletionsLink, InsertionsLink, ProportionExplanation, SubstitutionsLink } from '../components/mutation-info';
24
25
  import { type DisplayedMutationType, MutationTypeSelector } from '../components/mutation-type-selector';
25
26
  import { NoDataDisplay } from '../components/no-data-display';
26
27
  import type { ProportionInterval } from '../components/proportion-selector';
@@ -242,29 +243,10 @@ const MutationsInfo: FunctionComponent<MutationsInfoProps> = ({ originalComponen
242
243
  <Info>
243
244
  <InfoHeadline1>Mutations</InfoHeadline1>
244
245
  <InfoParagraph>
245
- This shows mutations of a variant. There are three types of mutations:{' '}
246
- <InfoLink href='https://www.genome.gov/genetics-glossary/Substitution'>substitutions</InfoLink>,{' '}
247
- <InfoLink href='https://www.genome.gov/genetics-glossary/Deletion'>deletions</InfoLink> and{' '}
248
- <InfoLink href='https://www.genome.gov/genetics-glossary/Insertion'>insertions</InfoLink>.
249
- </InfoParagraph>
250
- <InfoHeadline2>Proportion calculation</InfoHeadline2>
251
- <InfoParagraph>
252
- The proportion of a mutation is calculated by dividing the number of sequences with the mutation by the
253
- total number of sequences with a non-ambiguous symbol at the position.
254
- </InfoParagraph>
255
- <InfoParagraph>
256
- <b>Example:</b> Assume we look at nucleotide mutations at position 5 where the reference has a T and
257
- assume there are 10 sequences in total:
258
- <ul className='list-disc list-inside ml-2'>
259
- <li>3 sequences have a C,</li>
260
- <li>2 sequences have a T,</li>
261
- <li>1 sequence has a G,</li>
262
- <li>3 sequences have an N,</li>
263
- <li>1 sequence has a Y (which means T or C),</li>
264
- </ul>
265
- then the proportion of the T5C mutation is 50%. The 4 sequences that have an N or Y are excluded from
266
- the calculation.
246
+ This shows mutations of a variant. There are three types of mutations: <SubstitutionsLink />,{' '}
247
+ <DeletionsLink /> and <InsertionsLink />.
267
248
  </InfoParagraph>
249
+ <ProportionExplanation />
268
250
  <InfoComponentCode componentName='mutations' params={originalComponentProps} lapisUrl={lapis} />
269
251
  </Info>
270
252
  );
@@ -88,7 +88,35 @@ describe('queryWastewaterMutationsOverTime', () => {
88
88
  );
89
89
 
90
90
  await expect(queryWastewaterMutationsOverTime(DUMMY_LAPIS_URL, lapisFilter)).rejects.toThrowError(
91
- /^Failed to parse mutation frequency/,
91
+ /Failed to parse mutation frequency/,
92
+ );
93
+ });
94
+
95
+ it('should error on invalid mutation', async () => {
96
+ const lapisFilter = { country: 'Germany' };
97
+
98
+ lapisRequestMocks.details(
99
+ {
100
+ country: 'Germany',
101
+ fields: ['date', 'location', 'nucleotideMutationFrequency', 'aminoAcidMutationFrequency'],
102
+ },
103
+ {
104
+ data: [
105
+ {
106
+ date: '2021-01-01',
107
+ location: 'Germany',
108
+ reference: 'organismA',
109
+ nucleotideMutationFrequency: JSON.stringify({
110
+ 'not a mutation': 0.4,
111
+ }),
112
+ aminoAcidMutationFrequency: null,
113
+ },
114
+ ],
115
+ },
116
+ );
117
+
118
+ await expect(queryWastewaterMutationsOverTime(DUMMY_LAPIS_URL, lapisFilter)).rejects.toThrowError(
119
+ /Failed to parse mutation: "not a mutation"/,
92
120
  );
93
121
  });
94
122
  });
@@ -25,18 +25,26 @@ export async function queryWastewaterMutationsOverTime(
25
25
  ]);
26
26
  const data = (await fetchData.evaluate(lapis, signal)).content;
27
27
 
28
- return data.map((row) => ({
29
- location: row.location as string,
30
- date: toTemporalClass(parseDateStringToTemporal(row.date as string, 'day')),
31
- nucleotideMutationFrequency:
32
- row.nucleotideMutationFrequency !== null
33
- ? transformMutations(JSON.parse(row.nucleotideMutationFrequency as string))
34
- : [],
35
- aminoAcidMutationFrequency:
36
- row.aminoAcidMutationFrequency !== null
37
- ? transformMutations(JSON.parse(row.aminoAcidMutationFrequency as string))
38
- : [],
39
- }));
28
+ return data.map((row) => {
29
+ try {
30
+ return {
31
+ location: row.location as string,
32
+ date: toTemporalClass(parseDateStringToTemporal(row.date as string, 'day')),
33
+ nucleotideMutationFrequency:
34
+ row.nucleotideMutationFrequency !== null
35
+ ? transformMutations(JSON.parse(row.nucleotideMutationFrequency as string))
36
+ : [],
37
+ aminoAcidMutationFrequency:
38
+ row.aminoAcidMutationFrequency !== null
39
+ ? transformMutations(JSON.parse(row.aminoAcidMutationFrequency as string))
40
+ : [],
41
+ };
42
+ } catch (e) {
43
+ throw new Error(
44
+ `Failed to parse row of wastewater data: ${JSON.stringify(row)}: ${(e as Error)?.message ?? 'Unknown error'}`,
45
+ );
46
+ }
47
+ });
40
48
  }
41
49
 
42
50
  const mutationFrequencySchema = z.record(z.number().nullable());
@@ -48,8 +56,14 @@ function transformMutations(input: unknown): { mutation: Substitution; proportio
48
56
  throw new Error(`Failed to parse mutation frequency: ${mutationFrequency.error.message}`);
49
57
  }
50
58
 
51
- return Object.entries(mutationFrequency.data).map(([key, value]) => ({
52
- mutation: SubstitutionClass.parse(key)!,
53
- proportion: value,
54
- }));
59
+ return Object.entries(mutationFrequency.data).map(([key, value]) => {
60
+ const mutation = SubstitutionClass.parse(key);
61
+ if (mutation === null) {
62
+ throw new Error(`Failed to parse mutation: "${key}"`);
63
+ }
64
+ return {
65
+ mutation,
66
+ proportion: value,
67
+ };
68
+ });
55
69
  }
@@ -219,7 +219,7 @@ export const FiresEvent: StoryObj<LocationFilterProps> = {
219
219
 
220
220
  await step('Select Asia', async () => {
221
221
  await userEvent.type(inputField(), 'Asia');
222
- await userEvent.click(canvas.getByRole('option', { name: 'Asia Asia' }));
222
+ await userEvent.click(canvas.getByRole('option', { name: /^Asia.*Asia$/ }));
223
223
 
224
224
  await waitFor(() => {
225
225
  return expect(listenerMock.mock.calls.at(-1)![0].detail).toStrictEqual({