fix: onboarding validation error showing translation key #586 (#593)

* fix: onboarding validation error showing translation key #586

* fix: remove debug log for profile update errors

apps/dashboard/src/lib/utils/functions/validator.ts

@@ -2,141 +2,40 @@ import z from 'zod';
 import { get } from 'svelte/store';
 import isNumber from 'lodash/isNumber';
 import { validateEmail } from './validateEmail';
-import { t as _t, initialized } from '$lib/utils/functions/translations';
+import { t, initialized } from '$lib/utils/functions/translations';
 
-const t = {
-  get: (key: string) => {
-    const isInitialized = get(initialized);
-    if (!isInitialized) return key;
-
-    return _t.get(key);
-  }
-};
-
-const getOrgNameValidation = () =>
-  z
+function getOrgNameValidation() {
+  return z
     .string()
     .min(5, { message: `${t.get('validations.organization_name.min_char')}` })
     .refine((val) => !/^[-]|[-]$/.test(val), {
       message: `${t.get('validations.organization_name.hyphen_rule')}`
     });
+}
 
-const getSiteNameValidation = () =>
-  z
+function getSiteNameValidation() {
+  return z
     .string()
     .min(5, { message: `${t.get('validations.site_name.min_char')}` })
     .refine((val) => !/^[-]|[-]$/.test(val), {
       message: `${t.get('validations.site_name.hyphen_rule')}`
     });
-
-const getNewsfeedValidation = () =>
-  z.string().min(5, { message: `${t.get('validations.news_feed.min_char')}` });
-
-const lessonSchema = z.object({
-  title: z.string().nonempty({ message: `${t.get('validations.lesson_schema.empty_title')}` }),
-  lesson_at: z.string().optional(),
-  call_url: z.string().nullable().optional(),
-  is_unlocked: z.boolean().optional()
-});
-
-const createQuizValidationSchema = z.object({
-  title: z.string().min(6, {
-    message: `${t.get('validations.course_payment.full_name.min_char')}`
-  })
-});
-
-const askCommunityValidationSchema = z.object({
-  title: z.string().min(6, {
-    message: `${t.get('validations.ask_community.title.min_char')}`
-  }),
-  body: z.string().min(20, {
-    message: `${t.get('validations.ask_community.body.min_char')}`
-  }),
-  courseId: z.string().min(36, {
-    message: `${t.get('validations.ask_community.course_id.select_course')}`
-  })
-});
-const commentInCommunityValidationSchema = z.object({
-  comment: z.string().min(6, {
-    message: `${t.get('validations.comment_in_community.min_char')}`
-  })
-});
-
-const orgLandingpageValidationSchema = z.object({
-  name: z.string().min(6, {
-    message: `${t.get('validations.org_landing_page.name.min_char')}`
-  }),
-  email: z.string().email({
-    message: `${t.get('validations.org_landing_page.email.invalid_email')}`
-  }),
-  phone: z.string().min(6, {
-    message: `${t.get('validations.org_landing_page.phone.min_char')}`
-  }),
-  message: z.string().min(20, {
-    message: `${t.get('validations.org_landing_page.message.min_char')}`
-  })
-});
-
-const forgotValidationSchema = z.object({
-  email: z.string().email({
-    message: `${t.get('validations.forgot.invalid_email')}`
-  })
-});
-
-const authValidationSchema = z.object({
-  email: z.string().email({
-    message: 'validations.auth.email.invalid_email'
-  }),
-  password: z.string().min(6, {
-    message: 'validations.auth.password.min_char'
-  })
-});
-
-const resetValidationSchema = z.object({
-  password: z.string().min(6, {
-    message: `${t.get('validations.reset.password.min_char')}`
-  })
-});
-
-const onboardingValidationSchema = {
-  stepOne: z.object({
-    fullname: z
-      .string()
-      .min(5, { message: `${t.get('validations.onboarding.step_one.full_name.min_char')}` }),
-    orgName: getOrgNameValidation(),
-    siteName: getSiteNameValidation()
-  }),
-  stepTwo: z.object({
-    goal: z
-      .string({
-        required_error: `${t.get('validations.onboarding.step_two.goal.required')}`
-      })
-      .min(1),
-    source: z
-      .string({
-        required_error: `${t.get('validations.onboarding.step_two.source.required')}`
-      })
-      .min(1)
-  })
-};
-
-const saveCertificateSchema = z.object({
-  description: z.string().max(200, 'course.navItem.certificates.description_error'),
-  is_certificate_downloadable: z.boolean(),
-  certificate_theme: z.string()
-});
+}
+function getNewsfeedValidation() {
+  return z.string().min(5, { message: `${t.get('validations.news_feed.min_char')}` });
+}
 
 export const saveCertificateValidation = (fields = {}) => {
-  const { error } = saveCertificateSchema.safeParse(fields);
+  const schema = z.object({
+    description: z.string().max(200, 'course.navItem.certificates.description_error'),
+    is_certificate_downloadable: z.boolean(),
+    certificate_theme: z.string()
+  });
+
+  const { error } = schema.safeParse(fields);
   return processErrors(error);
 };
 
-const updateProfileValidationSchema = z.object({
-  email: z.string().email({ message: 'validations.user_profile.email' }),
-  username: z.string().nonempty({ message: 'validations.user_profile.username' }),
-  fullname: z.string().min(5, { message: 'validations.user_profile.fullname' })
-});
-
 export const getConfirmPasswordError = ({ password, confirmPassword }) => {
   return password > 6 && confirmPassword > 6 && password !== confirmPassword
     ? `${t.get('validations.confirm_password.not_match')}`
@@ -173,12 +72,30 @@ export const processErrors = (error, mapToId?: boolean) => {
 };
 
 export const authValidation = (fields = {}) => {
-  const { error } = authValidationSchema.safeParse(fields);
+  const schema = z.object({
+    email: z.string().email({
+      message: 'validations.auth.email.invalid_email'
+    }),
+    password: z.string().min(6, {
+      message: 'validations.auth.password.min_char'
+    })
+  });
+
+  const { error } = schema.safeParse(fields);
+
   return processErrors(error);
 };
 
 export const lessonValidation = (lesson = {}) => {
-  const { error } = lessonSchema.safeParse(lesson);
+  const schema = z.object({
+    title: z.string().nonempty({ message: `${t.get('validations.lesson_schema.empty_title')}` }),
+    lesson_at: z.string().optional(),
+    call_url: z.string().nullable().optional(),
+    is_unlocked: z.boolean().optional()
+  });
+
+  const { error } = schema.safeParse(lesson);
+
   return processErrors(error);
 };
 
@@ -197,24 +114,70 @@ export const coursePaymentValidation = (fields = {}) => {
 };
 
 export const resetValidation = (fields = {}) => {
-  const { error } = resetValidationSchema.safeParse(fields);
+  const schema = z.object({
+    password: z.string().min(6, {
+      message: `${t.get('validations.reset.password.min_char')}`
+    })
+  });
+  const { error } = schema.safeParse(fields);
 
   return processErrors(error);
 };
 
 export const forgotValidation = (fields = {}) => {
-  const { error } = forgotValidationSchema.safeParse(fields);
+  const schema = z.object({
+    email: z.string().email({
+      message: `${t.get('validations.forgot.invalid_email')}`
+    })
+  });
+  const { error } = schema.safeParse(fields);
 
   return processErrors(error);
 };
 
 export const orgLandingpageValidation = (fields = {}) => {
-  const { error } = orgLandingpageValidationSchema.safeParse(fields);
+  const schema = z.object({
+    name: z.string().min(6, {
+      message: `${t.get('validations.org_landing_page.name.min_char')}`
+    }),
+    email: z.string().email({
+      message: `${t.get('validations.org_landing_page.email.invalid_email')}`
+    }),
+    phone: z.string().min(6, {
+      message: `${t.get('validations.org_landing_page.phone.min_char')}`
+    }),
+    message: z.string().min(20, {
+      message: `${t.get('validations.org_landing_page.message.min_char')}`
+    })
+  });
+  const { error } = schema.safeParse(fields);
 
   return processErrors(error);
 };
 
 export const onboardingValidation = (fields = {}, step) => {
+  const onboardingValidationSchema = {
+    stepOne: z.object({
+      fullname: z
+        .string()
+        .min(5, { message: `${t.get('validations.onboarding.step_one.full_name.min_char')}` }),
+      orgName: getOrgNameValidation(),
+      siteName: getSiteNameValidation()
+    }),
+    stepTwo: z.object({
+      goal: z
+        .string({
+          required_error: `${t.get('validations.onboarding.step_two.goal.required')}`
+        })
+        .min(1),
+      source: z
+        .string({
+          required_error: `${t.get('validations.onboarding.step_two.source.required')}`
+        })
+        .min(1)
+    })
+  };
+
   const schema =
     step === 1 ? onboardingValidationSchema.stepOne : onboardingValidationSchema.stepTwo;
   const { error } = schema.safeParse(fields);
@@ -223,7 +186,11 @@ export const onboardingValidation = (fields = {}, step) => {
 };
 
 export const updateProfileValidation = (fields = {}) => {
-  const schema = updateProfileValidationSchema;
+  const schema = z.object({
+    email: z.string().email({ message: 'validations.user_profile.email' }),
+    username: z.string().nonempty({ message: 'validations.user_profile.username' }),
+    fullname: z.string().min(5, { message: 'validations.user_profile.fullname' })
+  });
   const { error } = schema.safeParse(fields);
 
   return processErrors(error);
@@ -297,19 +264,42 @@ export const updateProfileEmailValidation = (email) => {
 };
 
 export const createQuizValidation = (fields = {}) => {
-  const { error } = createQuizValidationSchema.safeParse(fields);
+  const schema = z.object({
+    title: z.string().min(6, {
+      message: `${t.get('validations.course_payment.full_name.min_char')}`
+    })
+  });
+
+  const { error } = schema.safeParse(fields);
 
   return processErrors(error);
 };
 
 export const askCommunityValidation = (fields = {}) => {
-  const { error } = askCommunityValidationSchema.safeParse(fields);
+  const schema = z.object({
+    title: z.string().min(6, {
+      message: `${t.get('validations.ask_community.title.min_char')}`
+    }),
+    body: z.string().min(20, {
+      message: `${t.get('validations.ask_community.body.min_char')}`
+    }),
+    courseId: z.string().min(36, {
+      message: `${t.get('validations.ask_community.course_id.select_course')}`
+    })
+  });
+
+  const { error } = schema.safeParse(fields);
 
   return processErrors(error);
 };
 
 export const commentInCommunityValidation = (fields = {}) => {
-  const { error } = commentInCommunityValidationSchema.safeParse(fields);
+  const schema = z.object({
+    comment: z.string().min(6, {
+      message: `${t.get('validations.comment_in_community.min_char')}`
+    })
+  });
+  const { error } = schema.safeParse(fields);
 
   return processErrors(error);
 };