Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: address confusing UX for network chromosome/assembly #233

Merged
merged 2 commits into from
Nov 26, 2024
Merged

chore: address confusing UX for network chromosome/assembly #233

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08b182b
chore: address confusing UX for network chromosome/assembly
davidlougheed Nov 26, 2024
688e749
chore(beacon): don't clear chrom if availableContigs stays blank
davidlougheed Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 21 additions & 14 deletions src/js/components/Beacon/BeaconCommon/VariantsForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { type CSSProperties, useEffect, useMemo } from 'react';
import { type CSSProperties, useEffect, useState } from 'react';

import { Col, Form, Row } from 'antd';
import type { DefaultOptionType } from 'antd/es/select/index';
Expand Down Expand Up @@ -70,17 +70,24 @@ const VariantsForm = ({ isNetworkQuery, beaconAssemblyIds }: VariantsFormProps)
const form = Form.useFormInstance();
const currentAssemblyID = Form.useWatch('Assembly ID', form);

// Right now, we cannot figure out the contig options for the network, so we fall back to a normal input box.
const availableContigs = useMemo<ContigOptionType[]>(
() =>
!isNetworkQuery && currentAssemblyID && genomesByID[currentAssemblyID]
? genomesByID[currentAssemblyID].contigs
.map(contigToOption)
.sort(contigOptionSort)
.filter(filterOutHumanLikeExtraContigs)
: [],
[isNetworkQuery, currentAssemblyID, genomesByID]
);
const [availableContigs, setAvailableContigs] = useState<ContigOptionType[]>([]);

useEffect(() => {
// Right now, we cannot figure out the contig options for the network, so we fall back to a normal input box.
if (!isNetworkQuery && currentAssemblyID && genomesByID[currentAssemblyID]) {
setAvailableContigs(
genomesByID[currentAssemblyID].contigs
.map(contigToOption)
.sort(contigOptionSort)
.filter(filterOutHumanLikeExtraContigs)
);
} else {
// Keep existing memory address for existing empty array if availableContigs was already empty, to avoid
// re-render/clearing effect.
setAvailableContigs((ac) => (ac.length ? [] : ac));
}
}, [isNetworkQuery, currentAssemblyID, genomesByID]);

const assemblySelect = !!availableContigs.length;

useEffect(() => {
Expand All @@ -92,7 +99,7 @@ const VariantsForm = ({ isNetworkQuery, beaconAssemblyIds }: VariantsFormProps)
const formFields = {
referenceName: {
name: 'Chromosome',
placeholder: !currentAssemblyID ? t('beacon.select_asm') : '',
placeholder: !isNetworkQuery && !currentAssemblyID ? t('beacon.select_asm') : '',
initialValue: '',
},
start: {
Expand Down Expand Up @@ -130,7 +137,7 @@ const VariantsForm = ({ isNetworkQuery, beaconAssemblyIds }: VariantsFormProps)
<Col span={8}>
<VariantInput
field={formFields.referenceName}
disabled={variantsError || !currentAssemblyID}
disabled={variantsError || (!isNetworkQuery && !currentAssemblyID)}
mode={assemblySelect ? { type: 'select', options: availableContigs } : { type: 'input' }}
/>
</Col>
Expand Down