Repository: incubator-nifi Updated Branches: refs/heads/NIFI-250 ec2149362 -> d8a27993d
NIFI-250: - Adding support to configure reporting task comments. Comments still need to be persisted to flow xml. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/d8a27993 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/d8a27993 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/d8a27993 Branch: refs/heads/NIFI-250 Commit: d8a27993d0d7a7650f59d595c58eb99e5140c82c Parents: ec21493 Author: Matt Gilman <[email protected]> Authored: Tue Mar 24 14:15:08 2015 -0400 Committer: Matt Gilman <[email protected]> Committed: Tue Mar 24 14:15:08 2015 -0400 ---------------------------------------------------------------------- .../org/apache/nifi/web/api/dto/ReportingTaskDTO.java | 12 ++++++------ .../org/apache/nifi/controller/FlowFromDOMFactory.java | 2 +- .../nifi/controller/StandardFlowSynchronizer.java | 2 +- .../org/apache/nifi/fingerprint/FingerprintFactory.java | 2 +- .../java/org/apache/nifi/web/api/dto/DtoFactory.java | 2 +- .../partials/canvas/reporting-task-configuration.jsp | 9 +++++++++ .../nifi-web-ui/src/main/webapp/css/reporting-task.css | 10 ++++++++++ .../src/main/webapp/js/nf/canvas/nf-reporting-task.js | 9 +++++++++ 8 files changed, 38 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d8a27993/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ReportingTaskDTO.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ReportingTaskDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ReportingTaskDTO.java index 7cb24ca..a019f97 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ReportingTaskDTO.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ReportingTaskDTO.java @@ -27,10 +27,10 @@ import javax.xml.bind.annotation.XmlType; @XmlType(name = "reportingTask") public class ReportingTaskDTO extends NiFiComponentDTO { private String name; - private String comment; private String type; private String state; private String availability; + private String comments; private String schedulingPeriod; private String schedulingStrategy; @@ -58,15 +58,15 @@ public class ReportingTaskDTO extends NiFiComponentDTO { } /** - * The user-defined comment for the reporting task + * The user-defined comments for the reporting task * @return */ - public String getComment() { - return comment; + public String getComments() { + return comments; } - public void setComment(String comment) { - this.comment = comment; + public void setComments(String comments) { + this.comments = comments; } /** http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d8a27993/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowFromDOMFactory.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowFromDOMFactory.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowFromDOMFactory.java index dc10bf0..85ad159 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowFromDOMFactory.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/FlowFromDOMFactory.java @@ -102,7 +102,7 @@ public class FlowFromDOMFactory { dto.setId(getString(element, "id")); dto.setName(getString(element, "name")); - dto.setComment(getString(element, "comment")); + dto.setComments(getString(element, "comment")); dto.setType(getString(element, "class")); dto.setSchedulingPeriod(getString(element, "schedulingPeriod")); dto.setState(getString(element, "scheduledState")); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d8a27993/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java index 674c115..91e7c86 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowSynchronizer.java @@ -377,7 +377,7 @@ public class StandardFlowSynchronizer implements FlowSynchronizer { final ReportingTaskNode reportingTask = controller.createReportingTask(dto.getType(), dto.getId(), false); reportingTask.setName(dto.getName()); - reportingTask.setComments(dto.getComment()); + reportingTask.setComments(dto.getComments()); reportingTask.setScheduldingPeriod(dto.getSchedulingPeriod()); reportingTask.setSchedulingStrategy(SchedulingStrategy.valueOf(dto.getSchedulingStrategy())); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d8a27993/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/fingerprint/FingerprintFactory.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/fingerprint/FingerprintFactory.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/fingerprint/FingerprintFactory.java index d1deff9..9a8ad28 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/fingerprint/FingerprintFactory.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/fingerprint/FingerprintFactory.java @@ -890,7 +890,7 @@ public final class FingerprintFactory { builder.append(dto.getId()); builder.append(dto.getType()); builder.append(dto.getName()); - builder.append(dto.getComment()); + builder.append(dto.getComments()); builder.append(dto.getSchedulingPeriod()); builder.append(dto.getSchedulingStrategy()); builder.append(dto.getAnnotationData()); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d8a27993/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java index dcf4f84..060790c 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/DtoFactory.java @@ -848,7 +848,7 @@ public final class DtoFactory { dto.setState(reportingTaskNode.getScheduledState().name()); dto.setActiveThreadCount(reportingTaskNode.getActiveThreadCount()); dto.setAnnotationData(reportingTaskNode.getAnnotationData()); -// dto.setComments(reportingTaskNode.getComments()); + dto.setComments(reportingTaskNode.getComments()); final Map<String, String> defaultSchedulingPeriod = new HashMap<>(); defaultSchedulingPeriod.put(SchedulingStrategy.TIMER_DRIVEN.name(), SchedulingStrategy.TIMER_DRIVEN.getDefaultSchedulingPeriod()); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d8a27993/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/reporting-task-configuration.jsp ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/reporting-task-configuration.jsp b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/reporting-task-configuration.jsp index 98f38f7..8d3e84d 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/reporting-task-configuration.jsp +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/reporting-task-configuration.jsp @@ -92,6 +92,15 @@ <div id="reporting-task-properties-tab-content" class="configuration-tab"> <div id="reporting-task-properties"></div> </div> + <div id="reporting-task-comments-tab-content" class="configuration-tab"> + <textarea cols="30" rows="4" id="reporting-task-comments" name="reporting-task-comments" class="reporting-task-editable setting-input"></textarea> + <div class="setting reporting-task-read-only hidden"> + <div class="setting-name">Comments</div> + <div class="setting-field"> + <span id="read-only-reporting-task-comments"></span> + </div> + </div> + </div> </div> </div> </div> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d8a27993/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/reporting-task.css ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/reporting-task.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/reporting-task.css index a94ed6c..8d5291e 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/reporting-task.css +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/reporting-task.css @@ -103,4 +103,14 @@ div.availability-setting { input.reporting-task-scheduling-period { font-size: 11px !important; width: 150px; +} + +/* + Comments +*/ + +#reporting-task-comments { + height: 250px; + width: 748px !important; + margin-top: 10px; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d8a27993/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-reporting-task.js ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-reporting-task.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-reporting-task.js index 7770df3..66d7b09 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-reporting-task.js +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-reporting-task.js @@ -64,6 +64,9 @@ nf.ReportingTask = (function () { if ($('#reporting-task-name').val() !== details.name) { return true; } + if ($('#reporting-task-comments').val() !== details['comments']) { + return true; + } if ($('#reporting-task-enabled').hasClass('checkbox-checked') && details['state'] === 'DISABLED') { return true; } else if ($('#reporting-task-enabled').hasClass('checkbox-unchecked') && (details['state'] === 'RUNNING' || details['state'] === 'STOPPED')) { @@ -117,6 +120,7 @@ nf.ReportingTask = (function () { reportingTaskDto['name'] = $('#reporting-task-name').val(); reportingTaskDto['schedulingStrategy'] = schedulingStrategy; reportingTaskDto['schedulingPeriod'] = schedulingPeriod.val(); + reportingTaskDto['comments'] = $('#reporting-task-comments').val(); // mark the processor disabled if appropriate if ($('#reporting-task-enabled').hasClass('checkbox-unchecked')) { @@ -248,6 +252,9 @@ nf.ReportingTask = (function () { }, { name: 'Properties', tabContentId: 'reporting-task-properties-tab-content' + }, { + name: 'Comments', + tabContentId: 'reporting-task-comments-tab-content' }], select: function () { // update the property table size in case this is the first time its rendered @@ -353,6 +360,7 @@ nf.ReportingTask = (function () { nf.Common.populateField('reporting-task-type', nf.Common.substringAfterLast(reportingTask['type'], '.')); $('#reporting-task-name').val(reportingTask['name']); $('#reporting-task-enabled').removeClass('checkbox-unchecked checkbox-checked').addClass(reportingTaskEnableStyle); + $('#reporting-task-comments').val(reportingTask['comments']); // select the availability when appropriate if (nf.Canvas.isClustered()) { @@ -567,6 +575,7 @@ nf.ReportingTask = (function () { nf.Common.populateField('reporting-task-id', reportingTask['id']); nf.Common.populateField('reporting-task-type', nf.Common.substringAfterLast(reportingTask['type'], '.')); nf.Common.populateField('read-only-reporting-task-name', reportingTask['name']); + nf.Common.populateField('read-only-reporting-task-comments', reportingTask['comments']); // select the availability when appropriate if (nf.Canvas.isClustered()) {
