diff --git a/src/i18n/locales/en.ts b/src/i18n/locales/en.ts
index ffef972ab..75d4dad2e 100644
--- a/src/i18n/locales/en.ts
+++ b/src/i18n/locales/en.ts
@@ -145,6 +145,8 @@ export const en = {
startWith: 'Start with',
prevWorkSection: 'In this section your previous work will be displayed',
prevWorkWith: 'You previously worked with',
+ candidateIsUnavailable: 'Existing candidates are unavailable',
+ genomeIsUnavailable: 'Whole genome/exome is unavailable',
},
buildFlow: {
candidateSet: 'Existing candidate sets',
@@ -152,6 +154,9 @@ export const en = {
whatsNext: "What's next?",
relevantPresets: 'Relevant presets',
additionalPresetFilter: 'Additional preset filters',
+ simpleFilter: 'Simple Filter',
+ inclusionExclusion: 'Inclusion/Exclusion Criteria',
+ viewVariants: 'View Variants',
},
},
ds: {
diff --git a/src/pages/main/components/selected-dataset/build-flow/components/build-flow-left-column.tsx b/src/pages/main/components/selected-dataset/build-flow/components/build-flow-left-column.tsx
deleted file mode 100644
index 54218b01d..000000000
--- a/src/pages/main/components/selected-dataset/build-flow/components/build-flow-left-column.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import styles from '../build-flow.module.css'
-
-import { ReactElement } from 'react'
-import cn from 'classnames'
-import { observer } from 'mobx-react-lite'
-
-import wizardStore from './wizard/wizard.store'
-
-export const BuildFlowLeftColumn = observer((): ReactElement => {
- const { wizardScenario } = wizardStore
-
- return (
-
- {wizardScenario.map((scenario, index) => {
- const Component = () =>
- scenario.component({
- id: scenario.id,
- continueDisabled: scenario.continueDisabled,
- editDisabled: scenario.editDisabled,
- contentDisabled: scenario.contentDisabled,
- selectedValue: scenario.value,
- title: scenario.title,
- maxHeight: scenario.maxHeight,
- })
- return (
- index < 2 && !scenario.hidden &&
- )
- })}
-
- )
-})
diff --git a/src/pages/main/components/selected-dataset/build-flow/components/build-flow-right-column.tsx b/src/pages/main/components/selected-dataset/build-flow/components/build-flow-right-column.tsx
deleted file mode 100644
index 18befeee2..000000000
--- a/src/pages/main/components/selected-dataset/build-flow/components/build-flow-right-column.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import styles from '../build-flow.module.css'
-
-import { ReactElement, useRef } from 'react'
-import { observer } from 'mobx-react-lite'
-
-import wizardStore from './wizard/wizard.store'
-
-export const BuildFlowRightColumn = observer((): ReactElement => {
- const { wizardScenario } = wizardStore
- const divRef = useRef(null)
-
- return (
-
- {wizardScenario.map((scenario, index) => {
- const Component = () =>
- scenario.component({
- id: scenario.id,
- continueDisabled: scenario.continueDisabled,
- editDisabled: scenario.editDisabled,
- contentDisabled: scenario.contentDisabled,
- selectedValue: scenario.value,
- title: scenario.title,
- maxHeight: scenario.maxHeight,
- })
- return (
- index > 1 && !scenario.hidden &&
- )
- })}
-
- )
-})
diff --git a/src/pages/main/components/selected-dataset/build-flow/components/cards/components/card-radio-list.interface.ts b/src/pages/main/components/selected-dataset/build-flow/components/cards/components/card-radio-list.interface.ts
index 78dba5687..9baa31e79 100644
--- a/src/pages/main/components/selected-dataset/build-flow/components/cards/components/card-radio-list.interface.ts
+++ b/src/pages/main/components/selected-dataset/build-flow/components/cards/components/card-radio-list.interface.ts
@@ -3,4 +3,12 @@ export interface ICardRadioItem {
value: T
}
-export type TDisabledOptions = Record
+export interface IDisabledOption {
+ isDisabled: boolean
+ placeholder: () => JSX.Element
+}
+
+export type TDisabledOptions = Record<
+ T,
+ boolean | IDisabledOption
+>
diff --git a/src/pages/main/components/selected-dataset/build-flow/components/cards/components/card-radio-list.tsx b/src/pages/main/components/selected-dataset/build-flow/components/cards/components/card-radio-list.tsx
index bd7a581fb..6c3d12ee7 100644
--- a/src/pages/main/components/selected-dataset/build-flow/components/cards/components/card-radio-list.tsx
+++ b/src/pages/main/components/selected-dataset/build-flow/components/cards/components/card-radio-list.tsx
@@ -1,4 +1,5 @@
import { Radio } from '@ui/radio'
+import { disabledOptionIsObject } from './card-radio.utils'
import { ICardRadioItem, TDisabledOptions } from './card-radio-list.interface'
interface ICardRadioListProps {
@@ -18,18 +19,37 @@ export const CardRadioList = function ({
}: ICardRadioListProps) {
return (
<>
- {data.map(({ label, value }) => (
-
-
onChange(value)}
- disabled={isOptionsDisabled || disabledOptions?.[value]}
- >
- {label}
-
-
- ))}
+ {data.map(({ label, value }) => {
+ const disabledOption = disabledOptions?.[value]
+ if (
+ disabledOptionIsObject(disabledOption) &&
+ disabledOption.isDisabled
+ ) {
+ return (
+
+ {disabledOption.placeholder()}
+
+ )
+ } else {
+ return (
+
+
onChange(value)}
+ disabled={
+ !!isOptionsDisabled ||
+ (disabledOptionIsObject(disabledOption)
+ ? disabledOption.isDisabled
+ : disabledOption)
+ }
+ >
+ {label}
+
+
+ )
+ }
+ })}
>
)
}
diff --git a/src/pages/main/components/selected-dataset/build-flow/components/cards/components/card-radio.utils.ts b/src/pages/main/components/selected-dataset/build-flow/components/cards/components/card-radio.utils.ts
new file mode 100644
index 000000000..f9525d206
--- /dev/null
+++ b/src/pages/main/components/selected-dataset/build-flow/components/cards/components/card-radio.utils.ts
@@ -0,0 +1,7 @@
+import { IDisabledOption } from './card-radio-list.interface'
+
+export const disabledOptionIsObject = (
+ value: boolean | IDisabledOption | undefined,
+): value is IDisabledOption => {
+ return typeof value === 'object'
+}
diff --git a/src/pages/main/components/selected-dataset/build-flow/components/cards/description-card/description-card.tsx b/src/pages/main/components/selected-dataset/build-flow/components/cards/description-card/description-card.tsx
index 7b46cb4d9..2b1e63e16 100644
--- a/src/pages/main/components/selected-dataset/build-flow/components/cards/description-card/description-card.tsx
+++ b/src/pages/main/components/selected-dataset/build-flow/components/cards/description-card/description-card.tsx
@@ -34,6 +34,7 @@ export const DescriptionCard = observer(
continueDisabled,
contentDisabled,
editDisabled,
+ position,
} = props
const history = useHistory()
const ds = title || datasetStore.datasetName
@@ -60,7 +61,6 @@ export const DescriptionCard = observer(
}
useEffect(() => {
- wizardStore.wizardScenario[id].title = ds
wizardStore.updateSelectedDataset(ds)
setDsName(ds)
// eslint-disable-next-line react-hooks/exhaustive-deps
@@ -73,16 +73,17 @@ export const DescriptionCard = observer(
return (
wizardStore.editCard(id)}
/>
-
+
Description