fix: table columns with names of ' or "" or `` could not be dropped (#18506)

ThanasisMpalatsoukas · web-flow · commit 8e3615eca86e · 2023-06-25T16:53:07.000-03:00
* fix: table columns with names of ' or "" or `` could not be dropped Unsafe javascript string was passed to the currColumnName var. By using escapeJsString from /modules/functions/escape.ts the unsafe string becomes a safe string and the rest of the code runs as expected. fixes issue #18448 Signed-off-by: Thanasis Mpalatsoukas <thanasismpalatsoukas@gmail.com> * fix: added an extra space below and added a signoff additionally Signed-off-by: Thanasis Mpalatsoukas <thanasismpalatsoukas@gmail.com> --------- Signed-off-by: Thanasis Mpalatsoukas <thanasismpalatsoukas@gmail.com>
diff --git a/js/src/table/structure.ts b/js/src/table/structure.ts
@@ -7,7 +7,7 @@ import highlightSql from '../modules/sql-highlight.ts';
 import { ajaxRemoveMessage, ajaxShowMessage } from '../modules/ajax-message.ts';
 import { Indexes } from '../modules/indexes.ts';
 import getJsConfirmCommonParam from '../modules/functions/getJsConfirmCommonParam.ts';
-import { escapeHtml } from '../modules/functions/escape.ts';
+import { escapeHtml, escapeJsString } from '../modules/functions/escape.ts';
 import refreshMainContent from '../modules/functions/refreshMainContent.ts';
 
 /**
@@ -191,7 +191,8 @@ AJAX.registerOnload('table/structure.js', function () {
          * @var currColumnName    String containing name of the field referred to by {@link curr_row}
          */
         var currColumnName = $currRow.children('th').children('label').text().trim();
-        currColumnName = escapeHtml(currColumnName);
+        currColumnName = escapeJsString(escapeHtml(currColumnName));
+
         /**
          * @var $afterFieldItem    Corresponding entry in the 'After' field.
          */
