From 97346491a947684a66f540ffd6d924ba066661a1 Mon Sep 17 00:00:00 2001 From: Ashish Gupta Date: Mon, 30 Sep 2024 16:39:28 +0530 Subject: [PATCH] fix description, glossary and relatedTerm escape char issue --- .../resources/ui/src/utils/CSV/CSV.utils.tsx | 2 -- .../ui/src/utils/CSV/CSVUtilsClassBase.tsx | 24 ++++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/CSV/CSV.utils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/CSV/CSV.utils.tsx index 26b1212b943..28d4d1bc9f8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/CSV/CSV.utils.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/CSV/CSV.utils.tsx @@ -144,8 +144,6 @@ export const getCSVStringFromColumnsAndDataSource = ( value.includes(',') || value.includes('\n') || colName.includes('tags') || - colName.includes('glossaryTerms') || - colName.includes('relatedTerms') || colName.includes('domain') ) { return isEmpty(value) ? '' : `"${value}"`; diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/CSV/CSVUtilsClassBase.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/CSV/CSVUtilsClassBase.tsx index 669c43692da..f79facd626f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/utils/CSV/CSVUtilsClassBase.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/utils/CSV/CSVUtilsClassBase.tsx @@ -37,7 +37,14 @@ class CSVUtilsClassBase { } public columnsWithMultipleValuesEscapeNeeded() { - return ['parent', 'extension', 'synonyms']; + return [ + 'parent', + 'extension', + 'synonyms', + 'description', + 'glossaryTerms', + 'relatedTerms', + ]; } public getEditor( @@ -151,16 +158,10 @@ class CSVUtilsClassBase { ) => { if (Array.isArray(option)) { props.onChange( - option - .map((tag) => - toString(tag.value)?.replace(new RegExp('"', 'g'), '""') - ) - .join(';') + option.map((tag) => toString(tag.value)).join(';') ); } else { - props.onChange( - toString(option.value)?.replace(new RegExp('"', 'g'), '""') - ); + props.onChange(toString(option.value)); } }; @@ -280,8 +281,9 @@ class CSVUtilsClassBase { popoverProps={{ open: true, }} - onUpdate={handleChange} - /> + onUpdate={handleChange}> + {' '} + ); }; case 'extension':