diff --git a/src/components/Questionnaire/Repository.tsx b/src/components/Questionnaire/Repository.tsx index 55ad6c3b5..236828a1d 100644 --- a/src/components/Questionnaire/Repository.tsx +++ b/src/components/Questionnaire/Repository.tsx @@ -87,6 +87,7 @@ const Repository: FC = ({ = ({ @@ -53,6 +54,7 @@ const ReviewDataListingProperty: FC = ({ gridWidth, textTransform = "uppercase", hideLabel = false, + delimiter = ",", }) => { const [isMultiple, setIsMultiple] = useState(false); @@ -61,15 +63,15 @@ const ReviewDataListingProperty: FC = ({ return []; } if (typeof value === "string") { - const splitted = value.split(',').map((item) => item.trim()).filter((item) => item.length); - if (splitted.length > 1) { + const split = value.split(delimiter).map((item) => item.trim()).filter((item) => item.length); + if (split.length > 1) { setIsMultiple(true); } - return splitted; + return split; } setIsMultiple(true); return value?.map((item) => item.trim()).filter((item) => item.length); - }, [value, isList]); + }, [value, isList, delimiter]); return ( @@ -102,7 +104,7 @@ const ReviewDataListingProperty: FC = ({ id={idPrefix.concat(`-property-value-${idx}`)} > {' '} - {`${val}${idx !== displayValues.length - 1 ? "," : ""}`} + {val} )) : ( diff --git a/src/content/questionnaire/sections/C.tsx b/src/content/questionnaire/sections/C.tsx index 387548d81..b513c2df4 100644 --- a/src/content/questionnaire/sections/C.tsx +++ b/src/content/questionnaire/sections/C.tsx @@ -159,6 +159,7 @@ const FormSectionC: FC = ({ SectionOption, refs }: FormSection id="section-c-other-cancer-types" key={`other_cancer_types_${cancerTypes?.toString()}`} label="Other cancer type(s)" + tooltipText='Enter additional Cancer Types, separated by pipes ("|").' labelStartAddornment={( = ({ SectionOption, refs }: FormSection = ({ SectionOption, refs }: FormSection = ({ SectionOption, refs }: FormSection value={data.otherDataTypes} placeholder="Other Data Types (Specify)" gridWidth={12} - tooltipText="Data that do not fit in any of the other categories." + tooltipText='Data that do not fit in any of the other categories. Enter additional Data Types, separated by pipes ("|").' readOnly={readOnlyInputs} maxLength={200} /> @@ -418,7 +418,7 @@ const FormSectionD: FC = ({ SectionOption, refs }: FormSection value={data.clinicalData.otherDataTypes} placeholder="Other clinical data types (Specify)" gridWidth={12} - tooltipText="If there are any additional types of data included with the study not already specified above, describe here." + tooltipText='If there are any additional types of data included with the study not already specified above, describe here. Enter additional Clinical Data Types, separated by pipes ("|").' readOnly={readOnlyInputs} maxLength={200} /> diff --git a/src/content/questionnaire/sections/Review.tsx b/src/content/questionnaire/sections/Review.tsx index 9d81fd9ae..965903a14 100644 --- a/src/content/questionnaire/sections/Review.tsx +++ b/src/content/questionnaire/sections/Review.tsx @@ -258,7 +258,7 @@ const FormSectionReview: FC = ({ valuePlacement="bottom" isList /> - + ))} @@ -279,8 +279,8 @@ const FormSectionReview: FC = ({ description={SectionMetadata.C.sections.CANCER_TYPES.description} > - - + + = ({ title={SectionMetadata.C.sections.SUBJECTS.title} > - + @@ -315,7 +315,7 @@ const FormSectionReview: FC = ({ {data.dataTypes?.includes(DataTypes.imaging.name) && data.imagingDataDeIdentified !== null && ( )} - + {data.dataTypes?.includes(DataTypes.clinicalTrial.name) && ( @@ -330,7 +330,7 @@ const FormSectionReview: FC = ({ - + )}