This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new 1ea0bc1f7f NIFI-13374: (#8938)
1ea0bc1f7f is described below
commit 1ea0bc1f7fa90ecff0ceb8b0c91a9aebeb05893b
Author: Matt Gilman <[email protected]>
AuthorDate: Fri Jun 7 15:19:35 2024 -0400
NIFI-13374: (#8938)
- Fixing handling of description in tooltip.
This closes #8938
---
.../webapp/js/nf/canvas/header/components/nf-ng-group-component.js | 2 +-
.../src/main/webapp/js/nf/canvas/nf-process-group-configuration.js | 4 ++--
.../nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/header/components/nf-ng-group-component.js
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/header/components/nf-ng-group-component.js
index 42d90c6c48..0dfb63b755 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/header/components/nf-ng-group-component.js
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-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/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js
index 5b17ad689b..e9fa26a8ac 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/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/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
index fda056e78c..ce30f5cdc8 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
+++
b/nifi-nar-bundles/nifi-framework-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) || ''
});
});
