NIFI-13374: (#8938)

- Fixing handling of description in tooltip. This closes #8938
apache · Jun 7, 2024 · 1ea0bc1 · 1ea0bc1
1 parent 8fc9473
commit 1ea0bc1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/...i-web/nifi-web-ui/src/main/webapp/js/nf/canvas/header/components/nf-ng-group-component.js b/...i-web/nifi-web-ui/src/main/webapp/js/nf/canvas/header/components/nf-ng-group-component.js
@@ -161,7 +161,7 @@
                             var option = {
                                 text: parameterContext.component.name,
                                 value: parameterContext.id,
-                                description: parameterContext.component.description
+                                description: nfCommon.escapeHtml(parameterContext.component.description)
                             };
 
                             if (nfCommon.isDefinedAndNotNull(parentParameterContext) && parentParameterContext.id === parameterContext.id) {

diff --git a/...ework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js b/...ework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js
@@ -391,7 +391,7 @@
                     option = {
                         'text': parameterContext.component.name,
                         'value': parameterContext.id,
-                        'description': parameterContext.component.description
+                        'description': nfCommon.escapeHtml(parameterContext.component.description)
                     };
                 } else {
                     option = {
@@ -439,7 +439,7 @@
                                         var option = {
                                             'text': parameterContextEntity.component.name,
                                             'value': parameterContextEntity.component.id,
-                                            'description': parameterContextEntity.component.description
+                                            'description': nfCommon.escapeHtml(parameterContextEntity.component.description)
                                         };
                                         options.push(option);
 

diff --git a/...rk-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js b/...rk-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
@@ -2679,7 +2679,7 @@
                 regTypeOptions.push({
                     text: nfCommon.substringAfterLast(type.type, '.') + ' (' + type.bundle.version + ')',
                     value: type.type,
-                    description: type.description || ''
+                    description: nfCommon.escapeHtml(type.description) || ''
                 });
             });