Merge remote-tracking branch 'origin/main' into storybook-components-tests

Author: ruscoder

apps/smart-forms-app/src/test/aboriginalFormCompletedFor0To1Years.test.tsx

@@ -114,6 +114,8 @@ const BooleanField = memo(function BooleanField(props: BooleanFieldProps) {
             alignItems="center"
             sx={inputsFlexGrow ? { width: '100%', flexWrap: 'nowrap' } : {}}>
             <RadioGroup
+              data-linkid={qItem.linkId}
+              data-label={qItem.text}
               id={qItem.type + '-' + qItem.linkId}
               aria-labelledby={
                 instructionsId ? `label-${qItem.linkId} ${instructionsId}` : `label-${qItem.linkId}`

apps/smart-forms-app/src/test/aboriginalFormCompletedFor12To6Years.test.tsx

@@ -22,14 +22,15 @@ import { StandardRadio } from '../../Radio.styles';
 
 interface ChoiceRadioSingleProps {
   value: string;
-  label: React.ReactNode;
+  label: string;
+  styledLabel?: React.ReactNode;
   readOnly: boolean;
   disabledViaToggleExpression: boolean;
   fullWidth: boolean;
 }
 
 function ChoiceRadioSingle(props: ChoiceRadioSingleProps) {
-  const { value, label, readOnly, disabledViaToggleExpression, fullWidth } = props;
+  const { value, styledLabel, label, readOnly, disabledViaToggleExpression, fullWidth } = props;
 
   const readOnlyVisualStyle = useRendererConfigStore.use.readOnlyVisualStyle();
 
@@ -55,7 +56,7 @@ function ChoiceRadioSingle(props: ChoiceRadioSingleProps) {
       control={
         <StandardRadio data-test={`radio-single-${label}`} size="small" readOnly={isHtmlReadOnly} />
       }
-      label={label}
+      label={styledLabel ?? label}
     />
   );
 }

apps/smart-forms-app/src/test/aboriginalFormCompletedFor24To13Years.test.tsx

@@ -86,6 +86,8 @@ function CustomDateField(props: CustomDateFieldProps) {
     <StandardTextField
       {...(!isTabled && { id: id })}
       data-test={'date'}
+      data-linkid={linkId}
+      data-label={itemText}
       ref={anchorRef}
       fullWidth
       textFieldWidth={textFieldWidth}

apps/smart-forms-app/src/test/aboriginalFormCompletedFor49To25Years.test.tsx

@@ -103,7 +103,7 @@ function GridTable(props: GridTableProps) {
           }
 
           return (
-            <TableRow key={qItem.linkId}>
+            <TableRow key={qItem.linkId} data-linkid={qItem.linkId} data-label={qItem.text}>
               <GridRow
                 qItem={qItem}
                 qrItem={qrItem ?? null}