-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(components): allow filter by mutation type for mutations tab
- Loading branch information
1 parent
ec0a1e5
commit 5f88b7c
Showing
8 changed files
with
177 additions
and
96 deletions.
There are no files selected for viewing
30 changes: 30 additions & 0 deletions
30
components/src/preact/components/mutation-type-selector.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
import { type FunctionComponent } from 'preact/compat'; | ||
|
||
import { type CheckboxItem, CheckboxSelector } from './checkbox-selector'; | ||
import type { SubstitutionOrDeletion } from '../../types'; | ||
|
||
export type DisplayedMutationType = CheckboxItem & { | ||
type: SubstitutionOrDeletion; | ||
}; | ||
|
||
export type MutationTypeSelectorProps = { | ||
displayedMutationTypes: DisplayedMutationType[]; | ||
setDisplayedMutationTypes: (mutationTypes: DisplayedMutationType[]) => void; | ||
}; | ||
|
||
export const MutationTypeSelector: FunctionComponent<MutationTypeSelectorProps> = ({ | ||
displayedMutationTypes, | ||
setDisplayedMutationTypes, | ||
}) => { | ||
const checkedLabels = displayedMutationTypes.filter((type) => type.checked).map((type) => type.label); | ||
const mutationTypesSelectorLabel = `Types: ${checkedLabels.length > 0 ? checkedLabels.join(', ') : 'None'}`; | ||
|
||
return ( | ||
<CheckboxSelector | ||
className='mx-1' | ||
items={displayedMutationTypes} | ||
label={mutationTypesSelectorLabel} | ||
setItems={(items) => setDisplayedMutationTypes(items)} | ||
/> | ||
); | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
import { queryInsertions } from '../../query/queryInsertions'; | ||
import { querySubstitutionsOrDeletions } from '../../query/querySubstitutionsOrDeletions'; | ||
import { | ||
type InsertionEntry, | ||
type LapisFilter, | ||
type MutationEntry, | ||
type SubstitutionOrDeletionEntry, | ||
} from '../../types'; | ||
import { type DisplayedSegment } from '../components/SegmentSelector'; | ||
import type { DisplayedMutationType } from '../mutationComparison/mutation-comparison'; | ||
|
||
export async function queryMutationsData( | ||
variant: LapisFilter, | ||
sequenceType: 'nucleotide' | 'amino acid', | ||
lapis: string, | ||
) { | ||
const substitutionsOrDeletions = (await querySubstitutionsOrDeletions(variant, sequenceType, lapis)).content; | ||
const insertions = (await queryInsertions(variant, sequenceType, lapis)).content; | ||
|
||
const mutationSegments = substitutionsOrDeletions | ||
.map((mutationEntry) => mutationEntry.mutation.segment) | ||
.filter((segment): segment is string => segment !== undefined); | ||
|
||
const segments = [...new Set(mutationSegments)]; | ||
|
||
return { | ||
mutationsData: { substitutionsOrDeletions, insertions }, | ||
segments, | ||
}; | ||
} | ||
|
||
export function filterMutationsData( | ||
data: { insertions: InsertionEntry[]; substitutionsOrDeletions: SubstitutionOrDeletionEntry[] }, | ||
displayedSegments: DisplayedSegment[], | ||
minProportion: number, | ||
maxProportion: number, | ||
displayedMutationTypes: DisplayedMutationType[], | ||
) { | ||
function bySelectedSegments<Mutation extends MutationEntry>(mutationEntry: Mutation) { | ||
if (mutationEntry.mutation.segment === undefined) { | ||
return true; | ||
} | ||
return displayedSegments.some( | ||
(displayedSegment) => | ||
displayedSegment.segment === mutationEntry.mutation.segment && displayedSegment.checked, | ||
); | ||
} | ||
|
||
const byProportion = (mutationEntry: SubstitutionOrDeletionEntry) => { | ||
return mutationEntry.proportion >= minProportion && mutationEntry.proportion <= maxProportion; | ||
}; | ||
|
||
const byDisplayedMutationTypes = (mutationEntry: SubstitutionOrDeletionEntry) => { | ||
return displayedMutationTypes.some( | ||
(displayedMutationType) => | ||
displayedMutationType.checked && displayedMutationType.type === mutationEntry.type, | ||
); | ||
}; | ||
|
||
const filteredSubstitutionsOrDeletions = data.substitutionsOrDeletions | ||
.filter(byProportion) | ||
.filter(bySelectedSegments); | ||
|
||
return { | ||
insertions: data.insertions.filter(bySelectedSegments), | ||
tableData: filteredSubstitutionsOrDeletions.filter(byDisplayedMutationTypes), | ||
gridData: filteredSubstitutionsOrDeletions, | ||
}; | ||
} |
7 changes: 4 additions & 3 deletions
7
...c/preact/textInput/test-input.stories.tsx → ...c/preact/textInput/text-input.stories.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.