This is an automated email from the ASF dual-hosted git repository.
mcgilman pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 644d086ff2 NIFI-12972 - Only show selected relationships in read-only
connection details (#8582)
644d086ff2 is described below
commit 644d086ff2d8d98bb8c31e714e1a254493f9daf3
Author: Pierre Villard <pierre.villard...@gmail.com>
AuthorDate: Thu Apr 4 01:50:17 2024 +0300
NIFI-12972 - Only show selected relationships in read-only connection
details (#8582)
* NIFI-12972 - Only show selected relationships in read-only connection
details
* review
This closes #8582
---
.../webapp/WEB-INF/partials/connection-details.jsp | 5 ++---
.../src/main/webapp/js/nf/nf-connection-details.js | 25 ++++++----------------
2 files changed, 8 insertions(+), 22 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/connection-details.jsp
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/connection-details.jsp
index e02f8a2413..f32ecdb763 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/connection-details.jsp
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/connection-details.jsp
@@ -38,8 +38,7 @@
</div>
<div id="read-only-relationship-names-container"
class="setting">
<div class="setting-name">
- Relationships
- <div class="fa fa-question-circle" alt="Info"
title="Selected relationships are in bold."></div>
+ Selected relationships
</div>
<div class="setting-field">
<div id="read-only-relationship-names"></div>
@@ -161,4 +160,4 @@
</div>
</div>
</div>
-</div>
\ No newline at end of file
+</div>
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-connection-details.js
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-connection-details.js
index 05db5db53b..8a0fd32f15 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-connection-details.js
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-connection-details.js
@@ -370,7 +370,7 @@
* @argument {string} name The relationship name
*/
var createRelationshipOption = function (name) {
- $('<div class="available-relationship-container"></div>').append(
+ return $('<div
class="available-relationship-container"></div>').append(
$('<div
class="relationship-name"></div>').text(name)).appendTo('#read-only-relationship-names');
};
@@ -496,30 +496,17 @@
var availableRelationships =
connection.availableRelationships;
var selectedRelationships =
connection.selectedRelationships;
- // show the available relationship if applicable
+ // show the selected relationships if applicable
if
(nfCommon.isDefinedAndNotNull(availableRelationships) ||
nfCommon.isDefinedAndNotNull(selectedRelationships)) {
- // populate the available connections
- $.each(availableRelationships, function (i, name) {
- createRelationshipOption(name);
- });
-
- // ensure all selected relationships are present
- // (may be undefined) and selected
+ // populate the selected connections
$.each(selectedRelationships, function (i, name) {
// mark undefined relationships accordingly
if ($.inArray(name, availableRelationships)
=== -1) {
var option =
createRelationshipOption(name);
$(option).children('div.relationship-name').addClass('undefined');
+ } else {
+ createRelationshipOption(name);
}
-
- // ensure all selected relationships are bold
- var relationships =
$('#read-only-relationship-names').children('div');
-
$.each(relationships.children('div.relationship-name'), function (i,
relationshipNameElement) {
- var relationshipName =
$(relationshipNameElement);
- if (relationshipName.text() === name) {
- relationshipName.css('font-weight',
'bold');
- }
- });
});
$('#selected-relationship-text').show();
@@ -580,4 +567,4 @@
}).fail(nfErrorHandler.handleAjaxError);
}
};
-}));
\ No newline at end of file
+}));
