diff --git a/services/cms/src/blocks/ResearchConsentCheckbox/ResearchConsentCheckBoxEditor.tsx b/services/cms/src/blocks/ResearchConsentCheckbox/ResearchConsentCheckBoxEditor.tsx index 9cbeb560e7ef..ad2693baeda1 100644 --- a/services/cms/src/blocks/ResearchConsentCheckbox/ResearchConsentCheckBoxEditor.tsx +++ b/services/cms/src/blocks/ResearchConsentCheckbox/ResearchConsentCheckBoxEditor.tsx @@ -4,6 +4,7 @@ import { BlockEditProps } from "@wordpress/blocks" import React from "react" import { useTranslation } from "react-i18next" +import ErrorBanner from "../../shared-module/components/ErrorBanner" import CheckBox from "../../shared-module/components/InputFields/CheckBox" import BlockPlaceholderWrapper from "../BlockPlaceholderWrapper" @@ -41,6 +42,9 @@ const ResearchConsentCheckBoxEditor: React.FC< onChange={(value: string) => setAttributes({ content: value })} /> + {(attributes.content ?? "").split(/\s+/).length < 3 && ( + + )} ) } diff --git a/services/course-material/src/components/ContentRenderer/moocfi/ResearchFormCheckBoxBlock.tsx b/services/course-material/src/components/ContentRenderer/moocfi/ResearchFormCheckBoxBlock.tsx index 10bc5098ab7c..fb5a926af362 100644 --- a/services/course-material/src/components/ContentRenderer/moocfi/ResearchFormCheckBoxBlock.tsx +++ b/services/course-material/src/components/ContentRenderer/moocfi/ResearchFormCheckBoxBlock.tsx @@ -30,6 +30,7 @@ const ResearchFormCheckBoxBlock: React.FC< <> handleChange(!questionIdsAndAnswers[props.data.clientId])} /> diff --git a/shared-module/src/components/InputFields/CheckBox.tsx b/shared-module/src/components/InputFields/CheckBox.tsx index 0869689ebbb6..924658e4627e 100644 --- a/shared-module/src/components/InputFields/CheckBox.tsx +++ b/shared-module/src/components/InputFields/CheckBox.tsx @@ -78,10 +78,21 @@ export interface CheckboxProps extends InputHTMLAttributes { error?: boolean checked?: boolean onChangeByValue?: (checked: boolean, name?: string) => void + labelIsRawHtml?: boolean } const CheckBox = forwardRef( - ({ onChangeByValue, onChange, className, checked, ...rest }: CheckboxProps, ref) => { + ( + { + onChangeByValue, + onChange, + className, + checked, + labelIsRawHtml = false, + ...rest + }: CheckboxProps, + ref, + ) => { const handleOnChange = (event: React.ChangeEvent) => { if (onChangeByValue) { const { @@ -112,7 +123,12 @@ const CheckBox = forwardRef( ref={ref} {...rest} /> - {rest.label} + {/* eslint-disable-next-line react/no-danger-with-children */} + {rest.error && (