Cherry pick qna fix for escaped new lines in prompt display text (#1310)

* Escape new lines in prompt display text (#1308)

* support escape char in qna prompt (#1309)

Co-authored-by: Shuai Wang <[email protected]>

Author: munozemilio

packages/lu/src/parser/lufile/LUFileParser.g4

@@ -230,7 +230,7 @@ promptSection
     ;
 
 filterLine
-    : WS* DASH (WS|TEXT)* newline
+    : WS* DASH (WS|TEXT|ESCAPE_CHARACTER)* newline
     ;
 
 errorFilterLine

packages/lu/src/parser/lufile/generated/LUFileParser.interp

@@ -48,7 +48,7 @@ const qnaToLuContent = function(qnaJSON){
         if (qnaItem.context && qnaItem.context.prompts && qnaItem.context.prompts.length !== 0) {
             fileContent += NEWLINE + '**Prompts:**' + NEWLINE;
             qnaItem.context.prompts.forEach(function(prompt) {
-                fileContent += `- [${prompt.displayText}](#${prompt.qnaId})`;
+                fileContent += `- [${prompt.displayText.replace(/\n/g, "\\n")}](#${prompt.qnaId})`;
                 // See if the linked prompt is context only and if so, add the decoration.
                 let promptQnA = root.find(item => item.id == prompt.qnaId);
                 if (promptQnA) {

packages/lu/src/parser/lufile/generated/LUFileParser.js

@@ -0,0 +1,59 @@
+const QnA = require('./../../../src/parser/qna/qnamaker/qnaConverter')
+var chai = require('chai').expect;
+
+describe('QnAMakerConverter', function() {
+    it('New lines are escaped properly in prompt display text', async () => {
+        const qnajson = {
+            "qnaDocuments": [
+                {
+                    "id": 1,
+                    "answer": "**Setting Up Sync Folders**\n\nYou decide which folders to synchronise to your computer from your web browser via [https://lion.app.box.com](https://lion.app.box.com/)",
+                    "source": "https://some.url",
+                    "questions": [
+                        "Using Box Sync"
+                    ],
+                    "metadata": [
+                        {
+                            "name": "category1",
+                            "value": "it"
+                        },
+                        {
+                            "name": "category2",
+                            "value": "collaborations"
+                        },
+                        {
+                            "name": "category3",
+                            "value": "lion box"
+                        }
+                    ],
+                    "alternateQuestionClusters": [],
+                    "context": {
+                        "isContextOnly": false,
+                        "prompts": [
+                            {
+                                "displayOrder": 1,
+                                "qnaId": 782,
+                                "displayText": "What \n Should You Sync"
+                            },
+                            {
+                                "displayOrder": 2,
+                                "qnaId": 783,
+                                "displayText": "Files that Cannot Sync\n"
+                            },
+                            {
+                                "displayOrder": 3,
+                                "qnaId": 784,
+                                "displayText": "Box Sync Status"
+                            }
+                        ]
+                    },
+                    "lastUpdatedTimestamp": "2021-09-17T08:28:19.46+00:00",
+                    "isDocumentText": false,
+                    "extractionConfidence": -1
+                }
+            ]
+        }
+        const markdown = QnA(qnajson)
+        chai(markdown).to.contain("Files that Cannot Sync\\n");
+    });
+});

packages/lu/src/parser/qna/qnamaker/qnaConverter.js

@@ -41,7 +41,7 @@ describe('QnAMakerBuilder', function() {
         \`\`\`
         
         **Prompts:**
-        - [hi greeting](#hi)`;
+        - [hi greeting\\n](#hi)`;
 
         let qnaContent3 =
         `# ? hi