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

[NIFI-2227] fix race condition for showing the view button on the flow file details dialog 

[NIFI-2109] update check boxes
[NIFI-2226] reset controller services properties table size on dialog open
This closes #653
This commit is contained in:
Scott Aslan 2016-07-14 11:57:22 -04:00 committed by Matt Gilman
parent 2540573d77
commit 02784b5fca
4 changed files with 60 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/inputCheckbox.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 389 B

After

Width:  |  Height:  |  Size: 322 B

1
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-global-menu-controller.js
View File

@ -284,6 +284,7 @@ nf.ng.Canvas.GlobalMenuCtrl = function (serviceProvider) {
// store the content viewer url if available
if (!nf.Common.isBlank(aboutDetails.contentViewerUrl)) {
$('#nifi-content-viewer-url').text(aboutDetails.contentViewerUrl);
nf.QueueListing.initFlowFileDetailsDialog();
}
}).fail(nf.Common.handleAjaxError);

4
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js
View File

@ -1837,6 +1837,8 @@ nf.ControllerService = (function () {
// show the border if necessary
updateReferencingComponentsBorder(referenceContainer);
$('#controller-service-properties').propertytable('resetTableSize');
}).fail(nf.Common.handleAjaxError);
},
@ -1952,6 +1954,8 @@ nf.ControllerService = (function () {
// show the border if necessary
updateReferencingComponentsBorder(referenceContainer);
$('#controller-service-properties').propertytable('resetTableSize');
});
},

111
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-queue-listing.js
View File

@ -166,61 +166,6 @@ nf.QueueListing = (function () {
});
};
/**
* Initializes the flowfile details dialog.
*/
var initFlowFileDetailsDialog = function () {
$('#content-download').on('click', downloadContent);
// only show if content viewer is configured
if (nf.Common.isContentViewConfigured()) {
$('#content-view').show();
$('#content-view').on('click', viewContent);
}
$('#flowfile-details-tabs').tabbs({
tabStyle: 'tab',
selectedTabStyle: 'selected-tab',
scrollableTabContentStyle: 'scrollable',
tabs: [{
name: 'Details',
tabContentId: 'flowfile-details-tab-content'
}, {
name: 'Attributes',
tabContentId: 'flowfile-attributes-tab-content'
}]
});
$('#flowfile-details-dialog').modal({
scrollableContentStyle: 'scrollable',
headerText: 'FlowFile',
buttons: [{
buttonText: 'Ok',
color: {
base: '#728E9B',
hover: '#004849',
text: '#ffffff'
},
handler: {
click: function () {
$('#flowfile-details-dialog').modal('hide');
}
}
}],
handler: {
close: function () {
// clear the details
$('#flowfile-attributes-container').empty();
$('#flowfile-cluster-node-id').text('');
$('#additional-flowfile-details').empty();
},
open: function () {
nf.Common.toggleScrollable($('#' + this.find('.tab-container').attr('id') + '-content').get(0));
}
}
});
};
/**
* Performs a listing on the specified connection.
*
@ -497,7 +442,6 @@ nf.QueueListing = (function () {
return {
init: function () {
initializeListingRequestStatusDialog();
initFlowFileDetailsDialog();
// define mouse over event for the refresh button
$('#queue-listing-refresh-button').click(function () {
@ -685,6 +629,61 @@ nf.QueueListing = (function () {
$('#displayed-flowfiles').text('0');
},
/**
* Initializes the flowfile details dialog.
*/
initFlowFileDetailsDialog: function () {
$('#content-download').on('click', downloadContent);
// only show if content viewer is configured
if (nf.Common.isContentViewConfigured()) {
$('#content-view').show();
$('#content-view').on('click', viewContent);
}
$('#flowfile-details-tabs').tabbs({
tabStyle: 'tab',
selectedTabStyle: 'selected-tab',
scrollableTabContentStyle: 'scrollable',
tabs: [{
name: 'Details',
tabContentId: 'flowfile-details-tab-content'
}, {
name: 'Attributes',
tabContentId: 'flowfile-attributes-tab-content'
}]
});
$('#flowfile-details-dialog').modal({
scrollableContentStyle: 'scrollable',
headerText: 'FlowFile',
buttons: [{
buttonText: 'Ok',
color: {
base: '#728E9B',
hover: '#004849',
text: '#ffffff'
},
handler: {
click: function () {
$('#flowfile-details-dialog').modal('hide');
}
}
}],
handler: {
close: function () {
// clear the details
$('#flowfile-attributes-container').empty();
$('#flowfile-cluster-node-id').text('');
$('#additional-flowfile-details').empty();
},
open: function () {
nf.Common.toggleScrollable($('#' + this.find('.tab-container').attr('id') + '-content').get(0));
}
}
});
},
/**
* Update the size of the grid based on its container's current size.
*/