Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-4436: 

- Minor tweak to when the max height for the options list is calculated per PR comments.
- Resolving logic issue in two phase commit when updating variable registry.
- Fixing variable visibility.
This commit is contained in:
Matt Gilman 2018-01-03 20:57:37 -05:00 committed by Bryan Bende
parent f702f808a7
commit fa996cd418
No known key found for this signature in database
GPG Key ID: A0DDA9ED50711C39
4 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java
View File

@ -620,7 +620,7 @@ public class ProcessGroupResource extends ApplicationResource {
final VariableRegistryDTO requestRegistryDto = requestVariableRegistryEntity.getVariableRegistry();
if (!groupId.equals(requestRegistryDto.getProcessGroupId())) {
throw new IllegalArgumentException(String.format("The process group id (%s) in the request body does "
+ "not equal the process group id of the requested resource (%s).", registryDto.getProcessGroupId(), groupId));
+ "not equal the process group id of the requested resource (%s).", requestRegistryDto.getProcessGroupId(), groupId));
}
if (isReplicateRequest()) {

12
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/VersionsResource.java
View File

@ -1590,12 +1590,12 @@ public class VersionsResource extends ApplicationResource {
private static class InitiateChangeFlowVersionRequestWrapper extends Entity {
final VersionControlInformationEntity versionControlInformationEntity;
final ComponentLifecycle componentLifecycle;
final URI exampleUri;
final Set<AffectedComponentEntity> affectedComponents;
final boolean replicateRequest;
final VersionedFlowSnapshot flowSnapshot;
private final VersionControlInformationEntity versionControlInformationEntity;
private final ComponentLifecycle componentLifecycle;
private final URI exampleUri;
private final Set<AffectedComponentEntity> affectedComponents;
private final boolean replicateRequest;
private final VersionedFlowSnapshot flowSnapshot;
public InitiateChangeFlowVersionRequestWrapper(final VersionControlInformationEntity versionControlInformationEntity, final ComponentLifecycle componentLifecycle,
final URI exampleUri, final Set<AffectedComponentEntity> affectedComponents, final boolean replicateRequest,

4
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js
View File

@ -176,6 +176,10 @@
if (maxHeight > 0) {
comboOptions.css('max-height', maxHeight + 'px');
}
} else {
var windowHeight = $(window).height();
maxHeight = windowHeight - (position.top + Math.round(combo.outerHeight())) - 32;
comboOptions.css('max-height', maxHeight + 'px');
}
// create the list that will contain the options

18
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-flow-version.js
View File

@ -214,14 +214,8 @@
});
}
// determine the max registry height
var windowHeight = $(window).height();
var registryOffset = $('#import-flow-version-registry-combo').offset();
var registryMaxHeight = windowHeight - registryOffset.top - 64;
// load the registries
registryCombo.combo({
maxHeight: registryMaxHeight,
options: registries,
select: function (selectedOption) {
selectRegistry(dialog, selectedOption, bucketCombo, flowCombo, selectBucket, bucketCheck)
@ -296,14 +290,8 @@
}
}
// determine the max bucket height
var windowHeight = $(window).height();
var bucketOffset = $('#import-flow-version-bucket-combo').offset();
var bucketMaxHeight = windowHeight - bucketOffset.top - 64;
// load the buckets
bucketCombo.combo('destroy').combo({
maxHeight: bucketMaxHeight,
options: buckets,
select: selectBucket
});
@ -902,14 +890,8 @@
});
}
// determine the max flow height
var windowHeight = $(window).height();
var flowOffset = $('#import-flow-version-name-combo').offset();
var flowMaxHeight = windowHeight - flowOffset.top - 64;
// load the buckets
$('#import-flow-version-name-combo').combo('destroy').combo({
maxHeight: flowMaxHeight,
options: versionedFlows,
select: function (selectedFlow) {
if (nfCommon.isDefinedAndNotNull(selectedFlow.value)) {