From da3f867c9babceef28e5d299302d7b13ceb0abfe Mon Sep 17 00:00:00 2001
From: Johannes Doberer <johannes.doberer@sap.com>
Date: Fri, 21 Jan 2022 11:34:24 +0100
Subject: [PATCH] Escaping helpers improvment and config fix of e2e app (#2483)

---
 .../src/utilities/helpers/escaping-helpers.js | 14 ++++----
 .../helpers/escaping-helpers.spec.js          | 33 +++++++++----------
 .../luigi-config/extended/projectDetailNav.js |  8 ++++-
 3 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/core/src/utilities/helpers/escaping-helpers.js b/core/src/utilities/helpers/escaping-helpers.js
index 7b56fb2931..fd84bc3351 100644
--- a/core/src/utilities/helpers/escaping-helpers.js
+++ b/core/src/utilities/helpers/escaping-helpers.js
@@ -1,6 +1,6 @@
 // Helper methods that deal with character escaping.
 class EscapingHelpersClass {
-  sanitizeHtml(text) {
+  sanitizeHtml(text = '') {
     return text
       .replace(/&/g, '&amp;')
       .replace(/</g, '&lt;')
@@ -10,7 +10,7 @@ class EscapingHelpersClass {
       .replace(/javascript:/g, '');
   }
 
-  restoreSanitizedBrs(text) {
+  restoreSanitizedBrs(text = '') {
     return text
       .replace(/&lt;br\/&gt;/g, '<br>')
       .replace(/&lt;br \/&gt;/g, '<br>')
@@ -18,7 +18,7 @@ class EscapingHelpersClass {
       .replace(/&lt;br &gt;/g, '<br>');
   }
 
-  restoreSanitizedElements(text) {
+  restoreSanitizedElements(text = '') {
     let result = text;
     const elements = ['i', 'b', 'br', 'mark', 'strong', 'em', 'small', 'del', 'ins', 'sub', 'sup'];
 
@@ -47,11 +47,11 @@ class EscapingHelpersClass {
     return result;
   }
 
-  sanatizeHtmlExceptTextFormatting(text) {
+  sanatizeHtmlExceptTextFormatting(text = '') {
     return this.restoreSanitizedElements(this.sanitizeHtml(text));
   }
 
-  sanitizeParam(param) {
+  sanitizeParam(param = '') {
     return String(param)
       .replace(/</g, '&lt;')
       .replace(/>/g, '&gt;')
@@ -60,11 +60,11 @@ class EscapingHelpersClass {
       .replace(/\//g, '&sol;');
   }
 
-  escapeKeyForRegexp(str) {
+  escapeKeyForRegexp(str = '') {
     return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\\$&');
   }
 
-  processTextAndLinks(text, links, uniqueID) {
+  processTextAndLinks(text = '', links, uniqueID) {
     let sanitizedText = this.restoreSanitizedBrs(this.sanitizeHtml(text));
     let initialValue = { sanitizedText, links: [] };
 
diff --git a/core/test/utilities/helpers/escaping-helpers.spec.js b/core/test/utilities/helpers/escaping-helpers.spec.js
index f12b71cec9..b47be56c3a 100644
--- a/core/test/utilities/helpers/escaping-helpers.spec.js
+++ b/core/test/utilities/helpers/escaping-helpers.spec.js
@@ -14,37 +14,48 @@ describe('Escaping-helpers', () => {
       sanitizedHtml2,
       'This is text &lt;img src=&quot;http://url.to.file.which/not.exist&quot; onerror=alert(document.cookie); onclick=alert(document.cookie)&gt;&lt;br&gt;&lt;IMG SRC=j&amp;#X41vascript:alert(&#39;test2&#39;)&gt;&lt;br&gt;'
     );
+    const sanitizedHtml3 = EscapingHelpers.sanitizeHtml();
+    assert.equal(sanitizedHtml3, '');
   });
 
   it('restoreSanitizedBrs', () => {
     const text = '&lt;br&gt; &lt;br &gt; &lt;br /&gt; &lt;br/&gt;';
     const restoredHtml = EscapingHelpers.restoreSanitizedBrs(text);
     assert.equal(restoredHtml, '<br> <br> <br> <br>');
+    const restoredHtml2 = EscapingHelpers.restoreSanitizedBrs();
+    assert.equal(restoredHtml2, '');
   });
 
   it('restoreSanitizedElements', () => {
-    const text =
-      '&lt;br&gt; &lt;b &gt; &lt;del /&gt; &lt;i/&gt; &lt;strong&gt;';
+    const text = '&lt;br&gt; &lt;b &gt; &lt;del /&gt; &lt;i/&gt; &lt;strong&gt;';
     const restoredHtml = EscapingHelpers.restoreSanitizedElements(text);
     assert.equal(restoredHtml, '<br> <b> <del> <i> <strong>');
+    const restoredHtml2 = EscapingHelpers.restoreSanitizedElements();
+    assert.equal(restoredHtml2, '');
   });
 
   it('sanatizeHtmlExceptTextFormatting', () => {
     const text = '<br> <b> <del> <i> <strong> <script>';
     const restoredHtml = EscapingHelpers.sanatizeHtmlExceptTextFormatting(text);
     assert.equal(restoredHtml, '<br> <b> <del> <i> <strong> &lt;script&gt;');
+    const restoredHtml2 = EscapingHelpers.sanatizeHtmlExceptTextFormatting();
+    assert.equal(restoredHtml2, '');
   });
 
   it('sanitizeParam', () => {
     const param = '<>"\'/';
     const sanitizedParam = EscapingHelpers.sanitizeParam(param);
     assert.equal(sanitizedParam, '&lt;&gt;&quot;&#39;&sol;');
+    const sanitizedParam2 = EscapingHelpers.sanitizeParam();
+    assert.equal(sanitizedParam2, '');
   });
 
   it('escapeKeyForRegexp', () => {
     const key = 'some/*/thing';
     const escapedRegexp = EscapingHelpers.escapeKeyForRegexp(key);
     assert.equal(escapedRegexp, 'some\\/\\*\\/thing');
+    const escapedRegexp2 = EscapingHelpers.escapeKeyForRegexp();
+    assert.equal(escapedRegexp2, '');
   });
 
   describe('processTextAndLinks', () => {
@@ -79,11 +90,7 @@ describe('Escaping-helpers', () => {
         links: []
       };
 
-      assert.deepEqual(
-        escapedTextAndLinks,
-        expectedResult,
-        'excaped text object with empty link array'
-      );
+      assert.deepEqual(escapedTextAndLinks, expectedResult, 'excaped text object with empty link array');
     });
 
     it('with links', () => {
@@ -102,11 +109,7 @@ describe('Escaping-helpers', () => {
       const uniqueID = 1234567890;
 
       // when
-      const escapedTextAndLinks = EscapingHelpers.processTextAndLinks(
-        text,
-        links,
-        uniqueID
-      );
+      const escapedTextAndLinks = EscapingHelpers.processTextAndLinks(text, links, uniqueID);
 
       // then
       const expectedResult = {
@@ -126,11 +129,7 @@ describe('Escaping-helpers', () => {
         ]
       };
 
-      assert.deepEqual(
-        escapedTextAndLinks,
-        expectedResult,
-        'excaped text and links object'
-      );
+      assert.deepEqual(escapedTextAndLinks, expectedResult, 'excaped text and links object');
     });
   });
 });
diff --git a/test/e2e-test-application/src/luigi-config/extended/projectDetailNav.js b/test/e2e-test-application/src/luigi-config/extended/projectDetailNav.js
index 028def8775..d50b87974a 100644
--- a/test/e2e-test-application/src/luigi-config/extended/projectDetailNav.js
+++ b/test/e2e-test-application/src/luigi-config/extended/projectDetailNav.js
@@ -216,7 +216,13 @@ export const projectDetailNavStructure = projectId => [
         viewUrl: '/sampleapp.html#/on-node-activation/conditionally-navigated',
         openNodeInModal: true,
         onNodeActivation: () => {
-          return Luigi.showConfirmationModal({}).then(() => true, () => false);
+          const settings = {
+            header: 'Confirmation',
+            body: 'Are you sure you want to do this?',
+            buttonConfirm: 'Yes',
+            buttonDismiss: 'No'
+          };
+          return Luigi.showConfirmationModal(settings).then(() => true, () => false);
         }
       }
     ]