Skip to content

Feat/react hook form #36

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

Merged
merged 5 commits into from
Jan 15, 2024
Merged

Feat/react hook form #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5681deb
WIP on form changes'
ojwanganto Jan 12, 2024
459fae6
(feat) enhance result-form to react-hook forms
donaldkibet Jan 12, 2024
49146aa
save results after form refactor
ojwanganto Jan 12, 2024
c72cf07
close modal on successful update
ojwanganto Jan 15, 2024
dfd8b0f
remove unused imports
ojwanganto Jan 15, 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
5 changes: 4 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,11 @@
},
"dependencies": {
"@carbon/react": "^1.14.0",
"@hookform/resolvers": "^3.3.4",
"lodash-es": "^4.17.21",
"react-to-print": "^2.14.15"
"react-hook-form": "^7.49.3",
"react-to-print": "^2.14.15",
"zod": "^3.22.4"
},
"peerDependencies": {
"@openmrs/esm-framework": "*",
Expand Down
175 changes: 112 additions & 63 deletions src/results/result-form-field.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,82 +2,131 @@ import React from "react";
import styles from "./result-form.scss";
import { TextInput, Select, SelectItem } from "@carbon/react";
import { useTranslation } from "react-i18next";

import { ConceptReference } from "./result-form.resource";
import { Controller } from "react-hook-form";

interface ResultFormFieldProps {
concept: ConceptReference;
setFormValues?: (value: any) => void;
inputValues?: any;
control: any;
register: any;
}
const ResultFormField: React.FC<ResultFormFieldProps> = ({
concept,
setFormValues,
inputValues,
control,
register,
}) => {
const { t } = useTranslation();
const isTextOrNumeric = (concept) =>
concept.datatype?.display === "Text" ||
concept.datatype?.display === "Numeric";
const isCoded = (concept) => concept.datatype?.display === "Coded";
const isPanel = (concept) => concept.setMembers?.length > 0;

// getInput values
const handleInputChange = (memberUuid, value) => {
setFormValues((prevValues) => ({
...prevValues,
[memberUuid]: value,
}));
};
return (
<>
{isTextOrNumeric(concept) && (
<Controller
control={control}
name={concept.uuid}
render={({ field }) => (
<TextInput
key={concept.uuid}
className={styles.textInput}
{...field}
type={concept.datatype.display === "Numeric" ? "number" : "text"}
labelText={concept?.display}
autoFocus
/>
)}
/>
)}
{isCoded(concept) && (
<Controller
name={concept.uuid}
control={control}
render={({ field }) => (
<Select
key={concept.uuid}
className={styles.textInput}
{...field}
type="text"
labelText={concept?.display}
>
<SelectItem text={t("option", "Choose an Option")} value="" />

// create input fields
if (concept === undefined) {
return null;
}
{concept?.answers?.map((answer) => (
<SelectItem
key={answer.uuid}
text={answer.display}
value={answer.uuid}
>
{answer.display}
</SelectItem>
))}
</Select>
)}
/>
)}

let inputField;
if (
concept.datatype?.display === "Text" ||
concept.datatype?.display === "Numeric"
) {
inputField = (
<TextInput
key={concept.uuid}
className={styles.textInput}
name={`member-${concept.uuid}-test-id`}
id={`member-${concept.uuid}-test-id`}
type={concept.datatype.display === "Numeric" ? "number" : "text"}
labelText={concept?.display}
value={inputValues[`${concept.uuid}`] || ""}
onChange={(e) => {
handleInputChange(concept.uuid, e.target.value);
}}
/>
);
} else if (concept?.datatype?.display === "Coded") {
inputField = (
<Select
key={concept.uuid}
className={styles.textInput}
name={`member-${concept.uuid}-test-id`}
id={`member-${concept.uuid}-test-id`}
type="text"
labelText={concept?.display}
value={inputValues[`${concept.uuid}`]}
onChange={(e) => {
handleInputChange(concept.uuid, e.target.value);
}}
>
<SelectItem text={t("option", "Choose an Option")} value="" />
{isPanel(concept) &&
concept.setMembers.map((member, index) => {
if (isTextOrNumeric(member)) {
return (
<Controller
control={control}
name={member.uuid}
render={({ field }) => (
<TextInput
key={member.uuid}
className={styles.textInput}
{...field}
type={
member.datatype.display === "Numeric" ? "number" : "text"
}
labelText={member?.display}
autoFocus={index === 0}
/>
)}
/>
);
}

if (isCoded(member)) {
return (
<Controller
name={member.uuid}
control={control}
render={({ field }) => (
<Select
key={member.uuid}
className={styles.textInput}
{...field}
type="text"
labelText={member?.display}
autoFocus={index === 0}
>
<SelectItem
text={t("option", "Choose an Option")}
value=""
/>

{concept?.answers?.map((answer) => (
<SelectItem
key={answer.uuid}
text={answer.display}
value={answer.uuid}
>
{answer.display}
</SelectItem>
))}
</Select>
);
}
return <>{inputField}</>;
{member?.answers?.map((answer) => (
<SelectItem
key={answer.uuid}
text={answer.display}
value={answer.uuid}
>
{answer.display}
</SelectItem>
))}
</Select>
)}
/>
);
}
})}
</>
);
};

export default ResultFormField;
Loading