mirror/formbricks-formbricks
1
0
Fork 0
mirror of https://github.com/formbricks/formbricks.git synced 2026-01-06 05:40:02 -06:00
Code Issues Packages Projects Releases 100 Wiki Activity

fix: fixes sonar issues and fixes error messages (#6905)

Browse Source
This commit is contained in:
Anshuman Pandey
2025-11-28 17:26:18 +05:30
committed by GitHub
parent 4e3dcae02d
commit f654ba6f83
6 changed files with 71 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
apps/web/app/lib/api/survey-transformation.ts
View File

@@ -439,6 +439,33 @@ const transformBlockLogicToQuestionLogic = (
});
};
const applyBlockAttributesToElement = (
element: Record<string, unknown>,
block: TSurveyBlock,
blockIdToQuestionId: Map<string, string>,
endingIds: Set<string>
): void => {
if (element.type === "cta" && element.ctaButtonLabel) {
element.buttonLabel = element.ctaButtonLabel;
}
if (Array.isArray(block.logic) && block.logic.length > 0) {
element.logic = transformBlockLogicToQuestionLogic(block.logic, blockIdToQuestionId, endingIds);
}
if (block.logicFallback) {
element.logicFallback = reverseLogicFallback(block.logicFallback, blockIdToQuestionId, endingIds);
}
if (block.buttonLabel) {
element.buttonLabel = block.buttonLabel;
}
if (block.backButtonLabel) {
element.backButtonLabel = block.backButtonLabel;
}
};
export const transformBlocksToQuestions = (
blocks: TSurveyBlock[],
endings: TSurveyEnding[] = []
@@ -459,27 +486,9 @@ export const transformBlocksToQuestions = (
for (const block of blocks) {
if (block.elements.length === 0) continue;
const element = { ...block.elements[0] } as Record<string, unknown>;
const element = { ...block.elements[0] };
if (element.type === "cta" && element.ctaButtonLabel) {
element.buttonLabel = element.ctaButtonLabel;
}
if (Array.isArray(block.logic) && block.logic.length > 0) {
element.logic = transformBlockLogicToQuestionLogic(block.logic, blockIdToQuestionId, endingIds);
}
if (block.logicFallback) {
element.logicFallback = reverseLogicFallback(block.logicFallback, blockIdToQuestionId, endingIds);
}
if (block.buttonLabel) {
element.buttonLabel = block.buttonLabel;
}
if (block.backButtonLabel) {
element.backButtonLabel = block.backButtonLabel;
}
applyBlockAttributesToElement(element, block, blockIdToQuestionId, endingIds);
questions.push(element);
}

7
apps/web/modules/survey/components/element-form-input/components/recall-item-select.tsx
View File

@@ -141,16 +141,19 @@ export const RecallItemSelect = ({
const getRecallItemIcon = (recallItem: TSurveyRecallItem) => {
switch (recallItem.type) {
case "element":
case "element": {
const element = elements.find((element) => element.id === recallItem.id);
if (element) {
return elementIconMapping[element?.type as keyof typeof elementIconMapping];
}
return null;
}
case "hiddenField":
return EyeOffIcon;
case "variable":
case "variable": {
const variable = localSurvey.variables.find((variable) => variable.id === recallItem.id);
return variable?.type === "number" ? FileDigitIcon : FileTextIcon;
}
default:
return null;
}

2
packages/surveys/src/components/general/element-conditional.tsx
View File

@@ -123,8 +123,8 @@ export function ElementConditional({
return null;
}
// NOSONAR - This is readable enough and can't be changed
const renderElement = () => {
// NOSONAR - This is readable enough and can't be changed
switch (element.type) {
case TSurveyElementTypeEnum.OpenText:
return (

28
packages/types/surveys/blocks.ts
View File

@@ -61,7 +61,20 @@ export type TSurveyBlockLogicActionObjective = "calculate" | "requireAnswer" | "
export const ZActionRequireAnswer = z.object({
id: ZId,
objective: z.literal("requireAnswer"),
target: ZSurveyElementId,
target: z
.string()
.min(1, "Conditional Logic: Target question id cannot be empty")
.superRefine((id, ctx) => {
const idParsed = ZSurveyElementId.safeParse(id);
if (!idParsed.success) {
ctx.addIssue({
code: z.ZodIssueCode.custom,
// This is not possible from the UI hence we can use the term "element" instead of "question"
message: "Conditional Logic: Target element id is not a valid element id",
path: ["target"],
});
}
}),
});
export type TActionRequireAnswer = z.infer<typeof ZActionRequireAnswer>;
@@ -71,7 +84,18 @@ export type TActionRequireAnswer = z.infer<typeof ZActionRequireAnswer>;
export const ZActionJumpToBlock = z.object({
id: ZId,
objective: z.literal("jumpToBlock"),
target: ZSurveyBlockId, // Must be a valid CUID
target: z
.string()
.min(1, "Conditional Logic: Target block id cannot be empty")
.superRefine((id, ctx) => {
const idParsed = ZSurveyBlockId.safeParse(id);
if (!idParsed.success) {
ctx.addIssue({
code: z.ZodIssueCode.custom,
message: "Conditional Logic: Target block id is not a valid block id",
});
}
}),
});
export type TActionJumpToBlock = z.infer<typeof ZActionJumpToBlock>;

6
packages/types/surveys/elements-validation.ts
View File

@@ -61,7 +61,7 @@ export const validateElementLabels = (
) {
return {
code: z.ZodIssueCode.custom,
message: `The ${field} in element ${String(elementIndex + 1)} of block ${String(blockIndex + 1)} is not present for the following languages: ${language.language.code}`,
message: `The ${field} in question ${String(elementIndex + 1)} of block ${String(blockIndex + 1)} is not present for the following languages: ${language.language.code}`,
path: ["blocks", blockIndex, "elements", elementIndex, field],
};
}
@@ -75,8 +75,8 @@ export const validateElementLabels = (
const messageSuffix = isDefaultOnly ? " is missing" : " is missing for the following languages: ";
const message = isDefaultOnly
? `${messagePrefix}${messageField} in element ${String(elementIndex + 1)} of block ${String(blockIndex + 1)}${messageSuffix}`
: `${messagePrefix}${messageField} in element ${String(elementIndex + 1)} of block ${String(blockIndex + 1)}${messageSuffix} -fLang- ${invalidLanguageCodes.join()}`;
? `${messagePrefix}${messageField} in question ${String(elementIndex + 1)} of block ${String(blockIndex + 1)}${messageSuffix}`
: `${messagePrefix}${messageField} in question ${String(elementIndex + 1)} of block ${String(blockIndex + 1)}${messageSuffix} -fLang- ${invalidLanguageCodes.join()}`;
if (invalidLanguageCodes.length) {
return {

14
packages/types/surveys/types.ts
View File

@@ -1606,7 +1606,7 @@ export const ZSurvey = z
ctx.addIssue({
code: z.ZodIssueCode.custom,
message: `Element ${String(elementIndex + 1)} in block ${String(blockIndex + 1)} has duplicate row labels ${isDefaultOnly ? "" : "for the following languages:"}`,
message: `Question ${String(elementIndex + 1)} in block ${String(blockIndex + 1)} has duplicate row labels ${isDefaultOnly ? "" : "for the following languages:"}`,
path: ["blocks", blockIndex, "elements", elementIndex, "rows"],
params: isDefaultOnly ? undefined : { invalidLanguageCodes },
});
@@ -1624,7 +1624,7 @@ export const ZSurvey = z
ctx.addIssue({
code: z.ZodIssueCode.custom,
message: `Element ${String(elementIndex + 1)} in block ${String(blockIndex + 1)} has duplicate column labels ${isDefaultOnly ? "" : "for the following languages:"}`,
message: `Question ${String(elementIndex + 1)} in block ${String(blockIndex + 1)} has duplicate column labels ${isDefaultOnly ? "" : "for the following languages:"}`,
path: ["blocks", blockIndex, "elements", elementIndex, "columns"],
params: isDefaultOnly ? undefined : { invalidLanguageCodes },
});
@@ -1635,7 +1635,7 @@ export const ZSurvey = z
if (element.allowedFileExtensions && element.allowedFileExtensions.length === 0) {
ctx.addIssue({
code: z.ZodIssueCode.custom,
message: `Element ${String(elementIndex + 1)} in block ${String(blockIndex + 1)} must have atleast one allowed file extension`,
message: `Question ${String(elementIndex + 1)} in block ${String(blockIndex + 1)} must have atleast one allowed file extension`,
path: ["blocks", blockIndex, "elements", elementIndex, "allowedFileExtensions"],
});
}
@@ -1647,7 +1647,7 @@ export const ZSurvey = z
if (!hostnameRegex.test(element.calHost)) {
ctx.addIssue({
code: z.ZodIssueCode.custom,
message: `Element ${String(elementIndex + 1)} in block ${String(blockIndex + 1)} must have a valid host name`,
message: `Question ${String(elementIndex + 1)} in block ${String(blockIndex + 1)} must have a valid host name`,
path: ["blocks", blockIndex, "elements", elementIndex, "calHost"],
});
}
@@ -1667,7 +1667,7 @@ export const ZSurvey = z
if (fields.every((field) => !field.show)) {
ctx.addIssue({
code: z.ZodIssueCode.custom,
message: `At least one field must be shown in the Contact Info element ${String(elementIndex + 1)} in block ${String(blockIndex + 1)}`,
message: `At least one field must be shown in the Contact Info question ${String(elementIndex + 1)} in block ${String(blockIndex + 1)}`,
path: ["blocks", blockIndex, "elements", elementIndex],
});
}
@@ -1709,7 +1709,7 @@ export const ZSurvey = z
if (fields.every((field) => !field.show)) {
ctx.addIssue({
code: z.ZodIssueCode.custom,
message: `At least one field must be shown in the Address element ${String(elementIndex + 1)} in block ${String(blockIndex + 1)}`,
message: `At least one field must be shown in the Address question ${String(elementIndex + 1)} in block ${String(blockIndex + 1)}`,
path: ["blocks", blockIndex, "elements", elementIndex],
});
}
@@ -3103,7 +3103,7 @@ const validateBlockConditions = (
if (!elementInfo) {
issues.push({
code: z.ZodIssueCode.custom,
message: `Conditional Logic: Element ID ${elementId} does not exist in logic no: ${String(logicIndex + 1)} of block ${String(blockIndex + 1)}`,
message: `Conditional Logic: Element Id ${elementId} does not exist in logic no: ${String(logicIndex + 1)} of block ${String(blockIndex + 1)}`,
path: ["blocks", blockIndex, "logic", logicIndex, "conditions"],
});
return;