From 58e827337de5fafc5477bdad25305f082deeec9f Mon Sep 17 00:00:00 2001 From: leonidastri Date: Mon, 3 Feb 2025 20:14:58 +0100 Subject: [PATCH] fix: import group-name --- .../static/group_manager/js/group_manager.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/group_manager/static/group_manager/js/group_manager.js b/group_manager/static/group_manager/js/group_manager.js index e8ea3d23..9d41c3c9 100644 --- a/group_manager/static/group_manager/js/group_manager.js +++ b/group_manager/static/group_manager/js/group_manager.js @@ -317,13 +317,14 @@ function readCsvFile (e) { table += '' newResult.forEach(function myFunction (groupDef, i) { + const sanitizedGroupname = groupDef.groupname.replace(/[^a-zA-Z0-9-_]/g, '-') const safeRowData = csvRowsCorrected[i].replace(/"/g, '"') - table += '' - table += '' + table += '' + table += '' presentationColumns.forEach(function myFunction (column) { table += '' + groupDef[column] + '' }) - table += '' + table += '' table += '' }) @@ -419,8 +420,8 @@ async function processImportedRow (row) { } else { // Row processing encountered problems => inform user and add appropriate classes. row.addClass('import-groupname-done') - - $('#processed-indicator-' + groupname).html('') + const sanitizedGroupname = groupname.replace(/[^a-zA-Z0-9-_]/g, '-') + $('#processed-indicator-' + sanitizedGroupname).html('') row.addClass('table-danger') let errorHtml = '' // collect error messages and maken 1 string to present to user. @@ -431,12 +432,14 @@ async function processImportedRow (row) { } else { errorHtml = 'An unknown error occurred.' } - $('#import-' + groupname).html(errorHtml) + $('#import-' + sanitizedGroupname).html(errorHtml) } } else { row.addClass('table-danger') - $('#processed-indicator-' + groupname).html('') - $('#import-' + groupname).html('An unexpected error occurred.') + // replace special characters + const sanitizedGroupname = groupname.replace(/[^a-zA-Z0-9-_]/g, '-') + $('#processed-indicator-' + sanitizedGroupname).html('') + $('#import-' + sanitizedGroupname).html('An unexpected error occurred.') } // if all is complete reload the left pane with data and setup click capability to open newly added groups in the groupmananger