fix edge cases in step switching, delete prints

dump-hr · Jan 31, 2025 · 3227939 · 3227939
1 parent 5cf68fc
commit 3227939
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 16 deletions.
diff --git a/apps/app/src/components/Checkbox/Checkbox.tsx b/apps/app/src/components/Checkbox/Checkbox.tsx
@@ -9,14 +9,16 @@ type CheckboxProps = {
 } & Omit<React.HTMLProps<HTMLInputElement>, 'onChange'>;
 export const Checkbox = ({ name, checked, label, onChange }: CheckboxProps) => {
   return (
-    <div className={c.checkbox}>
-      <input
-        type='checkbox'
-        checked={checked}
-        name={name}
-        onChange={onChange}
-      />
-      <label>{label}</label>
-    </div>
+    <>
+      <div className={c.checkbox}>
+        <input
+          type='checkbox'
+          checked={checked}
+          name={name}
+          onChange={onChange}
+        />
+        <label>{label}</label>
+      </div>
+    </>
   );
 };
diff --git a/apps/app/src/components/ProgressBar/ProgressBar.tsx b/apps/app/src/components/ProgressBar/ProgressBar.tsx
@@ -17,7 +17,7 @@ export const ProgressBar = ({
   const handleStepClick = (clickedStep: number) => {
     const isGoingBackwards = clickedStep <= currentStep;
     const isGoingForward = clickedStep === currentStep + 1;
-    console.log(isStepValid(currentStep));
+
     if (isGoingBackwards) {
       setCurrentStep(clickedStep);
     } else if (isGoingForward && isStepValid(currentStep)) {

diff --git a/.../src/components/RegistrationForms/FirstStepRegistrationForm/FirstStepRegistrationForm.tsx b/.../src/components/RegistrationForms/FirstStepRegistrationForm/FirstStepRegistrationForm.tsx
@@ -70,8 +70,22 @@ export const FirstStepRegistrationForm = ({
     }
   };
 
+  const allFieldsAreFilled = () => {
+    if (
+      (userData.firstName != '' &&
+        userData.lastName !== '' &&
+        userData.email !== '',
+      userData.password !== '',
+      userData.repeatedPassword !== '')
+    ) {
+      return true;
+    }
+
+    return false;
+  };
+
   useEffect(() => {
-    if (isSubmitted) {
+    if (isSubmitted || allFieldsAreFilled()) {
       validateFirstStep();
     }
   }, [isSubmitted, userData]);
@@ -124,15 +138,15 @@ export const FirstStepRegistrationForm = ({
           checked={userData.newsletterEnabled}
           name={UserDataFields.NewsletterEnabled}
           onChange={handleCheckboxChange}
-          error={errors[1]?.termsAndConditionsEnabled}
+          error={errors[1]?.newsletterEnabled}
           key={1}
         />
         <Checkbox
           label='Želim primati novosti o tvrtkama i otvorenim radnim pozicijama.'
           checked={userData.companiesNewsEnabled}
           name={UserDataFields.CompaniesNewsEnabled}
           onChange={handleCheckboxChange}
-          error={errors[1]?.termsAndConditionsEnabled}
+          error={errors[1]?.companiesNewsEnabled}
           key={2}
         />
         <Checkbox

diff --git a/.../app/src/components/RegistrationForms/GeneralRegistrationForm/GeneralRegistrationForm.tsx b/.../app/src/components/RegistrationForms/GeneralRegistrationForm/GeneralRegistrationForm.tsx
@@ -41,6 +41,7 @@ export const GeneralRegistrationForm = () => {
   };
 
   const { isStepValid } = useRegistration();
+
   const handleRegistrationClick = () => {
     switch (currentStep) {
       case 1:
@@ -62,7 +63,6 @@ export const GeneralRegistrationForm = () => {
       let nextStep = currentStep + 1;
       setCurrentStep(nextStep);
     }
-    console.log('currentStep: ', currentStep);
   };
 
   return (

diff --git a/...onents/RegistrationForms/SecondStepRegistrationForm/SecondStepRegistrationForm.module.tsx b/...onents/RegistrationForms/SecondStepRegistrationForm/SecondStepRegistrationForm.module.tsx
@@ -77,8 +77,20 @@ export const SecondStepRegistrationForm = ({
     }
   };
 
+  const allFieldsAreFilled = () => {
+    if (
+      userData.phoneNumber !== '' &&
+      userData.birthYear !== null &&
+      userData.educationDegree !== null &&
+      userData.occupation !== null
+    ) {
+      return true;
+    }
+    return false;
+  };
+
   useEffect(() => {
-    if (isSubmitted) {
+    if (isSubmitted || allFieldsAreFilled()) {
       validateSecondStep();
     }
   }, [isSubmitted, userData]);

diff --git a/apps/app/src/providers/RegistrationContext.tsx b/apps/app/src/providers/RegistrationContext.tsx
@@ -19,7 +19,6 @@ export const RegistrationProvider = ({ children }: { children: ReactNode }) => {
   const [errors, setErrors] = useState<Record<number, RegistrationFormErrors>>(
     {},
   );
-  console.log(errors);
 
   const setStepErrors = (
     step: number,