fix: validation UI (formbricks#3137)

Co-authored-by: Dhruwang <[email protected]>
Racks-Labs · Sep 12, 2024 · 1e2fe7b · 1e2fe7b
1 parent 426a0a3
commit 1e2fe7b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/...editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/SurveyMenuBar.tsx b/...editor)/environments/[environmentId]/surveys/[surveyId]/edit/components/SurveyMenuBar.tsx
@@ -179,7 +179,9 @@ export const SurveyMenuBar = ({
             (invalidLanguage: string) => getLanguageLabel(invalidLanguage) ?? invalidLanguage
           );
 
-          toast.error(`${currentError.message} ${invalidLanguageLabels.join(", ")}`);
+          const messageSplit = currentError.message.split("-fLang-")[0];
+
+          toast.error(`${messageSplit} ${invalidLanguageLabels.join(", ")}`);
         } else {
           toast.error(currentError.message);
         }

diff --git a/packages/types/surveys/validation.ts b/packages/types/surveys/validation.ts
@@ -86,10 +86,14 @@ export const validateQuestionLabels = (
   const messageField = FIELD_TO_LABEL_MAP[field] ? FIELD_TO_LABEL_MAP[field] : field;
   const messageSuffix = isDefaultOnly ? " is missing" : " is missing for the following languages: ";
 
+  const message = isDefaultOnly
+    ? `${messagePrefix}${messageField} in question ${String(questionIndex + 1)}${messageSuffix}`
+    : `${messagePrefix}${messageField} in question ${String(questionIndex + 1)}${messageSuffix} -fLang- ${invalidLanguageCodes.join()}`;
+
   if (invalidLanguageCodes.length) {
     return {
       code: z.ZodIssueCode.custom,
-      message: `${messagePrefix}${messageField} in question ${String(questionIndex + 1)}${messageSuffix} ${invalidLanguageCodes.join()}`,
+      message,
       path: ["questions", questionIndex, field],
       params: isDefaultOnly ? undefined : { invalidLanguageCodes },
     };
@@ -134,10 +138,14 @@ export const validateCardFieldsForAllLanguages = (
   const messageField = FIELD_TO_LABEL_MAP[field] ? FIELD_TO_LABEL_MAP[field] : field;
   const messageSuffix = isDefaultOnly ? " is missing" : " is missing for the following languages: ";
 
+  const message = isDefaultOnly
+    ? `${messagePrefix}${messageField} on the ${cardTypeLabel}${messageSuffix}`
+    : `${messagePrefix}${messageField} on the ${cardTypeLabel}${messageSuffix} -fLang- ${invalidLanguageCodes.join()}`;
+
   if (invalidLanguageCodes.length) {
     return {
       code: z.ZodIssueCode.custom,
-      message: `${messagePrefix}${messageField} on the ${cardTypeLabel} ${messageSuffix} ${invalidLanguageCodes.join()}`,
+      message,
       path,
       params: isDefaultOnly ? undefined : { invalidLanguageCodes },
     };