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

Add support for choiceColumn in choice questions. Ref #378 #379

Closed
wants to merge 2 commits into from
Closed

Add support for choiceColumn in choice questions. Ref #378 #379

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f71dd8
Add support for choiceColumn in choice questions. Ref #378
ruscoder Nov 22, 2024
b47461c
Reformat
ruscoder Nov 22, 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
43 changes: 37 additions & 6 deletions src/components/BaseQuestionnaireResponseForm/widgets/choice/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,16 @@ import _, { debounce } from 'lodash';
import { useCallback, useContext } from 'react';
import { QuestionItemProps } from 'sdc-qrf';

import { QuestionnaireItemAnswerOption, QuestionnaireResponseItemAnswer } from '@beda.software/aidbox-types';
import {
QuestionnaireItemAnswerOption,
QuestionnaireResponseItemAnswer,
QuestionnaireResponseItemAnswerValue,
} from '@beda.software/aidbox-types';

import { AsyncSelect, Select } from 'src/components/Select';
import { ValueSetExpandProvider } from 'src/contexts';
import { getDisplay } from 'src/utils/questionnaire';
import { evaluate } from 'src/utils';
import { getDisplay as getAnswerValueDisplay } from 'src/utils/questionnaire';

import s from '../../BaseQuestionnaireResponseForm.module.scss';
import { useFieldController } from '../../hooks';
Expand All @@ -19,10 +24,18 @@ interface ChoiceQuestionSelectProps {
options: QuestionnaireItemAnswerOption[];
repeats?: boolean;
placeholder?: string;
getDisplay?: (value?: QuestionnaireResponseItemAnswerValue) => string | number | null;
}

export function ChoiceQuestionSelect(props: ChoiceQuestionSelectProps) {
const { value, onChange, options, repeats = false, placeholder = t`Select...` } = props;
const {
value,
onChange,
options,
repeats = false,
placeholder = t`Select...`,
getDisplay = getAnswerValueDisplay,
} = props;

return (
<>
Expand All @@ -43,14 +56,29 @@ export function ChoiceQuestionSelect(props: ChoiceQuestionSelectProps) {
);
}

export function QuestionChoice({ parentPath, questionItem }: QuestionItemProps) {
const { linkId, answerOption, repeats, answerValueSet } = questionItem;
export function QuestionChoice({ parentPath, questionItem, context }: QuestionItemProps) {
const { linkId, answerOption, repeats, answerValueSet, choiceColumn } = questionItem;
const fieldName = [...parentPath, linkId];

const { value, formItem, onChange, placeholder = t`Select...` } = useFieldController(fieldName, questionItem);

const onSelect = useCallback((option: any) => onChange([].concat(option)), [onChange]);

const getDisplay = useCallback(
(value?: QuestionnaireResponseItemAnswerValue) => {
const specificValueType = value && (Object.keys(value)[0] as keyof QuestionnaireResponseItemAnswerValue);
if (choiceColumn && specificValueType) {
return (evaluate(value[specificValueType], choiceColumn![0]!.path!, context)[0] ?? null) as
| string
| number
| null;
}

return getAnswerValueDisplay(value);
},
[choiceColumn, context],
);

if (answerValueSet) {
return (
<Form.Item {...formItem} data-testid="question-choice">
Expand All @@ -60,6 +88,7 @@ export function QuestionChoice({ parentPath, questionItem }: QuestionItemProps)
onChange={onSelect}
repeats={repeats}
placeholder={placeholder}
getDisplay={getDisplay}
/>
</Form.Item>
);
Expand All @@ -73,6 +102,7 @@ export function QuestionChoice({ parentPath, questionItem }: QuestionItemProps)
onChange={onSelect}
repeats={repeats}
placeholder={placeholder}
getDisplay={getDisplay}
/>
</Form.Item>
);
Expand All @@ -84,10 +114,11 @@ interface ChoiceQuestionValueSetProps {
onChange: (option: any) => void;
repeats?: boolean;
placeholder?: string;
getDisplay?: (value?: QuestionnaireResponseItemAnswerValue) => string | number | null;
}

export function ChoiceQuestionValueSet(props: ChoiceQuestionValueSetProps) {
const { answerValueSet, value, onChange, repeats = false, placeholder } = props;
const { answerValueSet, value, onChange, repeats = false, placeholder, getDisplay = getAnswerValueDisplay } = props;
const expand = useContext(ValueSetExpandProvider);

const loadOptions = useCallback(
Expand Down
Loading