diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
index c401e4b440..f1d087c979 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
@@ -741,6 +741,7 @@
${staging.dir}/css/settings.css
${staging.dir}/css/about.css
${staging.dir}/css/status-history.css
+ ${staging.dir}/css/flow-analysis-drawer.css
@@ -780,6 +781,7 @@
${staging.dir}/css/processor-details.css
${staging.dir}/css/connection-details.css
${staging.dir}/css/status-history.css
+ ${staging.dir}/css/flow-analysis-drawer.css
${staging.dir}/css/summary.css
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/summary.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/summary.properties
index a45a07a430..9f3cc38b0d 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/summary.properties
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/summary.properties
@@ -43,4 +43,5 @@ nf.summary.style.tags=
+
');
+ var violationListItemWrapperEl = $('
');
+ var violationRuleEl = $('
');
+ var violationListItemNameEl = $('
');
+ var violationListItemIdEl = $('
');
+ var warningListItemWrapperEl = $('
');
+ var warningRuleEl = $('
');
+ var warningListItemNameEl = $('
');
+ var warningListItemIdEl = $('' + violations.length + ' ' + ruleType + '
';
+ } else {
+ violationCountEl = '' + violations.length + ' ' + ruleType + 's
';
+ }
+ violationsListEl = $('');
+ violations.forEach(function(violation) {
+ // create DOM elements
+ var violationListItemEl = $('
');
+ var violationNameEl = $('
');
+ var violationIdEl = $('
';
+ var requirementName = $('
').text(rule.name);
+ var requirementInfoButton = '';
+ recommendations.push(
+ {
+ 'requirement': $(requirement).append(requirementName),
+ 'requirementInfoButton': $(requirementInfoButton).data('ruleInfo', rule),
+ 'id': rule.id
+ }
+ )
+ recommendationsTotal++;
+ }
+ });
+
+ // add class to notification icon for recommended rules
+ var hasRecommendations = response.ruleViolations.findIndex(function(violation) {
+ return violation.enforcementPolicy === 'WARN';
+ });
+ if (hasRecommendations !== -1) {
+ $('#flow-analysis .flow-analysis-notification-icon ').addClass('recommendations');
+ } else {
+ $('#flow-analysis .flow-analysis-notification-icon ').removeClass('recommendations');
+ }
+
+ // build list of requirements
+ recommendedRuleCountEl.empty().append('(' + recommendationsTotal + ')');
+ recommendations.forEach(function(rec) {
+ flowAnalysisCtrl.buildRuleList('recommendation', violationsMap, rec);
+ });
+
+ response.rules.forEach(function(rule) {
+ if (rule.enforcementPolicy === 'ENFORCE') {
+ var requirement = '
';
+ var requirementName = $('
').text(rule.name);
+ var requirementInfoButton = '';
+ requirements.push(
+ {
+ 'requirement': $(requirement).append(requirementName),
+ 'requirementInfoButton': $(requirementInfoButton).data('ruleInfo', rule),
+ 'id': rule.id
+ }
+ )
+ requirementsTotal++;
+ }
+ });
+
+ // add class to notification icon for required rules
+ var hasViolations = response.ruleViolations.findIndex(function(violation) {
+ return violation.enforcementPolicy === 'ENFORCE';
+ })
+ if (hasViolations !== -1) {
+ $('#flow-analysis .flow-analysis-notification-icon ').addClass('violations');
+ } else {
+ $('#flow-analysis .flow-analysis-notification-icon ').removeClass('violations');
+ }
+
+ requiredRuleCountEl.empty().append('(' + requirementsTotal + ')');
+
+ // build violations
+ requirements.forEach(function(rec) {
+ flowAnalysisCtrl.buildRuleList('violation', violationsMap, rec);
+ });
+
+ $('#required-rules').accordion('refresh');
+ $('#recommended-rules').accordion('refresh');
+ // report the updated status
+ previousRulesResponse = response;
+
+ // setup rule menu handling
+ flowAnalysisCtrl.setRuleMenuHandling();
+
+ // setup violation menu handling
+ flowAnalysisCtrl.setViolationMenuHandling(response.rules);
+ }
+ }).fail(nfErrorHandler.handleAjaxError);
+ }
+ },
+
+ /**
+ * Set event bindings for rule menus
+ */
+ setRuleMenuHandling: function() {
+ $('.rule-menu-btn').click(function(event) {
+ // stop event from immediately bubbling up to document and triggering closeRuleWindow
+ event.stopPropagation();
+ // unbind previously bound rule data that may still exist
+ unbindRuleMenuHandling();
+
+ var ruleInfo = $(this).data('ruleInfo');
+ $('#violation-menu').hide();
+ $('#rule-menu').show();
+ $('#rule-menu').position({
+ my: "left top",
+ at: "left top",
+ of: event
+ });
+
+ // rule menu bindings
+ if (nfCommon.canAccessController()) {
+ $('#rule-menu-edit-rule').removeClass('disabled');
+ $('#rule-menu-edit-rule .rule-menu-option-icon').removeClass('disabled');
+ $('#rule-menu-edit-rule').on('click', openRuleDetailsDialog);
+ } else {
+ $('#rule-menu-edit-rule').addClass('disabled');
+ $('#rule-menu-edit-rule .rule-menu-option-icon').addClass('disabled');
+ }
+ $('#rule-menu-view-documentation').on('click', viewRuleDocumentation);
+ $(document).on('click', closeRuleWindow);
+
+ function viewRuleDocumentation(e) {
+ nfShell.showPage('../nifi-docs/documentation?' + $.param({
+ select: ruleInfo.type,
+ group: ruleInfo.bundle.group,
+ artifact: ruleInfo.bundle.artifact,
+ version: ruleInfo.bundle.version
+ })).done(function () {});
+ $("#rule-menu").hide();
+ unbindRuleMenuHandling();
+ }
+
+ function closeRuleWindow(e) {
+ if ($(e.target).parents("#rule-menu").length === 0) {
+ $("#rule-menu").hide();
+ unbindRuleMenuHandling();
+ }
+ }
+
+ function openRuleDetailsDialog() {
+ $('#rule-menu').hide();
+ nfSettings.showSettings().done(function() {
+ nfSettings.selectFlowAnalysisRule(ruleInfo.id);
+ });
+ unbindRuleMenuHandling();
+ }
+
+ function unbindRuleMenuHandling() {
+ $('#rule-menu-edit-rule').off("click");
+ $('#rule-menu-view-documentation').off("click");
+ $(document).unbind('click', closeRuleWindow);
+ }
+
+ });
+ },
+
+ /**
+ * Set event bindings for violation menus
+ */
+ setViolationMenuHandling: function(rules) {
+ $('.violation-menu-btn').click(function(event) {
+ // stop event from immediately bubbling up to document and triggering closeViolationWindow
+ event.stopPropagation();
+ var violationInfo = $(this).data('violationInfo');
+ $('#rule-menu').hide();
+ $('#violation-menu').show();
+ $('#violation-menu').position({
+ my: "left top",
+ at: "left top",
+ of: event
+ });
+
+ // violation menu bindings
+ if (violationInfo.subjectPermissionDto.canRead) {
+ $('#violation-menu-more-info').removeClass('disabled');
+ $('#violation-menu-more-info .violation-menu-option-icon').removeClass('disabled');
+ $('#violation-menu-more-info').on( "click", openRuleViolationMoreInfoDialog);
+ } else {
+ $('#violation-menu-more-info').addClass('disabled');
+ $('#violation-menu-more-info .violation-menu-option-icon').addClass('disabled');
+ }
+
+ if (violationInfo.subjectComponentType === 'PROCESSOR' && violationInfo.subjectPermissionDto.canRead) {
+ $('#violation-menu-go-to').removeClass('hidden');
+ $('#violation-menu-go-to').on('click', goToComponent);
+ } else {
+ $('#violation-menu-go-to').addClass('hidden');
+ }
+ $(document).on('click', closeViolationWindow);
+
+ function closeViolationWindow(e) {
+ if ($(e.target).parents("#violation-menu").length === 0) {
+ $("#violation-menu").hide();
+ unbindViolationMenuHandling();
+ }
+ }
+
+ function openRuleViolationMoreInfoDialog() {
+ var rule = rules.find(function(rule){
+ return rule.id === violationInfo.ruleId;
+ });
+ $('#violation-menu').hide();
+ $('#violation-type-pill').empty()
+ .removeClass()
+ .addClass(violationInfo.enforcementPolicy.toLowerCase() + ' violation-type-pill')
+ .append(violationInfo.enforcementPolicy);
+ $('#violation-description').empty().append(violationInfo.violationMessage);
+ $('#violation-menu-more-info-dialog').modal( "show" );
+ $('.violation-docs-link').click(function () {
+ // open the documentation for this flow analysis rule
+ nfShell.showPage('../nifi-docs/documentation?' + $.param({
+ select: rule.type,
+ group: rule.bundle.group,
+ artifact: rule.bundle.artifact,
+ version: rule.bundle.version
+ })).done(function () {});
+ });
+ unbindViolationMenuHandling();
+ }
+
+ function goToComponent() {
+ $('#violation-menu').hide();
+ nfCanvasUtils.showComponent(violationInfo.groupId, violationInfo.subjectId);
+ unbindViolationMenuHandling();
+ }
+
+ function unbindViolationMenuHandling() {
+ $('#violation-menu-more-info').off("click");
+ $('#violation-menu-go-to').off("click");
+ $(document).unbind('click', closeViolationWindow);
+ }
+ });
+ },
+
+ /**
+ * Initialize the flow analysis controller.
+ */
+ init: function () {
+ var flowAnalysisCtrl = this;
+ var drawer = $('#flow-analysis-drawer');
+ var requiredRulesEl = $('#required-rules');
+ var recommendedRulesEl = $('#recommended-rules');
+ var flowAnalysisRefreshIntervalSeconds = nfCommon.getAutoRefreshInterval();
+
+ $('#flow-analysis').click(function () {
+ $(this).toggleClass('opened');
+ drawer.toggleClass('opened');
+ });
+ requiredRulesEl.accordion({
+ collapsible: true,
+ active: false,
+ icons: {
+ "header": "fa fa-chevron-down",
+ "activeHeader": "fa fa-chevron-up"
+ }
+ });
+
+ recommendedRulesEl.accordion({
+ collapsible: true,
+ active: false,
+ icons: {
+ "header": "fa fa-chevron-down",
+ "activeHeader": "fa fa-chevron-up"
+ }
+ });
+ $('#rule-menu').hide();
+ $('#violation-menu').hide();
+ $('#rule-menu-more-info-dialog').modal({
+ scrollableContentStyle: 'scrollable',
+ headerText: 'Rule Information',
+ buttons: [{
+ buttonText: 'OK',
+ color: {
+ base: '#728E9B',
+ hover: '#004849',
+ text: '#ffffff'
+ },
+ handler: {
+ click: function () {
+ $(this).modal('hide');
+ }
+ }
+ }],
+ handler: {
+ close: function () {}
+ }
+ });
+ $('#violation-menu-more-info-dialog').modal({
+ scrollableContentStyle: 'scrollable',
+ headerText: 'Violation Information',
+ buttons: [{
+ buttonText: 'OK',
+ color: {
+ base: '#728E9B',
+ hover: '#004849',
+ text: '#ffffff'
+ },
+ handler: {
+ click: function () {
+ $(this).modal('hide');
+ }
+ }
+ }],
+ handler: {
+ close: function () {}
+ }
+ });
+
+ this.loadFlowPolicies();
+ setInterval(this.loadFlowPolicies.bind(this), flowAnalysisRefreshIntervalSeconds * 1000);
+
+ this.toggleOnlyViolations(false);
+ this.toggleOnlyWarnings(false);
+ // handle show only violations checkbox
+ $('#show-only-violations').on('change', function(event) {
+ var isChecked = $(this).hasClass('checkbox-checked');
+ flowAnalysisCtrl.toggleOnlyViolations(isChecked);
+ });
+
+ $('#show-only-warnings').on('change', function(event) {
+ var isChecked = $(this).hasClass('checkbox-checked');
+ flowAnalysisCtrl.toggleOnlyWarnings(isChecked);
+ });
+ },
+
+ /**
+ * Show/hide violations menu
+ */
+ toggleOnlyViolations: function(isViolationsChecked) {
+ var requiredRulesEl = $('#required-rules');
+ var recommendedRulesEl = $('#recommended-rules');
+ var ruleViolationsEl = $('#rule-violations');
+
+ var isWarningsChecked = $('#show-only-warnings').hasClass(
+ 'checkbox-checked'
+ );
+
+ isViolationsChecked
+ ? ruleViolationsEl.show()
+ : ruleViolationsEl.hide();
+ if (isViolationsChecked || isWarningsChecked) {
+ requiredRulesEl.hide();
+ recommendedRulesEl.hide();
+ } else {
+ requiredRulesEl.show();
+ recommendedRulesEl.show();
+ }
+ this.loadFlowPolicies();
+ },
+
+ /**
+ * Show/hide warnings menu
+ */
+ toggleOnlyWarnings: function (isWarningsChecked) {
+ var requiredRulesEl = $('#required-rules');
+ var recommendedRulesEl = $('#recommended-rules');
+ var ruleWarningsEl = $('#rule-warnings');
+ var isViolationsChecked = $('#show-only-violations').hasClass(
+ 'checkbox-checked'
+ );
+
+ isWarningsChecked
+ ? ruleWarningsEl.show()
+ : ruleWarningsEl.hide();
+ if (isWarningsChecked || isViolationsChecked) {
+ requiredRulesEl.hide();
+ recommendedRulesEl.hide();
+ } else {
+ requiredRulesEl.show();
+ recommendedRulesEl.show();
+ }
+ this.loadFlowPolicies();
+ },
+ }
+
/**
* The bulletins controller.
*/
@@ -468,6 +1029,7 @@
*/
init: function () {
this.search.init();
+ this.flowAnalysis.init();
},
/**
@@ -684,6 +1246,14 @@
*/
updateBulletins: function (response) {
this.bulletins.update(response);
+ },
+
+ /**
+ * Reloads flow analysis rules
+ *
+ */
+ reloadFlowPolicies: function () {
+ this.flowAnalysis.loadFlowPolicies();
}
}
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
index 458f6d84f0..f8f6b99298 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
@@ -1223,6 +1223,7 @@
*/
reload: function () {
nfCanvasUtils.reload();
+ nfNgBridge.injector.get('flowStatusCtrl').reloadFlowPolicies();
},
/**
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-bootstrap.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-bootstrap.js
index 8e5afb46a5..c120b6f5a5 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-bootstrap.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-bootstrap.js
@@ -333,7 +333,7 @@
// get the auto refresh interval
var autoRefreshIntervalSeconds = parseInt(configDetails.autoRefreshIntervalSeconds, 10);
-
+ nfCommon.setAutoRefreshInterval(autoRefreshIntervalSeconds);
// record whether we can configure the authorizer
nfCanvas.setManagedAuthorizer(configDetails.supportsManagedAuthorizer);
nfCanvas.setConfigurableAuthorizer(configDetails.supportsConfigurableAuthorizer);
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-flow-analysis-rule.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-flow-analysis-rule.js
index b59b3c070b..72874d4005 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-flow-analysis-rule.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-flow-analysis-rule.js
@@ -464,11 +464,11 @@
value: 'ENFORCE',
description: 'Treat violations of this rule as errors the correction of which is mandatory.'
}
-// , {
-// text: 'Warn',
-// value: 'WARN',
-// description: 'Treat violations of by this rule as warnings the correction of which is recommended but not mandatory.'
-// }
+ , {
+ text: 'Warn',
+ value: 'WARN',
+ description: 'Treat violations of by this rule as warnings the correction of which is recommended but not mandatory.'
+ }
],
selectedOption: {
value: flowAnalysisRule['enforcementPolicy']
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
index 3c6d0b1115..a3e37d2855 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
@@ -173,6 +173,7 @@
var nfCommon = {
ANONYMOUS_USER_TEXT: 'Anonymous user',
+ autoRefreshInterval: null,
config: {
sensitiveText: 'Sensitive value set',
@@ -1895,6 +1896,24 @@
});
return sortedAuthorizedParameterContexts.concat(sortedUnauthorizedParameterContexts);
+ },
+
+ /**
+ * Sets the global auto refresh value
+ *
+ * @param {integer} interval in seconds The numeric value for the auto refresh interval
+ */
+ setAutoRefreshInterval: function (interval) {
+ nfCommon.config.autoRefreshInterval = interval;
+ },
+
+ /**
+ * Gets the global auto refresh value
+ *
+ * @returns {integer}
+ */
+ getAutoRefreshInterval: function () {
+ return nfCommon.config.autoRefreshInterval;
}
};