You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2015/02/11 17:25:20 UTC
[4/4] incubator-nifi git commit: NIFI-250: - Renaming references to
referencing components to be more accurate. - Fixing borders around the
referencing components.
NIFI-250:
- Renaming references to referencing components to be more accurate.
- Fixing borders around the referencing components.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/62b0669e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/62b0669e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/62b0669e
Branch: refs/heads/NIFI-250
Commit: 62b0669e121e817cd80ba21b8104ad9e210ea531
Parents: 819c76b
Author: Matt Gilman <ma...@gmail.com>
Authored: Wed Feb 11 11:25:04 2015 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Wed Feb 11 11:25:04 2015 -0500
----------------------------------------------------------------------
.../nifi/web/api/dto/ControllerServiceDTO.java | 4 +-
.../nifi/web/StandardNiFiServiceFacade.java | 4 +-
.../org/apache/nifi/web/api/dto/DtoFactory.java | 10 +-
.../canvas/controller-service-configuration.jsp | 4 +-
.../disable-controller-service-dialog.jsp | 4 +-
.../src/main/webapp/css/controller-service.css | 25 ++--
.../src/main/webapp/css/settings.css | 1 -
.../js/nf/canvas/nf-controller-service.js | 124 +++++++++++--------
.../src/main/webapp/js/nf/canvas/nf-settings.js | 2 +-
9 files changed, 97 insertions(+), 81 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/62b0669e/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceDTO.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/ControllerServiceDTO.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceDTO.java
index 1372195..2f73f3f 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceDTO.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/dto/ControllerServiceDTO.java
@@ -151,11 +151,11 @@ public class ControllerServiceDTO extends NiFiComponentDTO {
*
* @return
*/
- public Set<ControllerServiceReferencingComponentDTO> getReferences() {
+ public Set<ControllerServiceReferencingComponentDTO> getReferencingComponents() {
return references;
}
- public void setReferences(Set<ControllerServiceReferencingComponentDTO> references) {
+ public void setReferencingComponents(Set<ControllerServiceReferencingComponentDTO> references) {
this.references = references;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/62b0669e/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.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/StandardNiFiServiceFacade.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
index 093296a..2ed5611 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
@@ -1215,7 +1215,7 @@ public class StandardNiFiServiceFacade implements NiFiServiceFacade {
@Override
public Set<ControllerServiceReferencingComponentDTO> execute() {
final ControllerServiceReference reference = controllerServiceDAO.updateControllerServiceReferencingComponents(controllerServiceId, state);
- return dtoFactory.createControllerServiceReferencesDto(reference);
+ return dtoFactory.createControllerServiceReferencingComponentsDto(reference);
}
});
}
@@ -1947,7 +1947,7 @@ public class StandardNiFiServiceFacade implements NiFiServiceFacade {
@Override
public Set<ControllerServiceReferencingComponentDTO> getControllerServiceReferencingComponents(String controllerServiceId) {
final ControllerServiceNode service = controllerServiceDAO.getControllerService(controllerServiceId);
- return dtoFactory.createControllerServiceReferencesDto(service.getReferences());
+ return dtoFactory.createControllerServiceReferencingComponentsDto(service.getReferences());
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/62b0669e/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 7a8f00a..4bc19f8 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
@@ -891,7 +891,7 @@ public final class DtoFactory {
}
// create the reference dto's
- dto.setReferences(createControllerServiceReferencesDto(controllerServiceNode.getReferences()));
+ dto.setReferencingComponents(createControllerServiceReferencingComponentsDto(controllerServiceNode.getReferences()));
// add the validation errors
final Collection<ValidationResult> validationErrors = controllerServiceNode.getValidationErrors();
@@ -907,8 +907,8 @@ public final class DtoFactory {
return dto;
}
- public Set<ControllerServiceReferencingComponentDTO> createControllerServiceReferencesDto(final ControllerServiceReference reference) {
- final Set<ControllerServiceReferencingComponentDTO> references = new LinkedHashSet<>();
+ public Set<ControllerServiceReferencingComponentDTO> createControllerServiceReferencingComponentsDto(final ControllerServiceReference reference) {
+ final Set<ControllerServiceReferencingComponentDTO> referencingComponents = new LinkedHashSet<>();
// get all references
for (final ConfiguredComponent component : reference.getReferencingComponents()) {
@@ -936,10 +936,10 @@ public final class DtoFactory {
dto.setReferenceType(ReportingTask.class.getSimpleName());
}
- references.add(dto);
+ referencingComponents.add(dto);
}
- return references;
+ return referencingComponents;
}
public RemoteProcessGroupPortDTO createRemoteProcessGroupPortDto(final RemoteGroupPort port) {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/62b0669e/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/controller-service-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/controller-service-configuration.jsp b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/controller-service-configuration.jsp
index f769b3e..4b4a75c 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/controller-service-configuration.jsp
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/controller-service-configuration.jsp
@@ -60,11 +60,11 @@
<div class="settings-right">
<div class="setting">
<div class="setting-name">
- References
+ Referencing Components
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="Other comonents referencing this controller service."/>
</div>
<div class="setting-field">
- <div id="controller-service-references"></div>
+ <div id="controller-service-referencing-components"></div>
</div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/62b0669e/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/disable-controller-service-dialog.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/disable-controller-service-dialog.jsp b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/disable-controller-service-dialog.jsp
index 33a0bd9..0b432af 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/disable-controller-service-dialog.jsp
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/disable-controller-service-dialog.jsp
@@ -24,9 +24,9 @@
</div>
</div>
<div class="setting">
- <div class="setting-name">References</div>
+ <div class="setting-name">Referencing Components</div>
<div class="setting-field">
- <div id="disable-controller-service-references"></div>
+ <div id="disable-controller-service-referencing-components"></div>
</div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/62b0669e/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service.css
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service.css
index 835bbd8..09be3c4 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service.css
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service.css
@@ -108,7 +108,7 @@ div.availability-setting {
Service references
*/
-#controller-service-references {
+#controller-service-referencing-components {
border: 0 solid #CCCCCC;
height: 280px;
overflow-y: auto;
@@ -117,30 +117,30 @@ div.availability-setting {
width: 376px;
}
-div.reference-block {
+div.referencing-component-block {
margin-bottom: 6px;
}
-span.reference-title {
+span.referencing-component-title {
margin-left: 5px;
font-weight: bold
}
-span.reference-count {
+span.referencing-component-count {
margin-left: 5px;
color: #aaa;
}
-ul.reference-listing {
+ul.referencing-component-listing {
margin-left: 20px;
margin-bottom: 6px;
}
-ul.reference-listing li {
+ul.referencing-component-listing li {
margin-bottom: 6px;
}
-div.reference-state {
+div.referencing-component-state {
margin-top: -2px;
}
@@ -149,20 +149,20 @@ span.service.expansion-button {
margin-top: 2px;
}
-span.reference-active-thread-count {
+span.referencing-component-active-thread-count {
}
-span.reference-name {
+span.referencing-component-name {
margin-left: 5px;
margin-right: 5px;
}
-span.reference-type {
+span.referencing-component-type {
color: #aaa;
font-style: italic;
}
-div.reference-references {
+div.referencing-component-references {
margin-left: 20px;
margin-top: 6px;
clear: left;
@@ -190,10 +190,11 @@ div.reference-references {
line-height: normal;
}
-#disable-controller-service-references {
+#disable-controller-service-referencing-components {
border: 0 solid #CCCCCC;
padding: 2px;
width: 474px;
height: 290px;
overflow: auto;
+ white-space: nowrap;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/62b0669e/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/settings.css
----------------------------------------------------------------------
diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/settings.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/settings.css
index 36fef5c..91805e1 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/settings.css
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/settings.css
@@ -46,7 +46,6 @@
span.expansion-button {
width: 10px;
height: 10px;
- display: inline-block;
float: left;
}
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/62b0669e/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.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-controller-service.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js
index 52dddcf..230eeb4 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js
@@ -138,12 +138,13 @@ nf.ControllerService = (function () {
var controllerServiceData = controllerServiceGrid.getData();
controllerServiceData.updateItem(controllerService.id, controllerService);
- // reload the controller service references
+ // reload the controller service referencing components
reloadControllerServiceReferences(controllerService);
};
/**
- * Reloads components that reference this controller service.
+ * Reloads components that reference this controller service as well as
+ * other services that this controller service references.
*
* @param {object} controllerService
*/
@@ -151,7 +152,7 @@ nf.ControllerService = (function () {
var reloadOther = false;
// reload all dependent processors if they are currently visible
- $.each(controllerService.references, function (_, reference) {
+ $.each(controllerService.referencingComponents, function (_, reference) {
if (reference.referenceType === 'Processor') {
if (nf.Canvas.getGroupId() === reference.groupId) {
var processor = nf.Processor.get(reference.id);
@@ -179,12 +180,17 @@ nf.ControllerService = (function () {
};
/**
- * Adds a border to the controller service references if necessary.
+ * Adds a border to the controller service referencing components if necessary.
*
* @argument {jQuery} referenceContainer
*/
- var updateReferencesBorder = function (referenceContainer) {
- if (referenceContainer.is(':visible') && referenceContainer.get(0).scrollHeight > referenceContainer.innerHeight()) {
+ var updateReferencingComponentsBorder = function (referenceContainer) {
+ // determine if it is too big
+ var tooBig = referenceContainer.get(0).scrollHeight > referenceContainer.innerHeight() ||
+ referenceContainer.get(0).scrollWidth > referenceContainer.innerWidth();
+
+ // draw the border if necessary
+ if (referenceContainer.is(':visible') && tooBig) {
referenceContainer.css('border-width', '1px');
} else {
referenceContainer.css('border-width', '0px');
@@ -195,9 +201,9 @@ nf.ControllerService = (function () {
* Adds the specified reference for this controller service.
*
* @argument {jQuery} referenceContainer
- * @param {array} references
+ * @param {array} referencingComponents
*/
- var createReferences = function (referenceContainer, references) {
+ var createReferencingComponents = function (referenceContainer, referencingComponents) {
// toggles the visibility of a container
var toggle = function (twist, container) {
if (twist.hasClass('expanded')) {
@@ -209,35 +215,35 @@ nf.ControllerService = (function () {
}
};
- var processors = $('<ul class="reference-listing clear"></ul>');
- var services = $('<ul class="reference-listing clear"></ul>');
- var tasks = $('<ul class="reference-listing clear"></ul>');
- $.each(references, function (_, reference) {
- if (reference.referenceType === 'Processor') {
- var processorLink = $('<span class="reference-name link"></span>').text(reference.name).on('click', function () {
+ var processors = $('<ul class="referencing-component-listing clear"></ul>');
+ var services = $('<ul class="referencing-component-listing clear"></ul>');
+ var tasks = $('<ul class="referencing-component-listing clear"></ul>');
+ $.each(referencingComponents, function (_, referencingComponent) {
+ if (referencingComponent.referenceType === 'Processor') {
+ var processorLink = $('<span class="referencing-component-name link"></span>').text(referencingComponent.name).on('click', function () {
// show the component
- nf.CanvasUtils.showComponent(reference.groupId, reference.id);
+ nf.CanvasUtils.showComponent(referencingComponent.groupId, referencingComponent.id);
// close the dialog and shell
referenceContainer.closest('.dialog').modal('hide');
$('#shell-close-button').click();
});
- var activeThreadCount = $('<span class="reference-active-thread-count"></span>');
- if (nf.Common.isDefinedAndNotNull(reference.activeThreadCount) && reference.activeThreadCount > 0) {
- activeThreadCount.text('(' + reference.activeThreadCount + ')');
+ var activeThreadCount = $('<span class="referencing-component-active-thread-count"></span>');
+ if (nf.Common.isDefinedAndNotNull(referencingComponent.activeThreadCount) && referencingComponent.activeThreadCount > 0) {
+ activeThreadCount.text('(' + referencingComponent.activeThreadCount + ')');
}
- var processorState = $('<div class="reference-state"></div>').addClass(reference.state.toLowerCase());
- var processorType = $('<span class="reference-type"></span>').text(nf.Common.substringAfterLast(reference.type, '.'));
+ var processorState = $('<div class="referencing-component-state"></div>').addClass(referencingComponent.state.toLowerCase());
+ var processorType = $('<span class="referencing-component-type"></span>').text(nf.Common.substringAfterLast(referencingComponent.type, '.'));
var processorItem = $('<li></li>').append(processorState).append(activeThreadCount).append(processorLink).append(processorType);
processors.append(processorItem);
- } else if (reference.referenceType === 'ControllerService') {
- var serviceLink = $('<span class="reference-name link"></span>').text(reference.name).on('click', function () {
+ } else if (referencingComponent.referenceType === 'ControllerService') {
+ var serviceLink = $('<span class="referencing-component-name link"></span>').text(referencingComponent.name).on('click', function () {
var controllerServiceGrid = $('#controller-services-table').data('gridInstance');
var controllerServiceData = controllerServiceGrid.getData();
// select the selected row
- var row = controllerServiceData.getRowById(reference.id);
+ var row = controllerServiceData.getRowById(referencingComponent.id);
controllerServiceGrid.setSelectedRows([row]);
// close the dialog and shell
@@ -245,15 +251,19 @@ nf.ControllerService = (function () {
});
// container for this service's references
- var referencingServiceReferencesContainer = $('<div class="reference-references hidden"></div>');
+ var referencingServiceReferencesContainer = $('<div class="referencing-component-references hidden"></div>');
var serviceTwist = $('<span class="service expansion-button collapsed pointer"></span>').on('click', function() {
if (serviceTwist.hasClass('collapsed')) {
var controllerServiceGrid = $('#controller-services-table').data('gridInstance');
var controllerServiceData = controllerServiceGrid.getData();
- var referencingService = controllerServiceData.getItemById(reference.id);
+ var referencingService = controllerServiceData.getItemById(referencingComponent.id);
// create the markup for the references
- createReferences(referencingServiceReferencesContainer, referencingService.references);
+ if (!nf.Common.isEmpty(referencingService.referencingComponents)) {
+ createReferencingComponents(referencingServiceReferencesContainer, referencingService.referencingComponents);
+ } else {
+ referencingServiceReferencesContainer.append('<div class="unset">This service has no components referencing it.</div>');
+ }
} else {
referencingServiceReferencesContainer.empty();
}
@@ -262,16 +272,16 @@ nf.ControllerService = (function () {
toggle(serviceTwist, referencingServiceReferencesContainer);
// update borders as necessary
- updateReferencesBorder(referenceContainer);
+ updateReferencingComponentsBorder(referenceContainer);
});
- var serviceState = $('<div class="reference-state"></div>').addClass(reference.enabled === true ? 'enabled' : 'disabled');
- var serviceType = $('<span class="reference-type"></span>').text(nf.Common.substringAfterLast(reference.type, '.'));
+ var serviceState = $('<div class="referencing-component-state"></div>').addClass(referencingComponent.enabled === true ? 'enabled' : 'disabled');
+ var serviceType = $('<span class="referencing-component-type"></span>').text(nf.Common.substringAfterLast(referencingComponent.type, '.'));
var serviceItem = $('<li></li>').append(serviceTwist).append(serviceState).append(serviceLink).append(serviceType).append(referencingServiceReferencesContainer);
services.append(serviceItem);
- } else if (reference.referenceType === 'ReportingTask') {
- var taskItem = $('<li></li>').text(reference.name).on('click', function () {
+ } else if (referencingComponent.referenceType === 'ReportingTask') {
+ var taskItem = $('<li></li>').text(referencingComponent.name).on('click', function () {
// close the dialog and shell
$('#controller-service-configuration').modal('hide');
@@ -288,16 +298,16 @@ nf.ControllerService = (function () {
}
var twist = $('<span class="expansion-button expanded"></span>');
- var title = $('<span class="reference-title"></span>').text(titleText);
- var count = $('<span class="reference-count"></span>').text('(' + list.children().length + ')');
+ var title = $('<span class="referencing-component-title"></span>').text(titleText);
+ var count = $('<span class="referencing-component-count"></span>').text('(' + list.children().length + ')');
// create the reference block
- $('<div class="reference-block pointer unselectable"></div>').on('click', function () {
+ $('<div class="referencing-component-block pointer unselectable"></div>').on('click', function () {
// toggle this block
toggle(twist, list);
// update the border if necessary
- updateReferencesBorder(referenceContainer);
+ updateReferencingComponentsBorder(referenceContainer);
}).append(twist).append(title).append(count).appendTo(referenceContainer);
// add the listing
@@ -306,11 +316,8 @@ nf.ControllerService = (function () {
// create blocks for each type of component
createReferenceBlock('Processors', processors);
- createReferenceBlock('Controller Services', services);
createReferenceBlock('Reporting Tasks', tasks);
-
- // update the border if necessary
- updateReferencesBorder(referenceContainer);
+ createReferenceBlock('Controller Services', services);
};
// sets whether the specified controller service is enabled
@@ -343,11 +350,20 @@ nf.ControllerService = (function () {
// populate the disable controller service dialog
$('#disable-controller-service-name').text(controllerService.name);
- var referencesContainer = $('#disable-controller-service-references');
- createReferences(referencesContainer, controllerService.references);
+ var referencingComponentsContainer = $('#disable-controller-service-referencing-components');
+
+ // load the controller referencing components list
+ if (!nf.Common.isEmpty(controllerService.referencingComponents)) {
+ createReferencingComponents(referencingComponentsContainer, controllerService.referencingComponents);
+ } else {
+ referencingComponentsContainer.append('<div class="unset">This service has no components referencing it.</div>');
+ }
// show the dialog
$('#disable-controller-service-dialog').modal('show');
+
+ // update the border if necessary
+ updateReferencingComponentsBorder(referencingComponentsContainer);
};
return {
@@ -379,8 +395,8 @@ nf.ControllerService = (function () {
$('#controller-service-properties').propertytable('saveRow');
// show the border around the processor relationships if necessary
- var referenceContainer = $('#controller-service-references');
- updateReferencesBorder(referenceContainer);
+ var referenceContainer = $('#controller-service-referencing-components');
+ updateReferencingComponentsBorder(referenceContainer);
}
});
@@ -395,8 +411,8 @@ nf.ControllerService = (function () {
overlayBackground: false,
handler: {
close: function () {
- // empty the references list
- $('#controller-service-references').css('border-width', '0').empty();
+ // empty the referencing components list
+ $('#controller-service-referencing-components').css('border-width', '0').empty();
// cancel any active edits
$('#controller-service-properties').propertytable('cancelEdit');
@@ -441,7 +457,7 @@ nf.ControllerService = (function () {
handler: {
close: function() {
$('#disable-controller-service-name').text('');
- $('#disable-controller-service-references').empty();
+ $('#disable-controller-service-referencing-components').css('border-width', '0').empty();
}
}
}).draggable({
@@ -504,13 +520,13 @@ nf.ControllerService = (function () {
}
// get the reference container
- var referenceContainer = $('#controller-service-references');
+ var referenceContainer = $('#controller-service-referencing-components');
- // load the controller references list
- if (!nf.Common.isEmpty(controllerService.references)) {
- createReferences(referenceContainer, controllerService.references);
+ // load the controller referencing components list
+ if (!nf.Common.isEmpty(controllerService.referencingComponents)) {
+ createReferencingComponents(referenceContainer, controllerService.referencingComponents);
} else {
- $('#controller-service-references').append('<div class="unset">This service has no components referencing it.</div>');
+ referenceContainer.append('<div class="unset">This service has no components referencing it.</div>');
}
var buttons = [{
@@ -629,7 +645,7 @@ nf.ControllerService = (function () {
$('#controller-service-configuration').modal('show');
// show the border if necessary
- updateReferencesBorder(referenceContainer);
+ updateReferencingComponentsBorder(referenceContainer);
}).fail(nf.Common.handleAjaxError);
},
@@ -652,7 +668,7 @@ nf.ControllerService = (function () {
* @param {object} controllerService
*/
disable: function(controllerService) {
- if (nf.Common.isEmpty(controllerService.references)) {
+ if (nf.Common.isEmpty(controllerService.referencingComponents)) {
setEnabled(controllerService, false);
} else {
showDisableControllerServiceDialog(controllerService);
@@ -664,7 +680,7 @@ nf.ControllerService = (function () {
*
* @param {object} controllerService
*/
- 'delete': function(controllerService) {
+ remove: function(controllerService) {
// prompt for removal?
var revision = nf.Client.getRevision();
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/62b0669e/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.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-settings.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
index 8e40865..eef5448 100644
--- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
+++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
@@ -809,7 +809,7 @@ nf.Settings = (function () {
} else if (target.hasClass('disable-controller-service')) {
nf.ControllerService.disable(controllerService);
} else if (target.hasClass('delete-controller-service')) {
- nf.ControllerService.delete(controllerService);
+ nf.ControllerService.remove(controllerService);
}
} else if (controllerServicesGrid.getColumns()[args.cell].id === 'moreDetails') {
if (target.hasClass('view-controller-service')) {