(feat) O3-4137: Add support for nested obsGroup #427
Merged
Conversation
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
|
Size Change: +705 B (+0.06%) Total Size: 1.25 MB ℹ️ View Unchanged
|
samuelmale
approved these changes
Nov 26, 2024
| field.questions | ||
| ?.filter((child) => !child.isHidden) | ||
| .map((child, index) => { | ||
| const keyId = `${child.id}_${index}`; |
There was a problem hiding this comment.
Suggested change
| const keyId = `${child.id}_${index}`; | |
| const key = `${child.id}_${index}`; |
src/adapters/obs-adapter.test.ts
Outdated
| ], | ||
| }); | ||
|
|
||
| const createNestedObs = () => ({ |
There was a problem hiding this comment.
Suggested change
| const createNestedObs = () => ({ | |
| const createEncounterWithNestedObs = () => ({ |
src/hooks/useFormFields.ts
Outdated
| const conceptReferencesTemp = new Set<string>(); | ||
|
|
||
| const flattenFields = (fields: FormField[]) => { |
There was a problem hiding this comment.
This function is recursive and causes side effects to external states, making it less pure. Below is an example of how we can simplify this logic (AI generated)
const processFlattenedFields = (fields: FormField[]): {
flattenedFields: FormField[];
conceptReferences: Set<string>;
} => {
const flattenedFields: FormField[] = [];
const conceptReferences = new Set<string>();
const processField = (field: FormField, parentGroupId?: string) => {
// Add group ID to nested fields if applicable
const processedField = parentGroupId
? { ...field, meta: { ...field.meta, groupId: parentGroupId } }
: field;
// Add field to flattened list
flattenedFields.push(processedField);
// Collect concept references
if (processedField.questionOptions?.concept) {
conceptReferences.add(processedField.questionOptions.concept);
}
// Collect concept references from answers
processedField.questionOptions?.answers?.forEach((answer) => {
if (answer.concept) {
conceptReferences.add(answer.concept);
}
});
// Recursively process nested questions for obsGroup
if (processedField.type === 'obsGroup' && processedField.questions) {
processedField.questions.forEach((nestedField) => {
processField(nestedField, processedField.id);
});
}
};
// Process all input fields
fields.forEach(processField);
return { flattenedFields, conceptReferences };
};
usamaidrsk
force-pushed
the
ft-nested-obs-group
branch
from
c16113f to
21ebc76
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Requirements
Summary
This PR introduces functionality for handling nested obsGroup questions. With this enhancement, users can now nest obsGroup elements within other obsGroup elements, allowing for complex hierarchical structures within forms. This feature supports scenarios requiring parent-child relationships among grouped observations, providing a more flexible and detailed data-capture process.
Example schema
Screenshots
Related Issue
https://openmrs.atlassian.net/browse/O3-4137
Other