Skip to content

Commit cd934cc

Browse files
fhennigfhennig
committed
chore(components): linter fixes
1 parent c66d8f8 commit cd934cc

File tree

3 files changed

+28
-30
lines changed

3 files changed

+28
-30
lines changed

‎components/src/preact/components/features-over-time-grid.tsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import { type FunctionComponent, JSX } from 'preact';
1+
import { type FunctionComponent, type JSX } from 'preact';
22
import { useMemo } from 'preact/hooks';
33
import z from 'zod';
44

5-
import { TemporalDataMap } from '../mutationsOverTime/MutationOverTimeData';
6-
import { getProportion, type ProportionValue } from '../../query/queryMutationsOverTime';
7-
import { type Temporal } from '../../utils/temporalClass';
85
import { type ColorScale, getColorWithinScale, getTextColorForScale } from './color-scale-selector';
96
import PortalTooltip from './portal-tooltip';
107
import { type TooltipPosition } from './tooltip';
8+
import { getProportion, type ProportionValue } from '../../query/queryMutationsOverTime';
9+
import { type Temporal } from '../../utils/temporalClass';
10+
import { type TemporalDataMap } from '../mutationsOverTime/MutationOverTimeData';
1111
import { formatProportion } from '../shared/table/formatProportion';
1212
import { type PageSizes, Pagination } from '../shared/tanstackTable/pagination';
1313
import { usePageSizeContext } from '../shared/tanstackTable/pagination-context';
@@ -67,7 +67,7 @@ function FeaturesOverTimeGrid<F>({
6767
const customValues = customColumns.map((col) => col.values[featureRenderer.asString(firstAxisKey)]);
6868
return { feature: firstAxisKey, values: [...row], customValues };
6969
});
70-
}, [data, customColumns]);
70+
}, [data, customColumns, featureRenderer]);
7171

7272
const columns = useMemo(() => {
7373
const columnHelper = createColumnHelper<RowType<F>>();
@@ -129,7 +129,7 @@ function FeaturesOverTimeGrid<F>({
129129
});
130130

131131
return [featureHeader, ...customColumnHeaders, ...dateHeaders];
132-
}, [colorScale, data, customColumns, tooltipPortalTarget]);
132+
}, [colorScale, data, customColumns, tooltipPortalTarget, featureRenderer, rowLabelHeader]);
133133

134134
const { pageSize } = usePageSizeContext();
135135
const table = usePreactTable({

‎components/src/preact/mutationsOverTime/mutations-over-time.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import {
1111
type MutationFilter,
1212
} from './getFilteredMutationsOverTimeData';
1313
import { type MutationOverTimeWorkerResponse } from './mutationOverTimeWorker';
14-
import FeaturesOverTimeGrid, { FeatureRenderer, customColumnSchema } from '../components/features-over-time-grid';
15-
import { ProportionValue, getProportion, type MutationOverTimeQuery } from '../../query/queryMutationsOverTime';
14+
import { MutationsOverTimeGridTooltip } from './mutations-over-time-grid-tooltip';
15+
import { type ProportionValue, getProportion, type MutationOverTimeQuery } from '../../query/queryMutationsOverTime';
1616
import {
1717
lapisFilterSchema,
1818
sequenceTypeSchema,
@@ -21,14 +21,16 @@ import {
2121
views,
2222
} from '../../types';
2323
import { type Deletion, type Substitution } from '../../utils/mutations';
24-
import { Temporal, toTemporalClass } from '../../utils/temporalClass';
24+
import { type Temporal, toTemporalClass } from '../../utils/temporalClass';
2525
import { useDispatchFinishedLoadingEvent } from '../../utils/useDispatchFinishedLoadingEvent';
2626
import { useLapisUrl } from '../LapisUrlContext';
2727
import { useMutationAnnotationsProvider } from '../MutationAnnotationsContext';
28+
import { AnnotatedMutation } from '../components/annotated-mutation';
2829
import { type ColorScale } from '../components/color-scale-selector';
2930
import { ColorScaleSelectorDropdown } from '../components/color-scale-selector-dropdown';
3031
import { CsvDownloadButton } from '../components/csv-download-button';
3132
import { ErrorBoundary } from '../components/error-boundary';
33+
import FeaturesOverTimeGrid, { type FeatureRenderer, customColumnSchema } from '../components/features-over-time-grid';
3234
import { Fullscreen } from '../components/fullscreen';
3335
import Info, { InfoComponentCode, InfoHeadline1, InfoParagraph } from '../components/info';
3436
import { LoadingDisplay } from '../components/loading-display';
@@ -43,8 +45,6 @@ import Tabs from '../components/tabs';
4345
import { pageSizesSchema } from '../shared/tanstackTable/pagination';
4446
import { PageSizeContextProvider } from '../shared/tanstackTable/pagination-context';
4547
import { useWebWorker } from '../webWorkers/useWebWorker';
46-
import { AnnotatedMutation } from '../components/annotated-mutation';
47-
import { MutationsOverTimeGridTooltip } from './mutations-over-time-grid-tooltip';
4848

4949
const mutationsOverTimeViewSchema = z.literal(views.grid);
5050
export type MutationsOverTimeView = z.infer<typeof mutationsOverTimeViewSchema>;

‎components/src/preact/wastewater/mutationsOverTime/wastewater-mutations-over-time.tsx‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,19 @@ import { type Dispatch, type StateUpdater, useMemo, useState, useRef } from 'pre
33
import z from 'zod';
44

55
import { computeWastewaterMutationsOverTimeDataPerLocation } from './computeWastewaterMutationsOverTimeDataPerLocation';
6+
import { type ProportionValue } from '../../../query/queryMutationsOverTime';
67
import { lapisFilterSchema, type SequenceType, sequenceTypeSchema } from '../../../types';
78
import { Map2dView } from '../../../utils/map2d';
9+
import { type Deletion, type Substitution } from '../../../utils/mutations';
10+
import { type Temporal } from '../../../utils/temporalClass';
811
import { useDispatchFinishedLoadingEvent } from '../../../utils/useDispatchFinishedLoadingEvent';
912
import { useLapisUrl } from '../../LapisUrlContext';
1013
import { useMutationAnnotationsProvider } from '../../MutationAnnotationsContext';
14+
import { AnnotatedMutation } from '../../components/annotated-mutation';
1115
import { type ColorScale } from '../../components/color-scale-selector';
1216
import { ColorScaleSelectorDropdown } from '../../components/color-scale-selector-dropdown';
1317
import { ErrorBoundary } from '../../components/error-boundary';
18+
import FeaturesOverTimeGrid from '../../components/features-over-time-grid';
1419
import { Fullscreen } from '../../components/fullscreen';
1520
import Info, { InfoComponentCode, InfoHeadline1, InfoParagraph } from '../../components/info';
1621
import { LoadingDisplay } from '../../components/loading-display';
@@ -24,15 +29,10 @@ import {
2429
type MutationFilter,
2530
mutationOrAnnotationDoNotMatchFilter,
2631
} from '../../mutationsOverTime/getFilteredMutationsOverTimeData';
27-
import FeaturesOverTimeGrid, { FeatureRenderer } from '../../components/features-over-time-grid';
32+
import { MutationsOverTimeGridTooltip } from '../../mutationsOverTime/mutations-over-time-grid-tooltip';
2833
import { pageSizesSchema } from '../../shared/tanstackTable/pagination';
2934
import { PageSizeContextProvider } from '../../shared/tanstackTable/pagination-context';
3035
import { useQuery } from '../../useQuery';
31-
import { Deletion, Substitution } from '../../../utils/mutations';
32-
import { AnnotatedMutation } from '../../components/annotated-mutation';
33-
import { MutationsOverTimeGridTooltip } from '../../mutationsOverTime/mutations-over-time-grid-tooltip';
34-
import { Temporal } from '../../../utils/temporalClass';
35-
import { ProportionValue } from '../../../query/queryMutationsOverTime';
3636

3737
const wastewaterMutationOverTimeSchema = z.object({
3838
lapisFilter: lapisFilterSchema,
@@ -166,18 +166,6 @@ const MutationsOverTimeTabs: FunctionComponent<MutationOverTimeTabsProps> = ({
166166
const [colorScale, setColorScale] = useState<ColorScale>({ min: 0, max: 1, color: 'indigo' });
167167
const [displayedSegments, setDisplayedSegments] = useDisplayedSegments(mutationOverTimeDataPerLocation);
168168

169-
const mutationRenderer: FeatureRenderer<Substitution | Deletion> = {
170-
asString: (value: Substitution | Deletion) => value.code,
171-
renderRowLabel: (value: Substitution | Deletion) => (
172-
<div className={'text-center'}>
173-
<AnnotatedMutation mutation={value} sequenceType={originalComponentProps.sequenceType} />
174-
</div>
175-
),
176-
renderTooltip: (value: Substitution | Deletion, temporal: Temporal, proportionValue: ProportionValue) => (
177-
<MutationsOverTimeGridTooltip mutation={value} date={temporal} value={proportionValue} />
178-
),
179-
};
180-
181169
const tabs = useMemo(
182170
() =>
183171
mutationOverTimeDataPerLocation.map(({ location, data }) => ({
@@ -194,7 +182,17 @@ const MutationsOverTimeTabs: FunctionComponent<MutationOverTimeTabsProps> = ({
194182
})}
195183
colorScale={colorScale}
196184
pageSizes={originalComponentProps.pageSizes}
197-
featureRenderer={mutationRenderer}
185+
featureRenderer={{
186+
asString: (value: Substitution | Deletion) => value.code,
187+
renderRowLabel: (value: Substitution | Deletion) => (
188+
<div className={'text-center'}>
189+
<AnnotatedMutation mutation={value} sequenceType={originalComponentProps.sequenceType} />
190+
</div>
191+
),
192+
renderTooltip: (value: Substitution | Deletion, temporal: Temporal, proportionValue: ProportionValue) => (
193+
<MutationsOverTimeGridTooltip mutation={value} date={temporal} value={proportionValue} />
194+
),
195+
}}
198196
tooltipPortalTarget={tooltipPortalTargetRef.current}
199197
/>
200198
),

0 commit comments

Comments
 (0)