Skip to content

(refactor) Add selectable orders section in testOrder question #381

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

(refactor) Add selectable orders section in testOrder question #381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
161 changes: 147 additions & 14 deletions src/components/interactive-builder/add-question.modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,12 @@ const AddQuestionModal: React.FC<AddQuestionModalProps> = ({
const [programWorkflows, setProgramWorkflows] = useState<Array<ProgramWorkflow>>([]);
const [toggleLabelTrue, setToggleLabelTrue] = useState('');
const [toggleLabelFalse, setToggleLabelFalse] = useState('');

const [selectedOrders, setSelectedOrders] = useState<
Array<{
concept: string;
label: string;
}>
>([]);
const renderTypeOptions = {
encounterDatetime: ['date'],
encounterLocation: ['ui-select-extended'],
Expand All @@ -173,6 +178,7 @@ const AddQuestionModal: React.FC<AddQuestionModalProps> = ({
const handleAnsConceptChange = (event: React.ChangeEvent<HTMLInputElement>) =>
setConceptAnsToLookup(event.target.value);

const handleOrdersChange = (event: React.ChangeEvent<HTMLInputElement>) => setConceptToLookup(event.target.value);
Copy link
Collaborator

@NethmiRodrigo NethmiRodrigo Jan 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: empty line between the two functions

Suggested change
const handleOrdersChange = (event: React.ChangeEvent<HTMLInputElement>) => setConceptToLookup(event.target.value);
const handleOrdersChange = (event: React.ChangeEvent<HTMLInputElement>) => setConceptToLookup(event.target.value);

const handleConceptSelect = (concept: Concept) => {
const updatedDatePickerType = getDatePickerType(concept);
if (updatedDatePickerType) setDatePickerType(updatedDatePickerType);
Expand All @@ -195,6 +201,21 @@ const AddQuestionModal: React.FC<AddQuestionModalProps> = ({
}),
);
};

const handleOrdersSelect = (concept: Concept) => {
const updatedDatePickerType = getDatePickerType(concept);
if (updatedDatePickerType) setDatePickerType(updatedDatePickerType);
Comment on lines +206 to +207
Copy link
Collaborator

@NethmiRodrigo NethmiRodrigo Jan 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The datepicker type is unnecessary

Suggested change
const updatedDatePickerType = getDatePickerType(concept);
if (updatedDatePickerType) setDatePickerType(updatedDatePickerType);

Copy link
Member

@denniskigen denniskigen Jan 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, prefer wrapping the if block in braces.

setConceptToLookup('');
setSelectedConcept(concept);
setSelectedOrders([
...selectedOrders,
{
concept: concept.uuid,
label: concept.display,
},
]);
};

const handleDeleteAnswer = (id) => {
setAddedAnswers((prevAnswers) => prevAnswers.filter((answer) => answer.id !== id));
};
Expand Down Expand Up @@ -251,8 +272,8 @@ const AddQuestionModal: React.FC<AddQuestionModalProps> = ({
const computedQuestionId = `question${questionIndex + 1}Section${sectionIndex + 1}Page-${pageIndex + 1}`;

const newQuestion = {
...(questionLabel && {label: questionLabel}),
...((renderingType === 'markdown') && {value: questionValue}),
...(questionLabel && { label: questionLabel }),
...(renderingType === 'markdown' && { value: questionValue }),
type: questionType ? questionType : 'control',
required: isQuestionRequired,
id: questionId ?? computedQuestionId,
Expand Down Expand Up @@ -295,6 +316,11 @@ const AddQuestionModal: React.FC<AddQuestionModalProps> = ({
labelFalse: toggleLabelFalse,
},
}),
...(questionType === 'testOrder' && {
orderType: 'testOrder',
orderSettingUuid: 'INPATIENT',
selectableOrders: selectedOrders,
}),
},
validators: [],
};
Expand All @@ -314,6 +340,7 @@ const AddQuestionModal: React.FC<AddQuestionModalProps> = ({
setSelectedAnswers([]);
setAddObsComment(false);
setAddInlineDate(false);
setSelectedOrders([]);

showSnackbar({
title: t('success', 'Success!'),
Expand Down Expand Up @@ -363,14 +390,16 @@ const AddQuestionModal: React.FC<AddQuestionModalProps> = ({
<ModalBody hasScrollingContent>
<FormGroup legendText={''}>
<Stack gap={5}>
{renderingType === 'markdown' ? <MarkdownQuestion onValueChange={setQuestionValue}/> : (
{renderingType === 'markdown' ? (
<MarkdownQuestion onValueChange={setQuestionValue} />
) : (
<TextInput
id="questionLabel"
labelText={<RequiredLabel isRequired={isQuestionRequired} text={t('questionLabel', 'Label')} t={t} />}
placeholder={t('labelPlaceholder', 'e.g. Type of Anaesthesia')}
value={questionLabel}
onChange={(event: React.ChangeEvent<HTMLInputElement>) => setQuestionLabel(event.target.value)}
/>
id="questionLabel"
labelText={<RequiredLabel isRequired={isQuestionRequired} text={t('questionLabel', 'Label')} t={t} />}
placeholder={t('labelPlaceholder', 'e.g. Type of Anaesthesia')}
value={questionLabel}
onChange={(event: React.ChangeEvent<HTMLInputElement>) => setQuestionLabel(event.target.value)}
/>
)}

<TextInput
Expand Down Expand Up @@ -457,12 +486,16 @@ const AddQuestionModal: React.FC<AddQuestionModalProps> = ({
required
>
{!renderingType && <SelectItem text={t('chooseRenderingType', 'Choose a rendering type')} value="" />}
{questionTypes.filter((questionType) => !['obs', 'control'].includes(questionType)).includes(questionType as Exclude<QuestionType, 'obs' | 'control'>)
{questionTypes
.filter((questionType) => !['obs', 'control'].includes(questionType))
.includes(questionType as Exclude<QuestionType, 'obs' | 'control'>)
? renderTypeOptions[questionType].map((type, key) => (
<SelectItem key={`${questionType}-${key}`} text={type} value={type} />
))
: questionType === 'obs'
? fieldTypes.filter(type => type !== 'markdown').map((type, key) => <SelectItem key={key} text={type} value={type} />)
: questionType === 'obs'
? fieldTypes
.filter((type) => type !== 'markdown')
.map((type, key) => <SelectItem key={key} text={type} value={type} />)
: fieldTypes.map((type, key) => <SelectItem key={key} text={type} value={type} />)}
</Select>

Expand Down Expand Up @@ -1000,6 +1033,106 @@ const AddQuestionModal: React.FC<AddQuestionModalProps> = ({
)}
</Stack>
)}

{questionType === 'testOrder' && (
<Stack gap={5}>
<div>
<FormLabel className={styles.label}>
{t('searchForBackingConcept', 'Search for a backing concept')}
</FormLabel>
{conceptLookupError ? (
<InlineNotification
kind="error"
lowContrast
className={styles.error}
title={t('errorFetchingConcepts', 'Error fetching concepts')}
subtitle={t('pleaseTryAgain', 'Please try again.')}
/>
) : null}
<Search
id="conceptLookup"
onClear={() => {
setSelectedConcept(null);
setDatePickerType('both');
setAnswers([]);
setConceptMappings([]);
}}
onChange={handleOrdersChange}
placeholder={t('searchConcept', 'Search using a concept name or UUID')}
required
size="md"
value={(() => {
if (conceptToLookup) {
return conceptToLookup;
}
if (selectedConcept) {
return selectedConcept.display;
}
return '';
})()}
/>
{(() => {
if (!conceptToLookup) return null;
if (isLoadingConcepts)
return (
<InlineLoading className={styles.loader} description={t('searching', 'Searching') + '...'} />
);
if (concepts?.length && !isLoadingConcepts) {
return (
<ul className={styles.conceptList}>
{concepts?.map((concept, index) => (
<li
role="menuitem"
className={styles.concept}
key={index}
onClick={() => handleOrdersSelect(concept)}
>
{concept.display}
</li>
))}
</ul>
);
}
return (
<Layer>
<Tile className={styles.emptyResults}>
<span>
{t('noMatchingConcepts', 'No concepts were found that match')}{' '}
<strong>"{debouncedConceptToLookup}".</strong>
</span>
</Tile>

<div className={styles.oclLauncherBanner}>
{
<p className={styles.bodyShort01}>
{t('conceptSearchHelpText', "Can't find a concept?")}
</p>
}
<a
className={styles.oclLink}
target="_blank"
rel="noopener noreferrer"
href={'https://app.openconceptlab.org/'}
>
{t('searchInOCL', 'Search in OCL')}
<ArrowUpRight size={16} />
</a>
</div>
</Layer>
);
})()}
{selectedOrders.length ? (
<div>
{selectedOrders.map((answer) => (
<Tag className={styles.tag} key={answer.concept} type={'blue'}>
{answer.label}
</Tag>
))}
</div>
) : null}
Comment on lines +1124 to +1132
Copy link
Collaborator

@NethmiRodrigo NethmiRodrigo Jan 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Its better if we can have a way to remove selected ones, similar to how you've done when editing.

</div>
</Stack>
)}
</Stack>
</FormGroup>
</ModalBody>
Expand Down Expand Up @@ -1037,4 +1170,4 @@ function RequiredLabel({ isRequired, text, t }: RequiredLabelProps) {
);
}

export default AddQuestionModal;
export default AddQuestionModal;
Loading
Loading