Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NIFI-12972 - Only show selected relationships in read-only connection details #8582

Merged
merged 2 commits into from
Apr 3, 2024
Merged

NIFI-12972 - Only show selected relationships in read-only connection details #8582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef4b909
NIFI-12972 - Only show selected relationships in read-only connection…
pvillard31 Mar 29, 2024
b9d5ff5
review
pvillard31 Apr 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions ...fi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/connection-details.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
pvillard31 marked this conversation as resolved.
Show resolved Hide resolved
Selected relationships
</div>
<div class="setting-field">
<div id="read-only-relationship-names"></div>
Expand Down Expand Up @@ -161,4 +160,4 @@
</div>
</div>
</div>
</div>
</div>
25 changes: 6 additions & 19 deletions ...bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-connection-details.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
};

Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -580,4 +567,4 @@
}).fail(nfErrorHandler.handleAjaxError);
}
};
}));
}));
Loading