Skip to content

Hot-Fix: MCQ Asterisk Character Breaks Message Rendering #1041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
1AhmedYasser wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Hot-Fix: MCQ Asterisk Character Breaks Message Rendering #1041

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 17 additions & 19 deletions GUI/src/services/service-builder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,29 +708,28 @@ function replaceSpacesOutsideTags(input: string, placeholder: string): string {
return result;
}

function handleTextField(
finishedFlow: Map<any, any>,
parentStepName: string,
parentNode: Node,
childNode: Node<NodeDataProps> | undefined,
) {
function toMarkdownMessage(raw: string): string {
const spacePlaceholder = '___SPACE___';
const rawMessage = typeof parentNode.data.message === 'string' ? decodeHtmlEntities(parentNode.data.message) : '';
const rawMessageWithSpaceholders = replaceSpacesOutsideTags(
rawMessage.replaceAll('{{', '${').replaceAll('}}', '}'),
const withPlaceholders = replaceSpacesOutsideTags(
decodeHtmlEntities(raw).replaceAll('{{', '${').replaceAll('}}', '}'),
spacePlaceholder,
);
const markdownMessage = htmlToMarkdown
.translate(rawMessageWithSpaceholders)
const markdown = htmlToMarkdown
.translate(withPlaceholders)
.replaceAll(spacePlaceholder, ' ')
.replaceAll(/\\([-~>[\]_*#().!`=<\\])/g, String.raw`\\$1`);

let finalMessage = markdownMessage;
const trimmedMessage = markdownMessage.trim().toLowerCase();
const trimmed = markdown.trim().toLowerCase();
return trimmed === 'yes' || trimmed === 'no' ? `\${"${trimmed}"}` : markdown;
}

if (trimmedMessage === 'yes' || trimmedMessage === 'no') {
finalMessage = `\${"${trimmedMessage}"}`;
}
function handleTextField(
finishedFlow: Map<any, any>,
parentStepName: string,
parentNode: Node,
childNode: Node<NodeDataProps> | undefined,
) {
const finalMessage = toMarkdownMessage(typeof parentNode.data.message === 'string' ? parentNode.data.message : '');

finishedFlow.set(parentStepName, {
assign: {
Expand Down Expand Up @@ -884,14 +883,13 @@ function handleMultiChoiceQuestion(
b.payload = b.payload.replace(/\/[^/]*_mcq_/, `/${rootServiceName}_mcq_`);
});

const rawQuestion = decodeHtmlEntities(parentNode?.data?.multiChoiceQuestion?.question ?? '');
const markdownQuestion = htmlToMarkdown.translate(rawQuestion);
const finalQuestion = toMarkdownMessage(parentNode?.data?.multiChoiceQuestion?.question ?? '');

return finishedFlow.set(parentStepName, {
assign: {
buttons: parentNode?.data?.multiChoiceQuestion?.buttons ?? [],
res: {
result: markdownQuestion,
result: finalQuestion,
},
},
next: childNode ? toSnakeCase(childNode.data.label ?? 'format_messages') : 'format_messages',
Expand Down
Loading