fix: sonarcloud

src/extensions/components/registration/AgencyFields/index.tsx

@@ -49,7 +49,9 @@ export const AgencySelectionFormField = ({
 			<InputFormField
 				name="consultingTypeId"
 				type="hidden"
-				pattern={/^\d+$/}
+				rule={{
+					pattern: /^\d+$/
+				}}
 			/>
 			<InputFormField name="postCode" type="hidden" />
 			<InputFormField name="agencyId" type="hidden" />

src/extensions/components/registration/FormAccordion/FormAccordion.tsx

@@ -9,6 +9,7 @@ import { useDebouncedCallback } from 'use-debounce';
 import './formAccordion.styles.scss';
 import { FormAccordionItemProps } from './FormAccordionItem';
 import { DebouncedState } from 'use-debounce/lib/useDebouncedCallback';
+import { FormInstance } from 'rc-field-form';
 
 export interface FormAccordionChildProps {
 	activePanel: FormAccordionItemProps['id'];
@@ -43,43 +44,41 @@ export const FormAccordion = ({ children, onComplete }: FormAccordionProps) => {
 	>(childIds[0]);
 	const ref = useRef<HTMLDivElement>(null);
 
-	const onClickNext = useCallback(() => {
+	const handleScroll = useCallback((panel) => {
+		setTimeout(() => {
+			const scrollContainer =
+				document.getElementsByClassName(`stageLayout`)[0];
+			const element = document.getElementById(`panel-${panel}`);
+			const offsetPosition = element.offsetTop - scrollOffset;
+
+			scrollContainer.scrollTo({
+				top: offsetPosition,
+				behavior: 'smooth'
+			});
+		}, 50);
+	}, []);
+
+	const handleNextStep = useCallback(() => {
 		const childIdIndex = childIds.indexOf(activePanel);
 		setActivePanel(childIds?.[childIdIndex + 1]);
 		// Call onComplete when next on last panel was clicked
-		if (childIdIndex === childIds.length - 1) {
-			onComplete?.();
+		if (childIdIndex !== childIds.length - 1) {
+			return handleScroll(childIds?.[childIdIndex + 1]);
 		}
-	}, [activePanel, childIds, onComplete]);
+		onComplete?.();
+	}, [activePanel, childIds, handleScroll, onComplete]);
 
 	const handlePanelClick = useCallback(
 		(
 			panel: FormAccordionChildProps['activePanel'],
 			isTabPressed?: boolean
 		) => {
-			console.log(
-				activePanel,
-				panel,
-				isTabPressed,
-				activePanel === panel && !isTabPressed ? undefined : panel
-			);
 			setActivePanel(
 				activePanel === panel && !isTabPressed ? undefined : panel
 			);
-
-			setTimeout(() => {
-				const scrollContainer =
-					document.getElementsByClassName(`stageLayout`)[0];
-				const element = document.getElementById(`panel-${panel}`);
-				const offsetPosition = element.offsetTop - scrollOffset;
-
-				scrollContainer.scrollTo({
-					top: offsetPosition,
-					behavior: 'smooth'
-				});
-			}, 50);
+			handleScroll(panel);
 		},
-		[activePanel]
+		[activePanel, handleScroll]
 	);
 	const debouncedHandlePanelClick = useDebouncedCallback(
 		handlePanelClick,
@@ -92,7 +91,7 @@ export const FormAccordion = ({ children, onComplete }: FormAccordionProps) => {
 			{children({
 				activePanel,
 				handlePanelClick: debouncedHandlePanelClick,
-				handleNextStep: onClickNext
+				handleNextStep
 			})}
 		</div>
 	);

src/extensions/components/registration/FormAccordion/FormAccordionItem.tsx

@@ -1,5 +1,5 @@
-import { FieldContext, FormInstance } from 'rc-field-form';
-import React from 'react';
+import { FieldContext } from 'rc-field-form';
+import React, { FC } from 'react';
 import './formAccordion.styles.scss';
 import { useTranslation } from 'react-i18next';
 import {
@@ -9,20 +9,21 @@ import {
 } from '../../../../components/button/Button';
 import { InvalidIcon } from '../../../../resources/img/icons';
 import { FormAccordionChildProps } from './FormAccordion';
+import classNames from 'classnames';
 
 export interface FormAccordionItemProps {
 	id?: string;
 	disableNextButton?: boolean;
-	form?: FormInstance;
 	stepNumber?: number;
 	title: string;
 	subTitle?: string;
 	formFields?: string[];
 	errorOnTouchExtraFields?: string[];
-	children: React.ReactChild | React.ReactChild[];
 }
 
-export const FormAccordionItem = ({
+export const FormAccordionItem: FC<
+	FormAccordionItemProps & FormAccordionChildProps
+> = ({
 	id,
 	stepNumber,
 	title,
@@ -33,12 +34,12 @@ export const FormAccordionItem = ({
 	handlePanelClick,
 	handleNextStep,
 	activePanel,
-	form,
 	disableNextButton
-}: FormAccordionItemProps & FormAccordionChildProps) => {
+}) => {
 	const formContext = React.useContext(FieldContext);
 	const fieldsToCheck = [...formFields, ...errorOnTouchExtraFields];
-	const isFieldsInValid = (form || formContext)
+
+	const isFieldsInValid = formContext
 		.getFieldsError(formFields)
 		.some((error) => error.errors.length !== 0);
 
@@ -58,7 +59,9 @@ export const FormAccordionItem = ({
 
 	return (
 		<div
-			className={`formAccordionDigi__Panel ${isActive ? 'active' : ''}`}
+			className={classNames('formAccordionDigi__Panel', {
+				active: isActive
+			})}
 			id={`panel-${id}`}
 		>
 			<div

src/extensions/components/registration/InputFormField/index.tsx

@@ -1,46 +1,44 @@
 import { Field } from 'rc-field-form';
 import React from 'react';
+import type { Rule, Store, StoreValue } from 'rc-field-form/es/interface';
+import { FieldProps } from 'rc-field-form/es/Field';
 
 interface InputProps {
 	name?: string;
 	min?: number;
 	max?: number;
 	placeholder?: string;
+	normalize?: FieldProps['normalize'];
 	type?: string;
-	pattern?: RegExp;
+	rule?: Rule;
 	tabIndex?: number;
 	autoFocus?: boolean;
 }
 
-const LocalInput = ({
-	value,
-	type,
-	...rest
-}: {
-	type?: string;
-	value?: string;
-	tabIndex?: number;
-	placeholder?: string;
-}) => (
-	<input
-		className="registrationFormDigi__Input"
-		type={type}
-		value={value || ''}
-		{...rest}
-	/>
-);
-
 export const InputFormField = ({
 	type = 'text',
 	name,
 	placeholder,
-	pattern,
+	normalize,
+	rule,
 	...rest
 }: InputProps) => {
-	const patternRules = pattern ? { pattern } : {};
 	return (
-		<Field name={name} rules={[{ required: true, ...patternRules }]}>
-			<LocalInput type={type} placeholder={placeholder} {...rest} />
+		<Field
+			name={name}
+			rules={[{ required: true, ...(rule || {}) }]}
+			normalize={normalize}
+		>
+			{({ value, ...props }) => (
+				<input
+					className="registrationFormDigi__Input"
+					type={type}
+					placeholder={placeholder}
+					value={value || ''}
+					{...rest}
+					{...props}
+				/>
+			)}
 		</Field>
 	);
 };

src/extensions/components/registration/RadioBoxGroup/index.tsx

@@ -11,6 +11,7 @@ interface RadioBoxGroupProps {
 	options: Array<{ label: string; value: string }>;
 	preset?: string;
 	dependencies?: NamePath[];
+	normalize?: (value: string) => any;
 }
 
 interface RadioBoxProps
@@ -52,6 +53,7 @@ export const RadioBoxGroup: FC<RadioBoxGroupProps> = ({
 	dependencies,
 	options,
 	preset,
+	normalize,
 	children,
 	...props
 }) => {
@@ -61,6 +63,7 @@ export const RadioBoxGroup: FC<RadioBoxGroupProps> = ({
 			rules={[{ required: true }]}
 			dependencies={dependencies}
 			initialValue={preset}
+			normalize={normalize}
 		>
 			{({ value, onChange }) =>
 				options.map(({ value: valueRadio, label }, i) => (